Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a34a6c51cd
|
|
@ -58,6 +58,10 @@
|
|||
nix-build lib/tests/maintainers.nix
|
||||
|
||||
See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
|
||||
|
||||
When adding a new maintainer, be aware of the current commit conventions
|
||||
documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions)
|
||||
file located in the root of the Nixpkgs repo.
|
||||
*/
|
||||
{
|
||||
_0b11stan = {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@
|
|||
, dconf
|
||||
, librsvg
|
||||
, gdk-pixbuf
|
||||
# some scripts need these when used in conjuction with firejail
|
||||
, coreutils
|
||||
, gnugrep
|
||||
# Configuration options for the wrapper
|
||||
, extraMakeWrapperArgs ? []
|
||||
, dbusVerify ? stdenv.isLinux
|
||||
|
|
@ -32,6 +35,7 @@ let
|
|||
"--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share"
|
||||
"--prefix" "GST_PLUGIN_SYSTEM_PATH_1_0" ":"
|
||||
"${lib.makeSearchPath "lib/girepository-1.0" unwrapped.gst_packages}"
|
||||
"--suffix" "PATH" ":" "${lib.makeBinPath [ coreutils gnugrep ]}"
|
||||
] ++ lib.optionals unwrapped.kdeIntegration [
|
||||
"--prefix" "QT_PLUGIN_PATH" ":" "${
|
||||
lib.makeSearchPath
|
||||
|
|
|
|||
|
|
@ -2,12 +2,11 @@
|
|||
, coreutils
|
||||
, fetchFromGitHub
|
||||
, ghostscript
|
||||
, glibc
|
||||
, locale
|
||||
, gnome
|
||||
, gnused
|
||||
, lib
|
||||
, resholve
|
||||
, xorg
|
||||
}:
|
||||
|
||||
resholve.mkDerivation rec {
|
||||
|
|
@ -35,15 +34,16 @@ resholve.mkDerivation rec {
|
|||
inputs = [
|
||||
coreutils
|
||||
ghostscript
|
||||
glibc
|
||||
locale
|
||||
gnome.zenity
|
||||
gnused
|
||||
xorg.xmessage
|
||||
];
|
||||
fake = {
|
||||
# only need xmessage if zenity is unavailable
|
||||
external = [ "xmessage" ];
|
||||
};
|
||||
execer = [
|
||||
"cannot:${glibc.bin}/bin/locale"
|
||||
"cannot:${gnome.zenity}/bin/zenity"
|
||||
"cannot:${xorg.xmessage}/bin/xmessage"
|
||||
];
|
||||
keep."$toutLu" = true;
|
||||
};
|
||||
|
|
@ -54,5 +54,6 @@ resholve.mkDerivation rec {
|
|||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
mainProgram = "pdfmm";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cwltool";
|
||||
version = "3.1.20240112164112";
|
||||
version = "3.1.20240404144621";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-workflow-language";
|
||||
repo = "cwltool";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Y0DORypXlTDv04qh796oXPSTxCXGb7rLQ8Su+/As7Lo=";
|
||||
hash = "sha256-atpXkMIQ60POuUk99uiiuCoRXt4Seg11g/eHCeTDe+Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,18 +10,18 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "bitwarden-cli";
|
||||
version = "2024.2.1";
|
||||
version = "2024.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "cli-v${version}";
|
||||
hash = "sha256-g9enDEIdVj9R3xkx5qllf7aTDa6F+MvozhwbJn9w/VY=";
|
||||
hash = "sha256-JBEP4dNGL4rYKl2qNyhB2y/wZunikaGFltGVXLxgMWI=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_18;
|
||||
|
||||
npmDepsHash = "sha256-fkoI8a8iVMWxtXAj5zNg2xwK/ZPyRZGPo7rnxHpKV7k=";
|
||||
npmDepsHash = "sha256-vNudSHIMmF7oXGz+ZymQahyHebs/CBDc6Oy1g0A5nqA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ let
|
|||
electron = electron_28;
|
||||
in buildNpmPackage rec {
|
||||
pname = "bitwarden-desktop";
|
||||
version = "2024.3.0";
|
||||
version = "2024.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "desktop-v${version}";
|
||||
hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g=";
|
||||
hash = "sha256-UzVzo8tq719W2EwUE4NfvUrqhb61fvd60EGkavQmv3Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -60,7 +60,7 @@ in buildNpmPackage rec {
|
|||
makeCacheWritable = true;
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
npmWorkspace = "apps/desktop";
|
||||
npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc=";
|
||||
npmDepsHash = "sha256-qkg1psct/ekIXB6QmJX1n/UOKUhYSD9Su7t/b4/4miM=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -76,7 +76,7 @@ in buildNpmPackage rec {
|
|||
patches;
|
||||
patchFlags = [ "-p4" ];
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI=";
|
||||
hash = "sha256-lvEJmjzhpMhm+9INYHWpdltinUOI3DMtFN/ddDQrUvo=";
|
||||
};
|
||||
cargoRoot = "apps/desktop/desktop_native";
|
||||
|
||||
|
|
|
|||
|
|
@ -6,18 +6,19 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "iredis";
|
||||
version = "1.14.1";
|
||||
version = "1.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laixintao";
|
||||
repo = "iredis";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ojS2wtxggZPp73n9SjPRAzBlnF1ScK/pNVGvAYKmQ5Y=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wfjr/FVmKgkP8FMKxw6e8U+lfZQZ2q52REC0mU8Xp7Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'packaging = "^23.0"' 'packaging = "*"' \
|
||||
--replace-fail 'wcwidth = "0.1.9"' 'wcwidth = "*"'
|
||||
'';
|
||||
|
||||
|
|
@ -26,20 +27,21 @@ python3.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pygments
|
||||
click
|
||||
configobj
|
||||
mistune
|
||||
packaging
|
||||
pendulum
|
||||
prompt-toolkit
|
||||
pygments
|
||||
python-dateutil
|
||||
redis
|
||||
wcwidth
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
freezegun
|
||||
pexpect
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
|
@ -50,7 +52,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
# Only execute unittests, because cli tests require a running Redis
|
||||
"tests/unittests/"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Flaky test
|
||||
# Flaky tests
|
||||
"--deselect=tests/unittests/test_entry.py::test_command_shell_options_higher_priority"
|
||||
"--deselect=tests/unittests/test_utils.py::test_timer"
|
||||
];
|
||||
|
||||
|
|
@ -58,8 +61,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A Terminal Client for Redis with AutoCompletion and Syntax Highlighting";
|
||||
changelog = "https://github.com/laixintao/iredis/raw/${src.rev}/CHANGELOG.md";
|
||||
homepage = "https://iredis.io/";
|
||||
changelog = "https://github.com/laixintao/iredis/blob/${src.rev}/CHANGELOG.md";
|
||||
homepage = "https://iredis.xbin.io/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
mainProgram = "iredis";
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "namespace-cli";
|
||||
version = "0.0.355";
|
||||
version = "0.0.356";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namespacelabs";
|
||||
repo = "foundation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-St/zZqfoate9TwYo7q9Za+T6q4kRw9vSzcBfMW7AXkw=";
|
||||
hash = "sha256-sQZ0kwZXaYoiXCaSvCcnMqYNeLHvtZzHih52+2AYdeY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE=";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qpoases";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "qpOASES";
|
||||
rev = "releases/${finalAttrs.version}";
|
||||
hash = "sha256-NWKwKYdXJD8lGorhTFWJmYeIhSCO00GHiYx+zHEJk0M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Allow building as shared library.
|
||||
# This was merged upstream, and can be removed on next version
|
||||
(fetchpatch {
|
||||
name = "shared-libs.patch";
|
||||
url = "https://github.com/coin-or/qpOASES/pull/109/commits/cb49b52c17e0b638c88ff92f4c59e347cd82a332.patch";
|
||||
hash = "sha256-6IoJHCFVCZpf3+Im1f64VwV5vj+bbbwCSF0vqpdd5Os=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source C++ implementation of the recently proposed online active set strategy";
|
||||
homepage = "https://github.com/coin-or/qpOASES";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ nim65s ];
|
||||
};
|
||||
})
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
|
||||
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
|
||||
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "8.3.27"; sha256 = "19y1zk2zga464jfv77qir8nlw7mx8lsfpgdswkgz5s3pbhpmzxl8"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "8.4.1"; sha256 = "03mdxfrwgfprpn9g17sxhzxg09k3dkkm2xs29i4r36b5jlgmms5g"; })
|
||||
(fetchNuGet { pname = "ExCSS"; version = "4.2.3"; sha256 = "1likxhccg4l4g4i65z4dfzp9059hij6h1q7prx2sgakvk8zzmw9k"; })
|
||||
(fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.5"; sha256 = "1fk38vm4fqrhwv7zcffg34dfrgdwfqndpyjpyblyx7xj3nlpm8hi"; })
|
||||
(fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; sha256 = "1ji816r8idwjmxk8bzyq1z32ybz7xdg3nb0a7pnvqr8vys11bkgb"; })
|
||||
|
|
@ -58,10 +58,10 @@
|
|||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.4.0"; sha256 = "138jyzwap55a8wgg26zwzm0lifc3im1cs65cjgrpw3b13szfqd5g"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.4.0"; sha256 = "0dv05mh0g3g39plza0qlsaak52z1drkansh65nhfjwhj968v7rr1"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.4.0"; sha256 = "16r0qyxbn7gibwpgprlxra5c183ps3njrxp5si28k50jhyjm7rxf"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.4.0"; sha256 = "056dg7iwgdp4kmw87rq7yzp5a2l02krssxdpga4rxrkj21iranm9"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.1"; sha256 = "0kdxb47rafvk6mx0xkf2pik7b638b2d847jlhzi3fvj6swg3v15b"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.1"; sha256 = "1ny97mhld7vzn5xwxvcy1jhfq4mw15wrk9c77z6cg2fydkgawyzx"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.1"; sha256 = "1zharnx3vhrfdn761w16ygxyj9ig5zn71346aqkk0nmzlll3gfjf"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.1"; sha256 = "14fjr679hwal35mdwdv4w40mnxzfnnx65yc16807zzkyri011zc1"; })
|
||||
(fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.0"; sha256 = "1zl39k27r4zq75r1x1zr1yl4nzxpkxdnnv6dwd4qp0xr22my85aq"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
|
|
|
|||
|
|
@ -19,19 +19,20 @@
|
|||
, fontconfig
|
||||
, glew
|
||||
, libGL
|
||||
, udev
|
||||
, SDL2
|
||||
, SDL2_mixer
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.1248"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.1281"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "7124d679fd4345f2ed517e77ab40d90e6bef9650";
|
||||
sha256 = "11lp9j885j1ybl9arj51233396r9qdsy53ahwhwsmjgz71n1d2i5";
|
||||
rev = "8884d1fd732c9ba788f0ab711e6a9f507d934ac8";
|
||||
sha256 = "0g4x10whiybckvx8hhpdrpa8mbypwmpq1av6cjk53zc7iwkhvigw";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
|
|
@ -49,6 +50,7 @@ buildDotnetModule rec {
|
|||
pulseaudio
|
||||
vulkan-loader
|
||||
ffmpeg
|
||||
udev
|
||||
|
||||
# Avalonia UI
|
||||
libICE
|
||||
|
|
|
|||
|
|
@ -10,15 +10,12 @@
|
|||
, libtiff
|
||||
, gst_all_1
|
||||
, libraw
|
||||
, libsoup
|
||||
, libsecret
|
||||
, glib
|
||||
, gtk3
|
||||
, gsettings-desktop-schemas
|
||||
, librsvg
|
||||
, libwebp
|
||||
, json-glib
|
||||
, webkitgtk
|
||||
, lcms2
|
||||
, bison
|
||||
, flex
|
||||
|
|
@ -65,17 +62,14 @@ stdenv.mkDerivation rec {
|
|||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gtk3
|
||||
json-glib
|
||||
lcms2
|
||||
libheif
|
||||
libjpeg
|
||||
libraw
|
||||
librsvg
|
||||
libsecret
|
||||
libsoup
|
||||
libtiff
|
||||
libwebp
|
||||
webkitgtk
|
||||
xapp
|
||||
];
|
||||
|
||||
|
|
@ -89,6 +83,10 @@ stdenv.mkDerivation rec {
|
|||
pix/make-authors-tab.py
|
||||
'';
|
||||
|
||||
# Avoid direct dependency on webkit2gtk-4.0
|
||||
# https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version
|
||||
mesonFlags = [ "-Dwebservices=false" ];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ let
|
|||
cargoDeps = if yjitSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.pname}-${version}/${finalAttrs.cargoRoot}";
|
||||
hash = cargoHash;
|
||||
hash = assert cargoHash != null; cargoHash;
|
||||
} else null;
|
||||
|
||||
postUnpack = opString rubygemsSupport ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
{ lib, buildDunePackage, fetchurl }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "miou";
|
||||
version = "0.1.0";
|
||||
|
||||
minimalOCamlVersion = "5.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz";
|
||||
hash = "sha256-WTs6L9j4z1/0wKcGIZVwaNrATRGCTN5A6RwO7tY2phE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Composable concurrency primitives for OCaml";
|
||||
homepage = "https://git.robur.coop/robur/miou";
|
||||
changelog = "https://git.robur.coop/robur/miou/src/tag/v${version}/CHANGES.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ marsam ];
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "blinkpy";
|
||||
version = "0.22.6";
|
||||
version = "0.22.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "fronzbot";
|
||||
repo = "blinkpy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-46REi+3dUY9dJrhXgKkQ1OfN6XCy1fV9cW6wk82ClOA=";
|
||||
hash = "sha256-FfjvF6PBM+18JgQBP6vyElQYWMVizAEGk92ILwxpFSk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "internetarchive";
|
||||
version = "3.7.0";
|
||||
version = "4.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "jjjake";
|
||||
repo = "internetarchive";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-krMOjXzI9tmLGLEswXLLqc8J68Gwnl1VrRO2fLbDv0o=";
|
||||
hash = "sha256-U6idxc5U2Bt581c/vnGgIou5+hoEJJZSPCo97MEDaW4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.10.4";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-HLoTQrC8LVI2LZFJPRaobFX0TgT8mwVkmzyuii5bGA8=";
|
||||
hash = "sha256-0Dk3f38kj4bSTffFVhMNwuQXmty7vZMAieKDmkH945Y=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-L7LDOfJ2v4FIdF8Ttpy7qOhMMLFFuhVxjuy5znn9Yb4=";
|
||||
vendorHash = "sha256-WT30up/1Y2ar0pkHOq1s0Sz7qc4b+Yr6gILzDYDo0Uk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "unflac";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ft";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-BgXuPAXrw28axfTEh10Yh8dQc27M1/lSmCo2eAeNnjE=";
|
||||
sha256 = "sha256-xJEVrzooNcS3zEKeF6DB7ZRZEjHfC7dGKgQfswxbD+U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IQHxEYv6l8ORoX+a3Szox9tS2fyBk0tpK+Q1AsWohX0=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "csview";
|
||||
version = "1.2.4";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7AppXnU9VQx1CMyK2evWtRFVb8qvgSzKp+oFKoIGR9w=";
|
||||
sha256 = "sha256-v+WqiHecps3rCGf6CF0KJDZUWs7zMrFypVPTANR8b6Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-npbvKwxf6OxNw340yZ9vrQkXrZxD4G8yhZZEdDLwLs8=";
|
||||
cargoHash = "sha256-v5QxJto9acVJnMUvBK3QdkDH+qO2+wtqitGfSCcaJ5w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high performance csv viewer with cjk/emoji support";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "d2";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GImv4OJHanj6dKtAJpTaGLrR4AaVTboiYHwRdh/gXaU=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lOZ2JFQG4x4xv/fdTlpOEp9lpdjR0ACyAIUWEZUm6L8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T7eki06fQuGvYIJKvBJsIkFS1fQ9Jbv+ieUSr2vupqg=";
|
||||
vendorHash = "sha256-aoc8KSznkWJpn0Ye7FUOH5sNQ4fslIGJhIaQdGrwcqQ=";
|
||||
|
||||
excludedPackages = [ "./e2etests" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hck";
|
||||
version = "0.9.2";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sstadick";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KPpvai7+El2JA97EXDCstZ66FeyVCe7w+ERDDNRZ/h8=";
|
||||
hash = "sha256-L/jad3T89VFub0JBC/o/xc4RI+/tF0hbhZdSxmSs+lo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TpwUO0BL8kambnxAUE9+l6YYkNL1WzmkTYn1YxjufdY=";
|
||||
cargoHash = "sha256-9v3yZNKBZ0XQkA7J50GH/Z4JQUQ48HnjNXr90ZBHXgI=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/sstadick/hck";
|
||||
changelog = "https://github.com/sstadick/hck/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit /* or */ unlicense ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
maintainers = with maintainers; [ figsoda gepbird ];
|
||||
mainProgram = "hck";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7820,10 +7820,7 @@ with pkgs;
|
|||
|
||||
choose = callPackage ../tools/text/choose { };
|
||||
|
||||
d2 = callPackage ../tools/text/d2 {
|
||||
# Failed tests
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
d2 = callPackage ../tools/text/d2 { };
|
||||
|
||||
ddev = callPackage ../applications/virtualization/ddev { };
|
||||
|
||||
|
|
@ -10233,8 +10230,6 @@ with pkgs;
|
|||
|
||||
ktailctl = kdePackages.callPackage ../applications/networking/ktailctl {};
|
||||
|
||||
iredis = callPackage ../tools/admin/iredis { };
|
||||
|
||||
ispell = callPackage ../tools/text/ispell { };
|
||||
|
||||
iodash = callPackage ../development/libraries/iodash { };
|
||||
|
|
|
|||
|
|
@ -1084,6 +1084,8 @@ let
|
|||
|
||||
minttea = callPackage ../development/ocaml-modules/minttea { };
|
||||
|
||||
miou = callPackage ../development/ocaml-modules/miou { };
|
||||
|
||||
mirage = callPackage ../development/ocaml-modules/mirage { };
|
||||
|
||||
mirage-block = callPackage ../development/ocaml-modules/mirage-block { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue