From ee4d327de8bd438f561b421c45adc7abd797c21f Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 18 Aug 2025 13:36:34 +0200 Subject: [PATCH 001/154] trickle: fix build --- pkgs/by-name/tr/trickle/atomicio.patch | 30 +++++++++++++++ pkgs/by-name/tr/trickle/package.nix | 37 ++++++++++++++----- .../tr/trickle/remove-libtrickle.patch | 17 +++++++++ pkgs/by-name/tr/trickle/trickle-gcc14.patch | 25 +++++++++++++ 4 files changed, 100 insertions(+), 9 deletions(-) create mode 100644 pkgs/by-name/tr/trickle/atomicio.patch create mode 100644 pkgs/by-name/tr/trickle/remove-libtrickle.patch create mode 100644 pkgs/by-name/tr/trickle/trickle-gcc14.patch diff --git a/pkgs/by-name/tr/trickle/atomicio.patch b/pkgs/by-name/tr/trickle/atomicio.patch new file mode 100644 index 000000000000..ea173e0155df --- /dev/null +++ b/pkgs/by-name/tr/trickle/atomicio.patch @@ -0,0 +1,30 @@ +diff --git i/atomicio.c w/atomicio.c +index 3930a07..81a14a4 100644 +--- i/atomicio.c ++++ w/atomicio.c +@@ -37,11 +37,7 @@ + * ensure all of data on socket comes through. f==read || f==write + */ + ssize_t +-atomicio(f, fd, _s, n) +- ssize_t (*f) (); +- int fd; +- void *_s; +- size_t n; ++atomicio(ssize_t (*f)(int, const void *, size_t), int fd, const void *_s, size_t n) + { + char *s = _s; + ssize_t res, pos = 0; +diff --git i/util.h w/util.h +index b00059c..f24d0c3 100644 +--- i/util.h ++++ w/util.h +@@ -41,7 +41,7 @@ + #define MAX(a, b) ((a) > (b) ? (a) : (b)) + #define MIN(a, b) ((a) < (b) ? (a) : (b)) + +-ssize_t atomicio(ssize_t (*)(), int, void *, size_t); ++ssize_t atomicio(ssize_t (*f)(int, const void *, size_t), int fd, const void *s, size_t n); + char *get_progname(char *); + + diff --git a/pkgs/by-name/tr/trickle/package.nix b/pkgs/by-name/tr/trickle/package.nix index 2ade49893aca..822c250c1ad7 100644 --- a/pkgs/by-name/tr/trickle/package.nix +++ b/pkgs/by-name/tr/trickle/package.nix @@ -1,38 +1,57 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, libevent, libtirpc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "trickle"; - version = "1.07"; + version = "1.07-unstable-2019-10-03"; - src = fetchurl { - url = "https://monkey.org/~marius/trickle/trickle-${version}.tar.gz"; - sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; + src = fetchFromGitHub { + owner = "mariusae"; + repo = "trickle"; + rev = "09a1d955c6554eb7e625c99bf96b2d99ec7db3dc"; + sha256 = "sha256-cqkNPeTo+noqMCXsxh6s4vKoYwsWusafm/QYX8RvCek="; }; + patches = [ + ./trickle-gcc14.patch + ./atomicio.patch + ./remove-libtrickle.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ libevent libtirpc ]; - preConfigure = '' - sed -i 's|libevent.a|libevent.so|' configure + preAutoreconf = '' + sed -i -e 's|\s*LIBCGUESS=.*|LIBCGUESS=${stdenv.cc.libc}/lib/libc.so.*|' configure.in + grep LIBCGUESS configure.in + sed -i 's|libevent.a|libevent.so|' configure.in ''; preBuild = '' sed -i '/#define in_addr_t/ s:^://:' config.h + sed -i 's|^_select(int|select(int|' trickle-overload.c ''; NIX_LDFLAGS = [ "-levent" "-ltirpc" ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-I${libtirpc.dev}/include/tirpc" + "-Wno-error=incompatible-pointer-types" + ]; configureFlags = [ "--with-libevent" ]; diff --git a/pkgs/by-name/tr/trickle/remove-libtrickle.patch b/pkgs/by-name/tr/trickle/remove-libtrickle.patch new file mode 100644 index 000000000000..060b3d3fe181 --- /dev/null +++ b/pkgs/by-name/tr/trickle/remove-libtrickle.patch @@ -0,0 +1,17 @@ +diff --git i/Makefile.am w/Makefile.am +index 9c2bbf3..0b0023e 100644 +--- i/Makefile.am ++++ w/Makefile.am +@@ -30,12 +30,6 @@ tricklectl_LDADD = @ERRO@ $(LIBOBJS) + + AM_CFLAGS = -Wall -Icompat @EVENTINC@ + +-overloaddir = $(libdir) +-overload_DATA = libtrickle.so +- +-libtrickle.so: trickle-overload.c atomicio.c +-$(overload_DATA): +- + CLEANFILES = *.so + + EXTRA_DIST = LICENSE README strlcat.c strlcpy.c err.c Makefile.am.inc \ diff --git a/pkgs/by-name/tr/trickle/trickle-gcc14.patch b/pkgs/by-name/tr/trickle/trickle-gcc14.patch new file mode 100644 index 000000000000..b6729dace2ff --- /dev/null +++ b/pkgs/by-name/tr/trickle/trickle-gcc14.patch @@ -0,0 +1,25 @@ +diff --git a/configure.in b/configure.in +index 6ebf3b2..5c85682 100644 +--- a/configure.in ++++ b/configure.in +@@ -198,6 +198,7 @@ if test "$HAVEMETHOD" = "no"; then + AC_TRY_RUN( + #include + #include ++ #include + + int + main(int argc, char **argv) +diff --git a/xdr.c b/xdr.c +index ed8bf5b..a20bbd9 100644 +--- a/xdr.c ++++ b/xdr.c +@@ -103,7 +103,7 @@ xdr_msg(XDR *xdrs, struct msg *msg) + { + X(xdr_short(xdrs, &msg->status)); + X(xdr_union(xdrs, (int *)&msg->type, (char *)&msg->data, +- xdr_msg_discrim, _xdr_void)); ++ xdr_msg_discrim, (xdrproc_t)_xdr_void)); + + return (TRUE); + } From 740e138fe0330f454347f887b4fe52e9b3677eaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 18:04:15 +0000 Subject: [PATCH 002/154] frei0r: 2.4.0 -> 2.5.0 --- pkgs/by-name/fr/frei0r/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix index 4d890bbbb6e7..1f1a1e862ef2 100644 --- a/pkgs/by-name/fr/frei0r/package.nix +++ b/pkgs/by-name/fr/frei0r/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "frei0r-plugins"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "dyne"; repo = "frei0r"; rev = "v${version}"; - hash = "sha256-95d1aXfCq4mPccY8VKmO7jkX57li6OVSwtfIf9459n4="; + hash = "sha256-JEQndfQOcSARGIPtMwteUqWqTLPEMcpF2F/xD1PsDEU="; }; nativeBuildInputs = [ From 5dff919f2fb8fd3a6bc499bef0bd3aa07a1fd453 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 23:21:06 +0000 Subject: [PATCH 003/154] python3Packages.thermobeacon-ble: 0.10.0 -> 1.0.0 --- pkgs/development/python-modules/thermobeacon-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index 7efc1c9e334d..b9c986c09f9c 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "thermobeacon-ble"; - version = "0.10.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "thermobeacon-ble"; tag = "v${version}"; - hash = "sha256-+WQWb1D1Rw5KE4fvu55WYF2YsQY48MWtPA26G5MB6aY="; + hash = "sha256-ij8g1bq9xmHLSHf2O69H6laK+KsEmW7E+hXv52/iJkY="; }; build-system = [ poetry-core ]; From 5761e3145526e17357667ff631c63c897516a360 Mon Sep 17 00:00:00 2001 From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com> Date: Tue, 14 Oct 2025 14:59:58 +0200 Subject: [PATCH 004/154] pingu: 0.0.5 -> 0.0.6 (forked) --- pkgs/by-name/pi/pingu/package.nix | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pi/pingu/package.nix b/pkgs/by-name/pi/pingu/package.nix index c5778b735bf4..5df2c28bc3bd 100644 --- a/pkgs/by-name/pi/pingu/package.nix +++ b/pkgs/by-name/pi/pingu/package.nix @@ -6,25 +6,37 @@ buildGoModule rec { pname = "pingu"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { - owner = "sheepla"; + owner = "CactiChameleon9"; repo = "pingu"; rev = "v${version}"; - sha256 = "sha256-iAHj6/qaZgpTfrUZZ9qdsjiNMJ2zH0CzhR4TVSC9oLE="; + sha256 = "sha256-pXC/y+piLhSWIcJ1/+UaC3sjHPKG3XvTuHzWENsXME0="; + # Get values that require us to use git, then delete .git + leaveDotGit = true; + postFetch = '' + cd $out + git rev-parse --short HEAD > ldflags_revision + find . -type d -name .git -print0 | xargs -0 rm -rf + ''; }; - vendorHash = "sha256-xn6la6E0C5QASXxNee1Py/rBs4ls9X/ePeg4Q1e2UyU="; + vendorHash = "sha256-8d0pKweumnJH49HSBCfEF8cwEXLGMAk2WbhS10T/Cmc="; + ldflags = [ + "-w" + "-s" + "-X main.appVersion=${version}" + ]; + preBuild = '' + ldflags+=" -X main.appRevision=$(cat ldflags_revision)" + ''; meta = with lib; { description = "Ping command implementation in Go but with colorful output and pingu ascii art"; - homepage = "https://github.com/sheepla/pingu/"; + homepage = "https://github.com/CactiChameleon9/pingu/"; license = licenses.mit; maintainers = with maintainers; [ CactiChameleon9 ]; mainProgram = "pingu"; - # Doesn't build with Go toolchain >1.22, build error: - # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'. - broken = true; }; } From c6e06c55e947d383192c1d545433811908adb313 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Oct 2025 23:00:19 +0200 Subject: [PATCH 005/154] python313Packages.thermobeacon-ble: remove disabled --- pkgs/development/python-modules/thermobeacon-ble/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index b9c986c09f9c..55261be555ca 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -7,7 +7,6 @@ poetry-core, pytest-cov-stub, pytestCheckHook, - pythonOlder, sensor-state-data, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "thermobeacon-ble"; From 7031da6224a74d8901083e7c58826137324eda06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 10:32:59 +0000 Subject: [PATCH 006/154] python3Packages.httpx-sse: 0.4.1 -> 0.4.3 --- pkgs/development/python-modules/httpx-sse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-sse/default.nix b/pkgs/development/python-modules/httpx-sse/default.nix index af17e3a88124..c38464b96200 100644 --- a/pkgs/development/python-modules/httpx-sse/default.nix +++ b/pkgs/development/python-modules/httpx-sse/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "httpx-sse"; - version = "0.4.1"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "florimondmanca"; repo = "httpx-sse"; tag = version; - hash = "sha256-bSozSZmbRU5sc3jvVUOAXQWVBA8GhzM2R26uPdabS+w="; + hash = "sha256-6DPbfJlbLmws9GkQ2zePGp4g0at4M32vrIDtmUPDkX4="; }; build-system = [ From 65a7c106e5467c587d15080dc8caff515b421036 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Oct 2025 13:08:43 +0000 Subject: [PATCH 007/154] restinio: 0.7.7 -> 0.7.8 --- pkgs/by-name/re/restinio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix index cff1d36155c4..4bf8302a89cf 100644 --- a/pkgs/by-name/re/restinio/package.nix +++ b/pkgs/by-name/re/restinio/package.nix @@ -21,13 +21,13 @@ assert !with_boost_asio -> asio != null; stdenv.mkDerivation (finalAttrs: { pname = "restinio"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "Stiffstream"; repo = "restinio"; tag = "v${finalAttrs.version}"; - hash = "sha256-bbiBz/WkQc3HiS7+x/qsRdHoravPX8LBKb+a2WeC81s="; + hash = "sha256-PXm9s586V1aZ7D5GwYzBc/Fljif/Iq3VChDe2NHWKSU="; }; # https://www.github.com/Stiffstream/restinio/issues/230 From 8810bf80eff2d67044e55c2380f55ae1675316bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 17:53:46 +0000 Subject: [PATCH 008/154] buildah-unwrapped: 1.41.5 -> 1.42.0 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 836faaa40936..73dd15593abc 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { pname = "buildah"; - version = "1.41.5"; + version = "1.42.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; tag = "v${finalAttrs.version}"; - hash = "sha256-NQ5nCU1uiw3SzPMo2rH4+GnAIbIzM9O0bJaXJg/rfZM="; + hash = "sha256-40SYqPo4BUer0Mvw8ts8uPNAlfec8ma/TYRkvyFQczw="; }; outputs = [ From d2975943120a5ac1fe8bd4d52119463e0c46e110 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 21:22:50 +0900 Subject: [PATCH 009/154] vital: cleanup, add desktop item --- pkgs/by-name/vi/vital/package.nix | 38 ++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix index e52b265c8bb7..1cf7b72c8a62 100644 --- a/pkgs/by-name/vi/vital/package.nix +++ b/pkgs/by-name/vi/vital/package.nix @@ -2,9 +2,9 @@ lib, stdenv, fetchzip, + fetchurl, autoPatchelfHook, makeBinaryWrapper, - alsa-lib, libjack2, curl, @@ -12,8 +12,15 @@ libGL, freetype, zenity, + makeDesktopItem, + copyDesktopItems, }: - +let + icon = fetchurl { + url = "https://vital.audio/images/apple_touch_icon.png"; + hash = "sha256-NZ/AQ2gjBXUPUj3ITbowD7HuxRmEDuATOWidLqLNrww="; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "vital"; version = "1.5.5"; @@ -24,10 +31,25 @@ stdenv.mkDerivation (finalAttrs: { }/VitalInstaller.zip"; hash = "sha256-hCwXSUiBB0YpQ1oN6adLprwAoel6f72tBG5fEb61OCI="; }; + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "vital"; + desktopName = "Vital"; + comment = "Spectral warping wavetable synth"; + icon = "Vital"; + exec = "Vital"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; nativeBuildInputs = [ autoPatchelfHook makeBinaryWrapper + copyDesktopItems ]; buildInputs = [ @@ -46,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall + install -Dm444 ${icon} $out/share/pixmaps/Vital.png + # copy each output to its destination (individually) mkdir -p $out/{bin,lib/{clap,vst,vst3}} for f in bin/Vital lib/{clap/Vital.clap,vst/Vital.so,vst3/Vital.vst3}; do @@ -68,15 +92,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Spectral warping wavetable synth"; homepage = "https://vital.audio/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = with licenses; [ - unfree # https://vital.audio/eula/ - ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = lib.licenses.unfree; # https://vital.audio/eula/ platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ PowerUser64 ]; + maintainers = with lib.maintainers; [ PowerUser64 ]; mainProgram = "Vital"; }; }) From 46b2761c272fc223cd8ccc1c05a17165fd355240 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 21:23:40 +0900 Subject: [PATCH 010/154] vital: add maintainer l1npengtul --- pkgs/by-name/vi/vital/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix index 1cf7b72c8a62..1b271c81ad39 100644 --- a/pkgs/by-name/vi/vital/package.nix +++ b/pkgs/by-name/vi/vital/package.nix @@ -98,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.unfree; # https://vital.audio/eula/ platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ PowerUser64 ]; + maintainers = with lib.maintainers; [ + PowerUser64 + l1npengtul + ]; mainProgram = "Vital"; }; }) From ac504840a5a53bf3ce2f76512d2e5f750db67572 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 22:15:56 +0900 Subject: [PATCH 011/154] jackass: cleanup, add nix-update-script --- pkgs/by-name/ja/jackass/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix index de9a4bcaecb7..3b40480a491d 100644 --- a/pkgs/by-name/ja/jackass/package.nix +++ b/pkgs/by-name/ja/jackass/package.nix @@ -5,6 +5,7 @@ pkg-config, vst2-sdk, wine64, + nix-update-script, enableJackAssWine64 ? false, }: @@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - enableParallelBuilding = true; + passthru.updateScript = nix-update-script { }; meta = { description = "VST plugin that provides JACK-MIDI support for VST hosts"; @@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { applications. Set enableJackAssWine64 to true to enable this output. ''; homepage = "https://github.com/falkTX/JackAss"; - maintainers = with lib.maintainers; [ PowerUser64 ]; + maintainers = with lib.maintainers; [PowerUser64 ]; license = [ lib.licenses.mit ]; platforms = lib.platforms.linux; }; From 8c7f54b821fe28f138105d565d25d94243069730 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 22:16:24 +0900 Subject: [PATCH 012/154] jackass: add maintainer l1npengtul --- pkgs/by-name/ja/jackass/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix index 3b40480a491d..99bba6cbcca1 100644 --- a/pkgs/by-name/ja/jackass/package.nix +++ b/pkgs/by-name/ja/jackass/package.nix @@ -52,7 +52,10 @@ stdenv.mkDerivation (finalAttrs: { applications. Set enableJackAssWine64 to true to enable this output. ''; homepage = "https://github.com/falkTX/JackAss"; - maintainers = with lib.maintainers; [PowerUser64 ]; + maintainers = with lib.maintainers; [ + PowerUser64 + l1npengtul + ]; license = [ lib.licenses.mit ]; platforms = lib.platforms.linux; }; From 38f3ca749f9179d60c812ce57931f72c6e399aed Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 22 Oct 2025 13:50:35 -0500 Subject: [PATCH 013/154] various: migrate python3Packages to by-name --- .../aw/aws-mfa/package.nix} | 10 ++++----- .../fu/fusesoc/package.nix} | 15 ++++--------- .../git-annex-remote-googledrive/package.nix} | 15 ++++--------- .../gi/gita/package.nix} | 8 +++---- .../mp/mpy-utils/package.nix} | 8 +++---- .../ne/networkd-notify/package.nix} | 8 +++---- .../pa/pass-git-helper/package.nix} | 15 +++++-------- .../si/silver-platter/package.nix} | 15 ++++--------- pkgs/top-level/all-packages.nix | 22 ------------------- 9 files changed, 30 insertions(+), 86 deletions(-) rename pkgs/{tools/admin/aws-mfa/default.nix => by-name/aw/aws-mfa/package.nix} (86%) rename pkgs/{tools/package-management/fusesoc/default.nix => by-name/fu/fusesoc/package.nix} (78%) rename pkgs/{applications/version-management/git-annex-remote-googledrive/default.nix => by-name/gi/git-annex-remote-googledrive/package.nix} (80%) rename pkgs/{applications/version-management/gita/default.nix => by-name/gi/gita/package.nix} (88%) rename pkgs/{tools/misc/mpy-utils/default.nix => by-name/mp/mpy-utils/package.nix} (82%) rename pkgs/{tools/networking/networkd-notify/default.nix => by-name/ne/networkd-notify/package.nix} (92%) rename pkgs/{applications/version-management/pass-git-helper/default.nix => by-name/pa/pass-git-helper/package.nix} (77%) rename pkgs/{applications/version-management/silver-platter/default.nix => by-name/si/silver-platter/package.nix} (86%) diff --git a/pkgs/tools/admin/aws-mfa/default.nix b/pkgs/by-name/aw/aws-mfa/package.nix similarity index 86% rename from pkgs/tools/admin/aws-mfa/default.nix rename to pkgs/by-name/aw/aws-mfa/package.nix index 69b2a5a56622..722dd410729a 100644 --- a/pkgs/tools/admin/aws-mfa/default.nix +++ b/pkgs/by-name/aw/aws-mfa/package.nix @@ -1,13 +1,11 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, fetchpatch, - setuptools, - boto3, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "aws-mfa"; version = "0.0.12"; pyproject = true; @@ -28,11 +26,11 @@ buildPythonApplication rec { }) ]; - build-system = [ + build-system = with python3Packages; [ setuptools ]; - dependencies = [ + dependencies = with python3Packages; [ boto3 ]; diff --git a/pkgs/tools/package-management/fusesoc/default.nix b/pkgs/by-name/fu/fusesoc/package.nix similarity index 78% rename from pkgs/tools/package-management/fusesoc/default.nix rename to pkgs/by-name/fu/fusesoc/package.nix index d0bc6297d8fc..edbffdc3f641 100644 --- a/pkgs/tools/package-management/fusesoc/default.nix +++ b/pkgs/by-name/fu/fusesoc/package.nix @@ -1,19 +1,12 @@ { - buildPythonPackage, + python3Packages, fetchPypi, lib, iverilog, verilator, gnumake, - edalize, - fastjsonschema, - pyparsing, - pyyaml, - simplesat, - ipyxact, - setuptools-scm, }: -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "fusesoc"; version = "2.2.1"; format = "setuptools"; @@ -23,9 +16,9 @@ buildPythonPackage rec { hash = "sha256-M36bXBgY8hR33AVDlHoH8PZJG2Bi0KOEI07IMns7R4w="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = with python3Packages; [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ edalize fastjsonschema pyparsing diff --git a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix b/pkgs/by-name/gi/git-annex-remote-googledrive/package.nix similarity index 80% rename from pkgs/applications/version-management/git-annex-remote-googledrive/default.nix rename to pkgs/by-name/gi/git-annex-remote-googledrive/package.nix index 0802769513e3..0911145b906b 100644 --- a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix +++ b/pkgs/by-name/gi/git-annex-remote-googledrive/package.nix @@ -1,17 +1,10 @@ { lib, - annexremote, - buildPythonApplication, - drivelib, + python3Packages, fetchPypi, - gitpython, - humanfriendly, - tenacity, - setuptools, - distutils, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-annex-remote-googledrive"; version = "1.3.2"; pyproject = true; @@ -21,9 +14,9 @@ buildPythonApplication rec { sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; - build-system = [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ annexremote drivelib gitpython diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/by-name/gi/gita/package.nix similarity index 88% rename from pkgs/applications/version-management/gita/default.nix rename to pkgs/by-name/gi/gita/package.nix index 9eff4a03486b..58e01af67a53 100644 --- a/pkgs/applications/version-management/gita/default.nix +++ b/pkgs/by-name/gi/gita/package.nix @@ -1,13 +1,11 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyyaml, - setuptools, installShellFiles, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { version = "0.16.6.1"; format = "setuptools"; pname = "gita"; @@ -19,7 +17,7 @@ buildPythonApplication rec { owner = "nosarthur"; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ pyyaml setuptools ]; diff --git a/pkgs/tools/misc/mpy-utils/default.nix b/pkgs/by-name/mp/mpy-utils/package.nix similarity index 82% rename from pkgs/tools/misc/mpy-utils/default.nix rename to pkgs/by-name/mp/mpy-utils/package.nix index 03002933433a..a79791bdfdc0 100644 --- a/pkgs/tools/misc/mpy-utils/default.nix +++ b/pkgs/by-name/mp/mpy-utils/package.nix @@ -1,13 +1,11 @@ { stdenv, lib, - buildPythonApplication, + python3Packages, fetchPypi, - fusepy, - pyserial, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mpy-utils"; version = "0.1.13"; format = "setuptools"; @@ -17,7 +15,7 @@ buildPythonApplication rec { hash = "sha256-die8hseaidhs9X7mfFvV8C8zn0uyw08gcHNqmjl+2Z4="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ fusepy pyserial ]; diff --git a/pkgs/tools/networking/networkd-notify/default.nix b/pkgs/by-name/ne/networkd-notify/package.nix similarity index 92% rename from pkgs/tools/networking/networkd-notify/default.nix rename to pkgs/by-name/ne/networkd-notify/package.nix index 316ef60a5672..cc3a0d7b35b0 100644 --- a/pkgs/tools/networking/networkd-notify/default.nix +++ b/pkgs/by-name/ne/networkd-notify/package.nix @@ -1,15 +1,13 @@ { lib, fetchFromGitLab, - buildPythonApplication, - dbus-python, - pygobject3, + python3Packages, systemd, wirelesstools, wrapGAppsNoGuiHook, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "networkd-notify"; version = "unstable-2022-11-29"; # There is no setup.py, just a single Python script. @@ -26,7 +24,7 @@ buildPythonApplication rec { wrapGAppsNoGuiHook ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ dbus-python pygobject3 ]; diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/by-name/pa/pass-git-helper/package.nix similarity index 77% rename from pkgs/applications/version-management/pass-git-helper/default.nix rename to pkgs/by-name/pa/pass-git-helper/package.nix index 1267fc3d2516..5552ad500974 100644 --- a/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/pkgs/by-name/pa/pass-git-helper/package.nix @@ -1,15 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyxdg, - pytestCheckHook, - pytest-cov-stub, - pytest-mock, - setuptools, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pass-git-helper"; version = "4.0.0"; pyproject = true; @@ -21,15 +16,15 @@ buildPythonApplication rec { sha256 = "sha256-SAMndgcxBa7wymXbOwRGcoogFfzpFFIZ0tF4NSCXpjw="; }; - build-system = [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = [ pyxdg ]; + dependencies = with python3Packages; [ pyxdg ]; env.HOME = "$TMPDIR"; pythonImportsCheck = [ "passgithelper" ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-cov-stub pytest-mock diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/by-name/si/silver-platter/package.nix similarity index 86% rename from pkgs/applications/version-management/silver-platter/default.nix rename to pkgs/by-name/si/silver-platter/package.nix index e99884ebe5a8..4834f13ab601 100644 --- a/pkgs/applications/version-management/silver-platter/default.nix +++ b/pkgs/by-name/si/silver-platter/package.nix @@ -1,24 +1,17 @@ { - buildPythonApplication, + python3Packages, lib, stdenv, fetchFromGitHub, pkg-config, - setuptools, - setuptools-rust, rustPlatform, cargo, rustc, - breezy, - dulwich, - jinja2, libiconv, openssl, - pyyaml, - ruamel-yaml, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "silver-platter"; version = "0.5.20"; pyproject = true; @@ -35,7 +28,7 @@ buildPythonApplication rec { hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM="; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ setuptools breezy dulwich @@ -44,7 +37,7 @@ buildPythonApplication rec { ruamel-yaml ]; nativeBuildInputs = [ - setuptools-rust + python3Packages.setuptools-rust rustPlatform.cargoSetupHook cargo rustc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7d72bf5914..21cdad1be483 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1083,12 +1083,6 @@ with pkgs; mkosi-full = mkosi.override { withQemu = true; }; - mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { }; - - networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify { - systemd = pkgs.systemd; - }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; @@ -1217,8 +1211,6 @@ with pkgs; forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; - gita = python3Packages.callPackage ../applications/version-management/gita { }; - github-cli = gh; git-annex-metadata-gui = @@ -1236,10 +1228,6 @@ with pkgs; ; }; - git-annex-remote-googledrive = - python3Packages.callPackage ../applications/version-management/git-annex-remote-googledrive - { }; - git-credential-manager = callPackage ../applications/version-management/git-credential-manager { }; gitRepo = git-repo; @@ -1255,14 +1243,8 @@ with pkgs; ; }; - pass-git-helper = - python3Packages.callPackage ../applications/version-management/pass-git-helper - { }; - qgit = qt6Packages.callPackage ../applications/version-management/qgit { }; - silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { }; - svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { }; @@ -1324,8 +1306,6 @@ with pkgs; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; - fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { }; - gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; @@ -1547,8 +1527,6 @@ with pkgs; autoflake = with python3.pkgs; toPythonApplication autoflake; - aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { }; - azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; # Derivation's result is not used by nixpkgs. Useful for validation for From b68d2ff377d690d2b39ca09b948a74edbf14424c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 23 Oct 2025 14:16:56 -0700 Subject: [PATCH 014/154] python3Packages.coq-tools: init at 0.0.36 --- .../python-modules/coq-tools/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/coq-tools/default.nix diff --git a/pkgs/development/python-modules/coq-tools/default.nix b/pkgs/development/python-modules/coq-tools/default.nix new file mode 100644 index 000000000000..b4e1edbfedb0 --- /dev/null +++ b/pkgs/development/python-modules/coq-tools/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "coq-tools"; + version = "0.0.36"; + pyproject = true; + + src = fetchPypi { + pname = "coq_tools"; + inherit version; + hash = "sha256-lZ469FZ19Cy+LdC4ymU4wVWe7ZtPSbYlgmym/ouQSwk="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "coq_tools" ]; + + meta = { + description = "Tools for working with Coq proof assistant"; + homepage = "https://pypi.org/project/coq-tools/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siraben ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4481f6a38c4e..63b51c3f6fbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3033,6 +3033,8 @@ self: super: with self; { copykitten = callPackage ../development/python-modules/copykitten { }; + coq-tools = callPackage ../development/python-modules/coq-tools { }; + coqpit = callPackage ../development/python-modules/coqpit { }; corallium = callPackage ../development/python-modules/corallium { }; From 7deaa22e9c6b63d95f5ff01c7dc7e30d2d262023 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Fri, 31 Oct 2025 14:35:08 +0100 Subject: [PATCH 015/154] vectorscan: Remove -Werror to fix darwin builds --- pkgs/by-name/ve/vectorscan/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix index 5c43c3fcccd9..8b174dc5feec 100644 --- a/pkgs/by-name/ve/vectorscan/package.nix +++ b/pkgs/by-name/ve/vectorscan/package.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { substituteInPlace libhs.pc.in \ --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \ --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" + substituteInPlace cmake/cflags-generic.cmake \ + --replace-fail "-Werror" "" substituteInPlace cmake/build_wrapper.sh \ --replace-fail 'nm' '${stdenv.cc.targetPrefix}nm' \ --replace-fail 'objcopy' '${stdenv.cc.targetPrefix}objcopy' From e824258139222acdde9c4704d4a97662c216c38e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 31 Oct 2025 20:38:57 +0100 Subject: [PATCH 016/154] blockbench: 4.12.6 -> 5.0.3 --- pkgs/by-name/bl/blockbench/package.nix | 47 +++++++++++++------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 547fa42bec90..9d1ef022400d 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "blockbench"; - version = "4.12.6"; + version = "5.0.3"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; tag = "v${version}"; - hash = "sha256-iV8qpUsUnL1n6hKADegNTmrW/AUWNiiNLxrTU4WPR30="; + hash = "sha256-kUPzAmxTEnUA+2o/IfBLE6hCChQ9YoTUfKKYfPGV0jg="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-ZLFmcK91SrUM+ouBENzc+MdNvQCRDh0ej4tf2TneUtQ="; + npmDepsHash = "sha256-Do5IJvd5ZXDgByKK1Elg0W2SZxeDH8OORloDuT9mIN4="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; @@ -39,7 +39,7 @@ buildNpmPackage rec { sed -i "/afterSign/d" package.json ''; - npmBuildScript = "bundle"; + npmBuildScript = "build-electron"; postBuild = '' # electronDist needs to be modifiable on Darwin @@ -54,28 +54,27 @@ buildNpmPackage rec { installPhase = '' runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + cp -r dist-electron/mac*/Blockbench.app $out/Applications + makeWrapper $out/Applications/Blockbench.app/Contents/MacOS/Blockbench $out/bin/blockbench + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + mkdir -p $out/share/blockbench + cp -r dist-electron/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - cp -r dist/mac*/Blockbench.app $out/Applications - makeWrapper $out/Applications/Blockbench.app/Contents/MacOS/Blockbench $out/bin/blockbench - ''} - - ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - mkdir -p $out/share/blockbench - cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench - - for size in 16 32 48 64 128 256 512; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - magick icon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png - done - - makeWrapper ${lib.getExe electron} $out/bin/blockbench \ - --add-flags $out/share/blockbench/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --inherit-argv0 - ''} + for size in 16 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + magick icon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png + done + makeWrapper ${lib.getExe electron} $out/bin/blockbench \ + --add-flags $out/share/blockbench/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --inherit-argv0 + '' + + '' runHook postInstall ''; From b9c7f0e6d4ebe0e0b2c1dc695fc94f2be563fbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 1 Nov 2025 16:15:52 +0100 Subject: [PATCH 017/154] empty-epsilon: avoid ambiguous version to make overrides easier --- pkgs/by-name/em/empty-epsilon/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix index d4009323fb73..9cb8ec06c7ea 100644 --- a/pkgs/by-name/em/empty-epsilon/package.nix +++ b/pkgs/by-name/em/empty-epsilon/package.nix @@ -14,7 +14,7 @@ }: let - version = { + versions = { seriousproton = "2024.12.08"; emptyepsilon = "2024.12.08"; basis-universal = "1.15_final"; @@ -23,18 +23,18 @@ let basis-universal = fetchFromGitHub { owner = "BinomialLLC"; repo = "basis_universal"; - tag = version.basis-universal; + tag = versions.basis-universal; hash = "sha256-pKvfVvdbPIdzdSOklicThS7xwt4i3/21bE6wg9f8kHY="; }; serious-proton = stdenv.mkDerivation { pname = "serious-proton"; - version = version.seriousproton; + version = versions.seriousproton; src = fetchFromGitHub { owner = "daid"; repo = "SeriousProton"; - tag = "EE-${version.seriousproton}"; + tag = "EE-${versions.seriousproton}"; hash = "sha256-k1YCB7EJIL+kdlHEU4cJjmLZZAZyxIPU0XlSn2t4C90="; }; @@ -64,12 +64,12 @@ in stdenv.mkDerivation { pname = "empty-epsilon"; - version = version.emptyepsilon; + version = versions.emptyepsilon; src = fetchFromGitHub { owner = "daid"; repo = "EmptyEpsilon"; - tag = "EE-${version.emptyepsilon}"; + tag = "EE-${versions.emptyepsilon}"; hash = "sha256-JsHFwbt4VGsgaZz9uxEmwzZGfkYTNsIZTKkpvCCmI48="; }; @@ -87,10 +87,10 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeFeature "SERIOUS_PROTON_DIR" "${serious-proton.src}") - (lib.cmakeFeature "CPACK_PACKAGE_VERSION" "${version.emptyepsilon}") - (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${lib.versions.major version.emptyepsilon}") - (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${lib.versions.minor version.emptyepsilon}") - (lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${lib.versions.patch version.emptyepsilon}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION" "${versions.emptyepsilon}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${lib.versions.major versions.emptyepsilon}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${lib.versions.minor versions.emptyepsilon}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${lib.versions.patch versions.emptyepsilon}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_BASIS" "${basis-universal}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MESHOPTIMIZER" "${meshoptimizer.src}") (lib.cmakeFeature "CMAKE_AR" "${stdenv.cc.cc}/bin/gcc-ar") From 80f6d95b34962ea7c0628c58d964a06e693201d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Krenski?= Date: Sat, 1 Nov 2025 10:45:43 +0100 Subject: [PATCH 018/154] boxflat: fix build by unrestricting PyYAML dependency --- pkgs/by-name/bo/boxflat/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix index 991bb43dc7f4..0a39c938d4db 100644 --- a/pkgs/by-name/bo/boxflat/package.nix +++ b/pkgs/by-name/bo/boxflat/package.nix @@ -45,12 +45,12 @@ python3Packages.buildPythonPackage rec { udevCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail "psutil==6.1.0" "psutil" \ - --replace-fail "evdev==1.7.1" "evdev" \ - --replace-fail "pycairo==1.27.0" "pycairo" - ''; + pythonRelaxDeps = [ + "psutil" + "evdev" + "pycairo" + "PyYAML" + ]; preBuild = '' cat > setup.py << EOF From 514f924995c86b63096cb3ca580ea103159afdf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 2 Nov 2025 16:36:45 +0100 Subject: [PATCH 019/154] glm_1_0_1: init --- pkgs/by-name/gl/glm/1_0_1.nix | 15 +++++++ pkgs/by-name/gl/glm/generic.nix | 72 +++++++++++++++++++++++++++++++++ pkgs/by-name/gl/glm/package.nix | 65 +---------------------------- pkgs/top-level/all-packages.nix | 2 + 4 files changed, 91 insertions(+), 63 deletions(-) create mode 100644 pkgs/by-name/gl/glm/1_0_1.nix create mode 100644 pkgs/by-name/gl/glm/generic.nix diff --git a/pkgs/by-name/gl/glm/1_0_1.nix b/pkgs/by-name/gl/glm/1_0_1.nix new file mode 100644 index 000000000000..68ecba82fa53 --- /dev/null +++ b/pkgs/by-name/gl/glm/1_0_1.nix @@ -0,0 +1,15 @@ +{ + callPackage, + fetchFromGitHub, +}: + +callPackage ./generic.nix rec { + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "g-truc"; + repo = "glm"; + rev = version; + sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE="; + }; +} diff --git a/pkgs/by-name/gl/glm/generic.nix b/pkgs/by-name/gl/glm/generic.nix new file mode 100644 index 000000000000..f7d024ab81cb --- /dev/null +++ b/pkgs/by-name/gl/glm/generic.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + + version, + src, +}: + +stdenv.mkDerivation rec { + pname = "glm"; + inherit version src; + + outputs = [ + "out" + "doc" + ]; + + patches = lib.optionals stdenv.hostPlatform.isLinux [ + # Remove when https://github.com/g-truc/glm/pull/1001 merged & in release. + # Relies on , Linux-specific + ./1001-glm-Fix-packing-on-BE.patch + ]; + + nativeBuildInputs = [ cmake ]; + + env.NIX_CFLAGS_COMPILE = + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 + if (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") then + "-fno-ipa-modref" + # Fix compilation errors on darwin + else if (stdenv.cc.isClang) then + "-Wno-error" + else + ""; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" false) + (lib.cmakeBool "BUILD_STATIC_LIBS" false) + (lib.cmakeBool "GLM_TEST_ENABLE" doCheck) + ]; + + doCheck = true; + + postInstall = '' + # Install pkg-config file + mkdir -p $out/lib/pkgconfig + substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc + + # Install docs + mkdir -p $doc/share/doc/glm + cp -rv ../doc/api $doc/share/doc/glm/html + cp -v ../doc/manual.pdf $doc/share/doc/glm + ''; + + meta = with lib; { + description = "OpenGL Mathematics library for C++"; + longDescription = '' + OpenGL Mathematics (GLM) is a header only C++ mathematics library for + graphics software based on the OpenGL Shading Language (GLSL) + specification and released under the MIT license. + ''; + homepage = "https://github.com/g-truc/glm"; + license = licenses.mit; + platforms = platforms.unix; + # https://github.com/g-truc/glm/issues/897 indicates that packing isn't implemented properly on non-LE. + # Patch from https://github.com/g-truc/glm/pull/1001 currently relies on Linux-only header. + broken = !stdenv.hostPlatform.isLittleEndian && !stdenv.hostPlatform.isLinux; + maintainers = with maintainers; [ smancill ]; + }; +} diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix index f5dd16d62101..298ad577aa2e 100644 --- a/pkgs/by-name/gl/glm/package.nix +++ b/pkgs/by-name/gl/glm/package.nix @@ -1,13 +1,10 @@ { - lib, - stdenv, + callPackage, fetchFromGitHub, - cmake, }: -stdenv.mkDerivation rec { +callPackage ./generic.nix rec { version = "1.0.2"; - pname = "glm"; src = fetchFromGitHub { owner = "g-truc"; @@ -15,62 +12,4 @@ stdenv.mkDerivation rec { rev = version; sha256 = "sha256-2xKv1nO+OdwA0r+I9OZ+OCL9dJFg/LJsQfIvIF76vc0="; }; - - outputs = [ - "out" - "doc" - ]; - - patches = lib.optionals stdenv.hostPlatform.isLinux [ - # Remove when https://github.com/g-truc/glm/pull/1001 merged & in release. - # Relies on , Linux-specific - ./1001-glm-Fix-packing-on-BE.patch - ]; - - nativeBuildInputs = [ cmake ]; - - env.NIX_CFLAGS_COMPILE = - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 - if (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") then - "-fno-ipa-modref" - # Fix compilation errors on darwin - else if (stdenv.cc.isClang) then - "-Wno-error" - else - ""; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" false) - (lib.cmakeBool "BUILD_STATIC_LIBS" false) - (lib.cmakeBool "GLM_TEST_ENABLE" doCheck) - ]; - - doCheck = true; - - postInstall = '' - # Install pkg-config file - mkdir -p $out/lib/pkgconfig - substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc - - # Install docs - mkdir -p $doc/share/doc/glm - cp -rv ../doc/api $doc/share/doc/glm/html - cp -v ../doc/manual.pdf $doc/share/doc/glm - ''; - - meta = with lib; { - description = "OpenGL Mathematics library for C++"; - longDescription = '' - OpenGL Mathematics (GLM) is a header only C++ mathematics library for - graphics software based on the OpenGL Shading Language (GLSL) - specification and released under the MIT license. - ''; - homepage = "https://github.com/g-truc/glm"; - license = licenses.mit; - platforms = platforms.unix; - # https://github.com/g-truc/glm/issues/897 indicates that packing isn't implemented properly on non-LE. - # Patch from https://github.com/g-truc/glm/pull/1001 currently relies on Linux-only header. - broken = !stdenv.hostPlatform.isLittleEndian && !stdenv.hostPlatform.isLinux; - maintainers = with maintainers; [ smancill ]; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03db0bc700ce..d48c9539019e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1659,6 +1659,8 @@ with pkgs; glances = python3Packages.callPackage ../applications/system/glances { }; + glm_1_0_1 = callPackage ../by-name/gl/glm/1_0_1.nix { }; + go2tv-lite = go2tv.override { withGui = false; }; guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { }; From 9442012bcbe070493ca9416cc418bbd327759a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 1 Nov 2025 16:16:41 +0100 Subject: [PATCH 020/154] empty-epsilon: fix serious-proton build by downgrading glm --- pkgs/by-name/em/empty-epsilon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix index 9cb8ec06c7ea..2eb7d5ad2697 100644 --- a/pkgs/by-name/em/empty-epsilon/package.nix +++ b/pkgs/by-name/em/empty-epsilon/package.nix @@ -7,7 +7,7 @@ libX11, glew, python3, - glm, + glm_1_0_1, meshoptimizer, SDL2, ninja, @@ -42,7 +42,7 @@ let buildInputs = [ sfml libX11 - glm + glm_1_0_1 SDL2 ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation { glew libX11 python3 - glm + glm_1_0_1 SDL2 ninja ]; From ea1b8fd3bfab6fce74b701ef1f3f1eab83ee4682 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Tue, 4 Nov 2025 00:44:30 +0800 Subject: [PATCH 021/154] arch-install-scripts: 29 -> 31 --- .../ar/arch-install-scripts/package.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ar/arch-install-scripts/package.nix b/pkgs/by-name/ar/arch-install-scripts/package.nix index 2a6ac6a6b146..310dd15257ad 100644 --- a/pkgs/by-name/ar/arch-install-scripts/package.nix +++ b/pkgs/by-name/ar/arch-install-scripts/package.nix @@ -19,18 +19,19 @@ "/usr/bin/vendor_perl" "/usr/bin/core_perl" ], + chrootSetprivPath ? "/usr/bin/setpriv", }: resholve.mkDerivation rec { pname = "arch-install-scripts"; - version = "29"; + version = "31"; src = fetchFromGitLab { domain = "gitlab.archlinux.org"; owner = "archlinux"; repo = "arch-install-scripts"; tag = "v${version}"; - hash = "sha256-XWcZZ+ET3J4dB6M9CdXESf0iQh+2vYxlxoJ6TZ3vFUk="; + hash = "sha256-Oh1nC/gPJDDy8cXiZPbEfpwOuO+RFRcxVCZuTtB2MV8="; }; nativeBuildInputs = [ @@ -40,12 +41,16 @@ resholve.mkDerivation rec { postPatch = '' substituteInPlace ./Makefile \ - --replace "PREFIX = /usr/local" "PREFIX ?= /usr/local" + --replace-fail "PREFIX = /usr/local" "PREFIX ?= /usr/local" + substituteInPlace ./pacstrap.in \ - --replace "cp -a" "cp -LR --no-preserve=mode" \ - --replace "unshare pacman" "unshare ${pacman}/bin/pacman" \ - --replace 'gnupg "$newroot/etc/pacman.d/"' 'gnupg "$newroot/etc/pacman.d/" && chmod 700 "$newroot/etc/pacman.d/gnupg"' + --replace-fail "cp -a" "cp -LR --no-preserve=mode" \ + --replace-fail "unshare pacman" "unshare ${pacman}/bin/pacman" \ + --replace-fail '"$gpg_dir" "$newroot/$gpg_dir"' '"$gpg_dir" "$newroot/$gpg_dir" && chmod 700 "$newroot/etc/pacman.d/gnupg"' + echo "export PATH=${lib.strings.makeSearchPath "" chrootPath}:\$PATH" >> ./common + substituteInPlace ./arch-chroot.in \ + --replace-fail "sd_args+=(setpriv" "sd_args+=(${chrootSetprivPath}" ''; installFlags = [ "PREFIX=$(out)" ]; @@ -80,10 +85,17 @@ resholve.mkDerivation rec { util-linux ]; - execer = [ "cannot:${pacman}/bin/pacman-key" ]; + execer = [ + "cannot:${pacman}/bin/pacman-conf" + "cannot:${pacman}/bin/pacman-key" + ]; - # TODO: no good way to resolve mount/umount in Nix builds for now - # see https://github.com/abathur/resholve/issues/29 + fake.external = [ + "systemd-escape" + "systemd-run" + ]; + + # Avoid using setuid wrappers fix = { mount = true; umount = true; @@ -93,6 +105,7 @@ resholve.mkDerivation rec { "$setup" "$pid_unshare" "$mount_unshare" + "$sd_args" "${pacman}/bin/pacman" ]; }; From 8a562d67ea56a6905f600dca76782b517fca94ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 06:35:46 +0000 Subject: [PATCH 022/154] btcd: 0.24.2 -> 0.25.0 --- pkgs/by-name/bt/btcd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bt/btcd/package.nix b/pkgs/by-name/bt/btcd/package.nix index 78fb2fef94e2..b8c8fb8481af 100644 --- a/pkgs/by-name/bt/btcd/package.nix +++ b/pkgs/by-name/bt/btcd/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "btcd"; - version = "0.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "btcsuite"; repo = "btcd"; rev = "v${version}"; - hash = "sha256-83eiVYXpyiGgLmYxj3rFk4CHG7F9UQ3vk1ZHm64Cm4A="; + hash = "sha256-redoqqbiVdwgNLxDzBccqRBZGwhRTIY5nE9Gx6+4POc="; }; - vendorHash = "sha256-ek+gaolwpwoEEWHKYpK2OxCpk/0vywF784J3CC0UCZ4="; + vendorHash = "sha256-qXfZKVoTvq7gNm0G4KKSL8anB8FUt/TxoxbOtH240cc="; subPackages = [ "." From 752d772b858f8385cc538880823631a1950be911 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 4 Nov 2025 18:45:33 +0100 Subject: [PATCH 023/154] =?UTF-8?q?ocamlPackages.qcheck:=200.25=20?= =?UTF-8?q?=E2=86=92=200.27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/containers/default.nix | 20 ++++++++++++------- .../ocaml-modules/qcheck/alcotest.nix | 2 +- .../development/ocaml-modules/qcheck/core.nix | 16 ++++++++------- .../ocaml-modules/qcheck/ounit.nix | 2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index c5888c737a5a..279c35c1da00 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, + fetchpatch, buildDunePackage, - ocaml, dune-configurator, either, seq, @@ -13,19 +13,25 @@ yojson, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "3.16"; pname = "containers"; - minimalOCamlVersion = "4.08"; - src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-WaHAZRLjaEJUba/I2r3Yof/iUqA3PFUuVbzm88izG1k="; }; + patches = [ + # Compatibility with qcheck ≥ 0.26 + (fetchpatch { + url = "https://github.com/c-cube/ocaml-containers/commit/3b49ad2a4e8cfe366d0588e1940d626f0e1b8a2d.patch"; + hash = "sha256-LFe+LtpBBrf82SX57b4iQSvfd9tSXmnfhffjvjcfLpg="; + }) + ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ either @@ -40,7 +46,7 @@ buildDunePackage rec { yojson ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = { homepage = "https://github.com/c-cube/ocaml-containers"; @@ -57,4 +63,4 @@ buildDunePackage rec { ''; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/pkgs/development/ocaml-modules/qcheck/alcotest.nix index e5a6d52cc45c..747844174afa 100644 --- a/pkgs/development/ocaml-modules/qcheck/alcotest.nix +++ b/pkgs/development/ocaml-modules/qcheck/alcotest.nix @@ -7,7 +7,7 @@ buildDunePackage { pname = "qcheck-alcotest"; - inherit (qcheck-core) version src patches; + inherit (qcheck-core) version src; propagatedBuildInputs = [ qcheck-core diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix index bfa2cffdc4c2..f80eff860259 100644 --- a/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,21 +2,23 @@ lib, buildDunePackage, fetchFromGitHub, + alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "qcheck-core"; - version = "0.25"; - - minimalOCamlVersion = "4.08"; + version = "0.27"; src = fetchFromGitHub { owner = "c-cube"; repo = "qcheck"; - tag = "v${version}"; - hash = "sha256-Z89jJ21zm89wb9m5HthnbHdnE9iXLyaH9k8S+FAWkKQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-UfBfFVSvDeVPUakj2GQCRy5G5IZBxrgdceYtj+VAYbg="; }; + doCheck = true; + checkInputs = [ alcotest ]; + meta = { description = "Core qcheck library"; homepage = "https://c-cube.github.io/qcheck/"; @@ -24,4 +26,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/qcheck/ounit.nix b/pkgs/development/ocaml-modules/qcheck/ounit.nix index 31c24ab1f7fe..9bc98e3ec24b 100644 --- a/pkgs/development/ocaml-modules/qcheck/ounit.nix +++ b/pkgs/development/ocaml-modules/qcheck/ounit.nix @@ -7,7 +7,7 @@ buildDunePackage { pname = "qcheck-ounit"; - inherit (qcheck-core) version src patches; + inherit (qcheck-core) version src; propagatedBuildInputs = [ qcheck-core From 3570896cecfd9e34d86149df6a0bfa24599e773f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 14:14:57 +0000 Subject: [PATCH 024/154] python3Packages.ufoprocessor: 1.13.3 -> 1.14.1 --- pkgs/development/python-modules/ufoprocessor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix index e848536d8c60..a9bcacc15869 100644 --- a/pkgs/development/python-modules/ufoprocessor/default.nix +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ufoprocessor"; - version = "1.13.3"; + version = "1.14.1"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1187g7xs6z8i2hzfkqhfd59qsdvzydqnmwhaz71nsi1zf5bw59gw"; + sha256 = "sha256-/TjTzDWblBcbqNP9weTe/eIgas70+X11tIUDu4rAOwE="; }; build-system = [ setuptools-scm ]; From c1ffa408eb32ea5947e03233a7de398af8d4fdf6 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 31 Oct 2025 08:46:23 +0100 Subject: [PATCH 025/154] framework-tool-tui: 0.5.1 -> 0.5.6 --- pkgs/by-name/fr/framework-tool-tui/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix index df7402cb8877..0c791d715a11 100644 --- a/pkgs/by-name/fr/framework-tool-tui/package.nix +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -7,20 +7,23 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool-tui"; - version = "0.5.1"; + version = "0.5.7"; src = fetchFromGitHub { owner = "grouzen"; repo = "framework-tool-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-R4/VeymmthI96PJt7XsKRYz1Y8QW/lV90HvJgt+e+hI="; + hash = "sha256-D9twqVizYqrglVOrwc8KuB5mk4vc/BTMv+HR3rv5yEk="; }; - cargoHash = "sha256-tDNYkV5MWb4+co/gwjpAt/M7yJbEWrryieJoBuXmY8M="; + cargoHash = "sha256-0/6b0C+uUNz03r5IEBvAGzagSyjzXFVbE74rgfGJoyM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; + # test suite needs a framework laptop + doCheck = false; + meta = { description = "TUI for controlling and monitoring Framework Computers hardware"; longDescription = '' From d28ccdc34da42f9ae2111e223fe3969d4f2a8d28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 11:04:28 +0000 Subject: [PATCH 026/154] cpuinfo: 0-unstable-2025-09-05 -> 0-unstable-2025-11-06 --- pkgs/by-name/cp/cpuinfo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 65424033c77d..b91e4c0c257e 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2025-09-05"; + version = "0-unstable-2025-11-06"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "877328f188a3c7d1fa855871a278eb48d530c4c0"; - hash = "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc="; + rev = "f01ce870215f9e5d4c32006796994469c5334fd7"; + hash = "sha256-v6U+Z5YHHSP0WUPxQ0G2zpP4a2D4I+BfhdY6q5BylBo="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cpu-info"; maintainers = with lib.maintainers; [ pawelchcki ]; pkgConfigModules = [ "libcpuinfo" ]; - # https://github.com/pytorch/cpuinfo/blob/877328f188a3c7d1fa855871a278eb48d530c4c0/CMakeLists.txt#L98 + # https://github.com/pytorch/cpuinfo/blob/f01ce870215f9e5d4c32006796994469c5334fd7/CMakeLists.txt#L98 platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv; }; }) From a21f7eee9de00a8ccd7a2b5c0e250312f77ef3ed Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Fri, 7 Nov 2025 13:01:28 +0100 Subject: [PATCH 027/154] databricks-cli: 0.270.0 -> 0.276.0 --- pkgs/by-name/da/databricks-cli/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 4cb2ec023d5c..7973ac33c3b3 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "databricks-cli"; - version = "0.270.0"; + version = "0.276.0"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-DCgj2IXGidWET8jCmmmuz9viOjdO89UqloZ5yvnXluk="; + hash = "sha256-iD8fB/sMHBGSL6pCEN3TPxlgcBd7+ckPXd7Gq3CLPEM="; }; # Otherwise these tests fail asserting that the version is 0.0.0-dev @@ -25,12 +25,13 @@ buildGoModule (finalAttrs: { --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" ''; - vendorHash = "sha256-U5H20Csk8EhIqmUBN8DVYA5jta2LoGLs/EYiZbGo6Tc="; + vendorHash = "sha256-mFM5i1ec+eB4IhxoZipMgXK3IZm9KcSmifE2kJRV9BY="; excludedPackages = [ "bundle/internal" "acceptance" "integration" + "tools/testrunner" ]; ldflags = [ From 86a379258b0350aa54e15a63d78648d8c33502f6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Nov 2025 10:44:55 +0000 Subject: [PATCH 028/154] python3Packages.coffea: 2025.10.2 -> 2025.11.0 Diff: https://github.com/CoffeaTeam/coffea/compare/v2025.10.2...v2025.11.0 Changelog: https://github.com/CoffeaTeam/coffea/releases/tag/v2025.11.0 --- pkgs/development/python-modules/coffea/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 32524ca40c76..55a37b4ff4cb 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -18,6 +18,7 @@ dask-histogram, fsspec, hist, + ipywidgets, lz4, matplotlib, mplhep, @@ -27,6 +28,7 @@ pandas, pyarrow, requests, + rich, scipy, toml, tqdm, @@ -42,14 +44,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2025.10.2"; + version = "2025.11.0"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; tag = "v${version}"; - hash = "sha256-vTTjdffQHzKnU41rW5XYTD7C4pH2fxhSy8mfKGMZbLc="; + hash = "sha256-vv1eHb8vt4nxdnpLmE0J5g/3oYmcoIykKCuOcQoxA60="; }; build-system = [ @@ -72,6 +74,7 @@ buildPythonPackage rec { dask-histogram fsspec hist + ipywidgets lz4 matplotlib mplhep @@ -81,6 +84,7 @@ buildPythonPackage rec { pandas pyarrow requests + rich scipy toml tqdm From 733271c086ccdb4b0970813bcea69ce604baef83 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 28 Oct 2025 21:59:42 +0000 Subject: [PATCH 029/154] {python3Packages.,}tiny-cuda-nn: 1.6 -> 2.0 Diff: https://github.com/NVlabs/tiny-cuda-nn/compare/v1.6...v2.0 --- pkgs/by-name/ti/tiny-cuda-nn/package.nix | 40 ++++++++++-------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix index ebeea75fa20b..0d0caffe578e 100644 --- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix +++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix @@ -13,18 +13,18 @@ }: let inherit (lib) lists strings; - inherit (cudaPackages) backendStdenv cudaAtLeast flags; + inherit (cudaPackages) backendStdenv flags; cuda-common-redist = with cudaPackages; [ (lib.getDev cuda_cudart) # cuda_runtime.h (lib.getLib cuda_cudart) (lib.getDev cuda_cccl) # - (lib.getDev libcublas) # cublas_v2.h - (lib.getLib libcublas) - (lib.getDev libcusolver) # cusolverDn.h - (lib.getLib libcusolver) - (lib.getDev libcusparse) # cusparse.h - (lib.getLib libcusparse) + (lib.getInclude cuda_nvrtc) # nvrtc.h + (lib.getLib cuda_nvrtc) + (lib.getInclude libcublas) # cublas_v2.h + (lib.getLib libcublas) # cublas_v2.h + (lib.getInclude libcusolver) # cusolverDn.h + (lib.getInclude libcusparse) # cusparse.h ]; cuda-native-redist = symlinkJoin { @@ -38,7 +38,6 @@ let }; unsupportedCudaCapabilities = [ - "9.0a" ]; cudaCapabilities = lists.subtractLists unsupportedCudaCapabilities flags.cudaCapabilities; @@ -47,7 +46,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "tiny-cuda-nn"; - version = "1.6"; + version = "2.0"; strictDeps = true; format = strings.optionalString pythonSupport "setuptools"; @@ -55,18 +54,11 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "NVlabs"; repo = "tiny-cuda-nn"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; + hash = "sha256-m73lnXufFQOoYHko8x/gIT2UAuHADAGRxVqDSbW+KlY="; }; - # Remove this once a release is made with - # https://github.com/NVlabs/tiny-cuda-nn/commit/78a14fe8c292a69f54e6d0d47a09f52b777127e1 - postPatch = '' - substituteInPlace bindings/torch/setup.py --replace-fail \ - "-std=c++14" "-std=c++17" - ''; - nativeBuildInputs = [ cmake cuda-native-redist @@ -78,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { [ pip setuptools - wheel ] ); @@ -164,16 +155,19 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + pythonImportsCheck = lib.optionals pythonSupport [ "tinycudann" ]; + passthru = { inherit cudaPackages; }; - meta = with lib; { + meta = { description = "Lightning fast C++/CUDA neural network framework"; homepage = "https://github.com/NVlabs/tiny-cuda-nn"; - license = licenses.bsd3; - maintainers = with maintainers; [ connorbaker ]; - platforms = platforms.linux; + changelog = "https://github.com/NVlabs/tiny-cuda-nn/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ connorbaker ]; + platforms = lib.platforms.linux; badPlatforms = [ # g++: error: unrecognized command-line option '-mf16c' lib.systems.inspect.patterns.isAarch64 From 241ad9ec134ffad3260f51fa5745732aa63fb7b3 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:06:55 +1000 Subject: [PATCH 030/154] autotiling: modernize --- pkgs/misc/autotiling/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index fa0e6373480e..2d412952bc22 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "nwg-piotr"; - repo = pname; + repo = "autotiling"; tag = "v${version}"; hash = "sha256-k+UiAGMB/fJiE+C737yGdyTpER1ciZrMkZezkcn/4yk="; }; @@ -24,12 +24,12 @@ buildPythonApplication rec { ]; doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/nwg-piotr/autotiling"; description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ artturin ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ artturin ]; mainProgram = "autotiling"; }; } From 138ac3a28120ec45ca19a2edcc20ca58496d5d9d Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:07:39 +1000 Subject: [PATCH 031/154] jackett: modernize --- pkgs/shells/fish/plugins/sponge.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/fish/plugins/sponge.nix b/pkgs/shells/fish/plugins/sponge.nix index 9375079d7a53..ad6a9b088b58 100644 --- a/pkgs/shells/fish/plugins/sponge.nix +++ b/pkgs/shells/fish/plugins/sponge.nix @@ -10,15 +10,15 @@ buildFishPlugin rec { src = fetchFromGitHub { owner = "meaningful-ooo"; - repo = pname; + repo = "sponge"; rev = version; sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; }; - meta = with lib; { + meta = { description = "Keeps your fish shell history clean from typos, incorrectly used commands and everything you don't want to store due to privacy reasons"; homepage = "https://github.com/meaningful-ooo/sponge"; - license = licenses.mit; - maintainers = with maintainers; [ quantenzitrone ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ quantenzitrone ]; }; } From aa7ca28926a5ea114490f8f69e75a98b2422e323 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:09:00 +1000 Subject: [PATCH 032/154] jackett: modernize --- pkgs/servers/jackett/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 2d48051f999b..6c69af569fdb 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -14,9 +14,9 @@ buildDotnetModule rec { version = "0.22.2390"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = "jackett"; + repo = "jackett"; + tag = "v${version}"; hash = "sha512-Viz9gU16NG6nYeEwhar3OCSPnsHrM6ZehsOcNxteaGyvgrhbyWt5rNI54wCJ7OngHaZgIoQhMoNNkvIhX8JDUg=="; }; @@ -51,13 +51,13 @@ buildDotnetModule rec { passthru.tests = { inherit (nixosTests) jackett; }; - meta = with lib; { + meta = { description = "API Support for your favorite torrent trackers"; mainProgram = "jackett"; homepage = "https://github.com/Jackett/Jackett/"; changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ edwtjo nyanloutre purcell From ee1039297a3492a6e4d844971b5e0741a2776672 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:11:24 +1000 Subject: [PATCH 033/154] apulse: modernize, move to finalAttrs --- pkgs/misc/apulse/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index df2480f902e3..ac2ab9763b6f 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -14,15 +14,15 @@ let oz = x: if x then "1" else "0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apulse"; version = "0.1.14"; src = fetchFromGitHub { owner = "i-rinat"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-SWvQvS9QBOevOSRpjY3XpyhzWoHAkXzkk8Mh4ovltNI="; + repo = "apulse"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SWvQvS9QBOevOSRpjY3XpyhzWoHAkXzkk8Mh4ovltNI="; }; nativeBuildInputs = [ @@ -40,12 +40,13 @@ stdenv.mkDerivation rec { "-DLOG_TO_STDERR=${oz logToStderr}" ]; - meta = with lib; { + meta = { description = "PulseAudio emulation for ALSA"; homepage = "https://github.com/i-rinat/apulse"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.jagajaga ]; + changelog = "https://github.com/i-rinat/apulse/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.jagajaga ]; mainProgram = "apulse"; }; -} +}) From a92c0fa8f6ea8d0ed3ac6cbc2a8b2fcdd77bdf57 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:13:40 +1000 Subject: [PATCH 034/154] lemmy-ui: modernize --- pkgs/servers/web-apps/lemmy/ui.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index 85ce59d44ab6..298f1d8f3d4d 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -11,7 +11,6 @@ let pinData = lib.importJSON ./pin.json; - in stdenvNoCC.mkDerivation (finalAttrs: { @@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { with finalAttrs; fetchFromGitHub { owner = "LemmyNet"; - repo = pname; + repo = "lemmy-ui"; rev = version; fetchSubmodules = true; hash = pinData.uiHash; @@ -79,15 +78,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { distPhase = "true"; - passthru.updateScript = ./update.py; - passthru.tests.lemmy-ui = nixosTests.lemmy; - passthru.commit_sha = finalAttrs.src.rev; + passthru = { + updateScript = ./update.py; + tests.lemmy-ui = nixosTests.lemmy; + commit_sha = finalAttrs.src.rev; + }; - meta = with lib; { + meta = { description = "Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ happysalada billewanick georgyo From c7155ef85e0b31c07cdb3e2e7f84a820f6d37636 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 07:12:08 +0000 Subject: [PATCH 035/154] rcon-cli: 1.7.2 -> 1.7.3 --- pkgs/by-name/rc/rcon-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rc/rcon-cli/package.nix b/pkgs/by-name/rc/rcon-cli/package.nix index 6afa73ae7fb9..575bfee0baa1 100644 --- a/pkgs/by-name/rc/rcon-cli/package.nix +++ b/pkgs/by-name/rc/rcon-cli/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "rcon-cli"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "itzg"; repo = "rcon-cli"; tag = finalAttrs.version; - hash = "sha256-wog4nnXITV5p2lzfuO9tB//B87nh8KGpsCfSalt8WvE="; + hash = "sha256-v9f367XTPKAocGdwwPe/dXsFK30THbqpQwuvSV/lWN4="; }; - vendorHash = "sha256-vD+i3vMInErO0MpIRgsVe0Fl6HuFIwUS8xKHdZ7lxVM="; + vendorHash = "sha256-TogEdy0rtOzywBCtJ9dw8jO25dzxygqDGFDCbCNwhz8="; subPackages = [ "." ]; passthru.updateScript = nix-update-script { }; From bf559bd45a91a7dbde66cc6c554d5d6588b55619 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 08:11:39 +0000 Subject: [PATCH 036/154] oneDNN: 3.9.1 -> 3.10 --- pkgs/by-name/on/oneDNN/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/oneDNN/package.nix index e196a0acb4f9..f8365440bda8 100644 --- a/pkgs/by-name/on/oneDNN/package.nix +++ b/pkgs/by-name/on/oneDNN/package.nix @@ -11,13 +11,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.9.1"; + version = "3.10"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-DbLW22LgG8wrBNMsxoUGlacHLcfIBwqyiv+HOmFDtxc="; + hash = "sha256-EII2EFCxU+ZnmfnRM8dfHa+sEi2z+7k2ikBbfpZafko="; }; outputs = [ From 5c3e75c4eebdbf3d8e6928c55a79f1e988d02273 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sat, 8 Nov 2025 11:50:15 +0000 Subject: [PATCH 037/154] bun: 1.3.1 -> 1.3.2 Changelog: https://bun.com/blog/bun-v1.3.2 --- pkgs/by-name/bu/bun/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 9311c7f83886..63e6d45e381c 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.3.1"; + version = "1.3.2"; pname = "bun"; src = @@ -87,19 +87,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-ronylWETMwdRWqPdpdXv3R6dJod+yFtPGAABNDGqmO0="; + hash = "sha256-2FhHmC21dFGBMKRVgrzxTY4r6WELZstQRsIDSFeLD+I="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-ZWZqGEOeiR5XUbZmED/lkahRnxG2bsS9hlTFUV1P/4o="; + hash = "sha256-/jjBO2trRQr05PD7jgSyLspT+c1xBo0dHuv09KRPAvs="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-pILjoY8BpW13NvpuQXjbNdoeVr3cgjJa10jhXKAdigs="; + hash = "sha256-LW3aLD9Xp6m7qFJdUcQAbj2M7MS2rTP/ae4HZgbBN7w="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-QAgkyCv8wIVDZbytoRz1PXOE7LHiw9oOLAosalJ9Vik="; + hash = "sha256-DLVqRIS9d2Sj7vm55nq0V4QJgSh7RnlJdNHmYSy/Zwk="; }; }; updateScript = writeShellScript "update-bun" '' From 7446242d145fdc4b18848b154df95c9fdbcaf79d Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 8 Nov 2025 13:52:39 -0500 Subject: [PATCH 038/154] cargo-binstall: adopt --- pkgs/by-name/ca/cargo-binstall/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index c894974e9a07..76b2d4ed3e82 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -68,6 +68,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/cargo-bins/cargo-binstall"; changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; } From 8a036f3d17d6146a1753e48c5eba431173336dc1 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 8 Nov 2025 12:34:23 -0800 Subject: [PATCH 039/154] python3Packages.curl-cffi: pin websockets at 12.0 --- .../python-modules/curl-cffi/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index ac1eb455aa11..4f5a6eec18f0 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -19,10 +18,30 @@ python-multipart, trustme, uvicorn, - websockets, writableTmpDirAsHomeHook, }: +let + # This is only used for testing and requires 12.0 specifically + # due to incompatible API changes in later versions. + websockets = buildPythonPackage rec { + pname = "websockets"; + version = "12.0"; + pyproject = true; + src = fetchFromGitHub { + owner = "aaugustin"; + repo = "websockets"; + tag = version; + hash = "sha256-sOL3VI9Ib/PncZs5KN4dAIHOrBc7LfXqT15LO4M6qKg="; + }; + + build-system = [ setuptools ]; + + doCheck = false; + + pythonImportsCheck = [ "websockets" ]; + }; +in buildPythonPackage rec { pname = "curl-cffi"; version = "0.14.0b2"; From e4c1bb1c21668ee9dc597eb2ce989e58021fe9da Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 13:20:11 -0500 Subject: [PATCH 040/154] nodePackages.ni: alias to pkgs.ni Same package. no need for it to be here. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 51 ------------------- 4 files changed, 1 insertion(+), 53 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 4846153350fb..48505c180f38 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -33,6 +33,7 @@ let in mapAliases { + "@antfu/ni" = pkgs.ni; # Added 2025-11-08 "@antora/cli" = pkgs.antora; # Added 2023-05-06 "@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12 "@babel/cli" = diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 37347bee4e52..f458fbe78de2 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -1,7 +1,6 @@ # Use this file to add `meta.mainProgram` to packages in `nodePackages`. { # Packages that provide multiple executables where one is clearly the `mainProgram`. - "@antfu/ni" = "ni"; "@microsoft/rush" = "rush"; # Packages that provide a single executable. diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6b644d17d2ac..ea9336d4cfc3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,6 +1,5 @@ [ "@angular/cli" -, "@antfu/ni" , "@commitlint/cli" , "@microsoft/rush" , "@tailwindcss/aspect-ratio" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f1f1bbb3dfd6..d1052067781d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4224,15 +4224,6 @@ let sha512 = "QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg=="; }; }; - "ansis-3.17.0" = { - name = "ansis"; - packageName = "ansis"; - version = "3.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansis/-/ansis-3.17.0.tgz"; - sha512 = "0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg=="; - }; - }; "any-base-1.1.0" = { name = "any-base"; packageName = "any-base"; @@ -11721,15 +11712,6 @@ let sha512 = "vAcPiyomt1ioKAsAL2uxSABHJ4Ju/e4UeDM+g1OlR0vV4YhLGMNsdLNvZTpEDY4JCSt0E4hASCNM5t2ETtsbyg=="; }; }; - "fzf-0.5.2" = { - name = "fzf"; - packageName = "fzf"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fzf/-/fzf-0.5.2.tgz"; - sha512 = "Tt4kuxLXFKHy8KT40zwsUPUkg1CrsgY25FxA2U/j/0WgEDCk3ddc/zLTCCcbSHX9FcKtLuVaDGtGE/STWC+j3Q=="; - }; - }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -20280,15 +20262,6 @@ let sha512 = "UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="; }; }; - "package-manager-detector-1.0.0" = { - name = "package-manager-detector"; - packageName = "package-manager-detector"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.0.0.tgz"; - sha512 = "7elnH+9zMsRo7aS72w6MeRugTpdRvInmEB4Kmm9BVvPw/SLG8gXUGQ+4wF0Mys0RSWPz0B9nuBbDe8vFeA2sfg=="; - }; - }; "pacote-20.0.0" = { name = "pacote"; packageName = "pacote"; @@ -29748,30 +29721,6 @@ in bypassCache = true; reconstructLock = true; }; - "@antfu/ni" = nodeEnv.buildNodePackage { - name = "_at_antfu_slash_ni"; - packageName = "@antfu/ni"; - version = "24.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-24.2.0.tgz"; - sha512 = "+B9wzpv+KOhqbOgHjHcBAX7IwIKdDt4SFzYlxIPr4srANFJfjAABC7nU8KNFba+DYLymRe2EPSUfE7+reJb5UA=="; - }; - dependencies = [ - sources."ansis-3.17.0" - sources."fzf-0.5.2" - sources."package-manager-detector-1.0.0" - sources."tinyexec-0.3.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Use the right package manager"; - homepage = "https://github.com/antfu-collective/ni#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; From 6c3af5d19523f5c0b3f5ae4686924d96b131a7fa Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 13:50:57 -0500 Subject: [PATCH 041/154] json-diff: migrate from nodePackages --- pkgs/by-name/js/json-diff/package.nix | 32 ++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 52 ------------------- 4 files changed, 33 insertions(+), 53 deletions(-) create mode 100644 pkgs/by-name/js/json-diff/package.nix diff --git a/pkgs/by-name/js/json-diff/package.nix b/pkgs/by-name/js/json-diff/package.nix new file mode 100644 index 000000000000..ea94a368396f --- /dev/null +++ b/pkgs/by-name/js/json-diff/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "json-diff"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "andreyvit"; + repo = "json-diff"; + tag = "v${finalAttrs.version}"; + hash = "sha256-b8CtttEmPUIuFba6yn0DhVsSM1RA8Jsl4+zGvk3EZ2s="; + }; + + npmDepsHash = "sha256-hpnmBD9fyudjc3dzxZ5L5mhkCfRbw7BaAHKGf76qVDU="; + + npmBuildScript = "test"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Structural diff for JSON files"; + homepage = "https://github.com/andreyvit/json-diff"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "json-diff"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 48505c180f38..5f77fefbe91b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -193,6 +193,7 @@ mapAliases { inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 inherit (pkgs) js-beautify; # Added 2025-11-06 inherit (pkgs) jshint; # Added 2025-11-06 + inherit (pkgs) json-diff; # Added 2025-11-07 inherit (pkgs) jsonplaceholder; # Added 2025-11-04 inherit (pkgs) json-server; # Added 2025-11-06 joplin = pkgs.joplin-cli; # Added 2025-11-02 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ea9336d4cfc3..2a3e6b302f54 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -40,7 +40,6 @@ , "js-yaml" , "jsdoc" , "json" -, "json-diff" , "json-refs" , "jsonlint" , "katex" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d1052067781d..5b2dacd615f0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -741,15 +741,6 @@ let sha512 = "JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g=="; }; }; - "@ewoudenberg/difflib-0.1.0" = { - name = "_at_ewoudenberg_slash_difflib"; - packageName = "@ewoudenberg/difflib"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ewoudenberg/difflib/-/difflib-0.1.0.tgz"; - sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; - }; - }; "@exodus/schemasafe-1.3.0" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; @@ -9390,15 +9381,6 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; - "dreamopt-0.8.0" = { - name = "dreamopt"; - packageName = "dreamopt"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dreamopt/-/dreamopt-0.8.0.tgz"; - sha512 = "vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg=="; - }; - }; "dtrace-provider-0.6.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -12837,15 +12819,6 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; - "heap-0.2.7" = { - name = "heap"; - packageName = "heap"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz"; - sha512 = "2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="; - }; - }; "help-me-3.0.0" = { name = "help-me"; packageName = "help-me"; @@ -35780,31 +35753,6 @@ in bypassCache = true; reconstructLock = true; }; - json-diff = nodeEnv.buildNodePackage { - name = "json-diff"; - packageName = "json-diff"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-1.0.6.tgz"; - sha512 = "tcFIPRdlc35YkYdGxcamJjllUhXWv4n2rK9oJ2RsAzV4FBkuV4ojKEDgcZ+kpKxDmJKv+PFK65+1tVVOnSeEqA=="; - }; - dependencies = [ - sources."@ewoudenberg/difflib-0.1.0" - sources."colors-1.4.0" - sources."dreamopt-0.8.0" - sources."heap-0.2.7" - sources."wordwrap-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON diff"; - homepage = "https://github.com/andreyvit/json-diff"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; From 983751956ff932c3357fa18b0d0d42461fce1820 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 14:56:06 -0500 Subject: [PATCH 042/154] commitlint: migrate from nodePackages --- pkgs/by-name/co/commitlint/package.nix | 68 +++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 403 ------------------ pkgs/top-level/all-packages.nix | 2 - 6 files changed, 69 insertions(+), 407 deletions(-) create mode 100644 pkgs/by-name/co/commitlint/package.nix diff --git a/pkgs/by-name/co/commitlint/package.nix b/pkgs/by-name/co/commitlint/package.nix new file mode 100644 index 000000000000..b273859cf1a0 --- /dev/null +++ b/pkgs/by-name/co/commitlint/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "commitlint"; + version = "20.1.0"; + + src = fetchFromGitHub { + owner = "conventional-changelog"; + repo = "commitlint"; + rev = "v${finalAttrs.version}"; + hash = "sha256-o8AnIewSmg8vRjs8LU6QwRyl2hMQ2iK5W7WL137treU="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-Kg19sEgstrWj+JLzdZFnMeb0F5lFX3Z0VPNyiYPi6nY="; + }; + + nativeBuildInputs = [ + yarnConfigHook + nodejs + ]; + + buildPhase = '' + runHook preBuild + + pkgs=("config-validator" "rules" "parse" "is-ignored" "lint" + "resolve-extends" "execute-rule" "load" "read" "types" "cli") + for p in "''${pkgs[@]}" ; do + cd @commitlint/$p/ + yarn run tsc --build --force + cd ../.. + done + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn install --offline --production --ignore-scripts + mkdir -p $out/bin + mkdir -p $out/lib/node_modules/@commitlint/root + mv * $out/lib/node_modules/@commitlint/root/ + ln -s $out/lib/node_modules/@commitlint/root/@commitlint/cli/cli.js $out/bin/commitlint + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/conventional-changelog/commitlint/releases/tag/v${finalAttrs.version}"; + description = "Lint your commit messages"; + homepage = "https://commitlint.js.org/"; + license = lib.licenses.mit; + mainProgram = "commitlint"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 5f77fefbe91b..3c9930c12c27 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -39,6 +39,7 @@ mapAliases { "@babel/cli" = throw "@babel/cli was removed because upstream highly suggests installing it in your project instead of globally."; # Added 2025-11-06 "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 + "@commitlint/cli" = pkgs.commitlint; # Added 2025-11-08 "@commitlint/config-conventional" = throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index f458fbe78de2..6979f88e5242 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -5,7 +5,6 @@ # Packages that provide a single executable. "@angular/cli" = "ng"; - "@commitlint/cli" = "commitlint"; aws-cdk = "cdk"; cdk8s-cli = "cdk8s"; clipboard-cli = "clipboard"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2a3e6b302f54..6ffa0b2e5281 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,6 +1,5 @@ [ "@angular/cli" -, "@commitlint/cli" , "@microsoft/rush" , "@tailwindcss/aspect-ratio" , "@tailwindcss/forms" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5b2dacd615f0..b882ae1a03f7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -444,141 +444,6 @@ let sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; }; }; - "@commitlint/config-validator-19.8.0" = { - name = "_at_commitlint_slash_config-validator"; - packageName = "@commitlint/config-validator"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-19.8.0.tgz"; - sha512 = "+r5ZvD/0hQC3w5VOHJhGcCooiAVdynFlCe2d6I9dU+PvXdV3O+fU4vipVg+6hyLbQUuCH82mz3HnT/cBQTYYuA=="; - }; - }; - "@commitlint/ensure-19.8.0" = { - name = "_at_commitlint_slash_ensure"; - packageName = "@commitlint/ensure"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-19.8.0.tgz"; - sha512 = "kNiNU4/bhEQ/wutI1tp1pVW1mQ0QbAjfPRo5v8SaxoVV+ARhkB8Wjg3BSseNYECPzWWfg/WDqQGIfV1RaBFQZg=="; - }; - }; - "@commitlint/execute-rule-19.8.0" = { - name = "_at_commitlint_slash_execute-rule"; - packageName = "@commitlint/execute-rule"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-19.8.0.tgz"; - sha512 = "fuLeI+EZ9x2v/+TXKAjplBJWI9CNrHnyi5nvUQGQt4WRkww/d95oVRsc9ajpt4xFrFmqMZkd/xBQHZDvALIY7A=="; - }; - }; - "@commitlint/format-19.8.0" = { - name = "_at_commitlint_slash_format"; - packageName = "@commitlint/format"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-19.8.0.tgz"; - sha512 = "EOpA8IERpQstxwp/WGnDArA7S+wlZDeTeKi98WMOvaDLKbjptuHWdOYYr790iO7kTCif/z971PKPI2PkWMfOxg=="; - }; - }; - "@commitlint/is-ignored-19.8.0" = { - name = "_at_commitlint_slash_is-ignored"; - packageName = "@commitlint/is-ignored"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.8.0.tgz"; - sha512 = "L2Jv9yUg/I+jF3zikOV0rdiHUul9X3a/oU5HIXhAJLE2+TXTnEBfqYP9G5yMw/Yb40SnR764g4fyDK6WR2xtpw=="; - }; - }; - "@commitlint/lint-19.8.0" = { - name = "_at_commitlint_slash_lint"; - packageName = "@commitlint/lint"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-19.8.0.tgz"; - sha512 = "+/NZKyWKSf39FeNpqhfMebmaLa1P90i1Nrb1SrA7oSU5GNN/lksA4z6+ZTnsft01YfhRZSYMbgGsARXvkr/VLQ=="; - }; - }; - "@commitlint/load-19.8.0" = { - name = "_at_commitlint_slash_load"; - packageName = "@commitlint/load"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-19.8.0.tgz"; - sha512 = "4rvmm3ff81Sfb+mcWT5WKlyOa+Hd33WSbirTVUer0wjS1Hv/Hzr07Uv1ULIV9DkimZKNyOwXn593c+h8lsDQPQ=="; - }; - }; - "@commitlint/message-19.8.0" = { - name = "_at_commitlint_slash_message"; - packageName = "@commitlint/message"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/message/-/message-19.8.0.tgz"; - sha512 = "qs/5Vi9bYjf+ZV40bvdCyBn5DvbuelhR6qewLE8Bh476F7KnNyLfdM/ETJ4cp96WgeeHo6tesA2TMXS0sh5X4A=="; - }; - }; - "@commitlint/parse-19.8.0" = { - name = "_at_commitlint_slash_parse"; - packageName = "@commitlint/parse"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-19.8.0.tgz"; - sha512 = "YNIKAc4EXvNeAvyeEnzgvm1VyAe0/b3Wax7pjJSwXuhqIQ1/t2hD3OYRXb6D5/GffIvaX82RbjD+nWtMZCLL7Q=="; - }; - }; - "@commitlint/read-19.8.0" = { - name = "_at_commitlint_slash_read"; - packageName = "@commitlint/read"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/read/-/read-19.8.0.tgz"; - sha512 = "6ywxOGYajcxK1y1MfzrOnwsXO6nnErna88gRWEl3qqOOP8MDu/DTeRkGLXBFIZuRZ7mm5yyxU5BmeUvMpNte5w=="; - }; - }; - "@commitlint/resolve-extends-19.8.0" = { - name = "_at_commitlint_slash_resolve-extends"; - packageName = "@commitlint/resolve-extends"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.8.0.tgz"; - sha512 = "CLanRQwuG2LPfFVvrkTrBR/L/DMy3+ETsgBqW1OvRxmzp/bbVJW0Xw23LnnExgYcsaFtos967lul1CsbsnJlzQ=="; - }; - }; - "@commitlint/rules-19.8.0" = { - name = "_at_commitlint_slash_rules"; - packageName = "@commitlint/rules"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-19.8.0.tgz"; - sha512 = "IZ5IE90h6DSWNuNK/cwjABLAKdy8tP8OgGVGbXe1noBEX5hSsu00uRlLu6JuruiXjWJz2dZc+YSw3H0UZyl/mA=="; - }; - }; - "@commitlint/to-lines-19.8.0" = { - name = "_at_commitlint_slash_to-lines"; - packageName = "@commitlint/to-lines"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-19.8.0.tgz"; - sha512 = "3CKLUw41Cur8VMjh16y8LcsOaKbmQjAKCWlXx6B0vOUREplp6em9uIVhI8Cv934qiwkbi2+uv+mVZPnXJi1o9A=="; - }; - }; - "@commitlint/top-level-19.8.0" = { - name = "_at_commitlint_slash_top-level"; - packageName = "@commitlint/top-level"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-19.8.0.tgz"; - sha512 = "Rphgoc/omYZisoNkcfaBRPQr4myZEHhLPx2/vTXNLjiCw4RgfPR1wEgUpJ9OOmDCiv5ZyIExhprNLhteqH4FuQ=="; - }; - }; - "@commitlint/types-19.8.0" = { - name = "_at_commitlint_slash_types"; - packageName = "@commitlint/types"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-19.8.0.tgz"; - sha512 = "LRjP623jPyf3Poyfb0ohMj8I3ORyBDOwXAgxxVPbSD0unJuW2mJWeiRfaQinjtccMqC5Wy1HOMfa4btKjbNxbg=="; - }; - }; "@conventional-changelog/git-client-1.0.1" = { name = "_at_conventional-changelog_slash_git-client"; packageName = "@conventional-changelog/git-client"; @@ -3027,15 +2892,6 @@ let sha512 = "3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ=="; }; }; - "@types/conventional-commits-parser-5.0.1" = { - name = "_at_types_slash_conventional-commits-parser"; - packageName = "@types/conventional-commits-parser"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/conventional-commits-parser/-/conventional-commits-parser-5.0.1.tgz"; - sha512 = "7uz5EHdzz2TqoMfV7ee61Egf5y6NkcO4FB/1iCCQnbeiI1F3xzv3vK5dBCXUCLQgGYS+mUeigK1iKQzvED+QnQ=="; - }; - }; "@types/cors-2.8.17" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; @@ -7590,15 +7446,6 @@ let sha512 = "tuUH8H/19VjtD9Ig7l6TQRh+Z0Yt0NZ6w/cCkkyzUbGQTnUEmKfGtkC9gGfVgCfOL1Rzno5NgNF4KY8vR+Jo3w=="; }; }; - "conventional-changelog-angular-7.0.0" = { - name = "conventional-changelog-angular"; - packageName = "conventional-changelog-angular"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz"; - sha512 = "ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ=="; - }; - }; "conventional-changelog-angular-8.0.0" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -7716,15 +7563,6 @@ let sha512 = "tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q=="; }; }; - "conventional-commits-parser-5.0.0" = { - name = "conventional-commits-parser"; - packageName = "conventional-commits-parser"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz"; - sha512 = "ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA=="; - }; - }; "conventional-commits-parser-6.1.0" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; @@ -7887,15 +7725,6 @@ let sha512 = "itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg=="; }; }; - "cosmiconfig-typescript-loader-6.1.0" = { - name = "cosmiconfig-typescript-loader"; - packageName = "cosmiconfig-typescript-loader"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-6.1.0.tgz"; - sha512 = "tJ1w35ZRUiM5FeTzT7DtYWAFFv37ZLqSRkGi2oeCK1gPhvaWjkAtfXvLmvE1pRfxxp9aQo6ba/Pvg1dKj05D4g=="; - }; - }; "cp-file-10.0.0" = { name = "cp-file"; packageName = "cp-file"; @@ -8400,15 +8229,6 @@ let sha512 = "ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="; }; }; - "dargs-8.1.0" = { - name = "dargs"; - packageName = "dargs"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dargs/-/dargs-8.1.0.tgz"; - sha512 = "wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw=="; - }; - }; "dash-ast-1.0.0" = { name = "dash-ast"; packageName = "dash-ast"; @@ -11199,15 +11019,6 @@ let sha512 = "v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw=="; }; }; - "find-up-7.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz"; - sha512 = "YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g=="; - }; - }; "find-up-simple-1.0.1" = { name = "find-up-simple"; packageName = "find-up-simple"; @@ -11964,15 +11775,6 @@ let sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; - "git-raw-commits-4.0.0" = { - name = "git-raw-commits"; - packageName = "git-raw-commits"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-4.0.0.tgz"; - sha512 = "ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ=="; - }; - }; "git-raw-commits-5.0.0" = { name = "git-raw-commits"; packageName = "git-raw-commits"; @@ -13386,15 +13188,6 @@ let sha512 = "f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA=="; }; }; - "import-meta-resolve-4.1.0" = { - name = "import-meta-resolve"; - packageName = "import-meta-resolve"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz"; - sha512 = "I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw=="; - }; - }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -14700,15 +14493,6 @@ let sha512 = "9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w=="; }; }; - "is-text-path-2.0.0" = { - name = "is-text-path"; - packageName = "is-text-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz"; - sha512 = "+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw=="; - }; - }; "is-typed-array-1.1.15" = { name = "is-typed-array"; packageName = "is-typed-array"; @@ -16329,15 +16113,6 @@ let sha512 = "yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q=="; }; }; - "lodash.kebabcase-4.1.1" = { - name = "lodash.kebabcase"; - packageName = "lodash.kebabcase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; - sha512 = "N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="; - }; - }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -16356,15 +16131,6 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; - "lodash.mergewith-4.6.2" = { - name = "lodash.mergewith"; - packageName = "lodash.mergewith"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; - sha512 = "GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="; - }; - }; "lodash.omitby-4.6.0" = { name = "lodash.omitby"; packageName = "lodash.omitby"; @@ -16383,24 +16149,6 @@ let sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; }; }; - "lodash.snakecase-4.1.1" = { - name = "lodash.snakecase"; - packageName = "lodash.snakecase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; - sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; - }; - }; - "lodash.startcase-4.4.0" = { - name = "lodash.startcase"; - packageName = "lodash.startcase"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz"; - sha512 = "+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg=="; - }; - }; "lodash.template-4.5.0" = { name = "lodash.template"; packageName = "lodash.template"; @@ -16491,15 +16239,6 @@ let sha512 = "7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q=="; }; }; - "lodash.upperfirst-4.3.1" = { - name = "lodash.upperfirst"; - packageName = "lodash.upperfirst"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz"; - sha512 = "sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg=="; - }; - }; "lodash.zip-4.2.0" = { name = "lodash.zip"; packageName = "lodash.zip"; @@ -24798,15 +24537,6 @@ let sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; - "split2-4.2.0" = { - name = "split2"; - packageName = "split2"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz"; - sha512 = "UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg=="; - }; - }; "sprintf-js-1.0.3" = { name = "sprintf-js"; packageName = "sprintf-js"; @@ -25842,15 +25572,6 @@ let sha512 = "3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA=="; }; }; - "text-extensions-2.4.0" = { - name = "text-extensions"; - packageName = "text-extensions"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-extensions/-/text-extensions-2.4.0.tgz"; - sha512 = "te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g=="; - }; - }; "text-hex-1.0.0" = { name = "text-hex"; packageName = "text-hex"; @@ -29694,130 +29415,6 @@ in bypassCache = true; reconstructLock = true; }; - "@commitlint/cli" = nodeEnv.buildNodePackage { - name = "_at_commitlint_slash_cli"; - packageName = "@commitlint/cli"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-19.8.0.tgz"; - sha512 = "t/fCrLVu+Ru01h0DtlgHZXbHV2Y8gKocTR5elDOqIRUzQd0/6hpt2VIWOj9b3NDo7y4/gfxeR2zRtXq/qO6iUg=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@commitlint/config-validator-19.8.0" - sources."@commitlint/ensure-19.8.0" - sources."@commitlint/execute-rule-19.8.0" - sources."@commitlint/format-19.8.0" - sources."@commitlint/is-ignored-19.8.0" - sources."@commitlint/lint-19.8.0" - sources."@commitlint/load-19.8.0" - sources."@commitlint/message-19.8.0" - sources."@commitlint/parse-19.8.0" - sources."@commitlint/read-19.8.0" - sources."@commitlint/resolve-extends-19.8.0" - sources."@commitlint/rules-19.8.0" - sources."@commitlint/to-lines-19.8.0" - sources."@commitlint/top-level-19.8.0" - sources."@commitlint/types-19.8.0" - sources."@types/conventional-commits-parser-5.0.1" - sources."@types/node-22.13.10" - sources."JSONStream-1.3.5" - sources."ajv-8.17.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."array-ify-1.0.0" - sources."callsites-3.1.0" - sources."chalk-5.4.1" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."compare-func-2.0.0" - sources."conventional-changelog-angular-7.0.0" - sources."conventional-commits-parser-5.0.0" - sources."cosmiconfig-9.0.0" - sources."cosmiconfig-typescript-loader-6.1.0" - sources."dargs-8.1.0" - sources."dot-prop-5.3.0" - sources."emoji-regex-8.0.0" - sources."env-paths-2.2.1" - sources."error-ex-1.3.2" - sources."escalade-3.2.0" - sources."fast-deep-equal-3.1.3" - sources."fast-uri-3.0.6" - sources."find-up-7.0.0" - sources."get-caller-file-2.0.5" - sources."git-raw-commits-4.0.0" - sources."global-directory-4.0.1" - ( - sources."import-fresh-3.3.1" - // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - } - ) - sources."import-meta-resolve-4.1.0" - sources."ini-4.1.1" - sources."is-arrayish-0.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-obj-2.0.0" - sources."is-text-path-2.0.0" - sources."jiti-2.4.2" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-1.0.0" - sources."jsonparse-1.3.1" - sources."lines-and-columns-1.2.4" - sources."locate-path-7.2.0" - sources."lodash.camelcase-4.3.0" - sources."lodash.isplainobject-4.0.6" - sources."lodash.kebabcase-4.1.1" - sources."lodash.merge-4.6.2" - sources."lodash.mergewith-4.6.2" - sources."lodash.snakecase-4.1.1" - sources."lodash.startcase-4.4.0" - sources."lodash.uniq-4.5.0" - sources."lodash.upperfirst-4.3.1" - sources."meow-12.1.1" - sources."minimist-1.2.8" - sources."p-limit-4.0.0" - sources."p-locate-6.0.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."path-exists-5.0.0" - sources."picocolors-1.1.1" - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."resolve-from-5.0.0" - sources."semver-7.7.1" - sources."split2-4.2.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."text-extensions-2.4.0" - sources."through-2.3.8" - sources."tinyexec-0.3.2" - sources."typescript-5.8.2" - sources."undici-types-6.20.0" - sources."unicorn-magic-0.1.0" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."yocto-queue-1.2.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Lint your commit messages"; - homepage = "https://commitlint.js.org/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b166db126cb..b5c15f512d01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1202,8 +1202,6 @@ with pkgs; cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { }; - commitlint = nodePackages."@commitlint/cli"; - datalad = with python3Packages; toPythonApplication datalad; datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; From 9b46c7ea31ee1dca7fc8852b0df2880150fed061 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 5 Nov 2025 21:31:18 +0000 Subject: [PATCH 043/154] python3Packages.pytorch-lightning: 2.5.5 -> 2.5.6 Diff: https://github.com/Lightning-AI/pytorch-lightning/compare/2.5.5...2.5.6 Changelog: https://github.com/Lightning-AI/pytorch-lightning/releases/tag/2.5.6 --- pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index d8e90c7c0cc2..979f6c4b0fa8 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.5.5"; + version = "2.5.6"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; tag = version; - hash = "sha256-8CDVvgaxnFWO4Fl5lW/+cn/1WZCgVXYys86iOVNYUfY="; + hash = "sha256-ojmE0d6Wy4UqQu4kBBE2qtQ4AYqplHOB7wJ7hEte664="; }; preConfigure = '' From 2c42578129d67a6a2319986ea1c8bf0f7b39bdfb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Nov 2025 22:53:11 +0000 Subject: [PATCH 044/154] python3Packages.finetuning-scheduler: fix ReduceLROnPlateau import https://github.com/speediedan/finetuning-scheduler/pull/21 --- .../python-modules/finetuning-scheduler/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index 113e77b2dca2..85b46d882a52 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -27,6 +27,14 @@ buildPythonPackage rec { hash = "sha256-AfkrWuqpFS71Zrh5NsamzxMitKCsqPF50F9zTDdDhRg="; }; + # See https://github.com/speediedan/finetuning-scheduler/pull/21 + postPatch = '' + substituteInPlace src/finetuning_scheduler/strategy_adapters/base.py \ + --replace-fail \ + "from lightning.fabric.utilities.types import ReduceLROnPlateau" \ + "from torch.optim.lr_scheduler import ReduceLROnPlateau" + ''; + build-system = [ setuptools ]; pythonRelaxDeps = [ From 70bf527a7bb32cec8a7809d633865bda091b067c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Nov 2025 22:57:32 +0000 Subject: [PATCH 045/154] python3Packages.lerobot: relax av dependency --- pkgs/development/python-modules/lerobot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index 6111f49275a0..a49cb26b1ec1 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; pythonRelaxDeps = [ + "av" "datasets" "draccus" "gymnasium" From 17029d07c4b18d7571db128f059628dfee4a376b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 00:36:26 +0000 Subject: [PATCH 046/154] firebase-tools: 14.20.0 -> 14.24.1 --- pkgs/by-name/fi/firebase-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 36e6d61f4941..df9d5950bf75 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.20.0"; + version = "14.24.1"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-CX/2luy78Du6gsGG3ex0Q5amu93MqebTUF9of7D6H4M="; + hash = "sha256-eXADtJFQWC5Qf013fkJ4AdukyaKlc5Rorys/jNG9f+E="; }; - npmDepsHash = "sha256-laYq6NNGsJ2YGhg6i0iFCVk+qyRqYdZPSSWzVHailcc="; + npmDepsHash = "sha256-m5Rz2JH9e/rJ4tKwNiiZb7wnOmeMDxYuUrVx6QZy25w="; # No more package-lock.json in upstream src postPatch = '' From 930ce25af3297b59ff39df42f733145f5d81b97a Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 18:42:31 -0500 Subject: [PATCH 047/154] yarn-lock-converter: clean up build Removes custom update script, in-tree lockfile, and makes it use the yarn tooling for the package since that's what upstream uses --- .../ya/yarn-lock-converter/package-lock.json | 592 ------------------ .../ya/yarn-lock-converter/package.nix | 67 +- .../ya/yarn-lock-converter/source.json | 6 - pkgs/by-name/ya/yarn-lock-converter/update.sh | 25 - 4 files changed, 41 insertions(+), 649 deletions(-) delete mode 100644 pkgs/by-name/ya/yarn-lock-converter/package-lock.json delete mode 100644 pkgs/by-name/ya/yarn-lock-converter/source.json delete mode 100755 pkgs/by-name/ya/yarn-lock-converter/update.sh diff --git a/pkgs/by-name/ya/yarn-lock-converter/package-lock.json b/pkgs/by-name/ya/yarn-lock-converter/package-lock.json deleted file mode 100644 index aa50ffec8d5b..000000000000 --- a/pkgs/by-name/ya/yarn-lock-converter/package-lock.json +++ /dev/null @@ -1,592 +0,0 @@ -{ - "name": "@vht/yarn-lock-converter", - "version": "0.0.2", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "@vht/yarn-lock-converter", - "version": "0.0.2", - "license": "MIT", - "dependencies": { - "@yarnpkg/lockfile": "^1.1.0", - "cacache": "^15.3.0", - "js-yaml": "^4.1.0", - "yargs": "^17.3.1" - }, - "bin": { - "yarn-lock-converter": "index.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" - }, - "node_modules/@npmcli/fs": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", - "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", - "dependencies": { - "@gar/promisify": "^1.0.1", - "semver": "^7.3.5" - } - }, - "node_modules/@npmcli/move-file": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", - "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/cacache": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", - "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", - "dependencies": { - "@npmcli/fs": "^1.0.0", - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "engines": { - "node": ">=10" - } - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "engines": { - "node": ">=6" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==" - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ssri": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", - "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/tar": { - "version": "6.1.14", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz", - "integrity": "sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/unique-filename": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", - "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "dependencies": { - "unique-slug": "^2.0.0" - } - }, - "node_modules/unique-slug": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", - "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", - "dependencies": { - "imurmurhash": "^0.1.4" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "engines": { - "node": ">=12" - } - } - } -} diff --git a/pkgs/by-name/ya/yarn-lock-converter/package.nix b/pkgs/by-name/ya/yarn-lock-converter/package.nix index 4bba600ea020..d63720de804e 100644 --- a/pkgs/by-name/ya/yarn-lock-converter/package.nix +++ b/pkgs/by-name/ya/yarn-lock-converter/package.nix @@ -1,51 +1,66 @@ { lib, - buildNpmPackage, - fetchurl, + stdenv, + fetchFromGitHub, nodejs, testers, yarn-lock-converter, + yarn-berry_3, + makeBinaryWrapper, + nix-update-script, }: - -let - source = lib.importJSON ./source.json; -in -buildNpmPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "yarn-lock-converter"; - inherit (source) version; + version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@vht/yarn-lock-converter/-/yarn-lock-converter-${version}.tgz"; - hash = "sha256-CP1wI33fgtp4GSjasktbfWuUjGzCuK3XR+p64aPAryQ="; + src = fetchFromGitHub { + owner = "vht"; + repo = "yarn-lock-converter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AFetTjQZwXjlgLFE9YWHt82j3y8Ej25HYLed3tw/IxU="; }; - npmDepsHash = source.deps; + offlineCache = yarn-berry_3.fetchYarnBerryDeps { + inherit (finalAttrs) src; + hash = "sha256-dpZJYiRJzd6QbrRJccXpEkkNgtbBJ669lY5UQmcy8Yg="; + }; - dontBuild = true; + nativeBuildInputs = [ + nodejs + yarn-berry_3.yarnBerryConfigHook + yarn-berry_3 + makeBinaryWrapper + ]; - nativeBuildInputs = [ nodejs ]; + installPhase = '' + runHook preInstall - postPatch = '' - # Use generated package-lock.json as upstream does not provide one - ln -s ${./package-lock.json} package-lock.json + yarn config set nodeLinker "node-modules" + yarn install --mode=skip-build --inline-builds + mkdir -p $out/lib/node_modules/yarn-lock-converter + chmod +x ./index.js + rm yarn.lock README.md package.json + mkdir $out/bin + mv * $out/lib/node_modules/yarn-lock-converter/ + + makeWrapper ${lib.getExe nodejs} $out/bin/yarn-lock-converter \ + --add-flags "$out/lib/node_modules/yarn-lock-converter/index.js" + + runHook postInstall ''; - postInstall = '' - mv $out/bin/@vht/yarn-lock-converter $out/bin/yarn-lock-converter - rmdir $out/bin/@vht - ''; passthru = { tests.version = testers.testVersion { package = yarn-lock-converter; }; - updateScript = ./update.sh; + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Converts modern Yarn v2+ yarn.lock files into a Yarn v1 format"; homepage = "https://github.com/VHT/yarn-lock-converter"; - license = licenses.mit; - maintainers = with maintainers; [ gador ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gador ]; mainProgram = "yarn-lock-converter"; }; -} +}) diff --git a/pkgs/by-name/ya/yarn-lock-converter/source.json b/pkgs/by-name/ya/yarn-lock-converter/source.json deleted file mode 100644 index a897b7c9fb67..000000000000 --- a/pkgs/by-name/ya/yarn-lock-converter/source.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "0.0.2", - "integrity": "sha512-58Oy9qP081Jr+h9EOYB0ItCQ7IfU0RBbkHN4AQR3h6aPDjIOPYTiEyczmTfsLQcAyCFl0MV1kU8QL1xBALKkYw==", - "filename": "vht-yarn-lock-converter-0.0.2.tgz", - "deps": "sha256-GCTjZ3x+ZgE762yUWQZzEOOwfAr7W0z/cySlehRILf4=" -} diff --git a/pkgs/by-name/ya/yarn-lock-converter/update.sh b/pkgs/by-name/ya/yarn-lock-converter/update.sh deleted file mode 100755 index 72d46b470f28..000000000000 --- a/pkgs/by-name/ya/yarn-lock-converter/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodejs libarchive prefetch-npm-deps moreutils -# shellcheck shell=bash - -set -exuo pipefail - -cd -- "$(dirname -- "${BASH_SOURCE[0]}")" - -TMPDIR="$(mktemp -d)" -trap 'rm -r -- "$TMPDIR"' EXIT - -pushd -- "$TMPDIR" -npm pack "@vht/yarn-lock-converter" --json | jq '.[0] | { version, integrity, filename }' > source.json -bsdtar -x -f "$(jq -r .filename source.json)" - -pushd package -npm install --package-lock-only -popd - -DEPS="$(prefetch-npm-deps package/package-lock.json)" -jq ".deps = \"$DEPS\"" source.json | sponge source.json - -popd - -cp -t . -- "$TMPDIR/source.json" "$TMPDIR/package/package-lock.json" From 0826c4c43fb6a6240aaf75b8b59f9f40cbd7eb31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 01:10:56 +0000 Subject: [PATCH 048/154] gatus: 5.30.0 -> 5.31.0 --- pkgs/by-name/ga/gatus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index 17f51ca2fb2a..43efdfa76d7b 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gatus"; - version = "5.30.0"; + version = "5.31.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-iQp/oIEuyD+lVf20BH3fMScUtRxvEVrbu1zoJE5YkVI="; + hash = "sha256-thLS6pAlnu7XcQHritr28CnzmpIOgIcEPIch2IwhZfQ="; }; - vendorHash = "sha256-vvYnNFRpDTaNBX30btvSrwmhimPobio/zAs7zQnZ7b8="; + vendorHash = "sha256-VaD/cTf9D00gr6+9gKadK4aTwqhmJN/+cohwNvckxyw="; subPackages = [ "." ]; From ea604bc0ef28c78c69fb2060d87f16ed18ecdc82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 03:57:00 +0000 Subject: [PATCH 049/154] lilex: 2.620 -> 2.621 --- pkgs/by-name/li/lilex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix index bbf5393d5908..49c031a22c0d 100644 --- a/pkgs/by-name/li/lilex/package.nix +++ b/pkgs/by-name/li/lilex/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "lilex"; - version = "2.620"; + version = "2.621"; src = fetchurl { url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip"; - hash = "sha256-h2Xt1HIOlh4wwHK3bg5hxyWxi/W8GWMiRkaWF7fhngU="; + hash = "sha256-TsLJ96SZpokW3354/yt0Re4ZtFXqYK/46iyZXdPKhoE="; }; nativeBuildInputs = [ unzip ]; From b33b32ebe90428a6ccd730825d7a0a45225c1f25 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 9 Nov 2025 14:59:03 +0800 Subject: [PATCH 050/154] anvil-editor: 0.6 -> 0.6.3 --- pkgs/by-name/an/anvil-editor/package.nix | 35 ++++++++++-------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix index a348bbce9c95..ed1a9e3d91ee 100644 --- a/pkgs/by-name/an/anvil-editor/package.nix +++ b/pkgs/by-name/an/anvil-editor/package.nix @@ -12,29 +12,36 @@ vulkan-headers, libGL, xorg, - buildPackages, }: buildGoModule (finalAttrs: { pname = "anvil-editor"; - version = "0.6"; + version = "0.6.3"; # has to update vendorHash of extra package manually # nixpkgs-update: no auto update src = fetchzip { url = "https://anvil-editor.net/releases/anvil-src-v${finalAttrs.version}.tar.gz"; - hash = "sha256-i0S5V3j6OPpu4z1ljDKP3WYa9L+EKwo/MBNgW2ENYk8="; + hash = "sha256-GPzd1oKkf160ya0sxUd72wego0BvwCerZ5SiY2q0EDE="; }; - modRoot = "anvil/src/anvil"; + modRoot = "anvil/editor"; - vendorHash = "sha256-1oFBV7D7JgOt5yYAxVvC4vL4ccFv3JrNngZbo+5pzrk="; + vendorHash = "sha256-Q2iVB5pvP2/VXjdSwWVkdqrVUj/nIiC/VHyD5nP9ilE="; anvilExtras = buildGoModule { pname = "anvil-editor-extras"; inherit (finalAttrs) version src meta; - vendorHash = "sha256-4pfk5XuwDbCWFZIF+1l+dy8NfnGNjgHmSg9y6/RnTSo="; - modRoot = "anvil-extras"; + vendorHash = "sha256-q/PunSBe+gWTWyf8rjfikK56rP2PeZqpuiFG9HIVMTk="; + modRoot = "anvil/extras"; + # Include dependency on anvil api + postPatch = '' + pushd anvil/extras + cp -r ${finalAttrs.src}/anvil/api/go/anvil ./_anvil_api + echo "replace github.com/jeffwilliams/anvil/api/go/anvil => ./_anvil_api" >> go.mod + go mod edit -require=github.com/jeffwilliams/anvil/api/go/anvil@v0.0.0 + popd + ''; }; nativeBuildInputs = [ @@ -75,15 +82,7 @@ buildGoModule (finalAttrs: { ]; postInstall = '' - pushd ../../img - # cannot add to nativeBuildInputs - # will be conflict with icnsutils in desktopToDarwinBundle - ${lib.getExe' buildPackages.libicns "icns2png"} -x anvil.icns - for width in 32 48 128 256; do - square=''${width}x''${width} - install -Dm644 anvil_''${square}x32.png $out/share/icons/hicolor/''${square}/apps/anvil.png - done - popd + install -Dm644 misc/icon/anvil-icon.svg $out/share/icons/hicolor/scalable/apps/anvil.svg cp ${finalAttrs.anvilExtras}/bin/* $out/bin ''; @@ -94,9 +93,5 @@ buildGoModule (finalAttrs: { mainProgram = "anvil"; maintainers = with lib.maintainers; [ aleksana ]; platforms = with lib.platforms; unix ++ windows; - # Doesn't build with >buildGo123Module. - # Multiple errors like the following: - # '> vendor/gioui.org/internal/vk/vulkan.go:1916:9: cannot define new methods on non-local type SurfaceCapabilities' - broken = true; }; }) From cca4364ef00bb71a954a2050063cb4869d0eef79 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Sun, 9 Nov 2025 08:09:33 +0100 Subject: [PATCH 051/154] modules/image/repart: fix typo in renamed option warning --- nixos/modules/image/repart.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index 8f892b96438b..bc1e0eb2f41d 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -384,8 +384,8 @@ in you're at version 9, you cannot increment this to 10. '' ++ lib.optional (partitionConfig.stripNixStorePrefix != "_mkMergedOptionModule") '' - The option definition `image.repart.paritions.${fileName}.stripNixStorePrefix` - has changed to `image.repart.paritions.${fileName}.nixStorePrefix` and now + The option definition `image.repart.partitions.${fileName}.stripNixStorePrefix` + has changed to `image.repart.partitions.${fileName}.nixStorePrefix` and now accepts the path to use as prefix directly. Use `nixStorePrefix = "/"` to achieve the same effect as setting `stripNixStorePrefix = true`. '' From 1210b27400856be55401e737837a0eeb1785c08d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 08:14:30 +0000 Subject: [PATCH 052/154] windsurf: 1.12.27 -> 1.12.28 --- pkgs/by-name/wi/windsurf/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index c5b1d6180859..d3286d55a630 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.12.27", + "version": "1.12.28", "vscodeVersion": "1.105.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-darwin-arm64-1.12.27.zip", - "sha256": "294f3a3aab7665caf936ef43b384540695849928c956c28b4b783bb3b34913a2" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/c855b1fa42fce019aedb4b06e6faa69d65ac7fd3/Windsurf-darwin-arm64-1.12.28.zip", + "sha256": "da2f5ad240ba49627c9d5bcdff8aec679c5a691f3195dc4bfb9bccf33a88e309" }, "x86_64-darwin": { - "version": "1.12.27", + "version": "1.12.28", "vscodeVersion": "1.105.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-darwin-x64-1.12.27.zip", - "sha256": "61e0dac30fa014f42f99138434f289504d4d2a79aaa9f4cc61c30c663c6ab979" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/c855b1fa42fce019aedb4b06e6faa69d65ac7fd3/Windsurf-darwin-x64-1.12.28.zip", + "sha256": "925733e51b22d36fd0ddbadf1e6dc12e47fbcbdc34de4aea325fc3c8c0862292" }, "x86_64-linux": { - "version": "1.12.27", + "version": "1.12.28", "vscodeVersion": "1.105.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-linux-x64-1.12.27.tar.gz", - "sha256": "8f380755df34a1b466c28448f22fc92d3cfb13da55e9d8f2c9db5a4db83f6cac" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/c855b1fa42fce019aedb4b06e6faa69d65ac7fd3/Windsurf-linux-x64-1.12.28.tar.gz", + "sha256": "cc781ce37d096843a16cefd5c692270c84b7b339d09b93ee515d630a1f6ace11" } } From f55186d344da3ef66c57601acffd9e38cc571ff8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 08:42:46 +0000 Subject: [PATCH 053/154] python3Packages.types-regex: 2025.10.23.20251023 -> 2025.11.3.20251106 --- pkgs/development/python-modules/types-regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-regex/default.nix b/pkgs/development/python-modules/types-regex/default.nix index 13c18db616f3..fd6ddb3c846f 100644 --- a/pkgs/development/python-modules/types-regex/default.nix +++ b/pkgs/development/python-modules/types-regex/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-regex"; - version = "2025.10.23.20251023"; + version = "2025.11.3.20251106"; pyproject = true; src = fetchPypi { pname = "types_regex"; inherit version; - hash = "sha256-dfAjvwrwV+AVennpnmZpBTe+uzXZA9uPKbTlwtO+54I="; + hash = "sha256-X5go7TmlpScntjf5P38PkJ1W+iIRYE7MIT/Ou1CbnVA="; }; build-system = [ From 861b5def77e4f0d081af7e133f39d04331e8a6f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 08:44:07 +0000 Subject: [PATCH 054/154] signal-desktop: 7.77.1 -> 7.78.0 --- pkgs/by-name/si/signal-desktop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 2220f87cbd7f..693cef03a7f6 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.77.1"; + version = "7.78.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-IFMNUuGL3sQVlEJI4N2rXrYStcDEZW/YxmZyPM0hhVU="; + hash = "sha256-pQk1k3ARBMk3YDTPeLNCWG7dCl1TWBn/evgKIEny3k0="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-RquJqKUDdz8QRJXz7eWiAcdUF+WhYEqnyOkhrIw7tgQ=" + "sha256-qOVwVQRGtxjpfVF+zBqeotYD0JE1n3az9yFclzXrHgs=" else - "sha256-v1KbjFLo5pD1uoNtDrX2kUbhCgGeEqbuHLZRIJqshHw="; + "sha256-Pby9shhDbvXGMY7K1Z+BZXwxY8QVwTYViaEMwZiDggI="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1761859038; + SOURCE_DATE_EPOCH = 1762378649; }; preBuild = '' From b0f28e554b61dd724841181aa6713d6269ff98d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 10:50:10 +0000 Subject: [PATCH 055/154] syft: 1.36.0 -> 1.37.0 --- pkgs/by-name/sy/syft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index f06260678818..fe68c41f0b89 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "syft"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-JSoKidueNwCI4Fbqs5K4RxfObJlet5FV6JgEWuLqd08="; + hash = "sha256-PWwbYInv/b/wkUrugtxB67uBmXtzPaVmdE7ppV+8Htk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-dKT2bEeIG3tndj5UuJO2g8gnVGM9AfB5ebu3CfWDhRg="; + vendorHash = "sha256-v4tRezweLJDPetG97VpJcloCNSqbc1EHpMJbKFh4Kio="; nativeBuildInputs = [ installShellFiles ]; From 6824e92aa65795d3ee33c69fb8b33322e3d7c12f Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sun, 9 Nov 2025 19:01:53 +0800 Subject: [PATCH 056/154] open-webui: 0.6.34 -> 0.6.36 Diff: https://github.com/open-webui/open-webui/compare/v0.6.34...v0.6.36 Changelog: https://github.com/open-webui/open-webui/blob/v0.6.36/CHANGELOG.md --- pkgs/by-name/op/open-webui/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 488a99f7d171..1fe667061bb5 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.6.34"; + version = "0.6.36"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-crjBVR0ZXUYck4pyLNb1IO9IoQ6MFBnCKEBsi0/JXCI="; + hash = "sha256-7+KFMmiJZB14kUtkKxTLZrZ2bA2MR1qA/cx7GX+FnUw="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-ofw/leDcfrc+Bp93s9BkB3WFs8qQgiWUag7gvdPJdlo="; + npmDepsHash = "sha256-CEjWmDcHHr0PeltETi5uIdoQ2C2Twmg+gDBZT5myo/E="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ @@ -212,7 +212,6 @@ python3Packages.buildPythonApplication rec { pymilvus pymongo qdrant-client - tencentcloud-sdk-python ] ++ moto.optional-dependencies.s3 ++ postgres; From c435c50a512d91cbbdb25b0f9bbf8da88c85aa97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:07:08 +0000 Subject: [PATCH 057/154] re-isearch: 2.20220925.4.0a-unstable-2025-11-02 -> 2.20220925.4.0a-unstable-2025-11-05 --- pkgs/by-name/re/re-isearch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index f6332b86eeeb..d3d95dee078c 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { pname = "re-Isearch"; - version = "2.20220925.4.0a-unstable-2025-11-02"; + version = "2.20220925.4.0a-unstable-2025-11-05"; src = fetchFromGitHub { owner = "re-Isearch"; repo = "re-Isearch"; - rev = "47e9a874d1343f68b67be16e8dd15661171c9270"; - hash = "sha256-cwH4W6+7JwohP2sx5PjvZtu63GDTfmt6nWd7cSqZkBQ="; + rev = "4c1afb365ded2fc181d11f67a9aa4a6984990afd"; + hash = "sha256-4sL5+V37MHnxNivl6sJBvp4NjtqOHmiftIsBCsz4tv8="; }; patches = [ From 96acd099e1645908c2dded2a4adc14e065553387 Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 11 Sep 2025 20:16:54 +0100 Subject: [PATCH 058/154] nixos/default.nix: Allow specialArgs to be passed To allow plain nixos configrations the same power as flakes, we must expose specialArgs, otherwise a classic pattern importing all of ones "inputs" (i.e. npins sources), and then exposing them to the module system becomes impossible due to the fact that imports must be statically resolvable so these sources cannot be passed in the existing entry point using _module.args if the sources themselves have modules to be imported. --- nixos/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/default.nix b/nixos/default.nix index f338e13fadb0..f87dd9a93365 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,12 +1,15 @@ { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" , system ? builtins.currentSystem, + # This should only be used for special arguments that need to be evaluated when resolving module structure (like in imports). + # For everything else, there's _module.args. + specialArgs ? { }, }: let eval = import ./lib/eval-config.nix { - inherit system; + inherit system specialArgs; modules = [ configuration ]; }; From 928c0e4dc76dadc9320d09bfb995678c8b15a99e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:20:01 +0000 Subject: [PATCH 059/154] python3Packages.unstructured-inference: 1.0.5 -> 1.1.1 --- .../python-modules/unstructured-inference/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index ecd16432d9cb..68a38bc70197 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "1.0.5"; + version = "1.1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; tag = version; - hash = "sha256-3eyavjGUc3qbKuTorAiefisz4TjiG5v/88lsXYmcFmo="; + hash = "sha256-yCLiZe7oSs63dSgN8tijpL2MOygyTmK+6TsC87sHAUQ="; }; propagatedBuildInputs = [ From 049ae4afc3046dfdd8408515c986762c8fc2e92e Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 12:53:23 +0100 Subject: [PATCH 060/154] wf-config: 0.9.0 -> 0.10.0 --- pkgs/applications/window-managers/wayfire/wf-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 995a71c6a3f5..fe53ca3065d9 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-config"; rev = "v${finalAttrs.version}"; - hash = "sha256-5HejuluCTsRsnHuaMCTnCPkbFvT/IcLkfNGjnXnZjJ0="; + hash = "sha256-WcGt6yl2LpLnAOVtiCyMyWsoMAUMG1MYhvW/m2DDMX4="; }; nativeBuildInputs = [ From d6647404290a89fca07a601642288fcc283a1620 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:01:38 +0100 Subject: [PATCH 061/154] wayfire: 0.9.0 -> 0.10.0 --- .../window-managers/wayfire/default.nix | 22 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index d03bed7e7a49..a62e955e0575 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -17,27 +17,37 @@ libinput, libjpeg, libxkbcommon, + libxml2, + vulkan-headers, wayland, wayland-protocols, wayland-scanner, - wlroots, + wlroots_0_19, pango, - nlohmann_json, xorg, + yyjson, }: +let + wlroots = wlroots_0_19; +in stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-xQZ4/UE66IISZQLl702OQXAAr8XmEsA4hJwB7aXua+E="; + hash = "sha256-rnrcuikfRPnIfIkmKUIRh8Sm+POwFLzaZZMAlmeBdjY="; }; + postPatch = '' + substituteInPlace plugins/common/wayfire/plugins/common/cairo-util.hpp \ + --replace "" "" + ''; + nativeBuildInputs = [ meson ninja @@ -53,9 +63,11 @@ stdenv.mkDerivation (finalAttrs: { libinput libjpeg libxkbcommon + libxml2 + vulkan-headers wayland-protocols xorg.xcbutilwm - nlohmann_json + yyjson ]; propagatedBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486b519307ce..9c9d64299417 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12924,9 +12924,7 @@ with pkgs; imlib2 = imlib2-nox; }; - wayfire = callPackage ../applications/window-managers/wayfire/default.nix { - wlroots = wlroots_0_17; - }; + wayfire = callPackage ../applications/window-managers/wayfire/default.nix { }; wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; wayfirePlugins = recurseIntoAttrs ( From 3af6539795d2130ae003f359f8e65bd127741ffa Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 7 Nov 2025 02:01:16 +0100 Subject: [PATCH 062/154] python3Packages.pyhanko-certvalidator: 0.26.8 -> 0.29.0 pyhanko-certvalidator was moved into the pyhanko repository, see https://docs.pyhanko.eu/en/latest/changelog.html#certvalidator-release-0-27-0. --- .../pyhanko-certvalidator/default.nix | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index d2663cb70d56..0a7d6dcbd759 100644 --- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -1,34 +1,43 @@ { lib, - aiohttp, - asn1crypto, buildPythonPackage, - cryptography, fetchFromGitHub, - freezegun, + nix-update-script, + + asn1crypto, + cryptography, oscrypto, + requests, + uritools, + + aiohttp, + freezegun, pytest-asyncio, pytestCheckHook, - pythonOlder, - requests, setuptools, - uritools, }: buildPythonPackage rec { pname = "pyhanko-certvalidator"; - version = "0.26.8"; + version = "0.29.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "MatthiasValvekens"; - repo = "certvalidator"; - tag = "v${version}"; - hash = "sha256-Gvahyuz3n/CNAEzMXS5Z0Z85yDqLUQu8Yis5oJ2jaKc="; + repo = "pyhanko"; + tag = "pyhanko-certvalidator/v${version}"; + hash = "sha256-ZDHAcI2yoiVifYt05V85lz8mJmoyi10g4XoLQ+LhLHE="; }; + sourceRoot = "${src.name}/pkgs/pyhanko-certvalidator"; + + postPatch = '' + substituteInPlace src/pyhanko_certvalidator/version.py \ + --replace-fail "0.0.0.dev1" "${version}" \ + --replace-fail "(0, 0, 0, 'dev1')" "tuple(\"${version}\".split(\".\"))" + substituteInPlace pyproject.toml --replace-fail "0.0.0.dev1" "${version}" + ''; + build-system = [ setuptools ]; dependencies = [ @@ -48,11 +57,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyhanko_certvalidator" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex=pyhanko-certvalidator/v(.*)" + ]; + }; + meta = with lib; { description = "Python library for validating X.509 certificates and paths"; - homepage = "https://github.com/MatthiasValvekens/certvalidator"; - changelog = "https://github.com/MatthiasValvekens/certvalidator/blob/v${version}/changelog.md"; + homepage = "https://github.com/MatthiasValvekens/pyHanko/tree/master/pkgs/pyhanko-certvalidator"; + changelog = "https://github.com/MatthiasValvekens/pyhanko/blob/pyhanko-certvalidator/${src.tag}/docs/changelog.rst#pyhanko-certvalidator"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.antonmosich ]; }; } From a3d34437576818c60c885af1a6c263d48a9d6b4f Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:06:41 +0100 Subject: [PATCH 063/154] wayfirePlugins.wcm: 0.9.0 -> 0.10.0 --- pkgs/applications/window-managers/wayfire/wcm.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index bd23d4faea00..9b633d3b6cbc 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wcm"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wcm"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-oaaEtyu/9XVhFTkmD7WjScMycpKf+M7oPyQatbY23Vo="; + hash = "sha256-O4BYwb+GOMZIn3I2B/WMJ5tUZlaegvwBuyNK9l/gxvQ="; }; nativeBuildInputs = [ @@ -48,10 +48,6 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon ]; - mesonFlags = [ - "-Denable_wdisplays=false" - ]; - meta = { homepage = "https://github.com/WayfireWM/wcm"; description = "Wayfire Config Manager"; From 91230d710b076b8eab31df1d367e45a208add280 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 12:55:00 +0000 Subject: [PATCH 064/154] python3Packages.zha: 0.0.77 -> 0.0.78 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 23a02f7dab2c..4d4e4fcfceae 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.77"; + version = "0.0.78"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-OtwfSt9KUs4oOCwnKygq/hDOXOhzhT3+KxxY/M9KAdU="; + hash = "sha256-io97gvYtI6wsynWPGm2CAAYyDkMRTUSJwL4N56+sNhw="; }; postPatch = '' From a6318ced8e859f814cfe67c0bbe3fc57fb358364 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:15:57 +0100 Subject: [PATCH 065/154] wayfirePlugins.wayfire-plugins-extra: 0.9.0 -> 0.10.0 Build all plugins in the subprojects by default. These can be excluded by passing the respective `with*Plugin` attribute. Remove `wayfirePlugins.focus-request` and `wayfirePlugins.wayfire-shadows` as they are now included with `wayfirePlugins.wayfire-plugins-extra`. --- .../window-managers/wayfire/focus-request.nix | 59 ------------------- .../window-managers/wayfire/plugins.nix | 4 +- .../wayfire/wayfire-plugins-extra.nix | 25 +++++--- .../wayfire/wayfire-shadows.nix | 54 ----------------- 4 files changed, 19 insertions(+), 123 deletions(-) delete mode 100644 pkgs/applications/window-managers/wayfire/focus-request.nix delete mode 100644 pkgs/applications/window-managers/wayfire/wayfire-shadows.nix diff --git a/pkgs/applications/window-managers/wayfire/focus-request.nix b/pkgs/applications/window-managers/wayfire/focus-request.nix deleted file mode 100644 index 2b7bd6fad686..000000000000 --- a/pkgs/applications/window-managers/wayfire/focus-request.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - ninja, - pkg-config, - wayfire, - wf-config, - wayland, - pango, - libinput, - libxkbcommon, - librsvg, - libGL, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "focus-request"; - version = "0.8.0.2"; - - src = fetchFromGitLab { - owner = "wayfireplugins"; - repo = "focus-request"; - rev = "v${finalAttrs.version}"; - hash = "sha256-kUYvLC28IPrvnMT/wKFRlOVkc2ohF3k0T/Qrm/zVkpE="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - wf-config - wayland - pango - libinput - libxkbcommon - librsvg - libGL - xcbutilwm - ]; - - env = { - PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; - }; - - meta = { - homepage = "https://gitlab.com/wayfireplugins/focus-request"; - description = "Wayfire plugin provides a mechanism to grant focus to views that make a focus self-request"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index d456058c245c..e2c81e41505d 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -10,9 +10,7 @@ lib.makeScope pkgs.newScope ( inherit (self) callPackage; in { - focus-request = callPackage ./focus-request.nix { }; wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; - wayfire-shadows = callPackage ./wayfire-shadows.nix { }; wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; windecor = callPackage ./windecor.nix { }; @@ -21,4 +19,6 @@ lib.makeScope pkgs.newScope ( ) // lib.optionalAttrs config.allowAliases { firedecor = throw "wayfirePlugins.firedecor has been removed as it is unmaintained and no longer used by mate-wayland-session."; # Added 2025-09-03 + focus-request = throw "wayfirePlugins.focus-request is now included with wayfirePlugins.wayfire-plugins-extra"; + wayfire-shadows = throw "wayfirePlugins.wayfire-shadows is now included with wayfirePlugins.wayfire-plugins-extra"; } diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix index 8a5801ec2237..2a96830ffef7 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -8,23 +8,30 @@ wayfire, wayland-scanner, wf-config, + boost, + libdrm, libevdev, libinput, libxkbcommon, - nlohmann_json, + vulkan-headers, xcbutilwm, gtkmm3, + withFiltersPlugin ? true, + withFocusRequestPlugin ? true, + withPixdecorPlugin ? true, + withWayfireShadowsPlugin ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire-plugins-extra"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire-plugins-extra"; rev = "v${finalAttrs.version}"; - hash = "sha256-TukDomxqfrM45+C7azfO8jVaqk3E5irdphH8U5IYItg="; + hash = "sha256-C5dgs81R4XuPjIm7sj1Mtu4IMIRBEYU6izg2olymeVI="; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -37,19 +44,21 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire wf-config + boost + libdrm libevdev libinput libxkbcommon - nlohmann_json + vulkan-headers xcbutilwm gtkmm3 ]; mesonFlags = [ - # plugins in submodule, packaged individually - (lib.mesonBool "enable_windecor" false) - (lib.mesonBool "enable_wayfire_shadows" false) - (lib.mesonBool "enable_focus_request" false) + (lib.mesonBool "enable_filters" withFiltersPlugin) + (lib.mesonBool "enable_focus_request" withFocusRequestPlugin) + (lib.mesonBool "enable_pixdecor" withPixdecorPlugin) + (lib.mesonBool "enable_wayfire_shadows" withWayfireShadowsPlugin) ]; env = { diff --git a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix deleted file mode 100644 index 9aef4a60e18f..000000000000 --- a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - unstableGitUpdater, - meson, - ninja, - pkg-config, - wayfire, - libxkbcommon, - libGL, - libinput, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wayfire-shadows"; - version = "0-unstable-2025-03-04"; - - src = fetchFromGitHub { - owner = "timgott"; - repo = "wayfire-shadows"; - rev = "8257a4f04670d8baf29e2d9cee0d78f978f0233f"; - hash = "sha256-cRayvjbolVxWtr1PbLSjxtIpZogTJaoAMxPOcZ+zBT8="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - libxkbcommon - libGL - libinput - xcbutilwm - ]; - - env = { - PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; - }; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - homepage = "https://github.com/timgott/wayfire-shadows"; - description = "Wayfire plugin that adds window shadows"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) From bfa23cd37ec0541e238a3916ccbd7ed3c2cad418 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:36:31 +0100 Subject: [PATCH 066/154] wayfirePlugins.wwp-switcher: remove It will also FTBFS with Wayfire 0.10. --- .../window-managers/wayfire/plugins.nix | 2 +- .../window-managers/wayfire/wwp-switcher.nix | 58 ------------------- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/applications/window-managers/wayfire/wwp-switcher.nix diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index e2c81e41505d..6e353026e1c1 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -14,11 +14,11 @@ lib.makeScope pkgs.newScope ( wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; windecor = callPackage ./windecor.nix { }; - wwp-switcher = callPackage ./wwp-switcher.nix { }; } ) // lib.optionalAttrs config.allowAliases { firedecor = throw "wayfirePlugins.firedecor has been removed as it is unmaintained and no longer used by mate-wayland-session."; # Added 2025-09-03 focus-request = throw "wayfirePlugins.focus-request is now included with wayfirePlugins.wayfire-plugins-extra"; wayfire-shadows = throw "wayfirePlugins.wayfire-shadows is now included with wayfirePlugins.wayfire-plugins-extra"; + wwp-switcher = throw "wayfirePlugins.wwp-switcher has been removed as it is unmaintained"; } diff --git a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix deleted file mode 100644 index afe50faba5b5..000000000000 --- a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - unstableGitUpdater, - meson, - ninja, - pkg-config, - wayfire, - libxkbcommon, - libGL, - libinput, - gtk3, - glibmm, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wwp-switcher"; - version = "0-unstable-2024-07-23"; - - src = fetchFromGitHub { - owner = "wb9688"; - repo = "wwp-switcher"; - rev = "d0cd97534a2a6355697efecb7bcf8f85f5dc4b5b"; - hash = "sha256-cU8INUb+JXlSCM7cAOUBU7z7W0IM6pAGN0izGdFYntc="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - libxkbcommon - libGL - libinput - gtk3 - glibmm - xcbutilwm - ]; - - env = { - PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; - }; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - homepage = "https://github.com/wb9688/wwp-switcher"; - description = "Plugin to switch active window"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) From 64bfbd50173f6e8e0c5912c4c4b3f35bd96dc9d3 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:39:21 +0100 Subject: [PATCH 067/154] wayfirePlugins.windecor: remove It will also FTBFS with Wayfire 0.10. --- .../window-managers/wayfire/plugins.nix | 2 +- .../window-managers/wayfire/windecor.nix | 58 ------------------- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/applications/window-managers/wayfire/windecor.nix diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index 6e353026e1c1..4835e498c388 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -13,12 +13,12 @@ lib.makeScope pkgs.newScope ( wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; - windecor = callPackage ./windecor.nix { }; } ) // lib.optionalAttrs config.allowAliases { firedecor = throw "wayfirePlugins.firedecor has been removed as it is unmaintained and no longer used by mate-wayland-session."; # Added 2025-09-03 focus-request = throw "wayfirePlugins.focus-request is now included with wayfirePlugins.wayfire-plugins-extra"; wayfire-shadows = throw "wayfirePlugins.wayfire-shadows is now included with wayfirePlugins.wayfire-plugins-extra"; + windecor = throw "wayfirePlugins.windecor has been removed as it is unmaintained"; wwp-switcher = throw "wayfirePlugins.wwp-switcher has been removed as it is unmaintained"; } diff --git a/pkgs/applications/window-managers/wayfire/windecor.nix b/pkgs/applications/window-managers/wayfire/windecor.nix deleted file mode 100644 index efe72b855df0..000000000000 --- a/pkgs/applications/window-managers/wayfire/windecor.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - ninja, - pkg-config, - wayfire, - eudev, - libinput, - libxkbcommon, - librsvg, - libGL, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "windecor"; - version = "0.8.0"; - - src = fetchFromGitLab { - owner = "wayfireplugins"; - repo = "windecor"; - rev = "v${finalAttrs.version}"; - hash = "sha256-v0kGT+KrtfFJ/hp1Dr8izKVj6UHhuW6udHFjWt1y9TY="; - }; - - postPatch = '' - substituteInPlace meson.build \ - --replace "wayfire.get_variable( pkgconfig: 'metadatadir' )" "join_paths(get_option('prefix'), 'share/wayfire/metadata')" - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - eudev - libinput - libxkbcommon - librsvg - libGL - xcbutilwm - ]; - - mesonFlags = [ "--sysconfdir=/etc" ]; - - meta = { - homepage = "https://gitlab.com/wayfireplugins/windecor"; - description = "Window decoration plugin for wayfire"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) From 5bac3ea83e45cc71a1db9c3fac3450e5780acad0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 13:15:15 +0000 Subject: [PATCH 068/154] python3Packages.asgineer: 0.9.3 -> 0.9.5 --- pkgs/development/python-modules/asgineer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgineer/default.nix b/pkgs/development/python-modules/asgineer/default.nix index b824c24f3287..6d95f8d71a54 100644 --- a/pkgs/development/python-modules/asgineer/default.nix +++ b/pkgs/development/python-modules/asgineer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "asgineer"; - version = "0.9.3"; + version = "0.9.5"; pyproject = true; src = fetchFromGitHub { owner = "almarklein"; repo = "asgineer"; tag = "v${version}"; - hash = "sha256-Uk1kstEBt321BVeNcfdhZuonmm1i9IXSBnZLa4eDS2E="; + hash = "sha256-8qI5eHt+UmQGZNCn12Iup9dIVd+aI6r3Z1R+u+SziMc="; }; build-system = [ flit-core ]; From d595d3b51ee33531514af8a3598980c1a1ede9d4 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 14:20:11 +0100 Subject: [PATCH 069/154] wayfire: add maintainer teatwig --- pkgs/applications/window-managers/wayfire/default.nix | 1 + pkgs/applications/window-managers/wayfire/wcm.nix | 1 + pkgs/applications/window-managers/wayfire/wf-config.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index a62e955e0575..49acba82cc61 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { description = "3D Wayland compositor"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + teatwig wucke13 wineee ]; diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index 9b633d3b6cbc..cc9902acc0dc 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Wayfire Config Manager"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + teatwig wucke13 wineee ]; diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index fe53ca3065d9..544f577714c7 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for managing configuration files, written for Wayfire"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + teatwig wucke13 wineee ]; From 47519458d3452e22987a4637be4a7e9d9d44dd7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 13:54:44 +0000 Subject: [PATCH 070/154] python3Packages.garminconnect: 0.2.31 -> 0.2.33 --- pkgs/development/python-modules/garminconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 95a97adbf317..c8e895092974 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.31"; + version = "0.2.33"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; tag = version; - hash = "sha256-yK4p1zb3OLTpDrtVz0bA/jlhDV3AFpltN3CTDBcSTPU="; + hash = "sha256-tQXrJsvdH2YfIpW8iKMBwHZPj2etQDpRaSGojMQ88J0="; }; pythonRelaxDeps = [ From 0596d39e1ce24f9589bb11199b3f3eaae1947acd Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 21 Mar 2025 12:39:43 +0100 Subject: [PATCH 071/154] vcv-rack: add support for darwin platform and modernize --- pkgs/by-name/vc/vcv-rack/package.nix | 295 +++++++++++------- .../vc/vcv-rack/rack-minimize-vendoring.patch | 19 +- 2 files changed, 190 insertions(+), 124 deletions(-) diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index da20022db086..efba2d35750c 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -1,5 +1,6 @@ { alsa-lib, + apple-sdk_13, cmake, copyDesktopItems, curl, @@ -21,8 +22,10 @@ libsamplerate, makeDesktopItem, makeWrapper, + openssl, pkg-config, rtmidi, + rsync, speexdsp, stdenv, wrapGAppsHook3, @@ -38,65 +41,65 @@ let owner = "jpommier"; repo = "pffft"; rev = "fbc4058602803f40dc554b8a5d2bcc694c005f2f"; - sha256 = "16biji3115232cr1j975hpxw68lfybajlspnhfjcwg8jz2d8ybrf"; + hash = "sha256-Li+PmvgSPc6kg/ZqKtXyjiLD+4XlJBkyE0OUEEaUcZk="; }; fuzzysearchdatabase-source = fetchFromBitbucket { owner = "j_norberg"; repo = "fuzzysearchdatabase"; rev = "23122d1ff60d936fd766361a30210c954e0c5449"; - sha256 = "1s88blx1rn2racmb8n5g0kh1ym7v21573l5m42c4nz266vmrvrvz"; + hash = "sha256-f+ed6zZGfEuYILXQcUoQ+1Qf4ASvWLQqU1nYHDpdCOk="; }; nanovg-source = fetchFromGitHub { owner = "VCVRack"; repo = "nanovg"; rev = "0bebdb314aff9cfa28fde4744bcb037a2b3fd756"; - sha256 = "HmQhCE/zIKc3f+Zld229s5i5MWzRrBMF9gYrn8JVQzg="; + hash = "sha256-HmQhCE/zIKc3f+Zld229s5i5MWzRrBMF9gYrn8JVQzg="; }; nanosvg-source = fetchFromGitHub { owner = "memononen"; repo = "nanosvg"; rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; - sha256 = "1pkzv75kavkhrbdd2kvq755jyr0vamgrfr7lc33dq3ipkzmqvs2l"; + hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94="; }; osdialog-source = fetchFromGitHub { owner = "AndrewBelt"; repo = "osdialog"; rev = "d0f64f0798c2e47f61d90a5505910ff2d63ca049"; - sha256 = "1d3058x6wgzw7b0wai792flk7s6ffw0z4n9sl016v91yjwv7ds3a"; + hash = "sha256-auh2Npc+pG0CoDpZ8gF3zugzqRPpRMXBOvw/bjoqYLQ="; }; oui-blendish-source = fetchFromGitHub { owner = "VCVRack"; repo = "oui-blendish"; rev = "2fc6405883f8451944ed080547d073c8f9f31898"; - sha256 = "1bs0654312555vm7nzswsmky4l8759bjdk17pl22p49rw9k4a1px"; + hash = "sha256-/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8="; }; simde-source = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; rev = "416091ebdb9e901b29d026633e73167d6353a0b0"; - sha256 = "064ygc6c737yjx04rydwwhkr4n4s4rbvj27swxwyzvp1h8nka6xf"; + hash = "sha256-rhs1LYLh7u955/oIuVcmmliSJ+S8+UxAl/6Mwwx7nhg="; }; tinyexpr-source = fetchFromGitHub { owner = "codeplea"; repo = "tinyexpr"; rev = "9907207e5def0fabdb60c443517b0d9e9d521393"; - sha256 = "0xbpd09zvrk2ppm1qm1skk6p50mqr9mzjixv3s0biqq6jpabs88l"; + hash = "sha256-FCG91JUG47iAHrtH+WvKuIJyzZw6VBzqvWLm/RNod3U="; }; fundamental-source = fetchFromGitHub { owner = "VCVRack"; repo = "Fundamental"; - rev = "5ed79544161e0fa9a55faa7c0a5f299e828e12ab"; # tip of branch v2 - sha256 = "0c6qpigyr0ppvra20hcy1fdcmqa212jckb9wkx4f6fgdby7565wv"; + rev = "b453f192d22b1c951d71e8a73f28a37cd96a7b6c"; # tip of branch v2 + hash = "sha256-Wr5G2wgCMIduMqFdIJUtkWQEbvihte/WZb/qUWXGE04="; }; vcv-rtaudio = stdenv.mkDerivation { pname = "vcv-rtaudio"; - version = "unstable-2020-01-30"; + version = "5.1.0-unstable-2020-01-30"; src = fetchFromGitHub { owner = "VCVRack"; repo = "rtaudio"; rev = "ece277bd839603648c80c8a5f145678e13bc23f3"; # tip of master branch - sha256 = "11gpl0ak757ilrq4fi0brj0chmlcr1hihc32yd7qza4fxjw2yx2v"; + hash = "sha256-W3QvuOyOqI9P82IwGGHIjFbIgMwLREdwpvGUMxWg94U="; }; nativeBuildInputs = [ @@ -104,28 +107,33 @@ let pkg-config ]; - buildInputs = [ - alsa-lib - libjack2 - libpulseaudio - ]; + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libjack2 + libpulseaudio + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; cmakeFlags = [ - "-DRTAUDIO_API_ALSA=ON" - "-DRTAUDIO_API_PULSE=ON" - "-DRTAUDIO_API_JACK=ON" - "-DRTAUDIO_API_CORE=OFF" + (lib.cmakeBool "RTAUDIO_API_ALSA" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "RTAUDIO_API_PULSE" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "RTAUDIO_API_JACK" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "RTAUDIO_API_CORE" stdenv.hostPlatform.isDarwin) ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vcv-rack"; version = "2.6.0"; desktopItems = [ (makeDesktopItem { type = "Application"; - name = pname; + name = "vcv-rack"; desktopName = "VCV Rack"; genericName = "Eurorack simulator"; comment = "Create music by patching together virtual synthesizer modules"; @@ -143,7 +151,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "VCVRack"; repo = "Rack"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-leI0wwhYiA8qktJFe6DuZjs6q5tMFQ4WFLD4Ivom5+E="; }; @@ -151,70 +159,104 @@ stdenv.mkDerivation rec { ./rack-minimize-vendoring.patch ]; - prePatch = '' - # As we can't use `make dep` to set up the dependencies (as explained - # above), we do it here manually - mkdir -p dep/include + prePatch = + '' + # As we can't use `make dep` to set up the dependencies (as explained + # above), we do it here manually + mkdir -p dep/include - cp -r ${pffft-source}/* dep/pffft - cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase - cp -r ${nanovg-source}/* dep/nanovg - cp -r ${nanosvg-source}/* dep/nanosvg - cp -r ${osdialog-source}/* dep/osdialog - cp -r ${oui-blendish-source}/* dep/oui-blendish - cp -r ${simde-source}/* dep/simde - cp -r ${tinyexpr-source}/* dep/tinyexpr + cp -r ${pffft-source}/* dep/pffft + cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase + cp -r ${nanovg-source}/* dep/nanovg + cp -r ${nanosvg-source}/* dep/nanosvg + cp -r ${osdialog-source}/* dep/osdialog + cp -r ${oui-blendish-source}/* dep/oui-blendish + cp -r ${simde-source}/* dep/simde + cp -r ${tinyexpr-source}/* dep/tinyexpr - cp dep/pffft/*.h dep/include - cp dep/fuzzysearchdatabase/src/*.hpp dep/include - cp dep/nanosvg/**/*.h dep/include - cp dep/nanovg/src/*.h dep/include - cp dep/osdialog/*.h dep/include - cp dep/oui-blendish/*.h dep/include - cp -r dep/simde/simde dep/include - cp dep/tinyexpr/tinyexpr.h dep/include + cp dep/pffft/*.h dep/include + cp dep/fuzzysearchdatabase/src/*.hpp dep/include + cp dep/nanosvg/**/*.h dep/include + cp dep/nanovg/src/*.h dep/include + cp dep/osdialog/*.h dep/include + cp dep/oui-blendish/*.h dep/include + cp -r dep/simde/simde dep/include + cp dep/tinyexpr/tinyexpr.h dep/include - # Build and dist the Fundamental plugins - cp -r ${fundamental-source} plugins/Fundamental/ - chmod -R +rw plugins/Fundamental # will be used as build dir - substituteInPlace plugin.mk --replace ":= all" ":= dist" - substituteInPlace plugins/Fundamental/src/Logic.cpp \ - --replace \ - "LightButton>" \ - "struct rack::componentlibrary::LightButton>" + # Build and dist the Fundamental plugins + cp -r ${fundamental-source} plugins/Fundamental/ + chmod -R +rw plugins/Fundamental # will be used as build dir + substituteInPlace plugin.mk --replace-fail ":= all" ":= dist" + substituteInPlace plugins/Fundamental/src/Logic.cpp \ + --replace-fail \ + "LightButton>" \ + "struct rack::componentlibrary::LightButton>" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + # Fix reference to zenity + substituteInPlace dep/osdialog/osdialog_zenity.c \ + --replace-fail 'zenityBin[] = "zenity"' 'zenityBin[] = "${lib.getExe zenity}"' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # * Set VERSION from finalAttrs to avoid build using git to determine version + # * Darwin needs to build the dist target, which builds the .app container, + # yet we want to exclude the documentation from dist target. + # * Replace path to Fundamental module with path to produced build artifact + # to avoid downloading a pre-compiled version + substituteInPlace Makefile \ + --replace-fail 'VERSION ?= $' 'VERSION ?= ${finalAttrs.version}#$' \ + --replace-fail 'DIST_HTML :=' '#DIST_HTML :=' \ + --replace-fail 'FUNDAMENTAL_FILENAME := Fundamental' 'FUNDAMENTAL_FILENAME := plugins/Fundamental/dist/Fundamental' + # Skip codesigning + substituteInPlace plugin.mk \ + --replace-fail '$(CODESIGN)' '#$(CODESIGN)' - # Fix reference to zenity - substituteInPlace dep/osdialog/osdialog_zenity.c \ - --replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${zenity}/bin/zenity"' - ''; + # To support macOS drag & drop a custom glfw patch is needed + # (see https://github.com/glfw/glfw/pull/1579 for details). + # Since the patch does not apply cleanly on the current glfw contained in nixpkgs + # disable drag & drop functionality for the time being. + substituteInPlace adapters/standalone.cpp \ + --replace-fail 'glfwGetOpenedFilenames()' 'NULL' + ''; - nativeBuildInputs = [ - copyDesktopItems - imagemagick - jq - libicns - makeWrapper - pkg-config - wrapGAppsHook3 - ]; - buildInputs = [ - alsa-lib - curl - ghc_filesystem - glew - glfw - zenity - gtk3-x11 - jansson - libarchive - libjack2 - libpulseaudio - libsamplerate - rtmidi - speexdsp - vcv-rtaudio - zstd - ]; + nativeBuildInputs = + [ + jq + makeWrapper + pkg-config + ] + ++ lib.optionals stdenv.isLinux [ + copyDesktopItems + libicns + imagemagick + wrapGAppsHook3 + ] + ++ lib.optionals stdenv.isDarwin [ rsync ]; + + buildInputs = + [ + curl + ghc_filesystem + glew + glfw + jansson + libarchive + libsamplerate + rtmidi + speexdsp + vcv-rtaudio + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + gtk3-x11 + libjack2 + libpulseaudio + zenity + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; + + enableParallelBuilding = true; makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -225,37 +267,64 @@ stdenv.mkDerivation rec { "plugins" ]; - installPhase = '' - runHook preInstall - - install -D -m755 -t $out/bin Rack - install -D -m755 -t $out/lib libRack.so - - mkdir -p $out/share/vcv-rack - cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack - cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin - - # Extract pngs from the Apple icon image and create - # the missing ones from the 1024x1024 image. - icns2png --extract icon.icns - for size in 16 24 32 48 64 128 256 512 1024; do - mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps - if [ ! -e icon_"$size"x"$size"x32.png ] ; then - convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png - fi - install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png - done; - - runHook postInstall + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + # To be able to use enableParallelBuilding = true + # the dist target needs run after the buildPhase as + # it depends on the all and plugin targets. + make "SED=sed -i" dist ''; + installPhase = + '' + runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + + install -D -m755 -t $out/bin Rack + install -D -m755 -t $out/lib libRack.so + + mkdir -p $out/share/vcv-rack + cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack + cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin + + # Extract pngs from the Apple icon image and create + # the missing ones from the 1024x1024 image. + icns2png --extract icon.icns + for size in 16 24 32 48 64 128 256 512 1024; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ ! -e icon_"$size"x"$size"x32.png ] ; then + convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png + fi + install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png + done; + '' + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{bin,Applications} + mv dist/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app' \ + $out/Applications + + # plugins/Fundamental/dist/Fundamental-*.vcvplugin + cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt \ + $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/Resources + '' + + '' + runHook postInstall + ''; + dontWrapGApps = true; - postFixup = '' - # Wrap gApp and override the default global resource file directory - wrapProgram $out/bin/Rack \ - "''${gappsWrapperArgs[@]}" \ - --add-flags "-s $out/share/vcv-rack" - ''; + postFixup = + lib.optionalString stdenv.hostPlatform.isLinux '' + # Wrap gApp and override the default global resource file directory + wrapProgram $out/bin/Rack \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "-s $out/share/vcv-rack" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper \ + $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/MacOS/Rack \ + $out/bin/${finalAttrs.meta.mainProgram} \ + --add-flags "-s $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/Resources" + ''; meta = with lib; { description = "Open-source virtual modular synthesizer"; @@ -273,6 +342,6 @@ stdenv.mkDerivation rec { ddelabru ]; mainProgram = "Rack"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch index 58f1b1f16f07..90bb80221288 100644 --- a/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch +++ b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch @@ -1,13 +1,10 @@ -diff --git a/Makefile b/Makefile -index fc7c3af1..c3672c6a 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,7 +34,7 @@ ifdef ARCH_LIN - - LDFLAGS += -Wl,--whole-archive - LDFLAGS += -static-libstdc++ -static-libgcc +diff --git i/Makefile w/Makefile +index 1d6accc6..f772883c 100644 +--- i/Makefile ++++ w/Makefile +@@ -38 +38 @@ ifdef ARCH_LIN - LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a + LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio - LDFLAGS += -Wl,--no-whole-archive - LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple - endif +@@ -53 +53 @@ ifdef ARCH_MAC +- LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a -Wl,-load_hidden,dep/lib/libarchive.a -Wl,-load_hidden,dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a -Wl,-load_hidden,dep/lib/librtmidi.a -Wl,-load_hidden,dep/lib/librtaudio.a ++ LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio From 526f5a1c0c9a8c71be3924bbec2dd7aced355f63 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 21 Mar 2025 14:40:07 +0100 Subject: [PATCH 072/154] vcv-rack: 2.6.0 -> 2.6.6 --- pkgs/by-name/vc/vcv-rack/package.nix | 340 ++++++++++-------- .../vc/vcv-rack/rack-minimize-vendoring.patch | 7 +- 2 files changed, 185 insertions(+), 162 deletions(-) diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index efba2d35750c..337995abe01e 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -6,6 +6,7 @@ curl, fetchFromBitbucket, fetchFromGitHub, + fetchpatch, ghc_filesystem, glew, glfw, @@ -37,11 +38,12 @@ let # Unfortunately, they are not pinned, so we have no guarantee that they # will be stable, and therefore, we can't use them directly. Instead # we'll have to fetch them separately ourselves. - pffft-source = fetchFromBitbucket { - owner = "jpommier"; - repo = "pffft"; - rev = "fbc4058602803f40dc554b8a5d2bcc694c005f2f"; - hash = "sha256-Li+PmvgSPc6kg/ZqKtXyjiLD+4XlJBkyE0OUEEaUcZk="; + # The revs used here have been determined using git submodule status. + filesystem-source = fetchFromGitHub { + owner = "gulrak"; + repo = "filesystem"; + rev = "7e37433f318488ae4bc80f80e12df12a01579874"; + hash = "sha256-dHwNsuuFkhd9Y24KRzGV9Z9UZolNtOtxyA1AEVG7uMU="; }; fuzzysearchdatabase-source = fetchFromBitbucket { owner = "j_norberg"; @@ -49,23 +51,23 @@ let rev = "23122d1ff60d936fd766361a30210c954e0c5449"; hash = "sha256-f+ed6zZGfEuYILXQcUoQ+1Qf4ASvWLQqU1nYHDpdCOk="; }; + nanosvg-source = fetchFromGitHub { + owner = "memononen"; + repo = "nanosvg"; + rev = "25241c5a8f8451d41ab1b02ab2d865b01600d949"; + hash = "sha256-b/aBmvuvKScF8zSkyF1tuqL9hov4XVLzKLTpr6p7mIQ="; + }; nanovg-source = fetchFromGitHub { owner = "VCVRack"; repo = "nanovg"; rev = "0bebdb314aff9cfa28fde4744bcb037a2b3fd756"; hash = "sha256-HmQhCE/zIKc3f+Zld229s5i5MWzRrBMF9gYrn8JVQzg="; }; - nanosvg-source = fetchFromGitHub { - owner = "memononen"; - repo = "nanosvg"; - rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; - hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94="; - }; osdialog-source = fetchFromGitHub { owner = "AndrewBelt"; repo = "osdialog"; - rev = "d0f64f0798c2e47f61d90a5505910ff2d63ca049"; - hash = "sha256-auh2Npc+pG0CoDpZ8gF3zugzqRPpRMXBOvw/bjoqYLQ="; + rev = "64482bde25a8e19cc38342ed21aa0e38c2751f6c"; + hash = "sha256-FiejDeZkLoyS7BBwPYBfdOCLxBV8hAFzJAFeTz80tH0="; }; oui-blendish-source = fetchFromGitHub { owner = "VCVRack"; @@ -73,33 +75,39 @@ let rev = "2fc6405883f8451944ed080547d073c8f9f31898"; hash = "sha256-/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8="; }; + pffft-source = fetchFromBitbucket { + owner = "jpommier"; + repo = "pffft"; + rev = "74d7261be17cf659d5930d4830609406bd7553e3"; + hash = "sha256-gYaumUeXYf3axAexGqWI/tYBs1dyebjAESo4o/DTjCA="; + }; simde-source = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; - rev = "416091ebdb9e901b29d026633e73167d6353a0b0"; - hash = "sha256-rhs1LYLh7u955/oIuVcmmliSJ+S8+UxAl/6Mwwx7nhg="; + rev = "dd0b662fd8cf4b1617dbbb4d08aa053e512b08e4"; + hash = "sha256-21YBpP7jwFqNiOu5Ilu8t9nt+AZmLc3PVEwHAWn7vM8="; }; tinyexpr-source = fetchFromGitHub { owner = "codeplea"; repo = "tinyexpr"; - rev = "9907207e5def0fabdb60c443517b0d9e9d521393"; - hash = "sha256-FCG91JUG47iAHrtH+WvKuIJyzZw6VBzqvWLm/RNod3U="; + rev = "4e8cc0067a1e2378faae23eb2dfdd21e9e9907c2"; + hash = "sha256-jYC0kSmYdzJsEaH9gres/NOcfsh+2ymqZAGxNbjus/s="; }; fundamental-source = fetchFromGitHub { owner = "VCVRack"; repo = "Fundamental"; - rev = "b453f192d22b1c951d71e8a73f28a37cd96a7b6c"; # tip of branch v2 - hash = "sha256-Wr5G2wgCMIduMqFdIJUtkWQEbvihte/WZb/qUWXGE04="; + rev = "v2.6.4"; + hash = "sha256-rpOIMFO17ixgJZDRRg6RdLKorN/XKCUXkapsxN1pmQ4="; }; vcv-rtaudio = stdenv.mkDerivation { pname = "vcv-rtaudio"; - version = "5.1.0-unstable-2020-01-30"; + version = "5.1.0-unstable-2022-11-22"; src = fetchFromGitHub { owner = "VCVRack"; repo = "rtaudio"; - rev = "ece277bd839603648c80c8a5f145678e13bc23f3"; # tip of master branch - hash = "sha256-W3QvuOyOqI9P82IwGGHIjFbIgMwLREdwpvGUMxWg94U="; + rev = "22d64cdcb151e388791caceee8aa0011a6aa46e0"; # tip of master branch + hash = "sha256-BW5XwbsuwbbFDHXnQrUMM+1p7Zy7zjwdHHQFGo2XMv0="; }; nativeBuildInputs = [ @@ -107,16 +115,15 @@ let pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libjack2 - libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libjack2 + libpulseaudio + ] + ++ lib.optional stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; cmakeFlags = [ (lib.cmakeBool "RTAUDIO_API_ALSA" stdenv.hostPlatform.isLinux) @@ -128,7 +135,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vcv-rack"; - version = "2.6.0"; + version = "2.6.6"; desktopItems = [ (makeDesktopItem { @@ -152,109 +159,125 @@ stdenv.mkDerivation (finalAttrs: { owner = "VCVRack"; repo = "Rack"; tag = "v${finalAttrs.version}"; - hash = "sha256-leI0wwhYiA8qktJFe6DuZjs6q5tMFQ4WFLD4Ivom5+E="; + hash = "sha256-v5/zk1eT5PRB4bwpCdlKb0nr7qERDM9jP5Q78F30O78="; }; patches = [ + # N.B.: Loading modules may fail due to symbols used by the moodules + # not being found, to address this issue the libraries providing the + # symbols are re-exported when building on Darwin using -Wl,-reexport-l. ./rack-minimize-vendoring.patch + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (fetchpatch { + name = "fix-segfault-on-linux.patch"; + url = "https://github.com/VCVRack/Rack/pull/1944.patch"; + hash = "sha256-dlndyCfCznGDzlWNWrQTgh+FtmsrrL2DVuRE0xCxUck="; + }) ]; - prePatch = - '' - # As we can't use `make dep` to set up the dependencies (as explained - # above), we do it here manually - mkdir -p dep/include + prePatch = '' + # As we can't use `make dep` to set up the dependencies (as explained + # above), we do it here manually + mkdir -p dep/include - cp -r ${pffft-source}/* dep/pffft - cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase - cp -r ${nanovg-source}/* dep/nanovg - cp -r ${nanosvg-source}/* dep/nanosvg - cp -r ${osdialog-source}/* dep/osdialog - cp -r ${oui-blendish-source}/* dep/oui-blendish - cp -r ${simde-source}/* dep/simde - cp -r ${tinyexpr-source}/* dep/tinyexpr + cp -r ${filesystem-source}/* dep/filesystem + cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase + cp -r ${nanosvg-source}/* dep/nanosvg + cp -r ${nanovg-source}/* dep/nanovg + cp -r ${osdialog-source}/* dep/osdialog + cp -r ${oui-blendish-source}/* dep/oui-blendish + cp -r ${pffft-source}/* dep/pffft + cp -r ${simde-source}/* dep/simde + cp -r ${tinyexpr-source}/* dep/tinyexpr - cp dep/pffft/*.h dep/include - cp dep/fuzzysearchdatabase/src/*.hpp dep/include - cp dep/nanosvg/**/*.h dep/include - cp dep/nanovg/src/*.h dep/include - cp dep/osdialog/*.h dep/include - cp dep/oui-blendish/*.h dep/include - cp -r dep/simde/simde dep/include - cp dep/tinyexpr/tinyexpr.h dep/include + cp dep/pffft/*.h dep/include + cp dep/fuzzysearchdatabase/src/*.hpp dep/include + cp dep/nanosvg/**/*.h dep/include + cp dep/nanovg/src/*.h dep/include + cp dep/osdialog/*.h dep/include + cp dep/oui-blendish/*.h dep/include + cp -r dep/simde/simde dep/include + cp dep/tinyexpr/tinyexpr.h dep/include - # Build and dist the Fundamental plugins - cp -r ${fundamental-source} plugins/Fundamental/ - chmod -R +rw plugins/Fundamental # will be used as build dir - substituteInPlace plugin.mk --replace-fail ":= all" ":= dist" - substituteInPlace plugins/Fundamental/src/Logic.cpp \ - --replace-fail \ - "LightButton>" \ - "struct rack::componentlibrary::LightButton>" - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - # Fix reference to zenity - substituteInPlace dep/osdialog/osdialog_zenity.c \ - --replace-fail 'zenityBin[] = "zenity"' 'zenityBin[] = "${lib.getExe zenity}"' - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # * Set VERSION from finalAttrs to avoid build using git to determine version - # * Darwin needs to build the dist target, which builds the .app container, - # yet we want to exclude the documentation from dist target. - # * Replace path to Fundamental module with path to produced build artifact - # to avoid downloading a pre-compiled version - substituteInPlace Makefile \ - --replace-fail 'VERSION ?= $' 'VERSION ?= ${finalAttrs.version}#$' \ - --replace-fail 'DIST_HTML :=' '#DIST_HTML :=' \ - --replace-fail 'FUNDAMENTAL_FILENAME := Fundamental' 'FUNDAMENTAL_FILENAME := plugins/Fundamental/dist/Fundamental' - # Skip codesigning - substituteInPlace plugin.mk \ - --replace-fail '$(CODESIGN)' '#$(CODESIGN)' + # Build and dist the Fundamental plugins + cp -r ${fundamental-source} plugins/Fundamental/ + chmod -R +rw plugins/Fundamental # will be used as build dir + substituteInPlace plugin.mk --replace-fail ":= all" ":= dist" + substituteInPlace plugins/Fundamental/src/Logic.cpp \ + --replace-fail \ + "LightButton>" \ + "struct rack::componentlibrary::LightButton>" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + # Fix reference to zenity + substituteInPlace dep/osdialog/osdialog_zenity.c \ + --replace-fail 'zenityBin[] = "zenity"' 'zenityBin[] = "${lib.getExe zenity}"' + # For some unknown reason __yield isn't available on aarch64-linux + substituteInPlace src/engine/Engine.cpp \ + --replace-fail '__yield();' 'asm volatile("yield");' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # * Set VERSION from finalAttrs to avoid build using git to determine version + # * Darwin needs to build the dist target, which builds the .app container, + # yet we want to exclude the documentation from dist target. + # * Skip stripping the binary to avoid "unsupported load command" error, which + # appears since several libraries are re-exported (see rack-minimize-vendoring.patch) + # * Replace path to Fundamental module with path to produced build artifact + # to avoid downloading a pre-compiled version + substituteInPlace Makefile \ + --replace-fail 'VERSION ?= $' 'VERSION ?= ${finalAttrs.version}#$' \ + --replace-fail 'DIST_HTML :=' '#DIST_HTML :=' \ + --replace-fail '$(STRIP)' '#$(STRIP)' \ + --replace-fail 'FUNDAMENTAL_FILENAME := Fundamental' 'FUNDAMENTAL_FILENAME := plugins/Fundamental/dist/Fundamental' - # To support macOS drag & drop a custom glfw patch is needed - # (see https://github.com/glfw/glfw/pull/1579 for details). - # Since the patch does not apply cleanly on the current glfw contained in nixpkgs - # disable drag & drop functionality for the time being. - substituteInPlace adapters/standalone.cpp \ - --replace-fail 'glfwGetOpenedFilenames()' 'NULL' - ''; + # Skip codesigning + substituteInPlace plugin.mk \ + --replace-fail '$(CODESIGN)' '#$(CODESIGN)' - nativeBuildInputs = - [ - jq - makeWrapper - pkg-config - ] - ++ lib.optionals stdenv.isLinux [ - copyDesktopItems - libicns - imagemagick - wrapGAppsHook3 - ] - ++ lib.optionals stdenv.isDarwin [ rsync ]; + # To support macOS drag & drop a custom glfw patch is needed + # (see https://github.com/glfw/glfw/pull/1579 for details). + # Since the patch does not apply cleanly on the current glfw contained in nixpkgs + # disable drag & drop functionality for the time being. + substituteInPlace adapters/standalone.cpp \ + --replace-fail 'glfwGetOpenedFilenames()' 'NULL' + ''; - buildInputs = - [ - curl - ghc_filesystem - glew - glfw - jansson - libarchive - libsamplerate - rtmidi - speexdsp - vcv-rtaudio - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - gtk3-x11 - libjack2 - libpulseaudio - zenity - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; + nativeBuildInputs = [ + jq + makeWrapper + pkg-config + zstd + ] + ++ lib.optionals stdenv.isLinux [ + copyDesktopItems + imagemagick + libicns + wrapGAppsHook3 + ] + ++ lib.optionals stdenv.isDarwin [ rsync ]; + + buildInputs = [ + curl + ghc_filesystem + glew + glfw + jansson + libarchive + libsamplerate + rtmidi + speexdsp + vcv-rtaudio + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + gtk3-x11 + libjack2 + libpulseaudio + zenity + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; enableParallelBuilding = true; @@ -267,49 +290,48 @@ stdenv.mkDerivation (finalAttrs: { "plugins" ]; + # To be able to use enableParallelBuilding = true + # the dist target needs run after the buildPhase as + # it depends on the all and plugin targets. postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - # To be able to use enableParallelBuilding = true - # the dist target needs run after the buildPhase as - # it depends on the all and plugin targets. make "SED=sed -i" dist ''; - installPhase = - '' - runHook preInstall - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' + installPhase = '' + runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' - install -D -m755 -t $out/bin Rack - install -D -m755 -t $out/lib libRack.so + install -D -m755 -t $out/bin Rack + install -D -m755 -t $out/lib libRack.so - mkdir -p $out/share/vcv-rack - cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack - cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin + mkdir -p $out/share/vcv-rack + cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack + cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin - # Extract pngs from the Apple icon image and create - # the missing ones from the 1024x1024 image. - icns2png --extract icon.icns - for size in 16 24 32 48 64 128 256 512 1024; do - mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps - if [ ! -e icon_"$size"x"$size"x32.png ] ; then - convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png - fi - install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png - done; - '' - + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/{bin,Applications} - mv dist/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app' \ - $out/Applications + # Extract pngs from the Apple icon image and create + # the missing ones from the 1024x1024 image. + icns2png --extract icon.icns + for size in 16 24 32 48 64 128 256 512 1024; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ ! -e icon_"$size"x"$size"x32.png ] ; then + convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png + fi + install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png + done; + '' + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{bin,Applications} + mv dist/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app' \ + $out/Applications - # plugins/Fundamental/dist/Fundamental-*.vcvplugin - cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt \ - $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/Resources - '' - + '' - runHook postInstall - ''; + # plugins/Fundamental/dist/Fundamental-*.vcvplugin + cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt \ + $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/Resources + '' + + '' + runHook postInstall + ''; dontWrapGApps = true; postFixup = diff --git a/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch index 90bb80221288..5e97b862ab83 100644 --- a/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch +++ b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch @@ -1,10 +1,11 @@ diff --git i/Makefile w/Makefile -index 1d6accc6..f772883c 100644 +index 1d6accc6..fc09198e 100644 --- i/Makefile +++ w/Makefile @@ -38 +38 @@ ifdef ARCH_LIN - LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a + LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio -@@ -53 +53 @@ ifdef ARCH_MAC +@@ -52,2 +52 @@ ifdef ARCH_MAC +- LDFLAGS += -Wl,-all_load - LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a -Wl,-load_hidden,dep/lib/libarchive.a -Wl,-load_hidden,dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a -Wl,-load_hidden,dep/lib/librtmidi.a -Wl,-load_hidden,dep/lib/librtaudio.a -+ LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio ++ LDFLAGS += -Wl,-reexport-lGLEW -Wl,-reexport-lglfw -Wl,-reexport-ljansson -lcurl -lssl -lcrypto -larchive -lz -Wl,-reexport-lspeexdsp -lsamplerate -lrtmidi -lrtaudio From 028597e20d19f8ab80a1a288c5ce8c25535559cf Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 9 Nov 2025 15:15:27 +0100 Subject: [PATCH 073/154] cryptomator: switch from openjdk to zulu The javafx build of openjdk25 is broken. Zulu also provides pre built javafx binaries. --- pkgs/by-name/cr/cryptomator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index 616ed7a5208a..f89a4ec587b6 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, fuse3, glib, - jdk25, + zulu25, lib, libayatana-appindicator, makeShellWrapper, @@ -13,7 +13,7 @@ }: let - jdk = jdk25.override { enableJavaFX = true; }; + jdk = zulu25.override { enableJavaFX = true; }; in maven.buildMavenPackage rec { pname = "cryptomator"; From 51300f95c16930ae708bf9064856872b0cced877 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 9 Nov 2025 15:18:18 +0100 Subject: [PATCH 074/154] cryptomator: 1.16.2 -> 1.17.1 --- pkgs/by-name/cr/cryptomator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index f89a4ec587b6..e0547ce0220f 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -17,18 +17,18 @@ let in maven.buildMavenPackage rec { pname = "cryptomator"; - version = "1.16.2"; + version = "1.17.1"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; tag = version; - hash = "sha256-U/I18OtinWlk8d9OLLAzZHoN5d8KHx9CUoZsv2mrQtw="; + hash = "sha256-2iWeF2su55yQjiFe8nyqTgqNDZuj2+JpzAx5tQJE1Z0="; }; mvnJdk = jdk; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-uQz70epBFKTyX/PpOyWBtxHOiX0OQT3aTX6KWKwLc1I="; + mvnHash = "sha256-lbyNCuZOYIoznOV+DHuhNFk9ALNQbMMXBrF7y246ktE="; preBuild = '' VERSION=${version} From 832e9bbe03212ceac88d03e0c447c839369992cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 14:23:16 +0000 Subject: [PATCH 075/154] libretro.fbneo: 0-unstable-2025-11-02 -> 0-unstable-2025-11-06 --- pkgs/applications/emulators/libretro/cores/fbneo.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 0fa8f419c63b..f60fe55951f4 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-11-02"; + version = "0-unstable-2025-11-06"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "442a0e901c3d7d60c94f21caf46c0535233086f6"; - hash = "sha256-ewwF7btf5EEBmGzAVuH4LavrDpmVzEBD/BE1/T/p6bM="; + rev = "7759881be43b5f1711c95a2a80aa8987a98fbb99"; + hash = "sha256-vYHWJV5xRACjdllmeg/3tr2WgI4QcWtuhKJhEwGIGD0="; }; makefile = "Makefile"; From f6b2eed42b7166096073cca9a848e4c20e464a95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 14:48:48 +0000 Subject: [PATCH 076/154] carapace: 1.5.3 -> 1.5.4 --- pkgs/by-name/ca/carapace/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/carapace/package.nix b/pkgs/by-name/ca/carapace/package.nix index bb5c46c581e7..3b1d1dafc558 100644 --- a/pkgs/by-name/ca/carapace/package.nix +++ b/pkgs/by-name/ca/carapace/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "carapace"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; tag = "v${finalAttrs.version}"; - hash = "sha256-KeIaA+v0jJzyEo6ZE+mwzMM8wjsbtdYipAhzkotRR+o="; + hash = "sha256-QTY2GH2aKTMowNXVVNUDJdHAFVhCPFBh2p+Mgon88EI="; }; - vendorHash = "sha256-bDPCLAkX9AofyzZMz8rV9RgbFlF0GwzVlal2N7you08="; + vendorHash = "sha256-Lswmq4j4nz7k+CRpyZhAubEZD59lNKpT/w3mQ4JlMys="; ldflags = [ "-s" From 1261711c3fd4b25d2a95e564502c88eeb770e862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 15:07:44 +0000 Subject: [PATCH 077/154] deck: 1.52.1 -> 1.53.1 --- pkgs/by-name/de/deck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 86b41e94836c..09f7a7062d44 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "deck"; - version = "1.52.1"; + version = "1.53.1"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${version}"; - hash = "sha256-nxb7iuAf1hGHdjomgxFZuYwZSUuRrd5J3iVtFgEINY4="; + hash = "sha256-uLT/VTO3+KVfAvnFnsyFo9oRwkxA0wgUDmRgQwhXLfY="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-K6BOZ0LAy107UMQ0ZjkSnI4Q0lSqfHqvIG+EhCaal9A="; + vendorHash = "sha256-EygCZy0IXvqr2874nKFQTi+Pm56J75cpQUrPo7JGUNc="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd deck \ From e2e25df1ca5b15ddef03e1196eea3fb1548615cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 15:25:10 +0000 Subject: [PATCH 078/154] rusty-path-of-building: 0.2.7 -> 0.2.8 --- pkgs/by-name/ru/rusty-path-of-building/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix index 10b0184b3670..997b766734e0 100644 --- a/pkgs/by-name/ru/rusty-path-of-building/package.nix +++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix @@ -17,16 +17,16 @@ }: rustPlatform.buildRustPackage rec { pname = "rusty-path-of-building"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "meehl"; repo = "rusty-path-of-building"; rev = "v${version}"; - hash = "sha256-J/tTifOcbY1mfcNbQFN4Vdyl78O7vTVbfew3fcnVyTA="; + hash = "sha256-GJP5kuDHDyKFzlDW3EiMzd2KruYB1L51QgK4NT6B3Cc="; }; - cargoHash = "sha256-Oekl6SDIvgFIzPnve7nuib3fEjPGC46F/TNULmgOpew="; + cargoHash = "sha256-RfF53qd/crWDgEDveP58FPInlH7vtpprMU3aLf9KO8A="; nativeBuildInputs = [ pkg-config From 36d97f54b65064b56ce981b5d773cb3c394e8ed3 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 9 Sep 2025 11:46:42 -0400 Subject: [PATCH 079/154] blender: use release config This ensures that we at least default to the config that upstream Blender uses. Remove any config that we have that is redundant with [the current upstream][1]. Need to explicitly turn off `WITH_CYCLES_CUDA_BINARIES` in non-CUDA (as release build will turn it on) and turn off `WITH_CYCLES_DEVICE_ONEAPI` (as it was previously implicitly off and we do not currently support it). [1]: https://projects.blender.org/blender/blender/src/tag/v4.5.2/build_files/cmake/config/blender_release.cmake --- pkgs/by-name/bl/blender/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 8645982537e9..0e5678977f98 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -146,6 +146,7 @@ stdenv'.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}"; cmakeFlags = [ + "-C../build_files/cmake/config/blender_release.cmake" "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" "-DPYTHON_LIBPATH=${python3}/lib" @@ -153,36 +154,26 @@ stdenv'.mkDerivation (finalAttrs: { "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include" "-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}" "-DPYTHON_VERSION=${python3.pythonVersion}" - "-DWITH_ALEMBIC=ON" - "-DWITH_ASSERT_ABORT=OFF" "-DWITH_BUILDINFO=OFF" - "-DWITH_CODEC_FFMPEG=ON" - "-DWITH_CODEC_SNDFILE=ON" "-DWITH_CPU_CHECK=OFF" + "-DWITH_CYCLES_CUDA_BINARIES=${if cudaSupport then "ON" else "OFF"}" "-DWITH_CYCLES_DEVICE_HIP=${if hipSupport then "ON" else "OFF"}" + "-DWITH_CYCLES_DEVICE_ONEAPI=OFF" "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}" "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}" "-DWITH_CYCLES_OSL=OFF" - "-DWITH_FFTW3=ON" "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}" - "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}" "-DWITH_LIBS_PRECOMPILED=OFF" - "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" - "-DWITH_OPENCOLORIO=ON" "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}" - "-DWITH_OPENSUBDIV=ON" - "-DWITH_OPENVDB=ON" "-DWITH_PIPEWIRE=OFF" "-DWITH_PULSEAUDIO=OFF" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" - "-DWITH_SDL=OFF" "-DWITH_STRICT_BUILD_OPTIONS=ON" - "-DWITH_TBB=ON" "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}" # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) From 184edc5166eb33e2c06c5dfe5f134781c5dcbdcf Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 8 Nov 2025 09:59:27 -0500 Subject: [PATCH 080/154] blender: 4.5.3 -> 4.5.4 Changelog: https://www.blender.org/download/lts/4-5/ --- pkgs/by-name/bl/blender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 0e5678977f98..f7c54e1451b7 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -116,12 +116,12 @@ in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.5.3"; + version = "4.5.4"; src = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-DNVZUZpysCyB/Xt8yB352gO+UK8Cd4aDFGYuUDKyIrs="; + hash = "sha256-/cYMCWgojkO1mqzJ4BZwbwXPuBmg66T+gzpEuLiOskY="; }; postPatch = From 249e49e3890711299408b1e591cdee17f2f2134c Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 14 Oct 2025 10:47:09 -0400 Subject: [PATCH 081/154] blender: alphabetize --- pkgs/by-name/bl/blender/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index f7c54e1451b7..5243b5fb15db 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -254,11 +254,11 @@ stdenv'.mkDerivation (finalAttrs: { openpgl (opensubdiv.override { inherit cudaSupport; }) openvdb + onetbb potrace pugixml python3 python3Packages.materialx - onetbb zlib zstd ] From e353d376026cea28562fb8c8e2652006ba2d7901 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 9 Nov 2025 10:12:34 -0500 Subject: [PATCH 082/154] blender: prefer lib.cmakeBool & lib.cmakeFeature Been putting this off for too long. --- pkgs/by-name/bl/blender/package.nix | 88 +++++++++++++++-------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 5243b5fb15db..1cedbfce2aac 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -147,58 +147,62 @@ stdenv'.mkDerivation (finalAttrs: { cmakeFlags = [ "-C../build_files/cmake/config/blender_release.cmake" - "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" - "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" - "-DPYTHON_LIBPATH=${python3}/lib" - "-DPYTHON_LIBRARY=${python3.libPrefix}" - "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include" - "-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}" - "-DPYTHON_VERSION=${python3.pythonVersion}" - "-DWITH_BUILDINFO=OFF" - "-DWITH_CPU_CHECK=OFF" - "-DWITH_CYCLES_CUDA_BINARIES=${if cudaSupport then "ON" else "OFF"}" - "-DWITH_CYCLES_DEVICE_HIP=${if hipSupport then "ON" else "OFF"}" - "-DWITH_CYCLES_DEVICE_ONEAPI=OFF" - "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}" - "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}" - "-DWITH_CYCLES_OSL=OFF" - "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}" - "-DWITH_INSTALL_PORTABLE=OFF" - "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}" - "-DWITH_LIBS_PRECOMPILED=OFF" - "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" - "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}" - "-DWITH_PIPEWIRE=OFF" - "-DWITH_PULSEAUDIO=OFF" - "-DWITH_PYTHON_INSTALL=OFF" - "-DWITH_PYTHON_INSTALL_NUMPY=OFF" - "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" - "-DWITH_STRICT_BUILD_OPTIONS=ON" - "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}" + + (lib.cmakeFeature "MaterialX_DIR" "${python3Packages.materialx}/lib/cmake/MaterialX") + (lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}") + (lib.cmakeFeature "PYTHON_LIBPATH" "${python3}/lib") + (lib.cmakeFeature "PYTHON_LIBRARY" "${python3.libPrefix}") + (lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include") + (lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python3Packages.numpy_1}/${python3.sitePackages}") + (lib.cmakeFeature "PYTHON_VERSION" "${python3.pythonVersion}") + + (lib.cmakeBool "WITH_BUILDINFO" false) + (lib.cmakeBool "WITH_CPU_CHECK" false) + (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" cudaSupport) + (lib.cmakeBool "WITH_CYCLES_DEVICE_HIP" hipSupport) + (lib.cmakeBool "WITH_CYCLES_DEVICE_ONEAPI" false) + (lib.cmakeBool "WITH_CYCLES_DEVICE_OPTIX" cudaSupport) + (lib.cmakeBool "WITH_CYCLES_EMBREE" embreeSupport) + (lib.cmakeBool "WITH_CYCLES_OSL" false) + (lib.cmakeBool "WITH_HYDRA" openUsdSupport) + (lib.cmakeBool "WITH_INSTALL_PORTABLE" false) + (lib.cmakeBool "WITH_JACK" jackaudioSupport) + (lib.cmakeBool "WITH_LIBS_PRECOMPILED" false) + (lib.cmakeBool "WITH_OPENCOLLADA" colladaSupport) + (lib.cmakeBool "WITH_OPENIMAGEDENOISE" openImageDenoiseSupport) + (lib.cmakeBool "WITH_PIPEWIRE" false) + (lib.cmakeBool "WITH_PULSEAUDIO" false) + (lib.cmakeBool "WITH_PYTHON_INSTALL" false) + (lib.cmakeBool "WITH_PYTHON_INSTALL_NUMPY" false) + (lib.cmakeBool "WITH_PYTHON_INSTALL_REQUESTS" false) + (lib.cmakeBool "WITH_STRICT_BUILD_OPTIONS" true) + (lib.cmakeBool "WITH_USD" openUsdSupport) # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) - "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" - "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}" + (lib.cmakeFeature "ALEMBIC_INCLUDE_DIR" "${lib.getDev alembic}/include") + (lib.cmakeFeature "ALEMBIC_LIBRARY" "${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}") ] ++ lib.optionals cudaSupport [ - "-DOPTIX_ROOT_DIR=${optix}" - "-DWITH_CYCLES_CUDA_BINARIES=ON" + (lib.cmakeFeature "OPTIX_ROOT_DIR" "${optix}") + (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" true) ] ++ lib.optionals hipSupport [ - "-DHIPRT_INCLUDE_DIR=${rocmPackages.hiprt}/include" - "-DWITH_CYCLES_DEVICE_HIPRT=ON" - "-DWITH_CYCLES_HIP_BINARIES=ON" + (lib.cmakeFeature "HIPRT_INCLUDE_DIR" "${rocmPackages.hiprt}/include") + (lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" true) + (lib.cmakeBool "WITH_CYCLES_HIP_BINARIES" true) ] ++ lib.optionals waylandSupport [ - "-DWITH_GHOST_WAYLAND=ON" - "-DWITH_GHOST_WAYLAND_DBUS=ON" - "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" - "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" + (lib.cmakeBool "WITH_GHOST_WAYLAND" true) + (lib.cmakeBool "WITH_GHOST_WAYLAND_DBUS" true) + (lib.cmakeBool "WITH_GHOST_WAYLAND_DYNLOAD" false) + (lib.cmakeBool "WITH_GHOST_WAYLAND_LIBDECOR" true) + ] + ++ lib.optionals stdenv.cc.isClang [ + (lib.cmakeFeature "PYTHON_LINKFLAGS" "") # Clang doesn't support "-export-dynamic" ] - ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DLIBDIR=/does-not-exist" - "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/include" + (lib.cmakeFeature "LIBDIR" "/does-not-exist") + (lib.cmakeFeature "SSE2NEON_INCLUDE_DIR" "${sse2neon}/include") ]; preConfigure = '' From 95bffe712f336fc064031f18c771490f3d952c70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 16:39:06 +0000 Subject: [PATCH 083/154] unordered_dense: 4.8.0 -> 4.8.1 --- pkgs/by-name/un/unordered_dense/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unordered_dense/package.nix b/pkgs/by-name/un/unordered_dense/package.nix index 41d1f23ef0bf..ca4bf94d089a 100644 --- a/pkgs/by-name/un/unordered_dense/package.nix +++ b/pkgs/by-name/un/unordered_dense/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "unordered-dense"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "martinus"; repo = "unordered_dense"; tag = "v${finalAttrs.version}"; - hash = "sha256-irjzMx0QVE6W/Tg4TV+RNw1kD16yIJPR3sBseauu6AQ="; + hash = "sha256-JdPlyShWnAcdgixDHRaroFg7YWdPtD4Nl1PmpcQ1SAk="; }; nativeBuildInputs = [ From 59ea18364b672e45f12ec6a6a91b9d8f7fd5d50c Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sun, 9 Nov 2025 17:48:56 +0100 Subject: [PATCH 084/154] hyprland: fix regression for layer-shell-qt --- pkgs/by-name/hy/hyprland/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index f9193601996b..902d2877d877 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -108,6 +108,12 @@ customStdenv.mkDerivation (finalAttrs: { url = "https://github.com/hyprwm/Hyprland/commit/522edc87126a48f3ce4891747b6a92a22385b1e7.patch"; hash = "sha256-0BAlAVW5isa8gd833PjZdqO/uEpDqdTlu0iZbLP4U9s="; }) + + # NOTE: fixes regression for layer-shell-qt. should be removed with the next release. + (fetchpatch { + url = "https://github.com/hyprwm/Hyprland/commit/0bd11d5eb941b8038f0723135768d84aa5512b4a.patch"; + hash = "sha256-yY5OsihAzm5cVLg8smGc4i/RIimUDwuZ1RUGqOlfV+Q="; + }) ]; postPatch = '' From cfbc41e7cbe43a97f942863a2db17cc3161daf45 Mon Sep 17 00:00:00 2001 From: Svenum Date: Sun, 9 Nov 2025 18:56:26 +0100 Subject: [PATCH 085/154] tail-tray: 0.2.23 -> 0.2.27 --- pkgs/by-name/ta/tail-tray/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index 883285623381..cdb9cf9b9a8b 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, davfs2, cmake, extra-cmake-modules, @@ -12,24 +11,15 @@ stdenv.mkDerivation rec { pname = "tail-tray"; - version = "0.2.23"; + version = "0.2.27"; src = fetchFromGitHub { owner = "SneWs"; repo = "tail-tray"; tag = "v${version}"; - hash = "sha256-fnr7EheVG3G4oLAe9liAy5qCDED/7eL0mUiE0qXsco4="; + hash = "sha256-/T7t8I1cfhNmTW277X8lz68qsp2KIDJPxAgUibh6O+w="; }; - patches = [ - # https://github.com/SneWs/tail-tray/pull/82 - (fetchpatch { - name = "dont-use-absoulte-paths-in-desktop-file.patch"; - url = "https://github.com/SneWs/tail-tray/commit/08aa4a4e061f21c2dcd07c94249f2eb15c4e4416.patch"; - hash = "sha256-6YOJes40e2rgVabYns55M5h1FGyFG+gjSewCaXesT8U="; - }) - ]; - nativeBuildInputs = with kdePackages; [ wrapQtAppsHook qttools From 0d3784037e4e7d00f0f3f92f311bfa1fef13fb1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 18:33:56 +0000 Subject: [PATCH 086/154] gdevelop: 5.5.244 -> 5.5.245 --- pkgs/by-name/gd/gdevelop/darwin.nix | 2 +- pkgs/by-name/gd/gdevelop/linux.nix | 2 +- pkgs/by-name/gd/gdevelop/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix index f97425ccc806..7a5044b9a86f 100644 --- a/pkgs/by-name/gd/gdevelop/darwin.nix +++ b/pkgs/by-name/gd/gdevelop/darwin.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip"; - hash = "sha256-rrPRIOnVPC7Moh+ewRbsV81oO7WridpUUoaOnEqm43o="; + hash = "sha256-F7yYZgCBMmRX1yYWC60RRtIw/ObDcbUcwY0yF4Ikagg="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index 89b881330ab0..6412678283de 100644 --- a/pkgs/by-name/gd/gdevelop/linux.nix +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -13,7 +13,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - hash = "sha256-IfgeeH+vNjIi0adrmXIjjX41qUxIWpoH2eX+Bd7h9AA="; + hash = "sha256-LwFialu3vQehcGVleuCSmDrrsw7b0uTxuAFhSwdE9jQ="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index bf42256f33ff..3b0528c4f080 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -4,7 +4,7 @@ callPackage, }: let - version = "5.5.244"; + version = "5.5.245"; pname = "gdevelop"; meta = { description = "Graphical Game Development Studio"; From c83e2729f5d3d90a0394172c0df2e735c5b96ba7 Mon Sep 17 00:00:00 2001 From: birkb Date: Sun, 9 Nov 2025 18:26:38 +0100 Subject: [PATCH 087/154] drbd-utils: 9.32.0 -> 9.33.0 - gettext build inputs added fix the ja docs Signed-off-by: birkb --- pkgs/os-specific/linux/drbd/utils.nix | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/os-specific/linux/drbd/utils.nix index 9f382c785717..c29891a60215 100644 --- a/pkgs/os-specific/linux/drbd/utils.nix +++ b/pkgs/os-specific/linux/drbd/utils.nix @@ -15,6 +15,7 @@ systemd, keyutils, udevCheckHook, + gettext, # drbd-utils are compiled twice, once with forOCF = true to extract # its OCF definitions for use in the ocf-resource-agents derivation, @@ -26,11 +27,11 @@ stdenv.mkDerivation rec { pname = "drbd"; - version = "9.32.0"; + version = "9.33.0"; src = fetchurl { url = "https://pkg.linbit.com/downloads/drbd/utils/${pname}-utils-${version}.tar.gz"; - hash = "sha256-szOM7jSbXEZZ4p1P73W6tK9Put0+wOZar+cUiUNC6M0="; + hash = "sha256-Ij/gfQtkbpkbM7qepBRo+aZvkDVi59p2bdD8a06jPbk="; }; nativeBuildInputs = [ @@ -40,11 +41,13 @@ stdenv.mkDerivation rec { asciidoctor keyutils udevCheckHook + gettext ]; buildInputs = [ perl perlPackages.Po4a + gettext ]; configureFlags = [ @@ -98,20 +101,6 @@ stdenv.mkDerivation rec { patch_docbook45 documentation/v9/drbdsetup.xml.in patch_docbook45 documentation/v84/drbdsetup.xml patch_docbook45 documentation/v84/drbd.conf.xml - # The ja documentation is disabled because: - # make[1]: Entering directory '/build/drbd-utils-9.16.0/documentation/ja/v84' - # /nix/store/wyx2nn2pjcn50lc95c6qgsgm606rn0x2-perl5.32.1-po4a-0.62/bin/po4a-translate -f docbook -M utf-8 -L utf-8 -keep 0 -m ../../v84/drbdsetup.xml -p drbdsetup.xml.po -l drbdsetup.xml - # Use of uninitialized value $args[1] in sprintf at /nix/store/wyx2nn2pjcn50lc95c6qgsgm606rn0x2-perl5.32.1-po4a-0.62/lib/perl5/site_perl/Locale/Po4a/Common.pm line 134. - # Invalid po file drbdsetup.xml.po: - substituteInPlace Makefile.in \ - --replace 'DOC_DIRS := documentation/v9 documentation/ja/v9' \ - 'DOC_DIRS := documentation/v9' \ - --replace 'DOC_DIRS += documentation/v84 documentation/ja/v84' \ - 'DOC_DIRS += documentation/v84' \ - --replace '$(MAKE) -C documentation/ja/v9 doc' \ - "" \ - --replace '$(MAKE) -C documentation/ja/v84 doc' \ - "" substituteInPlace user/v9/drbdtool_common.c \ --replace 'add_component_to_path("/lib/drbd");' \ 'add_component_to_path("${placeholder "out"}/lib/drbd");' @@ -139,7 +128,7 @@ stdenv.mkDerivation rec { ]; longDescription = '' DRBD is a software-based, shared-nothing, replicated storage solution - mirroring the content of block devices (hard disks, partitions, logical volumes, and so on) between hosts. + mirroring the content of block devices (hard disks, partitions, logical volumes etc.) between hosts. ''; }; } From a351f03c86034c7ed6201b84b47fe2b8ed8dc1bf Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 9 Nov 2025 19:07:48 +0100 Subject: [PATCH 088/154] logrotate: skip breaking tests --- pkgs/by-name/lo/logrotate/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix index 9db688ab8ac1..70642b44ef13 100644 --- a/pkgs/by-name/lo/logrotate/package.nix +++ b/pkgs/by-name/lo/logrotate/package.nix @@ -33,8 +33,12 @@ stdenv.mkDerivation rec { preCheck = '' sed -i 's#/bin/date#${lib.getExe' coreutils "date"}#' test/*.sh - # Skip this test because it depends on a working root user, which we don't have in the sandbox - # Exiting with 77 signals that the test is skipped, and we only place it on line 2 because the shebang is on line 1 + # Exiting with 77 signals that a test is skipped, and we only place it on line 2 because the shebang is on line 1 + # Does not work on certain filesystems due to incorrect sparse file detection. + # Upstream issue: https://github.com/logrotate/logrotate/issues/682 + sed -i '2iexit 77' test/test-0062.sh + sed -i '2iexit 77' test/test-0063.sh + # Depends on a working root user, which we don't have in the sandbox sed -i '2iexit 77' test/test-0110.sh ''; doCheck = true; From 42ec1c05896ee7703f6a8cbcdd0f18a3d2e1be45 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 15:01:25 -0500 Subject: [PATCH 089/154] coc-nginx: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 7 ++ .../vim/plugins/nodePackagePlugins.nix | 11 +-- pkgs/by-name/co/coc-nginx/package.nix | 71 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----- 6 files changed, 81 insertions(+), 28 deletions(-) create mode 100644 pkgs/by-name/co/coc-nginx/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index c073c194ca1e..2c89ba9de6a6 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -2,6 +2,7 @@ lib, buildVimPlugin, pkgs, + coc-nginx, }: final: prev: let @@ -60,3 +61,9 @@ lib.genAttrs cocPackages ( src = "${cocPkg}/lib/node_modules/${cocPkg.pname}"; } ) +// { + coc-nginx = buildVimPlugin { + inherit (coc-nginx) pname version meta; + src = "${coc-nginx}/lib/node_modules/@yaegassy/coc-nginx"; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 03fe172d2380..a19baf3d6f55 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -10,20 +10,13 @@ let "coc-ltex" "coc-tsserver" "coc-ultisnips" - "coc-nginx" ]; - - packageNameOverrides = { - "coc-nginx" = "@yaegassy/coc-nginx"; - }; - - getPackageName = name: packageNameOverrides.${name} or name; in lib.genAttrs nodePackageNames ( name: buildVimPlugin { pname = name; - inherit (nodePackages.${getPackageName name}) version meta; - src = "${nodePackages.${getPackageName name}}/lib/node_modules/${getPackageName name}"; + inherit (nodePackages.${name}) version meta; + src = "${nodePackages.${name}}/lib/node_modules/${name}"; } ) diff --git a/pkgs/by-name/co/coc-nginx/package.nix b/pkgs/by-name/co/coc-nginx/package.nix new file mode 100644 index 000000000000..7ffe64dc2314 --- /dev/null +++ b/pkgs/by-name/co/coc-nginx/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.16.17"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-nginx"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "yaegassy"; + repo = "coc-nginx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9dca1YUQZCbzmGe+9qVJABCWZCGUUZDvtznMQEP/CCQ="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-CBw2E93EWmBOCppj1gxYuAynHBZDJBPh58X099TP5mE="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + esbuild' + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "nginx-language-server extension for coc.nvim"; + homepage = "https://github.com/yaegassy/coc-nginx"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 3c9930c12c27..f8f4c7bddebc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -66,6 +66,7 @@ mapAliases { "@webassemblyjs/wasm-text-gen-1.11.1" = pkgs.wasm-text-gen; # Added 2025-11-06 "@webassemblyjs/wast-refmt-1.11.1" = pkgs.wast-refmt; # Added 2025-11-06 "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25 + "@yaegassy/coc-nginx" = pkgs.coc-nginx; # Added 2025-11-08 "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 inherit (pkgs) autoprefixer; # added 2024-06-25 inherit (pkgs) asar; # added 2023-08-26 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6ffa0b2e5281..be35ffa34b4d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -76,5 +76,4 @@ , "vega-cli" , "vercel" , "wavedrom-cli" -, "@yaegassy/coc-nginx" ] diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b882ae1a03f7..f7a1dc56e47d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -40129,22 +40129,4 @@ in bypassCache = true; reconstructLock = true; }; - "@yaegassy/coc-nginx" = nodeEnv.buildNodePackage { - name = "_at_yaegassy_slash_coc-nginx"; - packageName = "@yaegassy/coc-nginx"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@yaegassy/coc-nginx/-/coc-nginx-0.4.1.tgz"; - sha512 = "GJeiQWiBDxKsWPowBLBjxnPzaRT50L9tLDtD9dZcKh8OQTdrOJGa7cqNz7T/xuqSq3r+AyD1mmeNSL7141HMsQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "nginx-language-server extension for coc.nvim"; - homepage = "https://github.com/yaegassy/coc-nginx#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; } From 9cf3ceab665cb2896754bb3e34c5794c6f0f1983 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 15:13:26 -0500 Subject: [PATCH 090/154] code-theme-converter: migrate from nodePackages --- .../co/code-theme-converter/package.nix | 43 ++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 684 ------------------ 4 files changed, 44 insertions(+), 685 deletions(-) create mode 100644 pkgs/by-name/co/code-theme-converter/package.nix diff --git a/pkgs/by-name/co/code-theme-converter/package.nix b/pkgs/by-name/co/code-theme-converter/package.nix new file mode 100644 index 000000000000..01ceba741263 --- /dev/null +++ b/pkgs/by-name/co/code-theme-converter/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "code-theme-converter"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "tobiastimm"; + repo = "code-theme-converter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-b6b0s6FXyHwoAJnPTaLu9fMQJVpBSqfGBk/KqDbaK9U="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-M8zLr/BPQfS50ZsTwN/YdJAlYUtS9edE/jh+l1wBqR8="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Convert any Visual Studio Code Theme to Sublime Text 3 or IntelliJ IDEA"; + homepage = "https://github.com/tobiastimm/code-theme-converter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f8f4c7bddebc..cb18bf8fd1d2 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -130,6 +130,7 @@ mapAliases { inherit (pkgs) coc-wxml; # Added 2025-11-05 inherit (pkgs) coc-yaml; # Added 2025-11-05 inherit (pkgs) coc-yank; # Added 2025-11-05 + inherit (pkgs) code-theme-converter; # Added 2025-11-08 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index be35ffa34b4d..abcad7ed111e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -17,7 +17,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "code-theme-converter" , "conventional-changelog-cli" , "cpy-cli" , "dhcp" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f7a1dc56e47d..7b2cbcb8c933 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3513,15 +3513,6 @@ let sha512 = "/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="; }; }; - "@xmldom/xmldom-0.8.10" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.8.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz"; - sha512 = "2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="; - }; - }; "@xmldom/xmldom-0.9.8" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; @@ -3531,15 +3522,6 @@ let sha512 = "p96FSY54r+WJ50FIOsCOjyj/wavs8921hG5+kVMmZgKcvIKxMXHTrjNJvRgWa/zuX3B6t2lijLNFaOyuxUH+2A=="; }; }; - "@xstate/fsm-1.6.5" = { - name = "_at_xstate_slash_fsm"; - packageName = "@xstate/fsm"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.5.tgz"; - sha512 = "b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw=="; - }; - }; "@yarnpkg/lockfile-1.0.2" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -5178,15 +5160,6 @@ let sha512 = "YFgPTVRhUMncZr8tM3ige7gnViMGhKoGF23qaiISRG8xtYebTGHrMSMXsTXo6O1KbtdEI+4jzvGY1K/wdT9GUA=="; }; }; - "bl-1.2.3" = { - name = "bl"; - packageName = "bl"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz"; - sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; - }; - }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -6069,15 +6042,6 @@ let sha512 = "ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw=="; }; }; - "capture-stack-trace-1.0.2" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz"; - sha512 = "X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w=="; - }; - }; "cardinal-2.1.1" = { name = "cardinal"; packageName = "cardinal"; @@ -6114,15 +6078,6 @@ let sha512 = "prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A=="; }; }; - "caw-2.0.1" = { - name = "caw"; - packageName = "caw"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; - sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; - }; - }; "ccount-2.0.1" = { name = "ccount"; packageName = "ccount"; @@ -6771,15 +6726,6 @@ let sha512 = "iWDjmP8kvsMdBmLTHxFaqXikO8EdFRDfim7k6vUHglY/2xJ5jLrPsnQGijdfp4U+sr/BeecG0wKm02dSIAeQ1g=="; }; }; - "cmd-shim-2.1.0" = { - name = "cmd-shim"; - packageName = "cmd-shim"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.1.0.tgz"; - sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw=="; - }; - }; "cmdln-3.2.1" = { name = "cmdln"; packageName = "cmdln"; @@ -7059,15 +7005,6 @@ let sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; }; }; - "commander-5.1.0" = { - name = "commander"; - packageName = "commander"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; - sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; - }; - }; "commander-7.2.0" = { name = "commander"; packageName = "commander"; @@ -7788,15 +7725,6 @@ let sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; }; }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; - }; - }; "create-hash-1.2.0" = { name = "create-hash"; packageName = "create-hash"; @@ -7842,15 +7770,6 @@ let sha512 = "Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q=="; }; }; - "cross-spawn-6.0.6" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "6.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz"; - sha512 = "VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw=="; - }; - }; "cross-spawn-7.0.6" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -8436,15 +8355,6 @@ let sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; }; }; - "decompress-4.2.1" = { - name = "decompress"; - packageName = "decompress"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz"; - sha512 = "e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ=="; - }; - }; "decompress-response-3.3.0" = { name = "decompress-response"; packageName = "decompress-response"; @@ -8472,42 +8382,6 @@ let sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; }; - "decompress-tar-4.1.1" = { - name = "decompress-tar"; - packageName = "decompress-tar"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; - sha512 = "JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ=="; - }; - }; - "decompress-tarbz2-4.1.1" = { - name = "decompress-tarbz2"; - packageName = "decompress-tarbz2"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; - sha512 = "s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A=="; - }; - }; - "decompress-targz-4.1.1" = { - name = "decompress-targz"; - packageName = "decompress-targz"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; - sha512 = "4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w=="; - }; - }; - "decompress-unzip-4.0.1" = { - name = "decompress-unzip"; - packageName = "decompress-unzip"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; - sha512 = "1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw=="; - }; - }; "deep-equal-1.1.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -9183,24 +9057,6 @@ let sha512 = "vo835pntK7kzYStk7xUHDifiYJvXxVhUapt85uk2AI94gUUAQX9HNRtrcMHNSc3YHJUEHGbYIGsM99uIbgAtxw=="; }; }; - "download-5.0.3" = { - name = "download"; - packageName = "download"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; - sha512 = "rE0V29BV5FyylK3Uw5hmP90TBuwGHAqPYfaRHW/VHsKe9Xqi7RACVg0k0FokeE+MTWr9mtUy75GyszRACiD3Ow=="; - }; - }; - "download-git-repo-1.1.0" = { - name = "download-git-repo"; - packageName = "download-git-repo"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.1.0.tgz"; - sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; - }; - }; "dtrace-provider-0.6.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -10299,15 +10155,6 @@ let sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; - "execa-1.0.0" = { - name = "execa"; - packageName = "execa"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; - }; - }; "execa-5.1.1" = { name = "execa"; packageName = "execa"; @@ -10848,33 +10695,6 @@ let sha512 = "/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw=="; }; }; - "file-type-3.9.0" = { - name = "file-type"; - packageName = "file-type"; - version = "3.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; - sha512 = "RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA=="; - }; - }; - "file-type-5.2.0" = { - name = "file-type"; - packageName = "file-type"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; - sha512 = "Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ=="; - }; - }; - "file-type-6.2.0" = { - name = "file-type"; - packageName = "file-type"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; - sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; - }; - }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -10902,24 +10722,6 @@ let sha512 = "BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ=="; }; }; - "filename-reserved-regex-2.0.0" = { - name = "filename-reserved-regex"; - packageName = "filename-reserved-regex"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; - sha512 = "lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ=="; - }; - }; - "filenamify-2.1.0" = { - name = "filenamify"; - packageName = "filenamify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz"; - sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; - }; - }; "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; @@ -11604,15 +11406,6 @@ let sha512 = "sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="; }; }; - "get-proxy-2.1.0" = { - name = "get-proxy"; - packageName = "get-proxy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; - sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; - }; - }; "get-stdin-4.0.1" = { name = "get-stdin"; packageName = "get-stdin"; @@ -11649,24 +11442,6 @@ let sha512 = "dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA=="; }; }; - "get-stream-2.3.1" = { - name = "get-stream"; - packageName = "get-stream"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha512 = "AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA=="; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha512 = "GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="; - }; - }; "get-stream-4.1.0" = { name = "get-stream"; packageName = "get-stream"; @@ -11757,15 +11532,6 @@ let sha512 = "MDMwbhASQuVeD4JKd1fKgNgCRL3fGqMM4WaqpNhWO0JiMOAjbQdumbs4BbBZEy9/M00EHEjKN3HieVhCUlwjeQ=="; }; }; - "git-clone-0.1.0" = { - name = "git-clone"; - packageName = "git-clone"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz"; - sha512 = "zs9rlfa7HyaJAKG9o+V7C6qfMzyc+tb1IIXdUFcOBcR1U7siKy/uPdauLlrH1mc0vOgUwIv4BF+QxPiiTYz3Rw=="; - }; - }; "git-diff-tree-1.1.0" = { name = "git-diff-tree"; packageName = "git-diff-tree"; @@ -12135,15 +11901,6 @@ let sha512 = "XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA=="; }; }; - "got-6.7.1" = { - name = "got"; - packageName = "got"; - version = "6.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha512 = "Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg=="; - }; - }; "got-9.6.0" = { name = "got"; packageName = "got"; @@ -12360,15 +12117,6 @@ let sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="; }; }; - "has-symbol-support-x-1.4.2" = { - name = "has-symbol-support-x"; - packageName = "has-symbol-support-x"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; - sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; - }; - }; "has-symbols-1.1.0" = { name = "has-symbols"; packageName = "has-symbols"; @@ -12378,15 +12126,6 @@ let sha512 = "1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="; }; }; - "has-to-string-tag-x-1.4.1" = { - name = "has-to-string-tag-x"; - packageName = "has-to-string-tag-x"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; - }; - }; "has-tostringtag-1.0.2" = { name = "has-tostringtag"; packageName = "has-tostringtag"; @@ -14133,15 +13872,6 @@ let sha512 = "1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw=="; }; }; - "is-natural-number-4.0.1" = { - name = "is-natural-number"; - packageName = "is-natural-number"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; - sha512 = "Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ=="; - }; - }; "is-npm-5.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -14232,15 +13962,6 @@ let sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; - "is-object-1.0.2" = { - name = "is-object"; - packageName = "is-object"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz"; - sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA=="; - }; - }; "is-observable-1.1.0" = { name = "is-observable"; packageName = "is-observable"; @@ -14358,15 +14079,6 @@ let sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; - "is-redirect-1.0.0" = { - name = "is-redirect"; - packageName = "is-redirect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; - sha512 = "cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw=="; - }; - }; "is-reference-3.0.3" = { name = "is-reference"; packageName = "is-reference"; @@ -14754,15 +14466,6 @@ let sha512 = "7731a/t2llyrk8Hdwl1x3LkhIFGzxHQGpJA7Ur9cIRViakQF2y25Lwhx8Ziy1B068+kBYUmYPBzw5uo3DdWrdQ=="; }; }; - "isurl-1.0.0" = { - name = "isurl"; - packageName = "isurl"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; - }; - }; "jackspeak-3.4.3" = { name = "jackspeak"; packageName = "jackspeak"; @@ -18570,15 +18273,6 @@ let sha512 = "+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ=="; }; }; - "nice-try-1.0.5" = { - name = "nice-try"; - packageName = "nice-try"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; - }; - }; "nijs-0.0.25" = { name = "nijs"; packageName = "nijs"; @@ -18966,15 +18660,6 @@ let sha512 = "tlEhXU3689VLUHYEZTS/BC61vfeN2xSSZwoWDT6WLuenZTpDmGmNT5mtl15erTR0/A15ldK06/NEKg9jYJ9OTQ=="; }; }; - "npm-conf-1.1.3" = { - name = "npm-conf"; - packageName = "npm-conf"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; - }; - }; "npm-install-checks-7.1.1" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -19083,15 +18768,6 @@ let sha512 = "LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ=="; }; }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha512 = "lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="; - }; - }; "npm-run-path-4.0.1" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -19767,15 +19443,6 @@ let sha512 = "QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg=="; }; }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; - }; - }; "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -20370,15 +20037,6 @@ let sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; - "path-key-2.0.1" = { - name = "path-key"; - packageName = "path-key"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="; - }; - }; "path-key-3.1.1" = { name = "path-key"; packageName = "path-key"; @@ -20793,15 +20451,6 @@ let sha512 = "dL9Xc2Aj3YyBnwvCNuHmFl2LWvQacm/HEAsoVwLiuu0POboMChETt5wexpU1P6F6MnibIucXlVsMFFgNUT2IyA=="; }; }; - "plist-3.1.0" = { - name = "plist"; - packageName = "plist"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz"; - sha512 = "uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ=="; - }; - }; "plur-4.0.0" = { name = "plur"; packageName = "plur"; @@ -20946,15 +20595,6 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "prepend-http-1.0.4" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha512 = "PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg=="; - }; - }; "prepend-http-2.0.0" = { name = "prepend-http"; packageName = "prepend-http"; @@ -23421,15 +23061,6 @@ let sha512 = "yEsN6TuxZhZ1Tl9iB81frTNS292m0I/IG7+w8lTvfcJQP2x3vnpOoevjBoE3Np5A6KnZM2+RtVenihj9t6NiYg=="; }; }; - "seek-bzip-1.0.6" = { - name = "seek-bzip"; - packageName = "seek-bzip"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz"; - sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; - }; - }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -23718,15 +23349,6 @@ let sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg=="; }; }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="; - }; - }; "shebang-command-2.0.0" = { name = "shebang-command"; packageName = "shebang-command"; @@ -23736,15 +23358,6 @@ let sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="; - }; - }; "shebang-regex-3.0.0" = { name = "shebang-regex"; packageName = "shebang-regex"; @@ -24015,15 +23628,6 @@ let sha512 = "oVTC072yJCXdkjUXAA3rRsRo1op6XfAH1/AXJQznxdwwiYTEvYB6eG9SOU8FeVaEuz+LuoPDYEY5BBMj+uRHVQ=="; }; }; - "slash-2.0.0" = { - name = "slash"; - packageName = "slash"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; - sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; - }; - }; "slash-3.0.0" = { name = "slash"; packageName = "slash"; @@ -25095,24 +24699,6 @@ let sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; }; - "strip-dirs-2.1.0" = { - name = "strip-dirs"; - packageName = "strip-dirs"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; - sha512 = "JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g=="; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha512 = "7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="; - }; - }; "strip-final-newline-2.0.0" = { name = "strip-final-newline"; packageName = "strip-final-newline"; @@ -25185,15 +24771,6 @@ let sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; }; - "strip-outer-1.0.1" = { - name = "strip-outer"; - packageName = "strip-outer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; - sha512 = "k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg=="; - }; - }; "strnum-1.1.2" = { name = "strnum"; packageName = "strnum"; @@ -25473,15 +25050,6 @@ let sha512 = "ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg=="; }; }; - "tar-stream-1.6.2" = { - name = "tar-stream"; - packageName = "tar-stream"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz"; - sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; - }; - }; "tar-stream-2.2.0" = { name = "tar-stream"; packageName = "tar-stream"; @@ -25707,15 +25275,6 @@ let sha512 = "MyqZCTGLDZ77u4k+jqg4UlrzPTPZ49NDlaekU6uuFaJLzPIN1woaRXCbGeqOfxwc3Y37ZROGAJ614Rdv7Olt+g=="; }; }; - "timed-out-4.0.1" = { - name = "timed-out"; - packageName = "timed-out"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; - sha512 = "G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA=="; - }; - }; "timers-browserify-1.4.2" = { name = "timers-browserify"; packageName = "timers-browserify"; @@ -25770,15 +25329,6 @@ let sha512 = "LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A=="; }; }; - "to-buffer-1.1.1" = { - name = "to-buffer"; - packageName = "to-buffer"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; - sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="; - }; - }; "to-object-path-0.3.0" = { name = "to-object-path"; packageName = "to-object-path"; @@ -25968,15 +25518,6 @@ let sha512 = "jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ=="; }; }; - "trim-repeated-1.0.0" = { - name = "trim-repeated"; - packageName = "trim-repeated"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; - sha512 = "pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg=="; - }; - }; "triple-beam-1.4.1" = { name = "triple-beam"; packageName = "triple-beam"; @@ -27057,15 +26598,6 @@ let sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; }; }; - "unzip-response-2.0.1" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; - sha512 = "N0XH6lqDtFH84JxptQoZYmloF4nzrQqqrAymNj+/gW60AO2AZgOcf4O/nUXJcYfyQkqvMo9lSupBZmmgvuVXlw=="; - }; - }; "upath-1.2.0" = { name = "upath"; packageName = "upath"; @@ -27165,15 +26697,6 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; - "url-parse-lax-1.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha512 = "BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA=="; - }; - }; "url-parse-lax-3.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -27183,15 +26706,6 @@ let sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="; }; }; - "url-to-options-1.0.1" = { - name = "url-to-options"; - packageName = "url-to-options"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; - sha512 = "0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A=="; - }; - }; "urlpattern-polyfill-10.0.0" = { name = "urlpattern-polyfill"; packageName = "urlpattern-polyfill"; @@ -32512,204 +32026,6 @@ in bypassCache = true; reconstructLock = true; }; - code-theme-converter = nodeEnv.buildNodePackage { - name = "code-theme-converter"; - packageName = "code-theme-converter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/code-theme-converter/-/code-theme-converter-1.2.1.tgz"; - sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; - }; - dependencies = [ - sources."@xmldom/xmldom-0.8.10" - sources."@xstate/fsm-1.6.5" - sources."ansi-styles-3.2.1" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bl-1.2.3" - sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" - sources."capture-stack-trace-1.0.2" - sources."caw-2.0.1" - sources."chalk-2.4.2" - sources."cmd-shim-2.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-5.1.0" - sources."concat-map-0.0.1" - sources."config-chain-1.1.13" - sources."core-util-is-1.0.3" - sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.6" - sources."decompress-4.2.1" - sources."decompress-tar-4.1.1" - ( - sources."decompress-tarbz2-4.1.1" - // { - dependencies = [ - sources."file-type-6.2.0" - ]; - } - ) - sources."decompress-targz-4.1.1" - ( - sources."decompress-unzip-4.0.1" - // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - ]; - } - ) - sources."download-5.0.3" - sources."download-git-repo-1.1.0" - sources."duplexer3-0.1.5" - sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" - ( - sources."execa-1.0.0" - // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - } - ) - sources."fd-slicer-1.1.0" - sources."file-type-5.2.0" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" - sources."get-proxy-2.1.0" - sources."get-stream-3.0.0" - sources."git-clone-0.1.0" - sources."glob-7.2.3" - sources."got-6.7.1" - sources."graceful-fs-4.2.11" - sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" - sources."has-to-string-tag-x-1.4.1" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-natural-number-4.0.1" - sources."is-object-1.0.2" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isurl-1.0.0" - sources."js2xmlparser-4.0.2" - sources."json5-2.2.3" - sources."jsonfile-4.0.0" - sources."lowercase-keys-1.0.1" - ( - sources."make-dir-1.3.0" - // { - dependencies = [ - sources."pify-3.0.0" - ]; - } - ) - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."nice-try-1.0.5" - ( - sources."npm-conf-1.1.3" - // { - dependencies = [ - sources."pify-3.0.0" - ]; - } - ) - sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."p-finally-1.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."pend-1.2.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."plist-3.1.0" - sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.1" - sources."proto-list-1.2.4" - sources."pump-3.0.2" - sources."ramda-0.27.2" - ( - sources."readable-stream-2.3.8" - // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - } - ) - sources."rimraf-2.7.1" - sources."safe-buffer-5.2.1" - ( - sources."seek-bzip-1.0.6" - // { - dependencies = [ - sources."commander-2.20.3" - ]; - } - ) - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" - sources."slash-2.0.0" - ( - sources."string_decoder-1.1.1" - // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - } - ) - sources."strip-dirs-2.1.0" - sources."strip-eof-1.0.0" - sources."strip-outer-1.0.1" - sources."supports-color-5.5.0" - sources."tar-stream-1.6.2" - sources."through-2.3.8" - sources."timed-out-4.0.1" - sources."to-buffer-1.1.1" - sources."trim-repeated-1.0.0" - sources."tunnel-agent-0.6.0" - sources."unbzip2-stream-1.4.3" - sources."universalify-0.1.2" - sources."unzip-response-2.0.1" - sources."url-parse-lax-1.0.0" - sources."url-to-options-1.0.1" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."xmlbuilder-15.1.1" - sources."xmlcreate-2.0.4" - sources."xtend-4.0.2" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Convert any vscode theme with ease"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; conventional-changelog-cli = nodeEnv.buildNodePackage { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; From 0d94a711119266f5be117c53042e9f5bd65cd176 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 15:24:32 -0500 Subject: [PATCH 091/154] diff2html-cli: migrate from nodePackages --- pkgs/by-name/di/diff2html-cli/package.nix | 47 +++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 182 ------------------ 5 files changed, 48 insertions(+), 184 deletions(-) create mode 100644 pkgs/by-name/di/diff2html-cli/package.nix diff --git a/pkgs/by-name/di/diff2html-cli/package.nix b/pkgs/by-name/di/diff2html-cli/package.nix new file mode 100644 index 000000000000..f978092e7352 --- /dev/null +++ b/pkgs/by-name/di/diff2html-cli/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "diff2html-cli"; + version = "5.2.15"; + + src = fetchFromGitHub { + owner = "rtfpessoa"; + repo = "diff2html-cli"; + rev = finalAttrs.version; + hash = "sha256-aQoWn5n+xpYjhDQjw9v5HzWf/Hhmm6AK22OG4Ugq6Gk="; + }; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail "4.2.1" "${finalAttrs.version}"; + ''; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-9JkzWhsXUrjnMcDDJfqm+tZ+WV5j3CHJbpn9j7v/KLg="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + meta = { + description = "Generate pretty HTML diffs from unified and git diff output in your terminal"; + homepage = "https://diff2html.xyz#cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "diff2html"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index cb18bf8fd1d2..dc1d6b7986f5 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -144,6 +144,7 @@ mapAliases { dat = throw "dat was removed because it was broken"; # added 2023-08-21 inherit (pkgs) degit; # added 2023-08-18 inherit (pkgs) diagnostic-languageserver; # added 2024-06-25 + inherit (pkgs) diff2html-cli; # Added 2025-11-08 inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 inherit (pkgs) dotenv-cli; # added 2024-06-26 eask = pkgs.eask; # added 2023-08-17 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 6979f88e5242..e49eb1dbc12c 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -10,7 +10,6 @@ clipboard-cli = "clipboard"; conventional-changelog-cli = "conventional-changelog"; cpy-cli = "cpy"; - diff2html-cli = "diff2html"; fast-cli = "fast"; fauna-shell = "fauna"; fkill-cli = "fkill"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index abcad7ed111e..23004c2d7a22 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -20,7 +20,6 @@ , "conventional-changelog-cli" , "cpy-cli" , "dhcp" -, "diff2html-cli" , "dotenv-vault" , "elasticdump" , "emoj" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 7b2cbcb8c933..82a019701046 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -8184,15 +8184,6 @@ let sha512 = "NxuWFXR3+HJULO6F6VprWnUQbx0MXgfEuOfz3m+pw8LYZV06SHRjcaBVvVlwH132xJq12mljySVDLcbMcFM7EA=="; }; }; - "data-uri-to-buffer-4.0.1" = { - name = "data-uri-to-buffer"; - packageName = "data-uri-to-buffer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz"; - sha512 = "0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="; - }; - }; "data-uri-to-buffer-6.0.2" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; @@ -8823,24 +8814,6 @@ let sha512 = "uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A=="; }; }; - "diff-7.0.0" = { - name = "diff"; - packageName = "diff"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz"; - sha512 = "PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw=="; - }; - }; - "diff2html-3.4.51" = { - name = "diff2html"; - packageName = "diff2html"; - version = "3.4.51"; - src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.51.tgz"; - sha512 = "/rVCSDyokkzSCEGaGjkkElXtIRwyNDRzIa3S8VUhR6pjk25p6+AMnb1s2zGmhjl66D5m/HnV3IeZoxnWsvTy+w=="; - }; - }; "diffie-hellman-5.0.3" = { name = "diffie-hellman"; packageName = "diffie-hellman"; @@ -10596,15 +10569,6 @@ let sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; }; }; - "fetch-blob-3.2.0" = { - name = "fetch-blob"; - packageName = "fetch-blob"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz"; - sha512 = "7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ=="; - }; - }; "fifo-0.1.4" = { name = "fifo"; packageName = "fifo"; @@ -11091,15 +11055,6 @@ let sha512 = "wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="; }; }; - "formdata-polyfill-4.0.10" = { - name = "formdata-polyfill"; - packageName = "formdata-polyfill"; - version = "4.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz"; - sha512 = "buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g=="; - }; - }; "formidable-1.2.6" = { name = "formidable"; packageName = "formidable"; @@ -12396,15 +12351,6 @@ let sha512 = "Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="; }; }; - "hogan.js-3.0.2" = { - name = "hogan.js"; - packageName = "hogan.js"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"; - sha512 = "RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg=="; - }; - }; "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; @@ -17823,15 +17769,6 @@ let sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; - "mkdirp-0.3.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - sha512 = "OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew=="; - }; - }; "mkdirp-0.3.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -18381,15 +18318,6 @@ let sha512 = "h66cRVEWnPQFxh5Y1hk9MNs6jvlB26CjT727ZztkIkPN+eyRI2c9powQrBJ9pty2Kj7IBySDnYHig7QElmU4Pg=="; }; }; - "node-domexception-1.0.0" = { - name = "node-domexception"; - packageName = "node-domexception"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz"; - sha512 = "/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="; - }; - }; "node-emoji-1.11.0" = { name = "node-emoji"; packageName = "node-emoji"; @@ -18426,15 +18354,6 @@ let sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="; }; }; - "node-fetch-3.3.2" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz"; - sha512 = "dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA=="; - }; - }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -18498,15 +18417,6 @@ let sha512 = "5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ=="; }; }; - "nopt-1.0.10" = { - name = "nopt"; - packageName = "nopt"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha512 = "NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg=="; - }; - }; "nopt-2.0.0" = { name = "nopt"; packageName = "nopt"; @@ -27624,15 +27534,6 @@ let sha512 = "bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ=="; }; }; - "web-streams-polyfill-3.3.3" = { - name = "web-streams-polyfill"; - packageName = "web-streams-polyfill"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz"; - sha512 = "d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="; - }; - }; "web-vitals-0.2.4" = { name = "web-vitals"; packageName = "web-vitals"; @@ -32187,89 +32088,6 @@ in bypassCache = true; reconstructLock = true; }; - diff2html-cli = nodeEnv.buildNodePackage { - name = "diff2html-cli"; - packageName = "diff2html-cli"; - version = "5.2.15"; - src = fetchurl { - url = "https://registry.npmjs.org/diff2html-cli/-/diff2html-cli-5.2.15.tgz"; - sha512 = "w1WJSzyiXDSVsz6cYPE7eu0f3KptN1fT2s/i0ENavaB9aT1Fj/3zjH00mYB14JiPdj3X0hl4PsrtBNjgGKdpkA=="; - }; - dependencies = [ - sources."abbrev-1.1.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."bundle-name-4.1.0" - sources."clipboardy-4.0.0" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.6" - sources."data-uri-to-buffer-4.0.1" - sources."default-browser-5.2.1" - sources."default-browser-id-5.0.0" - sources."define-lazy-prop-3.0.0" - sources."diff-7.0.0" - sources."diff2html-3.4.51" - sources."emoji-regex-8.0.0" - sources."escalade-3.2.0" - sources."execa-8.0.1" - sources."fetch-blob-3.2.0" - sources."formdata-polyfill-4.0.10" - sources."get-caller-file-2.0.5" - sources."get-stream-8.0.1" - sources."hogan.js-3.0.2" - sources."human-signals-5.0.0" - sources."is-docker-3.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-inside-container-1.0.0" - sources."is-stream-3.0.0" - sources."is-wsl-3.1.0" - sources."is64bit-2.0.0" - sources."isexe-2.0.0" - sources."merge-stream-2.0.0" - sources."mimic-fn-4.0.0" - sources."mkdirp-0.3.0" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.2" - sources."nopt-1.0.10" - ( - sources."npm-run-path-5.3.0" - // { - dependencies = [ - sources."path-key-4.0.0" - ]; - } - ) - sources."onetime-6.0.0" - sources."open-10.1.0" - sources."path-key-3.1.1" - sources."require-directory-2.1.1" - sources."run-applescript-7.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-3.0.0" - sources."system-architecture-0.1.0" - sources."web-streams-polyfill-3.3.3" - sources."which-2.0.2" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fast Diff to colorized HTML"; - homepage = "https://diff2html.xyz/index.html#cli"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dotenv-vault = nodeEnv.buildNodePackage { name = "dotenv-vault"; packageName = "dotenv-vault"; From e99bf3b9616ba34ba15c46c32cc72573dfbf3484 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 16:01:07 -0500 Subject: [PATCH 092/154] katex: migrate from nodePackages --- pkgs/by-name/ka/katex/package.nix | 67 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 21 ------ 4 files changed, 68 insertions(+), 22 deletions(-) create mode 100644 pkgs/by-name/ka/katex/package.nix diff --git a/pkgs/by-name/ka/katex/package.nix b/pkgs/by-name/ka/katex/package.nix new file mode 100644 index 000000000000..3c01de945680 --- /dev/null +++ b/pkgs/by-name/ka/katex/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchFromGitHub, + yarn-berry, + nodejs, + makeBinaryWrapper, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "katex"; + version = "0.16.25"; + + src = fetchFromGitHub { + owner = "katex"; + repo = "katex"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XwKjoXkn96YNxrBv2qcUSqKMtHxz9+levevc4Rz1SYw="; + }; + + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src; + hash = "sha256-vPYzt+ZBbi1sR7T1I08f/syTnN8hnUTqH4fKCBiFIM0="; + }; + + nativeBuildInputs = [ + yarn-berry.yarnBerryConfigHook + yarn-berry + nodejs + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn config set nodeLinker "node-modules" + yarn install --mode=skip-build --inline-builds + mkdir -p $out/lib/node_modules/katex/ + mkdir $out/bin + mv * $out/lib/node_modules/katex/ + makeWrapper ${lib.getExe nodejs} $out/bin/katex \ + --add-flags "$out/lib/node_modules/katex/cli.js" \ + --set NODE_PATH "$out/lib/node_modules/katex/node_modules" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/KaTeX/KaTeX/releases/tag/v${finalAttrs.version}"; + description = "Render TeX to HTML"; + homepage = "https://katex.org/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pyrox0 ]; + mainProgram = "katex"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index dc1d6b7986f5..f05a7ab63cd5 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -203,6 +203,7 @@ mapAliases { joplin = pkgs.joplin-cli; # Added 2025-11-02 inherit (pkgs) kaput-cli; # added 2024-12-03 karma = pkgs.karma-runner; # added 2023-07-29 + inherit (pkgs) katex; # Added 2025-11-08 keyoxide = pkgs.keyoxide-cli; # Added 2025-10-20 leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31 inherit (pkgs) lerna; # added 2025-02-12 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 23004c2d7a22..c3283adf1511 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -39,7 +39,6 @@ , "json" , "json-refs" , "jsonlint" -, "katex" , "lcov-result-merger" , "live-server" , "livedown" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 82a019701046..8639481e8a11 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -34589,27 +34589,6 @@ in bypassCache = true; reconstructLock = true; }; - katex = nodeEnv.buildNodePackage { - name = "katex"; - packageName = "katex"; - version = "0.16.21"; - src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.16.21.tgz"; - sha512 = "XvqR7FgOHtWupfMiigNzmh+MgUVmDGU2kXZm899ZkPfcuoPuFxyHmXsgATDpFZDAXCI8tvinaVcDo8PIIJSo4A=="; - }; - dependencies = [ - sources."commander-8.3.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fast math typesetting for the web"; - homepage = "https://katex.org"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; From d8e0983f4fb6816ae8082cf21d41f88734d2f118 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 16:10:48 -0500 Subject: [PATCH 093/154] localtunnel: migrate from nodePackages --- pkgs/by-name/lo/localtunnel/package.nix | 44 +++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 77 ------------------- 5 files changed, 45 insertions(+), 79 deletions(-) create mode 100644 pkgs/by-name/lo/localtunnel/package.nix diff --git a/pkgs/by-name/lo/localtunnel/package.nix b/pkgs/by-name/lo/localtunnel/package.nix new file mode 100644 index 000000000000..34781bea138e --- /dev/null +++ b/pkgs/by-name/lo/localtunnel/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "localtunnel"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "localtunnel"; + repo = "localtunnel"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6gEK1VjF25Kbe2drxbxUKDNJGqZ+OXgkulPkAkMR2+k="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-zq9ygsKDU4lIsNxc6ovW+IXVztQoEaJAekzBrwCK7ik="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; + + updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/localtunnel/localtunnel/blob/v${finalAttrs.version}/CHANGELOG.md"; + description = "CLI for localtunnel"; + homepage = "https://localtunnel.me"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "lt"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f05a7ab63cd5..c20bcd79d4cf 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -209,6 +209,7 @@ mapAliases { inherit (pkgs) lerna; # added 2025-02-12 less = pkgs.lessc; # added 2024-06-15 less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15 + inherit (pkgs) localtunnel; # Added 2025-11-08 lodash = throw "lodash was removed because it provides no executable"; # added 2025-03-18 lua-fmt = throw "'lua-fmt' has been removed because it has critical bugs that break formatting"; # Added 2025-11-07 inherit (pkgs) lv_font_conv; # added 2024-06-28 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index e49eb1dbc12c..b9b549847bca 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -16,7 +16,6 @@ grunt-cli = "grunt"; gulp-cli = "gulp"; jsonlint = "jsonlint"; - localtunnel = "lt"; poor-mans-t-sql-formatter-cli = "sqlformat"; pulp = "pulp"; purescript-language-server = "purescript-language-server"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c3283adf1511..fe92e3018860 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -42,7 +42,6 @@ , "lcov-result-merger" , "live-server" , "livedown" -, "localtunnel" , "madoko" , "mathjax" , "multi-file-swagger" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8639481e8a11..b0a4ab1b2f51 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4845,15 +4845,6 @@ let sha512 = "lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="; }; }; - "axios-0.21.4" = { - name = "axios"; - packageName = "axios"; - version = "0.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - }; "axios-1.8.3" = { name = "axios"; packageName = "axios"; @@ -8247,15 +8238,6 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; "debug-4.3.4" = { name = "debug"; packageName = "debug"; @@ -19155,15 +19137,6 @@ let sha512 = "9asTNB9IkKEzWMcHmVZE7Ts3kC9G7AFHfs8i7caD8HbI76gEjdkId4z/AkP83xdZsH7PLAnnbl47qZkXuxpArw=="; }; }; - "openurl-1.1.1" = { - name = "openurl"; - packageName = "openurl"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"; - sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; - }; - }; "opn-5.3.0" = { name = "opn"; packageName = "opn"; @@ -28200,15 +28173,6 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; - "yargs-17.1.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"; - sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; - }; - }; "yargs-17.7.2" = { name = "yargs"; packageName = "yargs"; @@ -35595,47 +35559,6 @@ in bypassCache = true; reconstructLock = true; }; - localtunnel = nodeEnv.buildNodePackage { - name = "localtunnel"; - packageName = "localtunnel"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz"; - sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."axios-0.21.4" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."debug-4.3.2" - sources."emoji-regex-8.0.0" - sources."escalade-3.2.0" - sources."follow-redirects-1.15.9" - sources."get-caller-file-2.0.5" - sources."is-fullwidth-code-point-3.0.0" - sources."ms-2.1.2" - sources."openurl-1.1.1" - sources."require-directory-2.1.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.1.1" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Expose localhost to the world"; - homepage = "https://github.com/localtunnel/localtunnel#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; From 2bdcf95276a78d96b31daaa44692f6b389ec0e98 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 17:02:11 -0500 Subject: [PATCH 094/154] conventional-changelog-cli: migrate from nodePackages --- .../co/conventional-changelog-cli/package.nix | 68 ++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 318 ------------------ 5 files changed, 69 insertions(+), 320 deletions(-) create mode 100644 pkgs/by-name/co/conventional-changelog-cli/package.nix diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix new file mode 100644 index 000000000000..c3d264d6ec0f --- /dev/null +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nodejs, + pnpm, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "conventional-changelog-cli"; + version = "7.1.1"; + + src = fetchFromGitHub { + owner = "conventional-changelog"; + repo = "conventional-changelog"; + tag = "conventional-changelog-v${finalAttrs.version}"; + hash = "sha256-Pgx5gM4SdSL6WCkStByA7AP2O96MjAjyeMOI+Lo2mt0="; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-ZfG3F0J1hIhZlF2OadhVdbxhQrFcMYDG9gEXR04DgEI="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/conventional-changelog/ + mkdir $out/bin + mv * $out/lib/node_modules/conventional-changelog/ + chmod +x $out/lib/node_modules/conventional-changelog/packages/conventional-changelog/dist/cli/index.js + ln -s $out/lib/node_modules/conventional-changelog/packages/conventional-changelog/dist/cli/index.js $out/bin/conventional-changelog + patchShebangs $out/bin/conventional-changelog + + runHook postInstall + ''; + + postInstall = '' + substituteInPlace $out/lib/node_modules/conventional-changelog/packages/*/package.json \ + --replace-warn '"exports": "./src/index.ts"' '"exports": "./dist/index.js"' + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/conventional-changelog/conventional-changelog/releases/tag/conventional-changelog-v${finalAttrs.version}"; + description = "Generate a CHANGELOG from git metadata"; + homepage = "https://github.com/conventional-changelog/conventional-changelog"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.pyrox0 ]; + mainProgram = "conventional-changelog"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index c20bcd79d4cf..b0133d617fb8 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -135,6 +135,7 @@ mapAliases { coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 + inherit (pkgs) conventional-changelog-cli; # Added 2025-11-08 copy-webpack-plugin = throw "copy-webpack-plugin was removed because it is a JS library, so your project should lock it with a JS package manager instead."; # Added 2024-12-16 inherit (pkgs) cordova; # added 2023-08-18 create-cycle-app = throw "create-cycle-app has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index b9b549847bca..d907f1456299 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -8,7 +8,6 @@ aws-cdk = "cdk"; cdk8s-cli = "cdk8s"; clipboard-cli = "clipboard"; - conventional-changelog-cli = "conventional-changelog"; cpy-cli = "cpy"; fast-cli = "fast"; fauna-shell = "fauna"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index fe92e3018860..c92752a7f4b9 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -17,7 +17,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "conventional-changelog-cli" , "cpy-cli" , "dhcp" , "dotenv-vault" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b0a4ab1b2f51..4bb78775ca20 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -444,15 +444,6 @@ let sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; }; }; - "@conventional-changelog/git-client-1.0.1" = { - name = "_at_conventional-changelog_slash_git-client"; - packageName = "@conventional-changelog/git-client"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@conventional-changelog/git-client/-/git-client-1.0.1.tgz"; - sha512 = "PJEqBwAleffCMETaVm/fUgHldzBE35JFk3/9LL6NUA5EXa3qednu+UT6M7E5iBu3zIQZCULYIiZ90fBYHt6xUw=="; - }; - }; "@cspotcode/source-map-support-0.8.1" = { name = "_at_cspotcode_slash_source-map-support"; packageName = "@cspotcode/source-map-support"; @@ -732,15 +723,6 @@ let sha512 = "xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ=="; }; }; - "@hutson/parse-repository-url-5.0.0" = { - name = "_at_hutson_slash_parse-repository-url"; - packageName = "@hutson/parse-repository-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-5.0.0.tgz"; - sha512 = "e5+YUKENATs1JgYHMzTr2MW/NDcXGfYFAuOQU8gJgF/kEh4EqKgfGrfLI67bMD4tbhZVlkigz/9YYwWcbOFthg=="; - }; - }; "@ibm-cloud/openapi-ruleset-1.29.2" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; @@ -3234,15 +3216,6 @@ let sha512 = "JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g=="; }; }; - "@types/semver-7.5.8" = { - name = "_at_types_slash_semver"; - packageName = "@types/semver"; - version = "7.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz"; - sha512 = "I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="; - }; - }; "@types/supports-color-8.1.3" = { name = "_at_types_slash_supports-color"; packageName = "@types/supports-color"; @@ -3702,15 +3675,6 @@ let sha512 = "ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g=="; }; }; - "add-stream-1.0.0" = { - name = "add-stream"; - packageName = "add-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; - sha512 = "qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ=="; - }; - }; "addr-to-ip-port-1.5.4" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; @@ -4377,15 +4341,6 @@ let sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; }; - "array-ify-1.0.0" = { - name = "array-ify"; - packageName = "array-ify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; - sha512 = "c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng=="; - }; - }; "array-iterate-1.1.4" = { name = "array-iterate"; packageName = "array-iterate"; @@ -7050,15 +7005,6 @@ let sha512 = "3D+EY5nsRhqnOwDxveBv5T8wGo4DEvYxjDtPGmdOX+gfr5gE92c2RC0w2wa+xEefm07QuVqqcF3nZJUZ92l/og=="; }; }; - "compare-func-2.0.0" = { - name = "compare-func"; - packageName = "compare-func"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz"; - sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="; - }; - }; "component-bind-1.0.0" = { name = "component-bind"; packageName = "component-bind"; @@ -7365,141 +7311,6 @@ let sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; }; }; - "conventional-changelog-6.0.0" = { - name = "conventional-changelog"; - packageName = "conventional-changelog"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-6.0.0.tgz"; - sha512 = "tuUH8H/19VjtD9Ig7l6TQRh+Z0Yt0NZ6w/cCkkyzUbGQTnUEmKfGtkC9gGfVgCfOL1Rzno5NgNF4KY8vR+Jo3w=="; - }; - }; - "conventional-changelog-angular-8.0.0" = { - name = "conventional-changelog-angular"; - packageName = "conventional-changelog-angular"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-8.0.0.tgz"; - sha512 = "CLf+zr6St0wIxos4bmaKHRXWAcsCXrJU6F4VdNDrGRK3B8LDLKoX3zuMV5GhtbGkVR/LohZ6MT6im43vZLSjmA=="; - }; - }; - "conventional-changelog-atom-5.0.0" = { - name = "conventional-changelog-atom"; - packageName = "conventional-changelog-atom"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-5.0.0.tgz"; - sha512 = "WfzCaAvSCFPkznnLgLnfacRAzjgqjLUjvf3MftfsJzQdDICqkOOpcMtdJF3wTerxSpv2IAAjX8doM3Vozqle3g=="; - }; - }; - "conventional-changelog-codemirror-5.0.0" = { - name = "conventional-changelog-codemirror"; - packageName = "conventional-changelog-codemirror"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-5.0.0.tgz"; - sha512 = "8gsBDI5Y3vrKUCxN6Ue8xr6occZ5nsDEc4C7jO/EovFGozx8uttCAyfhRrvoUAWi2WMm3OmYs+0mPJU7kQdYWQ=="; - }; - }; - "conventional-changelog-conventionalcommits-8.0.0" = { - name = "conventional-changelog-conventionalcommits"; - packageName = "conventional-changelog-conventionalcommits"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-8.0.0.tgz"; - sha512 = "eOvlTO6OcySPyyyk8pKz2dP4jjElYunj9hn9/s0OB+gapTO8zwS9UQWrZ1pmF2hFs3vw1xhonOLGcGjy/zgsuA=="; - }; - }; - "conventional-changelog-core-8.0.0" = { - name = "conventional-changelog-core"; - packageName = "conventional-changelog-core"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-8.0.0.tgz"; - sha512 = "EATUx5y9xewpEe10UEGNpbSHRC6cVZgO+hXQjofMqpy+gFIrcGvH3Fl6yk2VFKh7m+ffenup2N7SZJYpyD9evw=="; - }; - }; - "conventional-changelog-ember-5.0.0" = { - name = "conventional-changelog-ember"; - packageName = "conventional-changelog-ember"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-5.0.0.tgz"; - sha512 = "RPflVfm5s4cSO33GH/Ey26oxhiC67akcxSKL8CLRT3kQX2W3dbE19sSOM56iFqUJYEwv9mD9r6k79weWe1urfg=="; - }; - }; - "conventional-changelog-eslint-6.0.0" = { - name = "conventional-changelog-eslint"; - packageName = "conventional-changelog-eslint"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-6.0.0.tgz"; - sha512 = "eiUyULWjzq+ybPjXwU6NNRflApDWlPEQEHvI8UAItYW/h22RKkMnOAtfCZxMmrcMO1OKUWtcf2MxKYMWe9zJuw=="; - }; - }; - "conventional-changelog-express-5.0.0" = { - name = "conventional-changelog-express"; - packageName = "conventional-changelog-express"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-5.0.0.tgz"; - sha512 = "D8Q6WctPkQpvr2HNCCmwU5GkX22BVHM0r4EW8vN0230TSyS/d6VQJDAxGb84lbg0dFjpO22MwmsikKL++Oo/oQ=="; - }; - }; - "conventional-changelog-jquery-6.0.0" = { - name = "conventional-changelog-jquery"; - packageName = "conventional-changelog-jquery"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-6.0.0.tgz"; - sha512 = "2kxmVakyehgyrho2ZHBi90v4AHswkGzHuTaoH40bmeNqUt20yEkDOSpw8HlPBfvEQBwGtbE+5HpRwzj6ac2UfA=="; - }; - }; - "conventional-changelog-jshint-5.0.0" = { - name = "conventional-changelog-jshint"; - packageName = "conventional-changelog-jshint"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-5.0.0.tgz"; - sha512 = "gGNphSb/opc76n2eWaO6ma4/Wqu3tpa2w7i9WYqI6Cs2fncDSI2/ihOfMvXveeTTeld0oFvwMVNV+IYQIk3F3g=="; - }; - }; - "conventional-changelog-preset-loader-5.0.0" = { - name = "conventional-changelog-preset-loader"; - packageName = "conventional-changelog-preset-loader"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-5.0.0.tgz"; - sha512 = "SetDSntXLk8Jh1NOAl1Gu5uLiCNSYenB5tm0YVeZKePRIgDW9lQImromTwLa3c/Gae298tsgOM+/CYT9XAl0NA=="; - }; - }; - "conventional-changelog-writer-8.0.1" = { - name = "conventional-changelog-writer"; - packageName = "conventional-changelog-writer"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-8.0.1.tgz"; - sha512 = "hlqcy3xHred2gyYg/zXSMXraY2mjAYYo0msUCpK+BGyaVJMFCKWVXPIHiaacGO2GGp13kvHWXFhYmxT4QQqW3Q=="; - }; - }; - "conventional-commits-filter-5.0.0" = { - name = "conventional-commits-filter"; - packageName = "conventional-commits-filter"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-5.0.0.tgz"; - sha512 = "tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q=="; - }; - }; - "conventional-commits-parser-6.1.0" = { - name = "conventional-commits-parser"; - packageName = "conventional-commits-parser"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-6.1.0.tgz"; - sha512 = "5nxDo7TwKB5InYBl4ZC//1g9GRwB/F3TXOGR9hgUjMGfvSP4Vu5NkpNro2+1+TIEy1vwxApl5ircECr2ri5JIw=="; - }; - }; "convert-hrtime-3.0.0" = { name = "convert-hrtime"; packageName = "convert-hrtime"; @@ -11478,15 +11289,6 @@ let sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; - "git-raw-commits-5.0.0" = { - name = "git-raw-commits"; - packageName = "git-raw-commits"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-5.0.0.tgz"; - sha512 = "I2ZXrXeOc0KrCvC7swqtIFXFN+rbjnC7b2T943tvemIOVNl+XP8YnA9UVwqFhzzLClnSA60KR/qEjLpXzs73Qg=="; - }; - }; "git-repo-info-2.1.1" = { name = "git-repo-info"; packageName = "git-repo-info"; @@ -11496,15 +11298,6 @@ let sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="; }; }; - "git-semver-tags-8.0.0" = { - name = "git-semver-tags"; - packageName = "git-semver-tags"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-8.0.0.tgz"; - sha512 = "N7YRIklvPH3wYWAR2vysaqGLPRcpwQ0GKdlqTiVN5w1UmCdaeY3K8s6DMKRCh54DDdzyt/OAB6C8jgVtb7Y2Fg=="; - }; - }; "git-spawned-stream-1.0.1" = { name = "git-spawned-stream"; packageName = "git-spawned-stream"; @@ -11919,15 +11712,6 @@ let sha512 = "V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A=="; }; }; - "handlebars-4.7.8" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz"; - sha512 = "vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ=="; - }; - }; "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; @@ -18138,15 +17922,6 @@ let sha512 = "LvnlJC5lg6MRazqzfRtIMvLmtOhCm9z/dkdVaHuCxQHLmD7NzLsExnqv7VMuRfL4tC0mXcLlnFsh9SF0PdIjSw=="; }; }; - "neo-async-2.6.2" = { - name = "neo-async"; - packageName = "neo-async"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - }; "nested-error-stacks-2.1.1" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -24987,15 +24762,6 @@ let sha512 = "nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw=="; }; }; - "tempfile-5.0.0" = { - name = "tempfile"; - packageName = "tempfile"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-5.0.0.tgz"; - sha512 = "bX655WZI/F7EoTDw9JvQURqAXiPHi8o8+yFxPF2lWYyz1aHnmMRuXWqL6YB6GmeO0o4DIYWHLgGNi/X64T+X4Q=="; - }; - }; "tempy-3.1.0" = { name = "tempy"; packageName = "tempy"; @@ -25770,15 +25536,6 @@ let sha512 = "ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="; }; }; - "uglify-js-3.19.3" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.19.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz"; - sha512 = "v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ=="; - }; - }; "uid-number-0.0.5" = { name = "uid-number"; packageName = "uid-number"; @@ -31891,81 +31648,6 @@ in bypassCache = true; reconstructLock = true; }; - conventional-changelog-cli = nodeEnv.buildNodePackage { - name = "conventional-changelog-cli"; - packageName = "conventional-changelog-cli"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-5.0.0.tgz"; - sha512 = "9Y8fucJe18/6ef6ZlyIlT2YQUbczvoQZZuYmDLaGvcSBP+M6h+LAvf7ON7waRxKJemcCII8Yqu5/8HEfskTxJQ=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@conventional-changelog/git-client-1.0.1" - sources."@hutson/parse-repository-url-5.0.0" - sources."@types/normalize-package-data-2.4.4" - sources."@types/semver-7.5.8" - sources."add-stream-1.0.0" - sources."array-ify-1.0.0" - sources."compare-func-2.0.0" - sources."conventional-changelog-6.0.0" - sources."conventional-changelog-angular-8.0.0" - sources."conventional-changelog-atom-5.0.0" - sources."conventional-changelog-codemirror-5.0.0" - sources."conventional-changelog-conventionalcommits-8.0.0" - sources."conventional-changelog-core-8.0.0" - sources."conventional-changelog-ember-5.0.0" - sources."conventional-changelog-eslint-6.0.0" - sources."conventional-changelog-express-5.0.0" - sources."conventional-changelog-jquery-6.0.0" - sources."conventional-changelog-jshint-5.0.0" - sources."conventional-changelog-preset-loader-5.0.0" - sources."conventional-changelog-writer-8.0.1" - sources."conventional-commits-filter-5.0.0" - sources."conventional-commits-parser-6.1.0" - sources."dot-prop-5.3.0" - sources."find-up-simple-1.0.1" - sources."git-raw-commits-5.0.0" - sources."git-semver-tags-8.0.0" - sources."handlebars-4.7.8" - sources."hosted-git-info-7.0.2" - sources."index-to-position-0.1.2" - sources."is-obj-2.0.0" - sources."js-tokens-4.0.0" - sources."lru-cache-10.4.3" - sources."meow-13.2.0" - sources."minimist-1.2.8" - sources."neo-async-2.6.2" - sources."normalize-package-data-6.0.2" - sources."parse-json-8.1.0" - sources."picocolors-1.1.1" - sources."read-package-up-11.0.0" - sources."read-pkg-9.0.1" - sources."semver-7.7.1" - sources."source-map-0.6.1" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.21" - sources."temp-dir-3.0.0" - sources."tempfile-5.0.0" - sources."type-fest-4.37.0" - sources."uglify-js-3.19.3" - sources."unicorn-magic-0.1.0" - sources."validate-npm-package-license-3.0.4" - sources."wordwrap-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Generate a changelog from git metadata"; - homepage = "https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; From 39c4aa65ec553304fde23e5162fe48f179b13076 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 17:15:56 -0500 Subject: [PATCH 095/154] nrm: migrate from nodePackages --- pkgs/by-name/nr/nrm/package.nix | 65 +++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 71 ------------------- 4 files changed, 66 insertions(+), 72 deletions(-) create mode 100644 pkgs/by-name/nr/nrm/package.nix diff --git a/pkgs/by-name/nr/nrm/package.nix b/pkgs/by-name/nr/nrm/package.nix new file mode 100644 index 000000000000..dda095ebb145 --- /dev/null +++ b/pkgs/by-name/nr/nrm/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nodejs, + pnpm, + makeBinaryWrapper, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nrm"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "pana"; + repo = "nrm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2P0dSZa17A3NslNatCx1edLnrcDtGGpOlk6srcvjL1Y="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeBinaryWrapper + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-PENYS5xO2LwT3+TGl/wU2r0ALEj/JQfbkpf/0MJs0uw="; + }; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/nrm + mkdir $out/bin + mv * $out/lib/node_modules/nrm/ + makeWrapper ${lib.getExe nodejs} $out/bin/nrm \ + --add-flags "$out/lib/node_modules/nrm/dist/index.js" \ + --set "NODE_PATH" "$out/lib/node_modules/nrm/node_modules" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/Pana/nrm/releases/tag/v${finalAttrs.version}"; + description = "Helps you switch between npm registries easily"; + homepage = "https://github.com/Pana/nrm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "nrm"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index b0133d617fb8..71d845fa6d3f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -240,6 +240,7 @@ mapAliases { }); # added 2024-10-04 inherit (pkgs) npm-check-updates; # added 2023-08-22 npm-merge-driver = throw "'npm-merge-driver' has been removed, since the upstream repo was archived on Aug 11, 2021"; # Added 2025-11-07 + inherit (pkgs) nrm; # Added 2025-11-08 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 orval = throw "orval has been removed because it was broken"; # added 2025-03-23 parcel = throw "parcel has been removed because it was broken"; # added 2025-03-12 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c92752a7f4b9..38761a8c7dff 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -48,7 +48,6 @@ , "node-gyp-build" , "node2nix" , "np" -, "nrm" , "peerflix" , "peerflix-server" , "poor-mans-t-sql-formatter-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 4bb78775ca20..455d9400a826 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -6960,15 +6960,6 @@ let sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; - "commander-8.3.0" = { - name = "commander"; - packageName = "commander"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; - }; - }; "comment-json-4.2.5" = { name = "comment-json"; packageName = "comment-json"; @@ -25653,15 +25644,6 @@ let sha512 = "5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg=="; }; }; - "undici-5.28.2" = { - name = "undici"; - packageName = "undici"; - version = "5.28.2"; - src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz"; - sha512 = "wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w=="; - }; - }; "undici-5.28.4" = { name = "undici"; packageName = "undici"; @@ -36191,59 +36173,6 @@ in bypassCache = true; reconstructLock = true; }; - nrm = nodeEnv.buildNodePackage { - name = "nrm"; - packageName = "nrm"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nrm/-/nrm-2.0.1.tgz"; - sha512 = "4QDRVI64plGF/tXei29gYGl9zNkB0YwtASnjGaB7EUmqnMPoKLNlL43lrylg4HA8DBGoKI+9SuomDDXJone4rw=="; - }; - dependencies = [ - sources."@fastify/busboy-2.1.1" - sources."@inquirer/checkbox-4.1.3" - sources."@inquirer/core-10.1.8" - sources."@inquirer/figures-1.0.11" - sources."@inquirer/select-4.0.10" - sources."@inquirer/type-3.0.5" - sources."@types/node-22.13.10" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."cli-width-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-8.3.0" - sources."define-lazy-prop-2.0.0" - sources."emoji-regex-8.0.0" - sources."has-flag-4.0.0" - sources."ini-4.1.3" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-wsl-2.2.0" - sources."mute-stream-2.0.0" - sources."open-8.4.2" - sources."signal-exit-4.1.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."type-fest-0.21.3" - sources."undici-5.28.2" - sources."undici-types-6.20.0" - sources."wrap-ansi-6.2.0" - sources."yoctocolors-cjs-2.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "npm registry manager can help you switch different npm registries easily and quickly"; - homepage = "https://github.com/Pana/nrm"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; From c4a3db606ee082f53b761b52bbfc14415eda3363 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 20:05:45 +0100 Subject: [PATCH 096/154] nixos/postfix: allow path values in main.cf This is useful for passing a tls_config_file for example. --- nixos/modules/services/mail/postfix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index bdfc53c83767..86b9223eb604 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -522,6 +522,7 @@ in nullOr (oneOf [ bool int + path str (listOf str) ]) From 72197fdd5a619fe9d48e604d05968812dc328b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Nov 2025 11:28:03 -0800 Subject: [PATCH 097/154] home-assistant-custom-components.garmin_connect: 0.2.37 -> 0.2.38 Diff: https://github.com/cyberjunky/home-assistant-garmin_connect/compare/0.2.37...0.2.38 Changelog: https://github.com/cyberjunky/home-assistant-garmin_connect/releases/tag/0.2.38 --- .../custom-components/garmin_connect/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix index df8f306173e5..d3dca515c8e6 100644 --- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "cyberjunky"; domain = "garmin_connect"; - version = "0.2.37"; + version = "0.2.38"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "home-assistant-garmin_connect"; tag = version; - hash = "sha256-d6RbDplrdqvFGSDcTgoYzYLSHDYdXG3/XvFxj8IfSbY="; + hash = "sha256-Df/ecgePR10LIeaGy0kmIWqiP9G7j+KscL/YA3VsARE="; }; dependencies = [ From a394acc1ce8c8c77549fc6e6ddf126076e14883e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 19:43:22 +0000 Subject: [PATCH 098/154] treemd: 0.1.2 -> 0.1.5 --- pkgs/by-name/tr/treemd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/treemd/package.nix b/pkgs/by-name/tr/treemd/package.nix index 8b2344206f12..a97f6ada2a63 100644 --- a/pkgs/by-name/tr/treemd/package.nix +++ b/pkgs/by-name/tr/treemd/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "treemd"; - version = "0.1.2"; + version = "0.1.5"; src = fetchFromGitHub { owner = "Epistates"; repo = "treemd"; tag = "v${finalAttrs.version}"; - hash = "sha256-PloG2eYelsp0Y3bG2ZNgSuwwPnKufBWwLW2TMQBGu1M="; + hash = "sha256-fD+LH7OziXsQdpcIFxh2fi+Dxb5kbJ7+eVVW0NIpeug="; }; - cargoHash = "sha256-jX2X90Kk8iAVVNm/r37v+0X1WSXje/GRr0Tv0ZzuwWI="; + cargoHash = "sha256-fU0i6a/9oXWJMNdoWCmv04am5qtrFe3ERhQiY25YCCo="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From ab25ffc65af3587f8368cc73b73e71a21885c355 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Oct 2025 19:33:53 +0000 Subject: [PATCH 099/154] mathmod: 12.1 -> 13.0 --- pkgs/by-name/ma/mathmod/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mathmod/package.nix b/pkgs/by-name/ma/mathmod/package.nix index 2eec8e24f29d..02af5659929b 100644 --- a/pkgs/by-name/ma/mathmod/package.nix +++ b/pkgs/by-name/ma/mathmod/package.nix @@ -7,19 +7,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "mathmod"; - version = "12.1"; + version = "13.0"; src = fetchFromGitHub { owner = "parisolab"; repo = "mathmod"; tag = finalAttrs.version; - hash = "sha256-gDIYDXI9X24JAM1HP10EhJXkHZV2X8QngD5KPCUqdyI="; + hash = "sha256-+UR8Tk20StplyNqPDNxR0HfjAzAru4r+WtVsW81LR9c="; }; patches = [ ./fix-paths.patch ]; postPatch = '' - substituteInPlace MathMod.pro --subst-var out + substituteInPlace MathMod.pro \ + --replace-fail "@out@" "$out" ''; nativeBuildInputs = with libsForQt5; [ From 0771b8c0eab638b3eef1e62521acb98fafbc8dc2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Nov 2025 23:21:19 +0000 Subject: [PATCH 100/154] vimPlugins.floaterm: init at 2025-09-23 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 54d95e730d12..08942cb6cd7b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5307,6 +5307,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + floaterm = buildVimPlugin { + pname = "floaterm"; + version = "2025-09-23"; + src = fetchFromGitHub { + owner = "nvzone"; + repo = "floaterm"; + rev = "34e14f0b5e2687fd31a93fe75982ec84e5145856"; + sha256 = "0g0wf1f049sayj9d11xjjz37ssvp7g9q39b5dwimf3i6fn80b42k"; + }; + meta.homepage = "https://github.com/nvzone/floaterm/"; + meta.hydraPlatforms = [ ]; + }; + floating-input-nvim = buildVimPlugin { pname = "floating-input.nvim"; version = "2025-05-28"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f714b498bbc6..e53cf7a738f7 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1215,6 +1215,10 @@ assertNoAdditions { dependencies = [ self.leap-nvim ]; }; + floaterm = super.floaterm.overrideAttrs { + dependencies = [ self.nvzone-volt ]; + }; + flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs { # Optional dap integration checkInputs = [ self.nvim-dap ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d3ec2a41bd9b..6208e68e00ae 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -406,6 +406,7 @@ https://github.com/willothy/flatten.nvim/,HEAD, https://github.com/felipeagc/fleet-theme-nvim/,, https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, +https://github.com/nvzone/floaterm/,HEAD, https://github.com/liangxianzhe/floating-input.nvim/,HEAD, https://github.com/floobits/floobits-neovim/,, https://github.com/nvim-flutter/flutter-tools.nvim/,HEAD, From d5485055bbe887289f1c526c7fc113def2eef4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Nov 2025 11:54:07 -0800 Subject: [PATCH 101/154] opencode: unpin bun --- pkgs/by-name/op/opencode/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index b284368643ee..ab7e65fab508 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -87,6 +87,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ./skip-npm-pack.patch ]; + postPatch = '' + # don't require a specifc bun version + substituteInPlace packages/script/src/index.ts \ + --replace-fail "if (process.versions.bun !== expectedBunVersion)" "if (false)" + ''; + configurePhase = '' runHook preConfigure From 01698a9baaad99a010ffe2e53762f480f39ff1ae Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 3 May 2024 17:05:10 +0200 Subject: [PATCH 102/154] klipper: fix $mcu.serial guard when $mcu.enableKlipperFlash This patch allows to set $mcu.canbus_uuid by setting $mcu.enableKlipperFlash to false. --- nixos/modules/services/misc/klipper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 223bc8125915..78bd208ca1b6 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -217,7 +217,7 @@ in } ] ++ lib.mapAttrsToList (mcu: firmware: { - assertion = firmware.enable -> firmware.serial != null; + assertion = firmware.enableKlipperFlash -> firmware.serial != null; message = '' Unable to determine the serial connection for services.klipper.firmwares."${mcu}". Please set one of the following: From 9d221d1fb4d783ba3151b886580fd01c8d1850a1 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 9 Nov 2025 15:03:00 -0500 Subject: [PATCH 103/154] krane: remove kira-bruneau as maintainer I don't actively use this package anymore. I originally packaged it for use at a company that I haven't been working at for over 2 years now. --- pkgs/by-name/kr/krane/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/kr/krane/package.nix b/pkgs/by-name/kr/krane/package.nix index 7b08e8a59083..5a5ddc115557 100644 --- a/pkgs/by-name/kr/krane/package.nix +++ b/pkgs/by-name/kr/krane/package.nix @@ -16,6 +16,6 @@ bundlerApp { homepage = "https://github.com/Shopify/krane"; changelog = "https://github.com/Shopify/krane/blob/main/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kira-bruneau ]; + maintainers = [ ]; }; } From c1322b2d37383f634777d4242b6ff6de8181d0f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:17:13 +0000 Subject: [PATCH 104/154] bruno: 2.13.2 -> 2.14.0 --- pkgs/by-name/br/bruno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 6d5bd7e5153c..da03f9443d09 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -20,20 +20,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "2.13.2"; + version = "2.14.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-oYp4sSL36HrDyK+YJfjvSQuYV0NdYcB6UeTGksbrcuI="; + hash = "sha256-fmT+KA8v/fdVQu7KUkZNOkNtcl5uPxzHVKplml2HbSM="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-TkPjT2SW5KgbaZiSCjWEd1UTqSsFq+MI58bMShkm/yI="; + npmDepsHash = "sha256-H2v9dm4VCRQrhs9g/D1QOu1L5AeN+Vqhez4qrBdd9Gs="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ From eee63d9431c4b080d8b1edfdf46ceacab1bc0bf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:21:44 +0000 Subject: [PATCH 105/154] mympd: 22.1.2 -> 23.0.0 --- pkgs/by-name/my/mympd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index 819ad8a5e463..eaeb8b2f410d 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "22.1.2"; + version = "23.0.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jgRzfVwVf6QOBGAsKNm9f8YqWBWd0KMJj0FTFcnu4NM="; + sha256 = "sha256-tD7ywqZJEix+ET26z3yJmgHXBACBOrSAlR9U1Uff/v8="; }; nativeBuildInputs = [ From ee618d2e121391d737235aa17778b98475842cbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:26:40 +0000 Subject: [PATCH 106/154] mcp-k8s-go: 0.5.0 -> 0.6.0 --- pkgs/by-name/mc/mcp-k8s-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcp-k8s-go/package.nix b/pkgs/by-name/mc/mcp-k8s-go/package.nix index 3ee42b813767..131cd879243a 100644 --- a/pkgs/by-name/mc/mcp-k8s-go/package.nix +++ b/pkgs/by-name/mc/mcp-k8s-go/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "mcp-k8s-go"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "strowk"; repo = "mcp-k8s-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-4pS0X1G/wGemBkLC9UFLHxaRLtCDALIRPnOCzAf/6JA="; + hash = "sha256-/5tmKngZTp5n8jDZwKAaG4ad+MPRFEJfgV/A5TMVLlM="; }; - vendorHash = "sha256-BPmocRaqqV7p5Yjto3UEbzc2vdlyRSGkdPye3EWXEe4="; + vendorHash = "sha256-WULy61Ntra9Jz4fhSVOzftzWyQxvPFyBfjuKlKTORqI="; doCheck = false; From ab10b4da90cb0c5d3a66eccd5704dc26fad6e360 Mon Sep 17 00:00:00 2001 From: MithicSpirit Date: Sun, 9 Nov 2025 15:28:35 -0500 Subject: [PATCH 107/154] idris2Packages.pack: 2024-02-07 -> 2025-11-06 Now that the compiler is updated, we can also update pack. This introduces several dependency changes, and a more scaleable solution for handling these will be necessary in the future. --- pkgs/development/compilers/idris2/pack.nix | 168 +++++++++++++++++++-- 1 file changed, 153 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix index 5ceb285f4b5b..5f38ee28fe51 100644 --- a/pkgs/development/compilers/idris2/pack.nix +++ b/pkgs/development/compilers/idris2/pack.nix @@ -11,41 +11,176 @@ }: let inherit (idris2Packages) idris2Api buildIdris; - toml = buildIdris { - ipkgName = "toml"; - version = "2022-05-05"; + + elab-util = buildIdris { + ipkgName = "elab-util"; + version = "2025-08-14"; src = fetchFromGitHub { - owner = "cuddlefishie"; - repo = "toml-idr"; - rev = "b4f5a4bd874fa32f20d02311a62a1910dc48123f"; - hash = "sha256-+bqfCE6m0aJ+S65urT+zQLuZUtUkC1qcuSsefML/fAE="; + owner = "stefan-hoeck"; + repo = "idris2-elab-util"; + rev = "6786ac7ef9931b1c8321a83e007f36a66e139e86"; + hash = "sha256-qInoAE28tEJIP8/R0Yjgn/+DoIDzI3GU8BAyWaIrrJE="; }; idrisLibraries = [ ]; }; + filepath = buildIdris { ipkgName = "filepath"; - version = "2023-12-04"; + version = "2024-10-06"; src = fetchFromGitHub { owner = "stefan-hoeck"; repo = "idris2-filepath"; - rev = "eac02d51b631633f32330c788bcebeb24221fa09"; - hash = "sha256-noylxQvT2h50H0xmAiwe/cI6vz5gkbOhSD7mXuhJGfU="; + rev = "0441eaee9ff1d921fc3f4619c2a8d542588c0e99"; + hash = "sha256-HiaT1Ggbzm7aAEMnCobhhavdheKbYyMA5D9BO0cdG7Y="; }; idrisLibraries = [ ]; }; + + getopts = buildIdris { + ipkgName = "getopts"; + version = "2023-10-28"; + src = fetchFromGitHub { + owner = "idris-community"; + repo = "idris2-getopts"; + rev = "0d41b98f83f3707deb0ffbc595ef36b7d9cb9eab"; + hash = "sha256-CthWByg4uFic0ktri1AuFqkHtyRzIUrreCTegQgdpVo="; + }; + idrisLibraries = [ ]; + }; + + algebra = buildIdris { + ipkgName = "algebra"; + version = "2024-04-05"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-algebra"; + rev = "829f44b7fd961e3f0a7ad9174b395f97ebc33336"; + hash = "sha256-etsWqF07j/XBgfnlaA8pyF06BeoXqg7iViG0o09s4Zc="; + }; + idrisLibraries = [ ]; + }; + + ref1 = buildIdris { + ipkgName = "ref1"; + version = "2025-10-30"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-ref1"; + rev = "ef6d4265deaa6a4f1b5228932102847a4e54e4d2"; + hash = "sha256-NwA6KezZFdF/ZGTOf3Z1zDjsGiy2hgYinGPeeofhZfw="; + }; + idrisLibraries = [ ]; + }; + + array = buildIdris { + ipkgName = "array"; + version = "2025-10-30"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-array"; + rev = "cecbd1dd3bae94669a2ed3689ee91ce1616cc34f"; + hash = "sha256-fRhIzkvL7n7wyXNQE3LHalexqYmTt6RVPoVEOqTb7d4="; + }; + idrisLibraries = [ + algebra + ref1 + ]; + }; + + bytestring = buildIdris { + ipkgName = "bytestring"; + version = "2025-10-02"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-bytestring"; + rev = "082c5114b4016425c9957e955e22fcb0b194ada4"; + hash = "sha256-KuHa1pDfsR4BmBiaw7k6ghZMf2/b+5AQc5I+NuQqbyw="; + }; + idrisLibraries = [ + algebra + array + ]; + }; + + refined = buildIdris { + ipkgName = "refined"; + version = "2024-04-05"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-refined"; + rev = "c585013c33ad5398c91beed71fec61a5b721a8da"; + hash = "sha256-9YQjVpJ5McpgjJx6hXCaXMKyEAFCnynw4ahHdY3Kz8Y="; + }; + idrisLibraries = [ + elab-util + algebra + ]; + }; + + ilex-core = buildIdris { + ipkgName = "core/ilex-core"; + version = "2025-10-31"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-ilex"; + rev = "c2d5a219c701a8f694aa95e8d34c7a58d58e5795"; + hash = "sha256-EseTOCNr0EuYqrjEd2SLqSz5ONOO3hRYghrHul0ccPA="; + }; + idrisLibraries = [ + elab-util + bytestring + ]; + }; + + ilex = buildIdris { + ipkgName = "ilex"; + version = "2025-10-31"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-ilex"; + rev = "c2d5a219c701a8f694aa95e8d34c7a58d58e5795"; + hash = "sha256-EseTOCNr0EuYqrjEd2SLqSz5ONOO3hRYghrHul0ccPA="; + }; + idrisLibraries = [ + elab-util + algebra + array + bytestring + ilex-core + refined + ]; + }; + + ilex-toml = buildIdris { + ipkgName = "toml/ilex-toml"; + version = "2025-10-31"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-ilex"; + rev = "c2d5a219c701a8f694aa95e8d34c7a58d58e5795"; + hash = "sha256-EseTOCNr0EuYqrjEd2SLqSz5ONOO3hRYghrHul0ccPA="; + }; + idrisLibraries = [ + ilex + refined + ]; + }; + packPkg = buildIdris { ipkgName = "pack"; - version = "2024-02-07"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "stefan-hoeck"; repo = "idris2-pack"; - rev = "305123401a28a57b02f750c589c35af628b2a5eb"; - hash = "sha256-IPAkwe6fEYWT3mpyKKkUPU0qFJX9gGIM1f7OeNWyB9w="; + rev = "37787fa16550ef761d3242bf8ccb8ab672d9f2d1"; + hash = "sha256-pvunaZSXj5Ee0utBFZfagxRKFuoSBxeU0IN7VTc56rY="; }; idrisLibraries = [ idris2Api - toml + elab-util filepath + getopts + ilex-toml ]; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -76,7 +211,10 @@ let mainProgram = "pack"; homepage = "https://github.com/stefan-hoeck/idris2-pack"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mattpolzin ]; + maintainers = with lib.maintainers; [ + mattpolzin + mithicspirit + ]; inherit (idris2Packages.idris2.meta) platforms; }; }; From e25af6d45f7547f45c19b72968a0b3f8a4ec54e6 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sun, 9 Nov 2025 21:25:09 +0100 Subject: [PATCH 108/154] vicinae: 0.16.1 -> 0.16.2 --- pkgs/by-name/vi/vicinae/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index ccdabb49d74e..9393aaa0fa4e 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-PWfgR7wyQINl0Xy/AJAaaUo1WtrkznGcaL1aCACqI7U="; + hash = "sha256-CNL45FJG8JAtFFbc8V8Hhf+RwZuWXFwz/v5E1yAi1bQ="; }; apiDeps = fetchNpmDeps { From 0036294983207d9eb155306978cc36507dc836e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:36:12 +0000 Subject: [PATCH 109/154] libretro.bluemsx: 0-unstable-2025-11-01 -> 0-unstable-2025-11-04 --- pkgs/applications/emulators/libretro/cores/bluemsx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index db0bd46bd5c0..724e20af4e5b 100644 --- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix +++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bluemsx"; - version = "0-unstable-2025-11-01"; + version = "0-unstable-2025-11-04"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "1f8aeb9ac3f3a4202736ac22e1785f01a834b975"; - hash = "sha256-VnTL7MLhB/WEHm9930OvM84I5Vp4AaAI6qh7I4QRkVw="; + rev = "036376d6679c9e153712dbbb3fdca774afc49706"; + hash = "sha256-0oT+m30bay/3BQgKBxX397a8o+QP1/IHIo0jGmSWGGg="; }; meta = { From 092b37cf298ffb3a7f5a5974a012291a0cb956d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:39:37 +0000 Subject: [PATCH 110/154] kdePackages.karousel: 0.14 -> 0.15 --- pkgs/kde/third-party/karousel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix index 9e0f2fee23ee..512c0bc4b900 100644 --- a/pkgs/kde/third-party/karousel/default.nix +++ b/pkgs/kde/third-party/karousel/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "karousel"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "peterfajdiga"; repo = "karousel"; rev = "v${finalAttrs.version}"; - hash = "sha256-bJv3fQ8w4bAtthlrDjj3cWA8lSpcJCEtJFk5C+94K5M="; + hash = "sha256-pxcKfhQmudxCJ7fwteT+QZrRib03tYZEWiRjmZtVKgQ="; }; postPatch = '' From 0a877d70adef740b4a52d2e3bd68291241b18cc3 Mon Sep 17 00:00:00 2001 From: lignus <64274485+linnnus@users.noreply.github.com> Date: Sat, 2 Aug 2025 14:58:36 +0200 Subject: [PATCH 111/154] virt-viewer: add project homepage --- pkgs/by-name/vi/virt-viewer/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/vi/virt-viewer/package.nix b/pkgs/by-name/vi/virt-viewer/package.nix index 999489c0f61f..4f08bc08e0fd 100644 --- a/pkgs/by-name/vi/virt-viewer/package.nix +++ b/pkgs/by-name/vi/virt-viewer/package.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://virt-manager.org/"; description = "Viewer for remote virtual machines"; maintainers = with maintainers; [ raskin From 450237964fe30774a87443509d824cb19e87fa5a Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 9 Nov 2025 21:50:08 +0100 Subject: [PATCH 112/154] python313Packages.sqlalchemy-views: drop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sqlalchemy-views is broken for Python ≥3.12 [1] and the last relevant upstream code change and release were in 2023 [2]. [1] https://hydra.nixos.org/build/310475445 [2] https://github.com/jklukas/sqlalchemy-views --- .../sqlalchemy-views/default.nix | 40 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/development/python-modules/sqlalchemy-views/default.nix diff --git a/pkgs/development/python-modules/sqlalchemy-views/default.nix b/pkgs/development/python-modules/sqlalchemy-views/default.nix deleted file mode 100644 index a462e48bfede..000000000000 --- a/pkgs/development/python-modules/sqlalchemy-views/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - sqlalchemy, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "sqlalchemy-views"; - version = "0.3.2"; - format = "setuptools"; - - src = fetchFromGitHub { - repo = "sqlalchemy-views"; - owner = "jklukas"; - tag = "v${version}"; - hash = "sha256-MJgikWXo3lpMsSYbb5sOSOTbJPOx5gEghW1V9jKvHKU="; - }; - - postPatch = '' - substituteInPlace tox.ini --replace '--cov=sqlalchemy_views --cov-report=term' "" - ''; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ sqlalchemy ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "sqlalchemy_views" ]; - - meta = with lib; { - description = "Adds CreateView and DropView constructs to SQLAlchemy"; - homepage = "https://github.com/jklukas/sqlalchemy-views"; - license = licenses.mit; - maintainers = with maintainers; [ cpcloud ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7cf00fbaa665..b0cfdae16fc8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -440,6 +440,7 @@ mapAliases { sphinxcontrib_httpdomain = throw "'sphinxcontrib_httpdomain' has been renamed to/replaced by 'sphinxcontrib-httpdomain'"; # Converted to throw 2025-10-29 sphinxcontrib_newsfeed = throw "'sphinxcontrib_newsfeed' has been renamed to/replaced by 'sphinxcontrib-newsfeed'"; # Converted to throw 2025-10-29 sphinxcontrib_plantuml = throw "'sphinxcontrib_plantuml' has been renamed to/replaced by 'sphinxcontrib-plantuml'"; # Converted to throw 2025-10-29 + sqlalchemy-views = throw "'sqlalchemy-views' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-09 sqlalchemy_migrate = throw "'sqlalchemy_migrate' has been renamed to/replaced by 'sqlalchemy-migrate'"; # Converted to throw 2025-10-29 subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04 supervise_api = throw "'supervise_api' has been renamed to/replaced by 'supervise-api'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99e66e842b76..bde77dda5bc1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17654,8 +17654,6 @@ self: super: with self; { sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; - sqlalchemy-views = callPackage ../development/python-modules/sqlalchemy-views { }; - sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1_4.nix { }; sqlcipher3 = callPackage ../development/python-modules/sqlcipher3 { }; From cf9b08c97ad3a2802161916410c5a9cb66f0c862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 03:49:07 +0000 Subject: [PATCH 113/154] framework-tool-tui: 0.5.7 -> 0.5.8 --- pkgs/by-name/fr/framework-tool-tui/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix index 0c791d715a11..07a6c9c2258c 100644 --- a/pkgs/by-name/fr/framework-tool-tui/package.nix +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -7,13 +7,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool-tui"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "grouzen"; repo = "framework-tool-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-D9twqVizYqrglVOrwc8KuB5mk4vc/BTMv+HR3rv5yEk="; + hash = "sha256-6rphmprOTg+Zk3HbE6mdszmQsCQ8mUbs59rvLeKQkps="; }; cargoHash = "sha256-0/6b0C+uUNz03r5IEBvAGzagSyjzXFVbE74rgfGJoyM="; @@ -21,9 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; - # test suite needs a framework laptop - doCheck = false; - meta = { description = "TUI for controlling and monitoring Framework Computers hardware"; longDescription = '' From 1bc6ed0dc26940419b238f26fe2b24667f8169ac Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 1 Nov 2025 10:37:19 -0700 Subject: [PATCH 114/154] python3Packages.curl-cffi: disable tests that hang and OOM --- pkgs/development/python-modules/curl-cffi/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 4f5a6eec18f0..310fd84f70ad 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { }; patches = [ ./use-system-libs.patch ]; + buildInputs = [ curl-impersonate-chrome ]; build-system = [ @@ -98,8 +99,11 @@ buildPythonPackage rec { disabledTestPaths = [ # test accesses network "tests/unittest/test_smoke.py::test_async" + # Hangs the build (possibly forever) under websockets > 12 + # https://github.com/lexiforest/curl_cffi/issues/657 + "tests/unittest/test_websockets.py::test_websocket" # Runs out of memory while testing - "tests/unittest/test_websockets.py" + "tests/unittest/test_websockets.py::test_receive_large_messages_run_forever" ]; disabledTests = [ @@ -121,6 +125,9 @@ buildPythonPackage rec { description = "Python binding for curl-impersonate via cffi"; homepage = "https://curl-cffi.readthedocs.io"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ chuangzhu ]; + maintainers = with lib.maintainers; [ + chuangzhu + sarahec + ]; }; } From 3e551073f4613b05148d53d8ee626b3c56d65932 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 5 Nov 2025 10:19:08 -0800 Subject: [PATCH 115/154] python3Packages.curl-cffi: add sarahec as maintainer From d8c575bf0ce3471ca4e51213e4b861992b207be5 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Fri, 7 Nov 2025 11:59:59 -0800 Subject: [PATCH 116/154] cen64: 0-unstable-2023-05-29 -> 0.3-unstable-2025-10-24 --- ...read-arg-type-for-pthread_setname_np.patch | 137 ------------------ pkgs/by-name/ce/cen64/package.nix | 16 +- 2 files changed, 6 insertions(+), 147 deletions(-) delete mode 100644 pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch diff --git a/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch b/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch deleted file mode 100644 index 7d3ff742c57a..000000000000 --- a/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 41ad58ab1953835313ad2b89686931b08b5b47e8 Mon Sep 17 00:00:00 2001 -From: ghpzin -Date: Tue, 25 Mar 2025 15:26:07 +0300 -Subject: [PATCH] Fix thread arg type for pthread_setname_np - -- change `thread` arg type to `cen64_thread` instead of `cen64_thread *` -(`pthread_t` instead of `pthread_t *`) according to definition of -`pthread_setname_np` from ``: -`int pthread_setname_np(pthread_t thread, const char *name);` -fixes gcc14 errors: -``` -/build/source/cen64.c:475:24: error: passing argument 1 of 'cen64_thread_setname' makes pointer from integer without a cast [-Wint-conversion] - 475 | cen64_thread_setname(thread, "device"); - | ^~~~~~ - | | - | cen64_thread {aka long unsigned int} -In file included from /build/source/device/device.h:26, - from /build/source/cen64.c:15: -/build/source/os/posix/thread.h:59:54: note: expected 'cen64_thread *' {aka 'long unsigned int *'} but argument is of type 'cen64_thread' {aka 'lo> - 59 | static inline int cen64_thread_setname(cen64_thread *t, const char *name) { - | ~~~~~~~~~~~~~~^ -``` - -- add cast to `cen64_thread` from NULL where `cen64_thread` is called -with it, fixes gcc14 errors: -``` -/build/source/gdb/gdb.c:82:24: error: passing argument 1 of 'cen64_thread_setname' makes integer from pointer without a cast [-Wint-conversion] - 82 | cen64_thread_setname(NULL, "gdb"); - | ^~~~ - | | - | void * -/build/source/os/posix/thread.h:59:53: note: expected 'cen64_thread' {aka 'long unsigned int'} but argument is of type 'void *' - 59 | static inline int cen64_thread_setname(cen64_thread t, const char *name) { - | ~~~~~~~~~~~~~^ -``` ---- - cen64.c | 2 +- - device/device.c | 4 ++-- - gdb/gdb.c | 4 ++-- - os/posix/thread.h | 6 +++--- - os/winapi/thread.h | 2 +- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/cen64.c b/cen64.c -index 51014a4..ca6bda1 100644 ---- a/cen64.c -+++ b/cen64.c -@@ -483,7 +483,7 @@ int run_device(struct cen64_device *device, bool no_video) { - } - - CEN64_THREAD_RETURN_TYPE run_device_thread(void *opaque) { -- cen64_thread_setname(NULL, "device"); -+ cen64_thread_setname((cen64_thread)NULL, "device"); - struct cen64_device *device = (struct cen64_device *) opaque; - - device_run(device); -diff --git a/device/device.c b/device/device.c -index cd5a046..c915846 100644 ---- a/device/device.c -+++ b/device/device.c -@@ -224,7 +224,7 @@ CEN64_THREAD_RETURN_TYPE run_rcp_thread(void *opaque) { - } - - CEN64_THREAD_RETURN_TYPE run_vr4300_thread(void *opaque) { -- cen64_thread_setname(NULL, "vr4300"); -+ cen64_thread_setname((cen64_thread)NULL, "vr4300"); - struct cen64_device *device = (struct cen64_device *) opaque; - - while (likely(device->running)) { -@@ -351,4 +351,4 @@ int device_debug_spin(struct cen64_device *device) { - - cen64_cold void device_connect_debugger(struct cen64_device *device, void* break_handler_data, vr4300_debug_break_handler break_handler) { - vr4300_connect_debugger(device->vr4300, break_handler_data, break_handler); --} -\ No newline at end of file -+} -diff --git a/gdb/gdb.c b/gdb/gdb.c -index 021784d..0e8d188 100644 ---- a/gdb/gdb.c -+++ b/gdb/gdb.c -@@ -79,7 +79,7 @@ bool gdb_parse_packet(const char* input, int len, const char** command_start, co - } - - CEN64_THREAD_RETURN_TYPE gdb_thread(void *opaque) { -- cen64_thread_setname(NULL, "gdb"); -+ cen64_thread_setname((cen64_thread)NULL, "gdb"); - struct gdb *gdb = (struct gdb *) opaque; - - cen64_mutex_lock(&gdb->client_mutex); -@@ -257,4 +257,4 @@ cen64_cold void gdb_destroy(struct gdb* gdb) { - - gdb->device = NULL; - free(gdb); --} -\ No newline at end of file -+} -diff --git a/os/posix/thread.h b/os/posix/thread.h -index 2a261c6..e8e6144 100644 ---- a/os/posix/thread.h -+++ b/os/posix/thread.h -@@ -45,9 +45,9 @@ static inline int cen64_thread_join(cen64_thread *t) { - #ifdef __APPLE__ - int pthread_setname_np(const char*); - #elif __NETBSD__ --int pthread_setname_np(cen64_thread*, const char*, const char*); -+int pthread_setname_np(cen64_thread, const char*, const char*); - #else --int pthread_setname_np(cen64_thread*, const char*); -+int pthread_setname_np(cen64_thread, const char*); - #endif - - // Sets the name of the thread to a specific value -@@ -56,7 +56,7 @@ int pthread_setname_np(cen64_thread*, const char*); - // If you call it at the wrong time or your OS doesn't support custom thread names - // the return value will be non-zero. - // If cen64_thread is not set the name of the current thread will be changed. --static inline int cen64_thread_setname(cen64_thread *t, const char *name) { -+static inline int cen64_thread_setname(cen64_thread t, const char *name) { - #ifdef __APPLE__ - if (t == NULL) - return pthread_setname_np(name); -diff --git a/os/winapi/thread.h b/os/winapi/thread.h -index d7c162a..128d935 100644 ---- a/os/winapi/thread.h -+++ b/os/winapi/thread.h -@@ -57,7 +57,7 @@ static inline int cen64_thread_join(cen64_thread *t) { - // - // Windows isn't supported for the moment. - // --static inline int cen64_thread_setname(cen64_thread *t, const char *name) { -+static inline int cen64_thread_setname(cen64_thread t, const char *name) { - return ENOSYS; - } - --- -2.48.1 - diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix index ea6071c71260..3eded229e9c9 100644 --- a/pkgs/by-name/ce/cen64/package.nix +++ b/pkgs/by-name/ce/cen64/package.nix @@ -11,22 +11,18 @@ stdenv.mkDerivation rec { pname = "cen64"; - version = "0-unstable-2023-05-29"; + version = "0.3-unstable-2025-10-24"; src = fetchFromGitHub { owner = "n64dev"; repo = "cen64"; - rev = "1c1118462bd9d9b8ceb4c556a647718072477aab"; - sha256 = "sha256-vFk29KESATcEY0eRNbS+mHLD9T1phJiG1fqjOlI19/w="; + rev = "e0641c8452a3ae8edcd2bf4e46794bb4eaafc076"; + sha256 = "sha256-PpaD3hgksPD729LyFm7+ID8i+x3yZ0f+S11eSQyoB64="; }; - patches = [ - # fix build with gcc14: - # https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96 - ./cast-mi_regs-callbacks.patch - # https://github.com/n64dev/cen64/pull/237 - ./fix-thread-arg-type-for-pthread_setname_np.patch - ]; + # fix build with gcc14: + # https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96 + patches = [ ./cast-mi_regs-callbacks.patch ]; nativeBuildInputs = [ cmake ]; buildInputs = [ From 8811aee7dbc61c14d53bbe3e172a283f47126280 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Fri, 7 Nov 2025 12:08:33 -0800 Subject: [PATCH 117/154] cen64: cleanup --- pkgs/by-name/ce/cen64/package.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix index 3eded229e9c9..38f8abc10daa 100644 --- a/pkgs/by-name/ce/cen64/package.nix +++ b/pkgs/by-name/ce/cen64/package.nix @@ -1,15 +1,16 @@ { lib, - cmake, + stdenv, fetchFromGitHub, + cmake, libGL, libiconv, libX11, openal, - stdenv, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cen64"; version = "0.3-unstable-2025-10-24"; @@ -17,33 +18,39 @@ stdenv.mkDerivation rec { owner = "n64dev"; repo = "cen64"; rev = "e0641c8452a3ae8edcd2bf4e46794bb4eaafc076"; - sha256 = "sha256-PpaD3hgksPD729LyFm7+ID8i+x3yZ0f+S11eSQyoB64="; + hash = "sha256-PpaD3hgksPD729LyFm7+ID8i+x3yZ0f+S11eSQyoB64="; }; # fix build with gcc14: # https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96 patches = [ ./cast-mi_regs-callbacks.patch ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; buildInputs = [ libGL libiconv - openal libX11 + openal ]; installPhase = '' runHook preInstall - install -D {,$out/bin/}${pname} + + install -D ${finalAttrs.meta.mainProgram} \ + --target-directory=$out/bin + runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { description = "Cycle-Accurate Nintendo 64 Emulator"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://github.com/n64dev/cen64"; - maintainers = [ maintainers._414owen ]; + maintainers = with lib.maintainers; [ _414owen ]; platforms = [ "x86_64-linux" ]; mainProgram = "cen64"; }; -} +}) From fd8857715ae8d0fa963b62deeb91a9bd3d1e9afb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:28:29 +0100 Subject: [PATCH 118/154] tslib: 1.23 -> 1.24 --- pkgs/by-name/ts/tslib/package.nix | 9 ++------- pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch | 11 ----------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch diff --git a/pkgs/by-name/ts/tslib/package.nix b/pkgs/by-name/ts/tslib/package.nix index ec21279b1272..58a3c1ff0112 100644 --- a/pkgs/by-name/ts/tslib/package.nix +++ b/pkgs/by-name/ts/tslib/package.nix @@ -8,20 +8,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "tslib"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "libts"; repo = "tslib"; tag = finalAttrs.version; - hash = "sha256-2YJDADh/WCksAEIjngAdji98YGmwjpvxSBZkxAwFc7k="; + hash = "sha256-WrzOTZlceYnFXi5AI5vb+ZDSRoqUDk/yyCdBUWKn0sM="; }; - patches = [ - # CMake 4 dropped support of versions lower than 3.5 - ./tslib-1.23-cmake4.patch - ]; - nativeBuildInputs = [ cmake ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch b/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch deleted file mode 100644 index d9f6b3ce0c5d..000000000000 --- a/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,7 @@ - # - # - --cmake_minimum_required(VERSION 3.3) -+cmake_minimum_required(VERSION 3.10) - - project(tslib LANGUAGES C) - \ No newline at end of file From e07098d2d2076c9737c16045fa90f6be56085125 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 21:37:15 +0000 Subject: [PATCH 119/154] python3Packages.msgraph-sdk: 1.47.0 -> 1.48.0 --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index adcf9271a8ba..d4caf51ba126 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.47.0"; + version = "1.48.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-/S9dJ5eeYG7I+COizOb3TpaYpx7Qu+R5brRxbLuV3F8="; + hash = "sha256-855hgTTjdgKuzpMHws4BppEHIQVlIwUgC/oANwTE+qM="; }; build-system = [ flit-core ]; From fa8030c458a6a6f1aa65063f96fc650885154be8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:38:14 +0100 Subject: [PATCH 120/154] mongoose: 3.3.5 -> 3.3.6 --- pkgs/by-name/mo/mongoose/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mo/mongoose/package.nix b/pkgs/by-name/mo/mongoose/package.nix index 500a2a135357..2a226b5c7994 100644 --- a/pkgs/by-name/mo/mongoose/package.nix +++ b/pkgs/by-name/mo/mongoose/package.nix @@ -8,11 +8,11 @@ }: let - suitesparseVersion = "7.11.0"; + suitesparseVersion = "7.12.1"; in stdenv.mkDerivation { pname = "mongoose"; - version = "3.3.5"; + version = "3.3.6"; outputs = [ "bin" @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; tag = "v${suitesparseVersion}"; - hash = "sha256-8CnN2P/W15GpK0nCNoRQongOrzcz5E8l9SgKksqLxd0="; + hash = "sha256-6EMPEH5dcNT1qtuSlzR26RhpfN7MbYJdSKcrsQ0Pzow="; }; nativeBuildInputs = [ @@ -41,7 +41,6 @@ stdenv.mkDerivation { dontUseCmakeConfigure = true; cmakeFlags = [ - "-DBLAS_LIBRARIES=${blas}" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; From 3f0c046c5b41319aa8d651e054f9349dcc527676 Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Tue, 4 Nov 2025 12:36:29 +0000 Subject: [PATCH 121/154] python3Packages.rapidocr-onnxruntime: fix aarch64-linux build --- .../on/onnxruntime/cpuinfo-logging.patch | 45 +++++++++++++++++++ pkgs/by-name/on/onnxruntime/package.nix | 6 +++ .../rapidocr-onnxruntime/default.nix | 3 -- .../python-modules/rapidocr/default.nix | 3 -- 4 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch diff --git a/pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch b/pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch new file mode 100644 index 000000000000..e071b24afec3 --- /dev/null +++ b/pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch @@ -0,0 +1,45 @@ +diff --git a/onnxruntime/core/common/cpuid_info.cc b/onnxruntime/core/common/cpuid_info.cc +--- a/onnxruntime/core/common/cpuid_info.cc ++++ b/onnxruntime/core/common/cpuid_info.cc +@@ -3,6 +3,7 @@ + #include "core/common/cpuid_info.h" + #include "core/common/logging/logging.h" + #include "core/common/logging/severity.h" ++#include + + #ifdef __linux__ + +@@ -364,8 +365,14 @@ + #if defined(CPUINFO_SUPPORTED) + pytorch_cpuinfo_init_ = cpuinfo_initialize(); + if (!pytorch_cpuinfo_init_) { +- LOGS_DEFAULT(WARNING) << "Failed to initialize PyTorch cpuinfo library. May cause CPU EP performance degradation " +- "due to undetected CPU features."; ++ constexpr const char* message = ++ "Failed to initialize PyTorch cpuinfo library. May cause CPU EP performance degradation due to undetected CPU " ++ "features."; ++ if (logging::LoggingManager::HasDefaultLogger()) { ++ LOGS_DEFAULT(WARNING) << message; ++ } else { ++ std::cerr << "onnxruntime cpuid_info warning: " << message << std::endl; ++ } + } + #endif // defined(CPUINFO_SUPPORTED) + #if defined(__linux__) +diff --git a/onnxruntime/core/platform/posix/env.cc b/onnxruntime/core/platform/posix/env.cc +--- a/onnxruntime/core/platform/posix/env.cc ++++ b/onnxruntime/core/platform/posix/env.cc +@@ -605,7 +605,12 @@ + PosixEnv() { + cpuinfo_available_ = cpuinfo_initialize(); + if (!cpuinfo_available_) { +- LOGS_DEFAULT(INFO) << "cpuinfo_initialize failed"; ++ constexpr const char* message = "cpuinfo_initialize failed"; ++ if (logging::LoggingManager::HasDefaultLogger()) { ++ LOGS_DEFAULT(INFO) << message; ++ } else { ++ std::cerr << "onnxruntime cpuid_info warning: " << message << std::endl; ++ } + } + } + bool cpuinfo_available_{false}; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index dcbea042fe7d..25166af7fb2a 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -92,6 +92,12 @@ effectiveStdenv.mkDerivation rec { url = "https://github.com/microsoft/onnxruntime/commit/f7619dc93f592ddfc10f12f7145f9781299163a0.patch"; hash = "sha256-jxfMB+/Zokcu5DSfZP7QV1E8mTrsLe/sMr+ZCX/Y3m0="; }) + # Handle missing default logger when cpuinfo initialization fails in the build sandbox + # TODO: Remove on next release + # https://github.com/microsoft/onnxruntime/issues/10038 + # https://github.com/microsoft/onnxruntime/pull/15661 + # https://github.com/microsoft/onnxruntime/pull/20509 + ./cpuinfo-logging.patch ] ++ lib.optionals cudaSupport [ # We apply the referenced 1064.patch ourselves to our nix dependency. diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index 6e369d6dcc97..6e4f3efadadb 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -120,9 +120,6 @@ buildPythonPackage { passthru.skipBulkUpdate = true; meta = { - # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 - # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 - badPlatforms = [ "aarch64-linux" ]; changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/${src.tag}"; description = "Cross platform OCR Library based on OnnxRuntime"; homepage = "https://github.com/RapidAI/RapidOCR"; diff --git a/pkgs/development/python-modules/rapidocr/default.nix b/pkgs/development/python-modules/rapidocr/default.nix index 5734de8c8bc6..e70f956e6809 100644 --- a/pkgs/development/python-modules/rapidocr/default.nix +++ b/pkgs/development/python-modules/rapidocr/default.nix @@ -110,9 +110,6 @@ buildPythonPackage { doCheck = false; meta = { - # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 - # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 - badPlatforms = [ "aarch64-linux" ]; changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/${src.tag}"; description = "Cross platform OCR Library based on OnnxRuntime"; homepage = "https://github.com/RapidAI/RapidOCR"; From 9773c37a2fadbae2d1dd4c8fc9c3528829c7c987 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 31 Oct 2025 07:43:41 -0300 Subject: [PATCH 122/154] itsycal: 0.15.7 -> 0.15.8 --- pkgs/by-name/it/itsycal/package.nix | 8 ++++++-- pkgs/by-name/it/itsycal/update.sh | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100755 pkgs/by-name/it/itsycal/update.sh diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix index b60ea425eb6b..2f6c0ad48f17 100644 --- a/pkgs/by-name/it/itsycal/package.nix +++ b/pkgs/by-name/it/itsycal/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "itsycal"; - version = "0.15.7"; + version = "0.15.8"; src = fetchzip { url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip"; - hash = "sha256-0JQ7fZ0cZM8DnAODZQKzUQEHQGhkNvV+0NY10Ef7MEw="; + hash = "sha256-zo77yCfIzb2ZmExJslQ64GPQqakXtiRmm0UYEgj+3eM="; }; installPhase = '' @@ -22,6 +22,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + updateScript = ./update.sh; + }; + meta = { changelog = "https://www.mowglii.com/itsycal/versionhistory.html"; description = "Tiny menu bar calendar"; diff --git a/pkgs/by-name/it/itsycal/update.sh b/pkgs/by-name/it/itsycal/update.sh new file mode 100755 index 000000000000..cd176cc46860 --- /dev/null +++ b/pkgs/by-name/it/itsycal/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl xq-xml common-updater-scripts + +set -eu + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/package.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find package.nix in $ROOT" + exit 1 +fi + +LATEST_VERSION="$(curl -Ls https://www.mowglii.com/itsycal/versionhistory.html | xq -m -q 'h4' -a 'id' | head -n1)" + +if [ -z "$LATEST_VERSION" ]; then + echo "ERROR: Failed to scrape the latest version." + exit 1 +fi + +update-source-version itsycal "$LATEST_VERSION" --file="$NIX_DRV" From 577a8e8d521090ef0a763eac4055a2a90db4184e Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Sun, 9 Nov 2025 22:51:40 +0100 Subject: [PATCH 123/154] nixos/meilisearch: remove redundant package setting The `services.meilisearch.package` option already defaults to `pkgs.meilisearch`, due to the nature of `mkPackageOption`. --- nixos/modules/services/search/meilisearch.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 1c335d8591ed..d58ed0f7c7e4 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -182,8 +182,6 @@ in no_analytics = lib.mkDefault true; }; - services.meilisearch.package = lib.mkDefault pkgs.meilisearch; - # used to restore dumps environment.systemPackages = [ cfg.package ]; From b615f1825dd7d68f46bdfa3481b7b615e8e9ad9c Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 18 Oct 2025 12:29:18 +0200 Subject: [PATCH 124/154] nixos/utils: Add support for LoadCredential= with genJqSecretsReplacementSnippet --- nixos/lib/utils.nix | 175 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 137 insertions(+), 38 deletions(-) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 35f5853e3f66..08678f5a6d00 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -229,7 +229,7 @@ let listToAttrs (flatten (recurse "." item)); /* - Takes an attrset and a file path and generates a bash snippet that + Takes some options, an attrset and a file path and generates a bash snippet that outputs a JSON file at the file path with all instances of { _secret = "/path/to/secret" } @@ -237,6 +237,28 @@ let in the attrset replaced with the contents of the file "/path/to/secret" in the output JSON. + The first argument exposes the following options: + + - attr: The name of the secret attribute that will be processed, defaults to "_secret" + - loadCredential: A boolean determining whether the script should load secrets directly (false) + or load them from $CREDENTIALS_DIRECTORY (true). In the latter case the output attribute set + will contain a .credentials attribute with the necessary credential list that can be passed + to systemd's `LoadCredential=` option. + + The output of this utility is an attribute set containing the main script and optionally + a list of credentials: + + { + # The main script + script = "..."; + + # If the loadCredential option was set: + credentials = [ + "secret1:/path/to/secret1" + #... + ]; + } + When a configuration option accepts an attrset that is finally converted to JSON, this makes it possible to let the user define arbitrary secret values. @@ -245,7 +267,7 @@ let If the file "/path/to/secret" contains the string "topsecretpassword1234", - genJqSecretsReplacementSnippet { + genJqSecretsReplacement { } { example = [ { irrelevant = "not interesting"; @@ -293,7 +315,7 @@ let { "b": "topsecretpassword5678" } ] - genJqSecretsReplacementSnippet { + genJqSecretsReplacement { } { example = [ { irrelevant = "not interesting"; @@ -330,12 +352,12 @@ let ] } */ - genJqSecretsReplacementSnippet = genJqSecretsReplacementSnippet' "_secret"; - - # Like genJqSecretsReplacementSnippet, but allows the name of the - # attr which identifies the secret to be changed. - genJqSecretsReplacementSnippet' = - attr: set: output: + genJqSecretsReplacement = + { + attr ? "_secret", + loadCredential ? false, + }: + set: output: let secretsRaw = recursiveGetAttrsetWithJqPrefix set attr; # Set default option values @@ -347,38 +369,115 @@ let // set ) secretsRaw; stringOrDefault = str: def: if str == "" then def else str; - in - '' - if [[ -h '${output}' ]]; then - rm '${output}' - fi - inherit_errexit_enabled=0 - shopt -pq inherit_errexit && inherit_errexit_enabled=1 - shopt -s inherit_errexit - '' - + concatStringsSep "\n" ( - imap1 (index: name: '' - secret${toString index}=$(<'${secrets.${name}.${attr}}') - export secret${toString index} - '') (attrNames secrets) - ) - + "\n" - + "${pkgs.jq}/bin/jq >'${output}' " - + escapeShellArg ( - stringOrDefault (concatStringsSep " | " ( + # Sanitize path to create a valid credential tag (same as in genLoadCredentialForJqSecretsReplacementSnippet) + sanitizePath = + path: lib.stringAsChars (c: if builtins.match "[a-zA-Z0-9_.#=!-]" c != null then c else "_") path; + + # Generate credential tag for a given index and path + credentialTag = index: path: "${toString index}_${sanitizePath (secrets.${path}.${attr})}"; + + credentialPath = + index: name: + if loadCredential then + ''"$CREDENTIALS_DIRECTORY/${credentialTag index name}"'' + else + "'${secrets.${name}.${attr}}'"; + in + { + script = '' + if [[ -h '${output}' ]]; then + rm '${output}' + fi + + inherit_errexit_enabled=0 + shopt -pq inherit_errexit && inherit_errexit_enabled=1 + shopt -s inherit_errexit + '' + + concatStringsSep "\n" ( imap1 ( index: name: - ''${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})'' - ) (attrNames secrets) - )) "." - ) - + '' - <<'EOF' - ${toJSON set} - EOF - (( ! inherit_errexit_enabled )) && shopt -u inherit_errexit - ''; + # We keep variable assignment and export separated to avoid masking the return code of the file access. + # With `set -e` this will now fail if a file doesn't exist. + '' + secret${toString index}=$(<${credentialPath index name}) + export secret${toString index} + '') (attrNames secrets) + ) + + "\n" + + "${pkgs.jq}/bin/jq >'${output}' " + + escapeShellArg ( + stringOrDefault (concatStringsSep " | " ( + imap1 ( + index: name: + ''${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})'' + ) (attrNames secrets) + )) "." + ) + + '' + <<'EOF' + ${toJSON set} + EOF + (( ! inherit_errexit_enabled )) && shopt -u inherit_errexit + ''; + + /* + Generates a list of systemd LoadCredential entries if loadCredential was set, + otherwise returns null. + + The tag is sanitized to only contain characters a-zA-Z0-9_-.#=! and prefixed + with an index to ensure uniqueness. + + Example: + genLoadCredentialForJqSecretsReplacementSnippet { } { + example = { + secret1 = { _secret = "/path/to/secret"; }; + secret2 = { _secret = "/another/secret"; }; + }; + } + -> [ "0_path_to_secret:/path/to/secret" "1_another_secret:/another/secret" ] + */ + credentials = + if loadCredential then + imap1 ( + index: path: + "${toString index}_${sanitizePath (secretsRaw.${path}.${attr})}:${secretsRaw.${path}.${attr}}" + ) (attrNames secretsRaw) + else + null; + }; + + /* + A convenience function around `genJqSecretsReplacement` without any additional + settings that returns just the script that does the secret replacing. Make sure + to have a look at `genJqSecretsReplacement` first to decide whether you need + the additional functionality. + + Example: + If the file "/path/to/secret" contains the string + "topsecretpassword1234", + + genJqSecretsReplacementSnippet { + example = [ + { + irrelevant = "not interesting"; + } + { + ignored = "ignored attr"; + relevant = { + secret = { + _secret = "/path/to/secret"; + }; + }; + } + ]; + } "/path/to/output.json" + + will return a set of bash commands that replaces the secret values + in the given attrset with values from the respective files and saves the result + as a JSON file. + */ + genJqSecretsReplacementSnippet = set: output: (genJqSecretsReplacement { } set output).script; /* Remove packages of packagesToRemove from packages, based on their names. From c01c52791798bbcede95c0c6bc4769a9b79928ba Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 8 Nov 2025 11:10:32 +0100 Subject: [PATCH 125/154] nixos/immich: switch to genJqSecretsReplacement and deprecate secretSettings --- nixos/modules/services/web-apps/immich.nix | 64 ++++++++-------------- nixos/tests/web-apps/immich.nix | 14 ++--- 2 files changed, 30 insertions(+), 48 deletions(-) diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index 23017629a329..7dff3515a268 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: let @@ -9,10 +10,9 @@ let format = pkgs.formats.json { }; isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host; isRedisUnixSocket = lib.hasPrefix "/" cfg.redis.host; - - # convert a Nix attribute path to jq object identifier-index: - # https://jqlang.org/manual/#object-identifier-index - attrPathToIndex = attrPath: "." + lib.concatStringsSep "." attrPath; + secretsReplacement = utils.genJqSecretsReplacement { + loadCredential = true; + } cfg.settings "/run/immich/config.json"; commonServiceConfig = { Type = "simple"; @@ -55,6 +55,22 @@ let if cfg.database.enable then config.services.postgresql.package else pkgs.postgresql; in { + imports = [ + (lib.mkRemovedOptionModule + [ + "services" + "immich" + "secretSettings" + ] + '' + `secretSettings` has been deprecated as secrets can now be specified + directly in `settings`. To do so, set `_secret` of the desired + attribute to a file path, for example: + `services.immich.settings.oauth.clientSecret._secret = "/path/to/secret/file";` + '' + ) + ]; + options.services.immich = { enable = mkEnableOption "Immich"; package = lib.mkPackageOption pkgs "immich" { }; @@ -128,6 +144,7 @@ in for options and defaults. Setting it to `null` allows configuring Immich in the web interface. + You can load secret values from a file in this configuration by setting `somevalue._secret = "/path/to/file"` instead of setting `somevalue` directly. ''; type = types.nullOr ( types.submodule { @@ -151,27 +168,6 @@ in ); }; - secretSettings = mkOption { - default = { }; - description = '' - Secrets to to be added to the JSON file generated from {option}`settings`, read from files. - ''; - example = lib.literalExpression '' - { - notifications.smtp.transport.password = "/path/to/secret"; - oauth.clientSecret = "/path/to/other/secret"; - } - ''; - type = - let - inherit (types) attrsOf either path; - recursiveType = either (attrsOf recursiveType) path // { - description = "nested " + (attrsOf path).description; - }; - in - recursiveType; - }; - machine-learning = { enable = mkEnableOption "immich's machine-learning functionality to detect faces and search for objects" @@ -424,24 +420,10 @@ in postgresqlPackage ]; - preStart = mkIf (cfg.settings != null) ( - '' - cat '${format.generate "immich-config.json" cfg.settings}' > /run/immich/config.json - '' - + lib.concatStrings ( - lib.mapAttrsToListRecursive (attrPath: _: '' - tmp="$(mktemp)" - ${lib.getExe pkgs.jq} --rawfile secret "$CREDENTIALS_DIRECTORY/${attrPathToIndex attrPath}" \ - '${attrPathToIndex attrPath} = ($secret | rtrimstr("\n"))' /run/immich/config.json > "$tmp" - mv "$tmp" /run/immich/config.json - '') cfg.secretSettings - ) - ); + preStart = mkIf (cfg.settings != null) secretsReplacement.script; serviceConfig = commonServiceConfig // { - LoadCredential = lib.mapAttrsToListRecursive ( - attrPath: file: "${attrPathToIndex attrPath}:${file}" - ) cfg.secretSettings; + LoadCredential = secretsReplacement.credentials; ExecStart = lib.getExe cfg.package; EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile; Slice = "system-immich.slice"; diff --git a/nixos/tests/web-apps/immich.nix b/nixos/tests/web-apps/immich.nix index fddc681620f1..406b51600c4e 100644 --- a/nixos/tests/web-apps/immich.nix +++ b/nixos/tests/web-apps/immich.nix @@ -17,14 +17,14 @@ services.immich = { enable = true; environment.IMMICH_LOG_LEVEL = "verbose"; - settings.backup.database = { - enabled = true; - cronExpression = "invalid"; - }; - secretSettings = { - backup.database.cronExpression = "${pkgs.writeText "cron" "0 02 * * *"}"; + settings = { + backup.database = { + enabled = true; + # Test loading secrets from files: + cronExpression._secret = "${pkgs.writeText "cron" "0 02 * * *"}"; + }; # thanks to LoadCredential files only readable by root should work - notifications.smtp.transport.password = "/etc/shadow"; + notifications.smtp.transport.password._secret = "/etc/shadow"; }; }; From 2fc0d21d4b5c634b63dc2b17149080f4ad5fe71f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 22:29:56 +0000 Subject: [PATCH 126/154] github-copilot-cli: 0.0.353 -> 0.0.354 --- pkgs/by-name/gi/github-copilot-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix index ec8334fcd9ce..7ce880ba0030 100644 --- a/pkgs/by-name/gi/github-copilot-cli/package.nix +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "github-copilot-cli"; - version = "0.0.353"; + version = "0.0.354"; src = fetchzip { url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz"; - hash = "sha256-OWlEz75vVEvbtDNobLJ/a1iUuepYewCTWoqTbDG+4wg="; + hash = "sha256-W0KiqTThHv/G69X35Sma0KBGH0JAdZhC4/goosSZUDs="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From ffa60e60defacbeeb9b96ff417e5efa6fafddbcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 22:52:06 +0000 Subject: [PATCH 127/154] terraform-providers.oracle_oci: 7.24.0 -> 7.25.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2c413730cf25..616ff1b3d9c7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1048,11 +1048,11 @@ "vendorHash": null }, "oracle_oci": { - "hash": "sha256-R+Khf/BCDaFf1ExD3+zUIEoL/egRw0ube83cP3opO/I=", + "hash": "sha256-Pp2eOcz1LQv2Ft2oiwW+7dypDO1PuRE0I7Wcr2E/G4w=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v7.24.0", + "rev": "v7.25.0", "spdx": "MPL-2.0", "vendorHash": null }, From 01d9d4a19b2e768561d9b634cdea039c1c9a2ebe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 23:22:08 +0000 Subject: [PATCH 128/154] warp-terminal: 0.2025.10.29.08.12.stable_03 -> 0.2025.11.05.08.12.stable_00 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 141842198ee4..82adb5dab130 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-7l9U9onDdMhyWwXs2+qfkTJwujq+KricG40YCXknMF4=", - "version": "0.2025.10.29.08.12.stable_03" + "hash": "sha256-H1ay2Xrp9ouUjICQKtKboWWPfXaOi3EU4UWWNhgtsqU=", + "version": "0.2025.11.05.08.12.stable_00" }, "linux_x86_64": { - "hash": "sha256-Se1/UN9W8jiI6ylhC8H9l4RKdg1OAm6gcg1OWjS31mo=", - "version": "0.2025.10.29.08.12.stable_03" + "hash": "sha256-yk/8tS5Pd0bHy4mTB+AyOufTrjZ4QmvOQLBmz3Bc1YM=", + "version": "0.2025.11.05.08.12.stable_00" }, "linux_aarch64": { - "hash": "sha256-9m0oK+OIxCOMp2YZaRUDlj5kBTUxsf+HIA0glMLeu8w=", - "version": "0.2025.10.29.08.12.stable_03" + "hash": "sha256-E+ZncXLnREVZ//2Q724Yuh9brO+biUglPkr/g2SfLIA=", + "version": "0.2025.11.05.08.12.stable_00" } } From fa853ef3cf76fc0b9d9fe86299e55057b455cc50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 23:49:45 +0000 Subject: [PATCH 129/154] chirp: 0.4.0-unstable-2025-10-30 -> 0.4.0-unstable-2025-11-05 --- pkgs/by-name/ch/chirp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 2b8bcba2d8f1..135f5710e008 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-10-30"; + version = "0.4.0-unstable-2025-11-05"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "a3b973cceb46e431423b3599fb365668958963d5"; - hash = "sha256-z68yLImyB7MvCd/+ZNiqZjFtXk6+fZ2uJPj5GUJZg8M="; + rev = "0d2703ecad8b055a33220de592dc11bcbc153a20"; + hash = "sha256-5O0bmxVpmAkonRInl3L2MplYnZSkkFVLRd4bz59HFv4="; }; nativeBuildInputs = [ From 6361da1a99e99e040247ccea67dfd94be707f7cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 00:08:47 +0000 Subject: [PATCH 130/154] cargo-nextest: 0.9.110 -> 0.9.111 --- pkgs/by-name/ca/cargo-nextest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index b8e34fcbc070..9a0b870f0c04 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.110"; + version = "0.9.111"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-ipxPE3nugBJt/gLUdy/LQOTqat1Li2ovVPq3i81Yd/w="; + hash = "sha256-5ri4KI0dvWAkReUznRkibI45ZeZV5DMyq5VAr+az+b4="; }; # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918 @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ./no-dtrace-macos.patch ]; - cargoHash = "sha256-9IvBgn+2taygTU+RjUWoiS3yI1LzejvzrYJ7VoiHpJI="; + cargoHash = "sha256-/YvzJO+GWo/B5AMXFYvFKfCS72QjOo8aZg+trKm+etI="; cargoBuildFlags = [ "-p" From 9ae26d37780695759f0fe50db68c9279733a6905 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 7 Nov 2025 02:02:44 +0100 Subject: [PATCH 131/154] python3Packages.pyhanko: 0.25.3 -> 0.31.0 See https://docs.pyhanko.eu/en/latest/changelog.html#pyhanko for changelog, the passthru.testData is needed for the tests of both pyhanko itself and pyhanko-cli. --- .../python-modules/pyhanko/default.nix | 73 ++++++++++++++----- 1 file changed, 53 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index e1b626c7863e..5d91680adc2b 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -9,17 +9,14 @@ # dependencies asn1crypto, - click, cryptography, + lxml, pyhanko-certvalidator, pyyaml, - qrcode, requests, tzlocal, # optional-dependencies - oscrypto, - defusedxml, fonttools, uharfbuzz, pillow, @@ -27,6 +24,7 @@ python-pkcs11, aiohttp, xsdata, + qrcode, # tests certomancer, @@ -35,40 +33,44 @@ pytestCheckHook, python-pae, requests-mock, + signxml, }: buildPythonPackage rec { pname = "pyhanko"; - version = "0.25.3"; + version = "0.31.0"; pyproject = true; src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "pyHanko"; tag = "v${version}"; - hash = "sha256-HJkCQ5YDVr17gtY4PW89ep7GwFdP21/ruBEKm7j3+Qo="; + hash = "sha256-ZDHAcI2yoiVifYt05V85lz8mJmoyi10g4XoLQ+LhLHE="; }; + sourceRoot = "${src.name}/pkgs/pyhanko"; + + postPatch = '' + substituteInPlace src/pyhanko/version/__init__.py \ + --replace-fail "0.0.0.dev1" "${version}" \ + --replace-fail "(0, 0, 0, 'dev1')" "tuple(\"${version}\".split(\".\"))" + substituteInPlace pyproject.toml \ + --replace-fail "0.0.0.dev1" "${version}" + ''; + build-system = [ setuptools ]; - pythonRelaxDeps = [ - "cryptography" - ]; - dependencies = [ asn1crypto - click cryptography pyhanko-certvalidator pyyaml - qrcode requests tzlocal + lxml ]; optional-dependencies = { - extra-pubkey-algs = [ oscrypto ]; - xmp = [ defusedxml ]; opentype = [ fonttools uharfbuzz @@ -79,7 +81,11 @@ buildPythonPackage rec { ]; pkcs11 = [ python-pkcs11 ]; async-http = [ aiohttp ]; - etsi = [ xsdata ]; + etsi = [ + xsdata + signxml + ]; + qr = [ qrcode ]; }; nativeCheckInputs = [ @@ -90,16 +96,18 @@ buildPythonPackage rec { pytestCheckHook python-pae requests-mock + passthru.testData + signxml ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ # ModuleNotFoundError: No module named 'csc_dummy' - "pyhanko_tests/test_csc.py" + "tests/test_csc.py" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # OSError: One or more parameters passed to a function were not valid. - "pyhanko_tests/cli_tests" + "tests/cli_tests" ]; disabledTests = [ @@ -126,6 +134,10 @@ buildPythonPackage rec { "test_ocsp_embed" "test_ts_fetch_aiohttp" "test_ts_fetch_requests" + + # https://github.com/MatthiasValvekens/pyHanko/pull/595 + "test_simple_text_stamp_on_page_with_leaky_graphics_state" + "test_simple_text_stamp_on_page_with_leaky_graphics_state_without_coord_correction" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # OSError: One or more parameters passed to a function were not valid. @@ -139,12 +151,33 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyhanko" ]; + passthru = { + testData = buildPythonPackage { + pname = "common-test-utils"; + inherit version pyproject src; + + sourceRoot = "${src.name}/internal/common-test-utils"; + # Include the test pdf/xml files etc. in the build output + postPatch = '' + echo "graft src/test_data" > MANIFEST.in + ''; + + build-system = [ setuptools ]; + + dependencies = [ + certomancer + pyhanko-certvalidator + ]; + + pythonRemoveDeps = [ "pyhanko" ]; + }; + }; + meta = { description = "Sign and stamp PDF files"; - mainProgram = "pyhanko"; homepage = "https://github.com/MatthiasValvekens/pyHanko"; - changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/v${version}/docs/changelog.rst"; + changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/${src.tag}/docs/changelog.rst#pyhanko"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.antonmosich ]; }; } From 1833e4b2091c995154d6efd84c3705220403afd0 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 7 Nov 2025 02:03:26 +0100 Subject: [PATCH 132/154] pyhanko-cli: init at 0.2.0 --- pkgs/by-name/py/pyhanko-cli/package.nix | 66 +++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/py/pyhanko-cli/package.nix diff --git a/pkgs/by-name/py/pyhanko-cli/package.nix b/pkgs/by-name/py/pyhanko-cli/package.nix new file mode 100644 index 000000000000..93c275e08ea0 --- /dev/null +++ b/pkgs/by-name/py/pyhanko-cli/package.nix @@ -0,0 +1,66 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + nix-update-script, +}: +python3Packages.buildPythonApplication rec { + pname = "pyhanko-cli"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "pyhanko"; + tag = "pyhanko-cli/v${version}"; + hash = "sha256-ZDHAcI2yoiVifYt05V85lz8mJmoyi10g4XoLQ+LhLHE="; + }; + + sourceRoot = "${src.name}/pkgs/pyhanko-cli"; + + postPatch = '' + substituteInPlace src/pyhanko/cli/version.py \ + --replace-fail "0.0.0.dev1" "${version}" \ + --replace-fail "(0, 0, 0, 'dev1')" "tuple(\"${version}\".split(\".\"))" + substituteInPlace pyproject.toml \ + --replace-fail "0.0.0.dev1" "${version}" + ''; + + build-system = [ python3Packages.setuptools ]; + + dependencies = + with python3Packages; + [ + asn1crypto + tzlocal + pyhanko + pyhanko-certvalidator + click + platformdirs + ] + ++ lib.flatten (lib.attrValues pyhanko.optional-dependencies); + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pyhanko.testData + requests-mock + freezegun + certomancer + aiohttp + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex=pyhanko-cli/v(.*)" + ]; + }; + + meta = { + description = "Sign and stamp PDF files"; + mainProgram = "pyhanko"; + homepage = "https://github.com/MatthiasValvekens/pyHanko/tree/master/pkgs/pyhanko-cli"; + changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/pyhanko-cli/${src.tag}/docs/changelog.rst#pyhanko-cli"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.antonmosich ]; + }; +} From d0e1ce24fef97b526cf2fbf191cb26b9fa76bace Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 01:21:55 +0000 Subject: [PATCH 133/154] home-assistant-custom-lovelace-modules.advanced-camera-card: 7.19.1 -> 7.19.2 --- .../custom-lovelace-modules/advanced-camera-card/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index d1e1c6fb5641..65edcab81875 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.19.1"; + version = "7.19.2"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-NkVgzmWnh+rB5joBA4RcGnrdLCZJ0n5aeDwv0rDsfYI="; + hash = "sha256-BimTVYWUWlEKOitEtKPECHyIXsM7Xknix1c03u07yr8="; }; # TODO: build from source once yarn berry support lands in nixpkgs From e32e658a0a9688eaf4e08824c7dd6b3ecf05b4ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:04:33 +0000 Subject: [PATCH 134/154] procfd: 1.2.0 -> 1.3.0 --- pkgs/by-name/pr/procfd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix index 16aa478eacdb..538741ab28a6 100644 --- a/pkgs/by-name/pr/procfd/package.nix +++ b/pkgs/by-name/pr/procfd/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "procfd"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "deshaw"; repo = "procfd"; tag = "v${finalAttrs.version}"; - hash = "sha256-KhnSHtPT9H9CWotwQIA9gFvwgm0PKsmDjQS817PxMw0="; + hash = "sha256-Z18DUXT26ZRFbD25pCKqPlEnxboQKhyhKysXeOsebcE="; }; - cargoHash = "sha256-srFXs+h+ZMXeWRwGQUAqMACJG4ZUgztWr2ff6sRfkU8="; + cargoHash = "sha256-QsdHNZnh86qQTE6ZtycrzqU+L72EBmRlRNqJ2CRU4MI="; nativeInstallCheckInputs = [ versionCheckHook From 4f1549db210827997e9d4f8e282c509c4162e6eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:06:43 +0000 Subject: [PATCH 135/154] rime-moegirl: 20251009 -> 20251109 --- pkgs/by-name/ri/rime-moegirl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ri/rime-moegirl/package.nix b/pkgs/by-name/ri/rime-moegirl/package.nix index 10597a8092e8..fad1bab6948d 100644 --- a/pkgs/by-name/ri/rime-moegirl/package.nix +++ b/pkgs/by-name/ri/rime-moegirl/package.nix @@ -5,10 +5,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-moegirl"; - version = "20251009"; + version = "20251109"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml"; - hash = "sha256-8WmfnkfTg8zdMKvn3I+Ag5KYjdbUpeWhgeSEEc/WUss="; + hash = "sha256-GBevsjo6KRd6Uicy2LpMwgZJkluN5n2ID/DAiaKJV74="; }; dontUnpack = true; From ac4f04f65ab4eb30934b9863ece2526bc8debc63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:37:49 +0000 Subject: [PATCH 136/154] uutils-coreutils-noprefix: 0.3.0 -> 0.4.0 --- pkgs/by-name/uu/uutils-coreutils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 1b1c2bf067df..686fc1404f02 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -21,19 +21,19 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux; stdenv.mkDerivation (finalAttrs: { pname = "uutils-coreutils"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; tag = finalAttrs.version; - hash = "sha256-qvHNV3oy89CVR4LtrxFQJpev3yhHXy2Fh5PTik7Eo8g="; + hash = "sha256-4C4i3oHw9WHwuq9DOufRvc/tOdwqHmYF/gUr2VkRmwM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "uutils-coreutils-${finalAttrs.version}"; - hash = "sha256-yJHp8FCk7W6EDhO/MLrhui50RHW4GOwPQnQmfkdkWd8="; + hash = "sha256-Xei7FIcJr5lr8+uC6veE2hnLPr1UjC/ooZxW6TWKsT8="; }; patches = [ From 309cafb4f85fc90c6460566afba51bc71f55a2be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:53:32 +0000 Subject: [PATCH 137/154] terraform-providers.nutanix_nutanix: 2.3.1 -> 2.3.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2c413730cf25..4dd5ae766085 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -985,13 +985,13 @@ "vendorHash": null }, "nutanix_nutanix": { - "hash": "sha256-nk5wdbAzgBJ6gyYSXZAiNdjx/XQ6XldAMsjb8yv+y7w=", + "hash": "sha256-NhVgZCscSyM6O/d4BYokGz9FQ2fSuN2/kw8iZhzzBQY=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v2.3.1", + "rev": "v2.3.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-ByB1ztK2/1pTFeO34eXVyQSSbe35qqoCeWe6MPZN7vY=" + "vendorHash": "sha256-CZo/GLUwmq/TxRDQr2h49rqENB24Zt4M7k5t7epXHuE=" }, "oboukili_argocd": { "hash": "sha256-3a/g1SbgeMWFMNTY/sYrItyE1rRimdNro8nu9wPTf6M=", From ee574550024c2e4c1f21fa9afbff51ae67ac60ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 03:16:14 +0000 Subject: [PATCH 138/154] xenia-canary: 0-unstable-2025-11-01 -> 0-unstable-2025-11-10 --- pkgs/by-name/xe/xenia-canary/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix index b830d9fb3b78..379a0dd06ce8 100644 --- a/pkgs/by-name/xe/xenia-canary/package.nix +++ b/pkgs/by-name/xe/xenia-canary/package.nix @@ -19,14 +19,14 @@ }: llvmPackages_20.stdenv.mkDerivation { pname = "xenia-canary"; - version = "0-unstable-2025-11-01"; + version = "0-unstable-2025-11-10"; src = fetchFromGitHub { owner = "xenia-canary"; repo = "xenia-canary"; fetchSubmodules = true; - rev = "b800011265bf47ea6b3f4f2b234d25249823a9be"; - hash = "sha256-XufXayBfpq8PUReAiNxAbt4gUhH+aYxMN10ZU7HVhJs="; + rev = "68b3490c8bdb2a819e80b113457aa16c6634118e"; + hash = "sha256-pUvOUAwF4FdDrQkXKH2zyQmlZ5/lM+7syROWVWhJcX8="; }; dontConfigure = true; From 8ecfc77f475c488de6e09648e2ff2e30f1158d1e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 10 Nov 2025 13:19:39 +1000 Subject: [PATCH 139/154] terraform-providers.1password_onepassword: 2.1.2 -> 2.2.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2c413730cf25..96a922deadf0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,12 +1,12 @@ { "1password_onepassword": { - "hash": "sha256-u2nSzEKD0o/e0AzeHdKQj3+h7mAt6r5cxaKsPn6nRGo=", + "hash": "sha256-4wEKPTBt9F8N9jPk/PUu+ewrCJ8IztU9CblfJxA7h1k=", "homepage": "https://registry.terraform.io/providers/1Password/onepassword", "owner": "1Password", "repo": "terraform-provider-onepassword", - "rev": "v2.1.2", + "rev": "v2.2.0", "spdx": "MIT", - "vendorHash": null + "vendorHash": "sha256-n01cHzyG9FvxCb92sFccKY1h7Pa0zmi+CUxSYHM5Elc=" }, "a10networks_thunder": { "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", From 14059021c5b6c312f73eb187a7246e6293af0548 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:42:34 +0200 Subject: [PATCH 140/154] ddccontrol: no with lib; in meta --- pkgs/by-name/dd/ddccontrol/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index 864381aa4d47..b3805617058e 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { intltoolize --force ''; - meta = with lib; { + meta = { description = "Program used to control monitor parameters by software"; homepage = "https://github.com/ddccontrol/ddccontrol"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pakhfn ]; }; } From 18cdb6a885bed141244f8621acb055b4f6abc870 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:42:58 +0200 Subject: [PATCH 141/154] ddccontrol: use tag in src --- pkgs/by-name/dd/ddccontrol/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index b3805617058e..8906257a387c 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = version; + tag = version; sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c="; }; From 5755f113347636187168c6b6bf625c2ae9d0a81c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:45:23 +0200 Subject: [PATCH 142/154] ddccontrol: use finalAttrs pattern --- pkgs/by-name/dd/ddccontrol/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index 8906257a387c..0dcea84a1b50 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -11,14 +11,14 @@ ddccontrol-db, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol"; version = "1.0.3"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pakhfn ]; }; -} +}) From 9b8dcfdf7a6292c6e2695ea6acff00d72aaa726e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:45:51 +0200 Subject: [PATCH 143/154] ddccontrol: add doronbehar as co-maintainer --- pkgs/by-name/dd/ddccontrol/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index 0dcea84a1b50..57b148c4ce92 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ddccontrol/ddccontrol"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ pakhfn ]; + maintainers = with lib.maintainers; [ + pakhfn + doronbehar + ]; }; }) From 3808a3dc89cdd374227af3406af1b4e7186f3164 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:48:11 +0200 Subject: [PATCH 144/154] ddccontrol-db: no with lib; in meta --- pkgs/by-name/dd/ddccontrol-db/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index b2fae63dc569..6316b06fd79c 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with lib; { + meta = { description = "Monitor database for DDCcontrol"; homepage = "https://github.com/ddccontrol/ddccontrol-db"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ lib.maintainers.pakhfn ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + pakhfn + ]; }; } From 9f24bb44dc4af34c7ffe26c48598596fcf7f2d70 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:48:23 +0200 Subject: [PATCH 145/154] ddccontrol-db: add doronbehar as co-maintainer --- pkgs/by-name/dd/ddccontrol-db/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index 6316b06fd79c..37bd26fe3814 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pakhfn + doronbehar ]; }; } From 6c554d57dba80435bc7e41dc67cd971690ce5e35 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:48:52 +0200 Subject: [PATCH 146/154] ddccontrol-db: use finalAttrs pattern --- pkgs/by-name/dd/ddccontrol-db/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index 37bd26fe3814..245302522809 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -8,14 +8,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol-db"; version = "20251102"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-r87zucuHnWbvaqg++xI3s3Tghz80auQBgUxJzu7nmqU="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { doronbehar ]; }; -} +}) From ccc159849627f7670306ee69c8d1e81e395a181a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:49:06 +0200 Subject: [PATCH 147/154] ddccontrol-db: use tag in src --- pkgs/by-name/dd/ddccontrol-db/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index 245302522809..b966947c04e0 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; - rev = finalAttrs.version; + tag = finalAttrs.version; sha256 = "sha256-r87zucuHnWbvaqg++xI3s3Tghz80auQBgUxJzu7nmqU="; }; From ae1d9b08d005b98e3bf670095da4e1508549bf2b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Oct 2025 18:06:33 +0200 Subject: [PATCH 148/154] nixos/ddccontrol: enable hardware.i2c and mention its group --- doc/release-notes/rl-2511.section.md | 2 ++ nixos/modules/services/hardware/ddccontrol.nix | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 75336f597b3a..a4ba427be9b5 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -96,6 +96,8 @@ - `spidermonkey_91` has been removed, as it has been EOL since September 2022. +- `ddccontrol` service now enables `hardware.i2c` by default, and adds `ddcci_backlight` to the kernel modules, based on [experiences reported on discourse](https://discourse.nixos.org/t/brightness-control-of-external-monitors-with-ddcci-backlight/8639/). + - The license of duckstation has changed from `gpl3Only` to `cc-by-nc-nd-40` making it unfree in newer releases. The `duckstation` package has been overhauled to support the new releases and `duckstation-bin` has been aliased to `duckstation` to support darwin binary builds. - `hiawata` has been removed, due to lack of active development upstream, lack of maintainership downstream and upcoming security issues. diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix index b9ad851333a4..6c1f0e8875a1 100644 --- a/nixos/modules/services/hardware/ddccontrol.nix +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -14,15 +14,25 @@ in options = { services.ddccontrol = { - enable = lib.mkEnableOption "ddccontrol for controlling displays"; + enable = lib.mkEnableOption '' + ddccontrol for controlling displays. + + This [enables `hardware.i2c`](#opt-hardware.i2c.enable), so note to add + yourself to [`hardware.i2c.group`](#opt-hardware.i2c.group). + ''; }; }; ###### implementation config = lib.mkIf cfg.enable { + boot.kernelModules = [ + "ddcci_backlight" + ]; # Load the i2c-dev module - boot.kernelModules = [ "i2c_dev" ]; + hardware.i2c = { + enable = true; + }; # Give users access to the "gddccontrol" tool environment.systemPackages = [ From 63edc4f2021084c666505eacbc6186c6bbe621b7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Oct 2025 18:13:41 +0200 Subject: [PATCH 149/154] nixos/ddccontrol: Add doronbehar as maintainer --- nixos/modules/services/hardware/ddccontrol.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix index 6c1f0e8875a1..6f6f30a82ada 100644 --- a/nixos/modules/services/hardware/ddccontrol.nix +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -10,6 +10,8 @@ let in { + meta.maintainers = with lib.maintainers; [ doronbehar ]; + ###### interface options = { From 44abfc6fbf78df3ba959e2fc1771f41c70dd8e63 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 2 Nov 2025 01:02:57 +0200 Subject: [PATCH 150/154] ddcutil-service: init at 1.0.14 https://github.com/digitaltrails/ddcutil-service --- pkgs/by-name/dd/ddcutil-service/package.nix | 46 +++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/dd/ddcutil-service/package.nix diff --git a/pkgs/by-name/dd/ddcutil-service/package.nix b/pkgs/by-name/dd/ddcutil-service/package.nix new file mode 100644 index 000000000000..497ddc511397 --- /dev/null +++ b/pkgs/by-name/dd/ddcutil-service/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + pkg-config, + + # buildInputs + glib, + ddcutil, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ddcutil-service"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "digitaltrails"; + repo = "ddcutil-service"; + rev = "v${finalAttrs.version}"; + hash = "sha256-IZ6s9z0zxMZT7qd+yuQJGLnKc1WISIvhJlIGsM/Dw3w="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + glib + ddcutil + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = { + description = "A Dbus ddcutil server for control of DDC Monitors/VDUs"; + homepage = "https://github.com/digitaltrails/ddcutil-service"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "ddcutil-service"; + platforms = lib.platforms.linux; + }; +}) From 4bf4bd3621f01e574d06e8d672272f02866891af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 06:02:51 +0000 Subject: [PATCH 151/154] terraform-providers.kislerdm_neon: 0.11.0 -> 0.12.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2c413730cf25..990a84c99708 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -805,11 +805,11 @@ "vendorHash": "sha256-OZG8EA8xtskbLZgHzWm865wjnhRCsWdNepNMHfdtkyw=" }, "kislerdm_neon": { - "hash": "sha256-O7VYLD1qyH5oXv02OxrhQW+J1VysiHwbwW+Fzq4VKkE=", + "hash": "sha256-4icz/nGHIP2nzGbP4iGuPVbn8OC+u13qBSwYbyFLCto=", "homepage": "https://registry.terraform.io/providers/kislerdm/neon", "owner": "kislerdm", "repo": "terraform-provider-neon", - "rev": "v0.11.0", + "rev": "v0.12.0", "spdx": "MPL-2.0", "vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU=" }, From b6bf6a8ff36b280e3bbc35db047b3f3e0ebff3c2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Oct 2025 18:30:46 +0200 Subject: [PATCH 152/154] nixos/ddccontrol: add package option --- nixos/modules/services/hardware/ddccontrol.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix index 6f6f30a82ada..51761ea4e0ae 100644 --- a/nixos/modules/services/hardware/ddccontrol.nix +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -22,6 +22,13 @@ in This [enables `hardware.i2c`](#opt-hardware.i2c.enable), so note to add yourself to [`hardware.i2c.group`](#opt-hardware.i2c.group). ''; + package = + lib.mkPackageOption pkgs + "package with which to control brightness; added also to [services.dbus.packages](#opt-services.dbus.packages)." + { + default = [ "ddccontrol" ]; + example = [ "ddcutil-service" ]; + }; }; }; @@ -36,17 +43,16 @@ in enable = true; }; - # Give users access to the "gddccontrol" tool environment.systemPackages = [ - pkgs.ddccontrol + cfg.package ]; services.dbus.packages = [ - pkgs.ddccontrol + cfg.package ]; systemd.packages = [ - pkgs.ddccontrol + cfg.package ]; }; } From 787aa8b71fda9c4a0c854a182db3a523366e50c5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 2 Nov 2025 11:43:00 +0200 Subject: [PATCH 153/154] vdu_controls: init at 2.4.3 https://github.com/digitaltrails/vdu_controls --- pkgs/by-name/vd/vdu_controls/package.nix | 79 ++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 pkgs/by-name/vd/vdu_controls/package.nix diff --git a/pkgs/by-name/vd/vdu_controls/package.nix b/pkgs/by-name/vd/vdu_controls/package.nix new file mode 100644 index 000000000000..83b407c3d59b --- /dev/null +++ b/pkgs/by-name/vd/vdu_controls/package.nix @@ -0,0 +1,79 @@ +{ + lib, + python3, + fetchFromGitHub, + fetchpatch, + qt6, + copyDesktopItems, + installShellFiles, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "vdu_controls"; + version = "2.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "digitaltrails"; + repo = "vdu_controls"; + rev = "v${version}"; + hash = "sha256-aapODSWPB98I/ieUTXIO7nrd11VY9SmFpsVR1ketsZU="; + }; + + patches = [ + # Standardize installation with pypa/build. See: + # https://github.com/digitaltrails/vdu_controls/pull/120 + (fetchpatch { + url = "https://github.com/digitaltrails/vdu_controls/commit/ef2ed07398fc88ccc18a11da3cf5ea1500a03cb6.patch"; + hash = "sha256-W0Iv3RXQFnHAzaXHh6ZvGARN4ShsNgOhg9FTpbvnfLo="; + }) + ]; + + build-system = [ + python3.pkgs.setuptools + python3.pkgs.sphinx + ]; + # Replace FHS paths with out paths. Unfortunately it will be pretty hard to + # change this behavior upstream, as they barely use any packaging system + # whatsoever. + preBuild = '' + substituteInPlace vdu_controls.py \ + --replace-fail /usr/share/vdu_controls $out/share/vdu_controls + ''; + + nativeBuildInputs = [ + qt6.wrapQtAppsHook + copyDesktopItems + installShellFiles + ]; + desktopItems = "vdu_controls.desktop"; + postInstall = '' + install -Dm066 vdu_controls.png $out/share/icons/hicolor/256x256/apps/vdu_controls.png + make -C docs man + installManPage docs/_build/man/vdu_controls.1 + mkdir -p $out/share/vdu_controls + cp -r icons $out/share/vdu_controls + cp -r sample-scripts $out/share/vdu_controls + cp -r translations $out/share/vdu_controls + ''; + + dependencies = [ + python3.pkgs.pyqt6 + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtwayland + ]; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = { + description = "VDU controls - a control panel for monitor brightness/contrast"; + homepage = "https://github.com/digitaltrails/vdu_controls"; + license = lib.licenses.gpl3Only; + mainProgram = "vdu_controls"; + }; +} From 906e1ce6c25361be1248dc53481f016c80af95b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 06:35:18 +0000 Subject: [PATCH 154/154] chafa: 1.16.2 -> 1.18.0 --- pkgs/by-name/ch/chafa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/chafa/package.nix b/pkgs/by-name/ch/chafa/package.nix index 702a89362d38..db38014956f5 100644 --- a/pkgs/by-name/ch/chafa/package.nix +++ b/pkgs/by-name/ch/chafa/package.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.16.2"; + version = "1.18.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; tag = finalAttrs.version; - hash = "sha256-bIFPnbciaog9piqBMSpe9zLwH7irp5CW1WG5frAMqpI="; + hash = "sha256-SKwrc0bOaSdxENUWMtErSCug7of9s/ZGLeKhTtUCbWY="; }; outputs = [