From 81591c99148b0d83bc1d05f3a25d632846c14995 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Thu, 11 Sep 2025 14:12:31 +0300 Subject: [PATCH 01/36] nixos/zapret: mention that `blockcheck` requires `nftables` or `iptables` --- nixos/modules/services/networking/zapret.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/zapret.nix b/nixos/modules/services/networking/zapret.nix index 6d99be824ca3..53e602670b9f 100644 --- a/nixos/modules/services/networking/zapret.nix +++ b/nixos/modules/services/networking/zapret.nix @@ -35,7 +35,7 @@ in Specify the bypass parameters for Zapret binary. There are no universal parameters as they vary between different networks, so you'll have to find them yourself. - This can be done by running the `blockcheck` binary from zapret package, i.e. `nix-shell -p zapret --command blockcheck`. + This can be done by running the `blockcheck` binary from zapret package, i.e. `nix-shell -p nftables zapret --command blockcheck` (or `iptables` instead of `nftables` if that is what your firewall is using). It'll try different params and then tell you which params are working for your network. ''; }; From 9db61ce7dde5d81341f7e45b4ad3c5a31d14946a Mon Sep 17 00:00:00 2001 From: kyehn <228304369+kyehn@users.noreply.github.com> Date: Mon, 17 Nov 2025 07:14:04 +0800 Subject: [PATCH 02/36] qtscrcpy: 3.3.1 -> 3.3.3 Diff: https://github.com/barry-ran/QtScrcpy/compare/v3.3.1...v3.3.3 --- pkgs/by-name/qt/qtscrcpy/package.nix | 8 +++---- .../qt/qtscrcpy/remove_predefined_paths.patch | 21 ++++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix index c12d29105126..a9757744fb6a 100644 --- a/pkgs/by-name/qt/qtscrcpy/package.nix +++ b/pkgs/by-name/qt/qtscrcpy/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "qtscrcpy"; - version = "3.3.1"; + version = "3.3.3"; src = (fetchFromGitHub { owner = "barry-ran"; repo = "QtScrcpy"; tag = "v${version}"; - hash = "sha256-kDeMgSIEIQxaTDR/QAcIaEmPjkmUKBsGyF8fISRzu1M="; + hash = "sha256-UZgAFptVC67IXYdxTEmB18fJlFdaOrYrQY4JmdGEJXE="; fetchSubmodules = true; }).overrideAttrs (_: { @@ -46,9 +46,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace QtScrcpy/QtScrcpyCore/{include/QtScrcpyCoreDef.h,src/device/server/server.h} \ - --replace-fail 'serverVersion = "3.3.1"' 'serverVersion = "${scrcpy.version}"' - substituteInPlace QtScrcpy/util/config.cpp \ - --replace-fail 'COMMON_SERVER_VERSION_DEF "3.3.1"' 'COMMON_SERVER_VERSION_DEF "${scrcpy.version}"' + --replace-fail 'serverVersion = "3.3.3"' 'serverVersion = "${scrcpy.version}"' substituteInPlace QtScrcpy/audio/audiooutput.cpp \ --replace-fail 'sndcpy.sh' "$out/share/qtscrcpy/sndcpy.sh" substituteInPlace QtScrcpy/sndcpy/sndcpy.sh \ diff --git a/pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch b/pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch index 574ced6384a7..7e01b9db7099 100644 --- a/pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch +++ b/pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch @@ -2,7 +2,7 @@ diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp index a24ba60..51e3d76 100644 --- a/QtScrcpy/main.cpp +++ b/QtScrcpy/main.cpp -@@ -22,22 +22,16 @@ int main(int argc, char *argv[]) +@@ -27,27 +27,16 @@ { // set env #ifdef Q_OS_WIN32 @@ -11,17 +11,22 @@ index a24ba60..51e3d76 100644 qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap"); qputenv("QTSCRCPY_CONFIG_PATH", "../../../config"); #endif - + #ifdef Q_OS_OSX - qputenv("QTSCRCPY_ADB_PATH", "../../../../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/mac/adb"); - qputenv("QTSCRCPY_SERVER_PATH", "../../../../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server"); qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../../../keymap"); qputenv("QTSCRCPY_CONFIG_PATH", "../../../../../../config"); #endif - + #ifdef Q_OS_LINUX -- qputenv("QTSCRCPY_ADB_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/linux/adb"); -- qputenv("QTSCRCPY_SERVER_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server"); - qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap"); - qputenv("QTSCRCPY_CONFIG_PATH", "../../../config"); - #endif +- // Only set environment variables if they are not already set (e.g., by AppImage AppRun) +- if (qgetenv("QTSCRCPY_ADB_PATH").isEmpty()) { +- qputenv("QTSCRCPY_ADB_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/linux/adb"); +- } +- if (qgetenv("QTSCRCPY_SERVER_PATH").isEmpty()) { +- qputenv("QTSCRCPY_SERVER_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server"); +- } + if (qgetenv("QTSCRCPY_KEYMAP_PATH").isEmpty()) { + qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap"); + } From cf2c3a99d3bb5b75a491b78dd887d5a2b34f5e6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Nov 2025 14:36:09 +0000 Subject: [PATCH 03/36] hyprwire: 0.1.0 -> 0.1.1 --- pkgs/by-name/hy/hyprwire/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprwire/package.nix b/pkgs/by-name/hy/hyprwire/package.nix index 2cafdd96a1ec..c33559e9ee35 100644 --- a/pkgs/by-name/hy/hyprwire/package.nix +++ b/pkgs/by-name/hy/hyprwire/package.nix @@ -11,13 +11,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprwire"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprwire"; tag = "v${finalAttrs.version}"; - hash = "sha256-84KqFPakU1Pv7axkwbSi1D5XssSHIW8B2xduOUq5Mw4="; + hash = "sha256-EoLyrxFJVr7igDhhVNRk2rRpEEOJllRWvYg5XZ3J5y0="; }; nativeBuildInputs = [ From 12ec90cd783e6ba619d58a7ab4ea0af3016adb5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Nov 2025 10:35:56 +0000 Subject: [PATCH 04/36] ocamlPackages.ca-certs-nss: 3.117 -> 3.118 --- pkgs/development/ocaml-modules/ca-certs-nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 506853cc491e..f1490b40b85a 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -14,13 +14,13 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.117"; + version = "3.118"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; - hash = "sha256-SdcTJ3Og5h5XvqnDqp1flw/hwLWINjlqeT/vIwAg380="; + hash = "sha256-BthKUUeuf3jFRmQzw0U9SEbvRqcVc1UKHmb4+YePRio="; }; propagatedBuildInputs = [ From 60dfb284891a0284e1bb00f731c64c9d5ae9ec94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Nov 2025 11:07:15 +0000 Subject: [PATCH 05/36] liferea: 1.16.1 -> 1.16.6 --- pkgs/by-name/li/liferea/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/liferea/package.nix b/pkgs/by-name/li/liferea/package.nix index fd463456ca6f..991222b673ad 100644 --- a/pkgs/by-name/li/liferea/package.nix +++ b/pkgs/by-name/li/liferea/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.16.1"; + version = "1.16.6"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-4KmqxG8D0vwrMlBo5qGBIUdKpB8wCGAhYyqSyvn2muw="; + hash = "sha256-D9mRmg1iwSlyYWCuYmMDzCkhUwgzDA/1DEgj49B59Lc="; }; nativeBuildInputs = [ From 791fac1add2b55af1198d3b03de620c86e5f2e9a Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 20 Nov 2025 09:13:08 +0000 Subject: [PATCH 06/36] verapdf: pin component versions By default, veraPDF uses version ranges for some components. These versions are pinned to the package version in order to avoid non-reproducibility of the maven dependencies. fixes #423208 --- pkgs/by-name/ve/verapdf/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix index 8cade5d819ca..e6d74bc67432 100644 --- a/pkgs/by-name/ve/verapdf/package.nix +++ b/pkgs/by-name/ve/verapdf/package.nix @@ -12,7 +12,17 @@ maven.buildMavenPackage rec { pname = "verapdf"; version = "1.28.2"; - mvnParameters = "-pl '!installer' -Dverapdf.timestamp=1980-01-01T00:00:02Z -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; + mvnParameters = + "-pl '!installer' -Dverapdf.timestamp=1980-01-01T00:00:02Z -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z " + + + # By default, veraPDF uses version ranges for some components. + # These versions are pinned to the package version in order to avoid + # non-reproducibility of the maven dependencies. + lib.concatMapStringsSep " " (id: "-Dverapdf.${id}.version=${version}") [ + "library" + "pdfbox.validation" + "validation" + ]; src = fetchFromGitHub { owner = "veraPDF"; @@ -23,8 +33,7 @@ maven.buildMavenPackage rec { patches = [ ./stable-maven-plugins.patch ]; - # FIXME: this hash keeps changing over time?? - mvnHash = "sha256-+4ccnv0S7K/S2T7KryBJHJBEFrMZSFC7cNf3Kg/wN20="; + mvnHash = "sha256-CrpiomKsAyD7SyVzwbjVXy8BoVnkejQVcim+kwVP5Ng="; nativeBuildInputs = [ makeWrapper From fb881e53b4bf9b4d5f060b49a215ab020febb4b6 Mon Sep 17 00:00:00 2001 From: kpbaks Date: Tue, 18 Nov 2025 18:25:09 +0100 Subject: [PATCH 07/36] docuum: update build to use `finalAttrs:` idiom Also add `nix-update-script` as `passthru.updateScript` and `doInstallCheck` using `versionCheckHook` --- pkgs/by-name/do/docuum/package.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix index 74bcfca4f13b..d913772dec26 100644 --- a/pkgs/by-name/do/docuum/package.nix +++ b/pkgs/by-name/do/docuum/package.nix @@ -2,16 +2,18 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, + versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "docuum"; version = "0.25.1"; src = fetchFromGitHub { owner = "stepchowfun"; repo = "docuum"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fc+qEDYQGRxOSfFng3/K3xYWb8mKTuuKWanQS+/UIMo="; }; @@ -22,12 +24,18 @@ rustPlatform.buildRustPackage rec { "--skip=format::tests::code_str_display" ]; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Least recently used (LRU) eviction of Docker images"; homepage = "https://github.com/stepchowfun/docuum"; - changelog = "https://github.com/stepchowfun/docuum/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ mkg20001 ]; + changelog = "https://github.com/stepchowfun/docuum/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mkg20001 ]; mainProgram = "docuum"; }; -} +}) From 8ed0edb6611a78f801c887e813913269eca1cf9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Nov 2025 20:39:02 +0000 Subject: [PATCH 08/36] crosvm: 0-unstable-2025-11-13 -> 0-unstable-2025-11-19 --- pkgs/by-name/cr/crosvm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index c45254893556..3d77c96eb5f9 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-11-13"; + version = "0-unstable-2025-11-19"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "3d7db6c9fded7a184e279ca9170abfa94fd59e34"; - hash = "sha256-sRl0ABggh1u3ctsqA/OSgDKtB1mO6zNHiRKvZ316sOM="; + rev = "470e07c23ea9f76fcbc922b03465be2d0d28e2ce"; + hash = "sha256-/1B2ddxrefjoVUCir051vblftZAluCc80yY+StpFHXI="; fetchSubmodules = true; }; From c92df6ba1d7e5484f8e229719c47750e2fe060e8 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Thu, 20 Nov 2025 21:49:38 +0100 Subject: [PATCH 09/36] tests.checkpointBuildTools: fix hello patches --- .../hello-additionalFile.patch | 30 ++++++++-------- .../checkpointBuild/hello-removeFile.patch | 36 +++++++++---------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/test/checkpointBuild/hello-additionalFile.patch b/pkgs/test/checkpointBuild/hello-additionalFile.patch index 345bc10ee49e..9debe6d1e767 100644 --- a/pkgs/test/checkpointBuild/hello-additionalFile.patch +++ b/pkgs/test/checkpointBuild/hello-additionalFile.patch @@ -4,27 +4,27 @@ :100644 100644 0000000 0000000 M src/system.h diff --git a/Makefile.in b/Makefile.in -index 1597d39..f63f830 100644 +index 7bacfe1..b0f3a3d 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -312,7 +312,7 @@ am_lib_libhello_a_OBJECTS = lib/basename-lgpl.$(OBJEXT) \ - lib/version-etc.$(OBJEXT) lib/version-etc-fsf.$(OBJEXT) \ - lib/wctype-h.$(OBJEXT) lib/xmalloc.$(OBJEXT) \ - lib/xalloc-die.$(OBJEXT) lib/xstriconv.$(OBJEXT) \ -- lib/xstrndup.$(OBJEXT) -+ lib/xstrndup.$(OBJEXT) src/additionalFile.$(OBJEXT) +@@ -500,7 +500,7 @@ am_lib_libhello_a_OBJECTS = lib/libhello_a-basename-lgpl.$(OBJEXT) \ + lib/libhello_a-wctype-h.$(OBJEXT) $(am__objects_51) \ + lib/libhello_a-xmalloc.$(OBJEXT) \ + lib/libhello_a-xalloc-die.$(OBJEXT) \ +- lib/libhello_a-xstriconv.$(OBJEXT) ++ lib/libhello_a-xstriconv.$(OBJEXT) src/additionalFile.$(OBJEXT) lib_libhello_a_OBJECTS = $(am_lib_libhello_a_OBJECTS) am_hello_OBJECTS = src/hello.$(OBJEXT) hello_OBJECTS = $(am_hello_OBJECTS) -@@ -1842,7 +1842,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \ - $(am__append_4) $(am__append_5) lib/version-etc.h \ +@@ -2557,7 +2557,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \ + $(am__append_51) $(am__append_52) lib/version-etc.h \ lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \ - lib/xmalloc.c lib/xalloc-die.c lib/xstriconv.h lib/xstriconv.c \ -- lib/xstrndup.h lib/xstrndup.c -+ lib/xstrndup.h lib/xstrndup.c src/additionalFile.c - lib_libhello_a_LIBADD = $(gl_LIBOBJS) - lib_libhello_a_DEPENDENCIES = $(gl_LIBOBJS) - EXTRA_lib_libhello_a_SOURCES = lib/close.c lib/stripslash.c lib/dup2.c \ + $(am__append_53) lib/xmalloc.c lib/xalloc-die.c \ +- lib/xstriconv.h lib/xstriconv.c ++ lib/xstriconv.h lib/xstriconv.c src/additionalFile.c + lib_libhello_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) $(GL_CFLAG_ALLOW_WARNINGS) + lib_libhello_a_LIBADD = $(gl_libhello_LIBOBJS) + lib_libhello_a_DEPENDENCIES = $(gl_libhello_LIBOBJS) diff --git a/src/additionalFile.c b/src/additionalFile.c new file mode 100644 index 0000000..34d683d diff --git a/pkgs/test/checkpointBuild/hello-removeFile.patch b/pkgs/test/checkpointBuild/hello-removeFile.patch index 2939790dabce..836bd3056645 100644 --- a/pkgs/test/checkpointBuild/hello-removeFile.patch +++ b/pkgs/test/checkpointBuild/hello-removeFile.patch @@ -3,28 +3,28 @@ :100644 100644 0000000 0000000 M src/hello.c :100755 100755 0000000 0000000 M tests/hello-1 -diff --git a/Makefile.in b/Makefile.in -index f63f830..1597d39 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -312,7 +312,7 @@ am_lib_libhello_a_OBJECTS = lib/basename-lgpl.$(OBJEXT) \ - lib/version-etc.$(OBJEXT) lib/version-etc-fsf.$(OBJEXT) \ - lib/wctype-h.$(OBJEXT) lib/xmalloc.$(OBJEXT) \ - lib/xalloc-die.$(OBJEXT) lib/xstriconv.$(OBJEXT) \ -- lib/xstrndup.$(OBJEXT) src/additionalFile.$(OBJEXT) -+ lib/xstrndup.$(OBJEXT) +diff --git b/Makefile.in a/Makefile.in +index b0f3a3d..7bacfe1 100644 +--- b/Makefile.in ++++ a/Makefile.in +@@ -500,7 +500,7 @@ am_lib_libhello_a_OBJECTS = lib/libhello_a-basename-lgpl.$(OBJEXT) \ + lib/libhello_a-wctype-h.$(OBJEXT) $(am__objects_51) \ + lib/libhello_a-xmalloc.$(OBJEXT) \ + lib/libhello_a-xalloc-die.$(OBJEXT) \ +- lib/libhello_a-xstriconv.$(OBJEXT) src/additionalFile.$(OBJEXT) ++ lib/libhello_a-xstriconv.$(OBJEXT) lib_libhello_a_OBJECTS = $(am_lib_libhello_a_OBJECTS) am_hello_OBJECTS = src/hello.$(OBJEXT) hello_OBJECTS = $(am_hello_OBJECTS) -@@ -1842,7 +1842,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \ - $(am__append_4) $(am__append_5) lib/version-etc.h \ +@@ -2557,7 +2557,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \ + $(am__append_51) $(am__append_52) lib/version-etc.h \ lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \ - lib/xmalloc.c lib/xalloc-die.c lib/xstriconv.h lib/xstriconv.c \ -- lib/xstrndup.h lib/xstrndup.c src/additionalFile.c -+ lib/xstrndup.h lib/xstrndup.c - lib_libhello_a_LIBADD = $(gl_LIBOBJS) - lib_libhello_a_DEPENDENCIES = $(gl_LIBOBJS) - EXTRA_lib_libhello_a_SOURCES = lib/close.c lib/stripslash.c lib/dup2.c \ + $(am__append_53) lib/xmalloc.c lib/xalloc-die.c \ +- lib/xstriconv.h lib/xstriconv.c src/additionalFile.c ++ lib/xstriconv.h lib/xstriconv.c + lib_libhello_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) $(GL_CFLAG_ALLOW_WARNINGS) + lib_libhello_a_LIBADD = $(gl_libhello_LIBOBJS) + lib_libhello_a_DEPENDENCIES = $(gl_libhello_LIBOBJS) diff --git a/src/additionalFile.c b/src/additionalFile.c deleted file mode 100644 index 34d683d..0000000 From 20d00a3b803f836c0a8114baa8b0b49dfc766990 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Nov 2025 21:43:49 +0000 Subject: [PATCH 10/36] openstack-rs: 0.13.2 -> 0.13.3 --- pkgs/by-name/op/openstack-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix index be2db56c5724..a202e2fbd581 100644 --- a/pkgs/by-name/op/openstack-rs/package.nix +++ b/pkgs/by-name/op/openstack-rs/package.nix @@ -9,15 +9,15 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "openstack-rs"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "gtema"; repo = "openstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-90yuCPUS9yv2UbPOPj+aE8s3qMJXsda41uoMRAVYQ1g="; + hash = "sha256-F9ePn+Fu9/9/rQnF0a+ViezsMtxuojycF4h9e77tm1Y="; }; - cargoHash = "sha256-qUCgRCfCuu6bSSlUsY18QQHIOtOwwPyYnA2sCpuf10I="; + cargoHash = "sha256-nVR0XUjOwiYNEYG/6ViH4biCXyeK5GVkMb/uOvBRFUw="; nativeBuildInputs = [ installShellFiles From b242fd133a5dbae45d466449fd6e72164ac80ae1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 20 Nov 2025 23:07:47 +0100 Subject: [PATCH 11/36] victoriatraces: 0.5.0 -> 0.5.1 ChangeLog: https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/v0.5.1 --- pkgs/by-name/vi/victoriatraces/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriatraces/package.nix b/pkgs/by-name/vi/victoriatraces/package.nix index 91f273e34550..bfa7c48aba9c 100644 --- a/pkgs/by-name/vi/victoriatraces/package.nix +++ b/pkgs/by-name/vi/victoriatraces/package.nix @@ -13,15 +13,22 @@ buildGoModule (finalAttrs: { pname = "VictoriaTraces"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaTraces"; tag = "v${finalAttrs.version}"; - hash = "sha256-jmcwn2/UB87wOBCHvquHIgc+a/sCXnxC63nddlZuSL0="; + hash = "sha256-RvP3hLM8SoDN91PATTI5RTKwnJsomBtWIakRlBprEPA="; }; + postPatch = '' + substituteInPlace go.mod \ + --replace-fail "go 1.25.4" "go 1.25.3" + substituteInPlace vendor/modules.txt \ + --replace-fail "go 1.25.4" "go 1.25.3" + ''; + vendorHash = null; subPackages = From e9a6f320c08199693a03a00662141897cd3c79ce Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 21 Nov 2025 00:36:07 +0100 Subject: [PATCH 12/36] sonarr: 4.0.15.2941 -> 4.0.16.2944 --- pkgs/by-name/so/sonarr/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index d524ab3cc5c0..3db36aa85bbd 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -21,7 +21,7 @@ applyPatches, }: let - version = "4.0.15.2941"; + version = "4.0.16.2944"; # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass # the already patched lockfile to `fetchYarnDeps`. src = applyPatches { @@ -29,10 +29,14 @@ let owner = "Sonarr"; repo = "Sonarr"; tag = "v${version}"; - hash = "sha256-1lBUkodBDFpJD7pyHAFb8HRLrbK8wyAboX0A2oBQnTM="; + hash = "sha256-ec/fxCUvKd6/+zrWLccnOsCwnZucZkEeCz9VpzdtjTg="; }; postPatch = '' mv src/NuGet.Config NuGet.Config + + # error CS0104: 'IPNetwork' is an ambiguous reference between 'Microsoft.AspNetCore.HttpOverrides.IPNetwork' and 'System.Net.IPNetwork' + substituteInPlace src/NzbDrone.Host/Startup.cs \ + --replace-fail 'IPNetwork' 'Microsoft.AspNetCore.HttpOverrides.IPNetwork' ''; patches = lib.optionals (lib.versionOlder version "5.0") [ # See https://github.com/Sonarr/Sonarr/issues/7442 and From dfd8c8fdb9a2f67ce33d7efa67d61f07a1a94182 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Nov 2025 02:08:59 +0000 Subject: [PATCH 13/36] azure-cli-extensions.k8s-configuration: 2.2.0 -> 2.3.0 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index d4c26f40253a..13f234ebdbe8 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -251,9 +251,9 @@ k8s-configuration = mkAzExtension rec { pname = "k8s-configuration"; - version = "2.2.0"; + version = "2.3.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_configuration-${version}-py3-none-any.whl"; - hash = "sha256-aRdNy3aH+xfLNK7asYqok9aw6RedEcAQqOUKxtIwRwg="; + hash = "sha256-ABkAYL19wQIiB+xuu2y/9otpSh/SSxgbuXhv5RrHP2c="; description = "Microsoft Azure Command-Line Tools K8s-configuration Extension"; propagatedBuildInputs = with python3Packages; [ pycryptodome From 654dac0156ba008878d4d209f32e42f65a4d01bf Mon Sep 17 00:00:00 2001 From: Marcel Date: Fri, 21 Nov 2025 03:40:28 +0100 Subject: [PATCH 14/36] lexbor: 2.5.0 -> 2.6.0 --- pkgs/by-name/le/lexbor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lexbor/package.nix b/pkgs/by-name/le/lexbor/package.nix index f5136271ce9f..132e21fac9ba 100644 --- a/pkgs/by-name/le/lexbor/package.nix +++ b/pkgs/by-name/le/lexbor/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lexbor"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "lexbor"; repo = "lexbor"; tag = "v${finalAttrs.version}"; - hash = "sha256-QmD8p6dySLEeHjCmDSTplXwsy2Z7yHKYlXmPCKwaBfU="; + hash = "sha256-l+pIUjHqt+pOyEUKoPQm0i9soQUkxLzLMQDStIiycAw="; }; nativeBuildInputs = [ From 1cd75316d958412f7713a5c82e796423577c71b9 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sun, 2 Nov 2025 18:34:37 +0100 Subject: [PATCH 15/36] python3Packages.selectolax: init at 0.4.3 --- ...-setup.py-devendor-modest-and-lexbor.patch | 40 ++++++++++++ .../python-modules/selectolax/default.nix | 62 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 104 insertions(+) create mode 100644 pkgs/development/python-modules/selectolax/0001-setup.py-devendor-modest-and-lexbor.patch create mode 100644 pkgs/development/python-modules/selectolax/default.nix diff --git a/pkgs/development/python-modules/selectolax/0001-setup.py-devendor-modest-and-lexbor.patch b/pkgs/development/python-modules/selectolax/0001-setup.py-devendor-modest-and-lexbor.patch new file mode 100644 index 000000000000..0e51e5527bf3 --- /dev/null +++ b/pkgs/development/python-modules/selectolax/0001-setup.py-devendor-modest-and-lexbor.patch @@ -0,0 +1,40 @@ +From f0e18a73f15f9cf0d60a25304e212e10bc206c53 Mon Sep 17 00:00:00 2001 +From: Marcel +Date: Fri, 21 Nov 2025 03:29:50 +0100 +Subject: [PATCH] setup.py: devendor modest and lexbor + +--- + setup.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 618e989..bf7028e 100644 +--- a/setup.py ++++ b/setup.py +@@ -163,9 +163,9 @@ def make_extensions(): + files_to_compile, + language="c", + include_dirs=[ +- "modest/include/", ++ "@modest@/include/", + ], +- extra_objects=extra_objects, ++ libraries=["modest"], + extra_compile_args=compile_arguments, + ) + ) +@@ -177,9 +177,9 @@ def make_extensions(): + files_to_compile_lxb, + language="c", + include_dirs=[ +- "lexbor/source/", ++ "@lexbor@/include/", + ], +- extra_objects=extra_objects_lxb, ++ libraries=["lexbor"], + extra_compile_args=compile_arguments_lxb, + ) + ) +-- +2.50.1 + diff --git a/pkgs/development/python-modules/selectolax/default.nix b/pkgs/development/python-modules/selectolax/default.nix new file mode 100644 index 000000000000..d85ce3e620be --- /dev/null +++ b/pkgs/development/python-modules/selectolax/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + replaceVars, + setuptools, + cython, + modest, + lexbor, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "selectolax"; + version = "0.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rushter"; + repo = "selectolax"; + tag = "v${version}"; + hash = "sha256-1xoHMQzoO0NYi5gJsV++Ngvkaf/O3U14nYkJLvzzbrQ="; + }; + + patches = [ + (replaceVars ./0001-setup.py-devendor-modest-and-lexbor.patch { + modest = lib.getDev modest; + lexbor = lib.getDev lexbor; + }) + ]; + + build-system = [ + setuptools + cython + ]; + + buildInputs = [ + modest + lexbor + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # shadows name and breaks imports in tests + rm -rf selectolax + ''; + + pythonImportsCheck = [ + "selectolax" + ]; + + meta = { + description = "Python binding to Modest and Lexbor engines. Fast HTML5 parser with CSS selectors for Python"; + homepage = "https://github.com/rushter/selectolax"; + changelog = "https://github.com/rushter/selectolax/blob/${src.tag}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marcel ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ae6d7863b67..46c609ab6e03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16793,6 +16793,8 @@ self: super: with self; { segyio = callPackage ../development/python-modules/segyio { inherit (pkgs) cmake ninja; }; + selectolax = callPackage ../development/python-modules/selectolax { }; + selenium = callPackage ../development/python-modules/selenium { }; selenium-wire = callPackage ../development/python-modules/selenium-wire { }; From 9fd2a267b7a1f6e867e7894752f7d27be531f0e8 Mon Sep 17 00:00:00 2001 From: Marcel Date: Fri, 31 Oct 2025 14:26:51 +0100 Subject: [PATCH 16/36] python3Packages.mkdocs-glightbox 0.4.0 -> 0.5.2 --- .../mkdocs-glightbox/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-glightbox/default.nix b/pkgs/development/python-modules/mkdocs-glightbox/default.nix index 65fdad8f38a8..5baa70cc59be 100644 --- a/pkgs/development/python-modules/mkdocs-glightbox/default.nix +++ b/pkgs/development/python-modules/mkdocs-glightbox/default.nix @@ -2,31 +2,38 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + hatchling, + selectolax, pytestCheckHook, pytest-click, + pytest-timeout, mkdocs-material, }: buildPythonPackage rec { pname = "mkdocs-glightbox"; - version = "0.4.0"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "blueswen"; repo = "mkdocs-glightbox"; tag = "v${version}"; - hash = "sha256-9HgXK7cE2z0fvKwEpCG5PTaaqGiet9KMNN2Ys9VJgeE="; + hash = "sha256-6HkBeZHBLR3HqWh3WjjCqxR85nQuQqq9+7UwbXOZHRk="; }; build-system = [ - setuptools + hatchling + ]; + + dependencies = [ + selectolax ]; nativeCheckInputs = [ pytestCheckHook pytest-click + pytest-timeout mkdocs-material ]; @@ -35,6 +42,11 @@ buildPythonPackage rec { "privacy" ]; + disabledTestPaths = [ + # dont execute benchmarks on hydra + "tests/test_perf.py" + ]; + pythonImportsCheck = [ "mkdocs_glightbox" ]; From fb633b29d55eab38eaeb7c6c860246aaa1e0463c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Nov 2025 02:59:55 +0000 Subject: [PATCH 17/36] ledger-live-desktop: 2.132.0 -> 2.133.0 --- pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index c191781aa357..b457e5a9115a 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.132.0"; + version = "2.133.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-wxOzx8Eo/AAbPor/nA3gjVC8vAfRTNjVmvxON5Ta5d0="; + hash = "sha256-2oyfqeNRYfl/UogFwQ+qKjmNJbdyQAF6/AlErOLw0hg="; }; appimageContents = appimageTools.extractType2 { From 01c0788c1a931b2ff2297659a6dad020431933de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Nov 2025 03:26:41 +0000 Subject: [PATCH 18/36] python3Packages.llguidance: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/llguidance/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/llguidance/default.nix b/pkgs/development/python-modules/llguidance/default.nix index 2256fc21346c..a7e60c9717c5 100644 --- a/pkgs/development/python-modules/llguidance/default.nix +++ b/pkgs/development/python-modules/llguidance/default.nix @@ -22,19 +22,19 @@ buildPythonPackage rec { pname = "llguidance"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "guidance-ai"; repo = "llguidance"; tag = "v${version}"; - hash = "sha256-lnQn8587ioMXm1HiY/yBLFdofJldsw0Y6csBJiVnBrs="; + hash = "sha256-+DRJIzFqJEeinwJVyXuRQ1niQmDoNhKLHrfvFnjDL8c="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-CMRkOeO8JMVatjjDNsaN2CcWGQS/l0onjqrCbp3/49Q="; + hash = "sha256-SQ8ahSCJUaYF7PzPfRUjCdJTJ811oTyxiLDfRre2BO0="; }; nativeBuildInputs = [ From 80140502a00db52803f80c5f08b9797724b14391 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Nov 2025 05:40:18 +0000 Subject: [PATCH 19/36] libretro.beetle-pce-fast: 0-unstable-2025-10-17 -> 0-unstable-2025-11-14 --- .../emulators/libretro/cores/beetle-pce-fast.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index 138ce2e99ed4..4e994394f762 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2025-10-17"; + version = "0-unstable-2025-11-14"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "d5c2b28ee6931ae43a4a79455937693ae8ccc8a1"; - hash = "sha256-67SLilFN88TVdbtpb97dw87QVLJWIib44kifVvZMXYE="; + rev = "7e9b257b8a591cb7e00f9e55371edba19db9799c"; + hash = "sha256-LBx4bSnE3XeQw/Bc5EID8U6Dxj7uc6JBrV8vSwO/jEM="; }; makefile = "Makefile"; From f459e56201addcf02091528948e172fb453d7fb0 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Fri, 21 Nov 2025 05:56:29 +0000 Subject: [PATCH 20/36] linuxPackages.r8168: fix build on linux 5.10 --- pkgs/os-specific/linux/r8168/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index e272449933ac..1a70c4b00332 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -36,10 +36,11 @@ stdenv.mkDerivation rec { # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168 makeFlags = kernelModuleMakeFlags ++ [ "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "M=$(PWD)/src" "modules" ]; preBuild = '' + absSrc=$(realpath src) + makeFlagsArray+=("M=$absSrc") makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN -DCONFIG_ASPM -DENABLE_S5WOL -DENABLE_EEE") ''; From 18419a56176547f09922af9f3a45da2672e85e81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Nov 2025 06:01:09 +0000 Subject: [PATCH 21/36] mongodb-atlas-cli: 1.50.0 -> 1.50.1 --- pkgs/by-name/mo/mongodb-atlas-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix index 954f55e351b8..78608c3583e3 100644 --- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix +++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "mongodb-atlas-cli"; - version = "1.50.0"; + version = "1.50.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongodb-atlas-cli"; tag = "atlascli/v${version}"; - hash = "sha256-vo2vfnGKp71S9mVGK5SVi8YqNLjedzfjJhh5uK/pb4E="; + hash = "sha256-hDiHECN58mwTufU9nsbKtBlUiweTuOfMgsADcguCKzA="; }; - vendorHash = "sha256-qcB8Hgp/4kVsEo32E6I4GMSBbRByPTyk3Oas2CpS4Xc="; + vendorHash = "sha256-StKuOuyVPJ+fSWcRKR53yyr9cB8GD3dfzyex3sMzsAk="; nativeBuildInputs = [ installShellFiles ]; From 318b4a071673f6b15d43de1d21e4ecf7d0e46e82 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Fri, 21 Nov 2025 15:55:53 +0800 Subject: [PATCH 22/36] prl-tools: 26.1.1-57288 -> 26.1.2-57293 --- pkgs/by-name/pr/prl-tools/package.nix | 4 ++-- pkgs/by-name/pr/prl-tools/update.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prl-tools/package.nix b/pkgs/by-name/pr/prl-tools/package.nix index 7c78f14257bb..49bb154dd71c 100644 --- a/pkgs/by-name/pr/prl-tools/package.nix +++ b/pkgs/by-name/pr/prl-tools/package.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "26.1.1-57288"; + version = "26.1.2-57293"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-11IyKI2oOffzSPTB65XksZI3PD9W2+0SPZIfpb0RLuU="; + hash = "sha256-0sL6uKYw/D7gYYZyAWkxcP/KbJ1rBnlXIKYDu6MlTLQ="; }; hardeningDisable = [ diff --git a/pkgs/by-name/pr/prl-tools/update.sh b/pkgs/by-name/pr/prl-tools/update.sh index cd2a9ff22b57..ba2cae4e952b 100755 --- a/pkgs/by-name/pr/prl-tools/update.sh +++ b/pkgs/by-name/pr/prl-tools/update.sh @@ -4,7 +4,7 @@ set -eu -o pipefail nixpkgs="$(git rev-parse --show-toplevel)" -path="$nixpkgs/pkgs/by-name/pr/prl-tools/default.nix" +path="$nixpkgs/pkgs/by-name/pr/prl-tools/package.nix" # Currently this script only supports Parallels 26 # Please change the knowledge base url after each major release From ff864cbcd9db8f57957fb85101d32edd5028515a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Nov 2025 08:00:02 +0000 Subject: [PATCH 23/36] panoply: 5.8.0 -> 5.8.1 --- pkgs/by-name/pa/panoply/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/panoply/package.nix b/pkgs/by-name/pa/panoply/package.nix index 56144e750fa3..3300635e22c0 100644 --- a/pkgs/by-name/pa/panoply/package.nix +++ b/pkgs/by-name/pa/panoply/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - hash = "sha256-5QpfuS5mX8xImWX8F/+5r3jlW4bmMvtUakXjRva1xD8="; + hash = "sha256-pdlJGr4zwHiBP9BujALNPBe9m9UIwNQLgOURomxlnjU="; }; nativeBuildInputs = [ makeWrapper ]; From 73c085e4aa4f09f0479b77f922ed5da137125884 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Nov 2025 13:31:16 +0000 Subject: [PATCH 24/36] python3Packages.pytest-integration: init at 0.2.3 --- .../pytest-integration/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-integration/default.nix diff --git a/pkgs/development/python-modules/pytest-integration/default.nix b/pkgs/development/python-modules/pytest-integration/default.nix new file mode 100644 index 000000000000..b0caf78aeb3e --- /dev/null +++ b/pkgs/development/python-modules/pytest-integration/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pytest-integration"; + version = "0.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jbwdevries"; + repo = "pytest-integration"; + tag = "v${version}"; + hash = "sha256-Ziy+GEfljYDccx3mm63p7rhDUQVDXLbk7DxUW3npjiE="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "pytest_integration" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Tests need to discover the mock `package` module located under `example/` + preCheck = '' + pushd example + ''; + + postCheck = '' + popd + ''; + + meta = { + description = "Organizing test by unit test, quick integration or slow integration"; + homepage = "https://github.com/jbwdevries/pytest-integration"; + changelog = "https://github.com/jbwdevries/pytest-integration/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ae6d7863b67..a609834da981 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14737,6 +14737,8 @@ self: super: with self; { pytest-instafail = callPackage ../development/python-modules/pytest-instafail { }; + pytest-integration = callPackage ../development/python-modules/pytest-integration { }; + pytest-isort = callPackage ../development/python-modules/pytest-isort { }; pytest-json-report = callPackage ../development/python-modules/pytest-json-report { }; From 1a2e8a425190f558ebc148ada10a08ea42c1aba6 Mon Sep 17 00:00:00 2001 From: Carman Fu Date: Fri, 21 Nov 2025 16:26:55 +0800 Subject: [PATCH 25/36] vimPlugins.stringbreaker-nvim: init at 2025-09-24 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 101b44835689..7a8a0b31afe2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -14500,6 +14500,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + stringbreaker-nvim = buildVimPlugin { + pname = "stringbreaker.nvim"; + version = "2025-09-24"; + src = fetchFromGitHub { + owner = "duqcyxwd"; + repo = "stringbreaker.nvim"; + rev = "f6310ad154063151078548b21e8de05bec1f6ac9"; + sha256 = "14k7cvjh9kz3p33np275qp2p2aipbxm934kqz2yc7l08fag9sg3x"; + }; + meta.homepage = "https://github.com/duqcyxwd/stringbreaker.nvim/"; + meta.hydraPlatforms = [ ]; + }; + styler-nvim = buildVimPlugin { pname = "styler.nvim"; version = "2025-10-28"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index edba6ecc9851..1f93f48a4fb6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1113,6 +1113,7 @@ https://github.com/darfink/starsearch.vim/,, https://github.com/max397574/startup.nvim/,HEAD, https://github.com/luukvbaal/statuscol.nvim/,, https://github.com/arnamak/stay-centered.nvim/,HEAD, +https://github.com/duqcyxwd/stringbreaker.nvim/,HEAD, https://github.com/folke/styler.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, https://github.com/gbprod/substitute.nvim/,HEAD, From c339e2fa12cec99164f41a3c22209191035a3213 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 20 Nov 2025 10:46:29 +0000 Subject: [PATCH 26/36] python3Packages.model-hosting-container-standards: init at 0.1.9 --- .../default.nix | 78 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/python-modules/model-hosting-container-standards/default.nix diff --git a/pkgs/development/python-modules/model-hosting-container-standards/default.nix b/pkgs/development/python-modules/model-hosting-container-standards/default.nix new file mode 100644 index 000000000000..369e1ff00cf8 --- /dev/null +++ b/pkgs/development/python-modules/model-hosting-container-standards/default.nix @@ -0,0 +1,78 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + fastapi, + httpx, + jmespath, + pydantic, + starlette, + supervisor, + + # tests + pytest-asyncio, + pytestCheckHook, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "model-hosting-container-standards"; + version = "0.1.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aws"; + repo = "model-hosting-container-standards"; + tag = "v${version}"; + hash = "sha256-iy7lPtMM2J/zC1TUB5Eydtesy4JsjWTjACNlDhfSPA8="; + }; + + sourceRoot = "${src.name}/python"; + + build-system = [ + poetry-core + ]; + + pythonRelaxDeps = [ + "starlette" + ]; + pythonRemoveDeps = [ + # Declared as a runtime dependency, but not used in practice + "setuptools" + ]; + dependencies = [ + fastapi + httpx + jmespath + pydantic + starlette + supervisor + ]; + + pythonImportsCheck = [ "model_hosting_container_standards" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # AssertionError: Server should have created restart log + "test_continuous_restart_behavior" + "test_startup_retry_limit" + ]; + + meta = { + description = "Standardized Python framework for seamless integration between ML frameworks (TensorRT-LLM, vLLM) and Amazon SageMaker hosting"; + homepage = "https://github.com/aws/model-hosting-container-standards/tree/main/python"; + changelog = "https://github.com/aws/model-hosting-container-standards/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ae6d7863b67..2ad16cd5dd6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9717,6 +9717,10 @@ self: super: with self; { model-checker = callPackage ../development/python-modules/model-checker { }; + model-hosting-container-standards = + callPackage ../development/python-modules/model-hosting-container-standards + { }; + model-signing = callPackage ../development/python-modules/model-signing { }; modelcif = callPackage ../development/python-modules/modelcif { }; From 6be96c9b2dae497128bff19da09f0c363e98f9b0 Mon Sep 17 00:00:00 2001 From: Marc Bornand Date: Fri, 21 Nov 2025 10:06:28 +0100 Subject: [PATCH 27/36] tor-browser: set ffmpeg to version 7 As of tor-browser 15.0.2 ffmpeg 7 is needed over 8 to read mpeg4 videos fixes: 130c99296179d0b3e2f6a6f7b0742659d32139ec --- pkgs/by-name/to/tor-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index d89ee04a9eba..89821aa54c71 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -40,7 +40,7 @@ libGL, mediaSupport ? true, - ffmpeg, + ffmpeg_7, audioSupport ? mediaSupport, @@ -99,7 +99,7 @@ let ++ lib.optionals pipewireSupport [ pipewire ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals libvaSupport [ libva ] - ++ lib.optionals mediaSupport [ ffmpeg ] + ++ lib.optionals mediaSupport [ ffmpeg_7 ] ); version = "15.0.2"; From f1e8b5721a96e1266fef14c5a68934b052246b4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Nov 2025 09:29:52 +0000 Subject: [PATCH 28/36] obs-do: 0.1.11 -> 0.1.12 --- pkgs/by-name/ob/obs-do/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix index ad5b86abb5d1..5201ab07a5a7 100644 --- a/pkgs/by-name/ob/obs-do/package.nix +++ b/pkgs/by-name/ob/obs-do/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "obs-do"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "jonhoo"; repo = "obs-do"; tag = "v${finalAttrs.version}"; - hash = "sha256-EbwgYBvHsfUNmv3y5r6nfK6C4sqZ7ZkG4HTb3+0cA3o="; + hash = "sha256-BYZI8XirNon7P2ckyXaLkFiU4OuwK2y9eLccj0D/2W4="; }; - cargoHash = "sha256-LOoMtzIRaoAg02gY7EWj9A8vsjdUyEnxNy38Z5dFs+4="; + cargoHash = "sha256-V5j+zi7ogwxs2kCMRjDD7pF8yBWE6p7J2UAOXeJGbFw="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; From e5060b0ed1e1af8a6fd2730cab93b459d74ef5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 21 Nov 2025 09:51:16 +0000 Subject: [PATCH 29/36] claude-code: 2.0.47 -> 2.0.49 --- pkgs/by-name/cl/claude-code/package-lock.json | 4 ++-- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index bf42d166fc79..5d48da62ccdd 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.47", + "version": "2.0.49", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.47", + "version": "2.0.49", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 6ef0f3f18b7f..f0f96967ec09 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,14 +7,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.47"; + version = "2.0.49"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-do9NH1L8ME1+ZbXB7XgmQMzHLmuBssPjDo/aTYV+Nzo="; + hash = "sha256-ht6s8NOPgwS3Vnwd+2ECO8KAWbXZOL8ZNnOFMNxmAdI="; }; - npmDepsHash = "sha256-Ikl6Q6vvFi5LCuHYIYfXxovFwdcK/dG6QqGwq9Gm+aI="; + npmDepsHash = "sha256-KqLOvyZ9YYdUIeyzdlElOIq2bjieTbklCbVIoYSE63g="; postPatch = '' cp ${./package-lock.json} package-lock.json From d03a2ff5fe10353dd681f1270bea59947a31b51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 21 Nov 2025 09:51:58 +0000 Subject: [PATCH 30/36] vscode-extensions.anthropic.claude-code: 2.0.47 -> 2.0.49 --- .../vscode/extensions/anthropic.claude-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 7ed31923f60f..d21734bb26ba 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.47"; - hash = "sha256-2wvViSXJQO5h8WGYqXpn+gRQ8Tzfb9O+MoJBTLaevUw="; + version = "2.0.49"; + hash = "sha256-norWEwxgAFlylLH+NphYdmpb0vkVcmkidi0SN8Kr6R0="; }; meta = { From f81081372e42280c2b6f57cd25fb88655bd31729 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Nov 2025 12:54:26 +0000 Subject: [PATCH 31/36] python3Packages.torchtune: init at 0.6.1 --- .../python-modules/torchtune/default.nix | 123 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 125 insertions(+) create mode 100644 pkgs/development/python-modules/torchtune/default.nix diff --git a/pkgs/development/python-modules/torchtune/default.nix b/pkgs/development/python-modules/torchtune/default.nix new file mode 100644 index 000000000000..d205aa25f51d --- /dev/null +++ b/pkgs/development/python-modules/torchtune/default.nix @@ -0,0 +1,123 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + blobfile, + datasets, + huggingface-hub, + kagglehub, + numpy, + omegaconf, + pillow, + psutil, + safetensors, + sentencepiece, + tiktoken, + tokenizers, + torch, + torchdata, + tqdm, + torchao, + torchvision, + + # tests + comet-ml, + mlflow, + pytest-integration, + pytest-mock, + pytestCheckHook, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "torchtune"; + version = "0.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "meta-pytorch"; + repo = "torchtune"; + tag = "v${version}"; + hash = "sha256-evhQBpZiUXriL0PAYkEzGypH21iRs37Ix6Nl5YAyeQ0="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + blobfile + datasets + huggingface-hub + kagglehub + numpy + omegaconf + pillow + psutil + safetensors + sentencepiece + tiktoken + tokenizers + torch + torchdata + tqdm + + # Not explicitly listed as requirements, but effectively imported at runtime + torchao + torchvision + ] + ++ huggingface-hub.optional-dependencies.hf_transfer; + + pythonImportsCheck = [ "torchtune" ]; + + nativeCheckInputs = [ + comet-ml + mlflow + pytest-integration + pytest-mock + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # AssertionError (tensors are not equal) + "test_stop_tokens" + "test_stop_tokens_batched" + "test_stop_tokens_batched_uneven_stopping" + "test_stop_tokens_batched_uneven_stopping_left_padded" + + # RuntimeError: not allowed to set torch.backends.cudnn flags after disable_global_flags; + # please use flags() context manager instead + "test_deterministic_false" + "test_deterministic_true" + + # TypeError: exceptions must be derived from Warning, not + "test_deprecated" + + # Flaky + # AssertionError: actual: -83.3048095703125, expected: -83.15229797363281 + "test_forward" + "test_forward_kv_cache" + "test_forward_with_2d_pos_ids" + "test_forward_with_curr_pos" + "test_forward_with_packed_pos" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Segmentation fault + "test_forward_gqa" + ]; + + meta = { + description = "PyTorch native post-training library"; + homepage = "https://github.com/meta-pytorch/torchtune"; + changelog = "https://github.com/meta-pytorch/torchtune/releases/tag/${src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a609834da981..36bab22a161e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18849,6 +18849,8 @@ self: super: with self; { torchtnt = callPackage ../development/python-modules/torchtnt { }; + torchtune = callPackage ../development/python-modules/torchtune { }; + torchvision = callPackage ../development/python-modules/torchvision { }; torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { }; From 7c37d69e1dab7a1808099c5af91d051290ca1523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 21 Nov 2025 09:57:10 +0000 Subject: [PATCH 32/36] gemini-cli: 0.16.0 -> 0.17.0 --- pkgs/by-name/ge/gemini-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index d5a132cc16e1..66f340f49158 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-EOiG7Ov+tY6UPci4A67kKcCItkTrrENOm1mSaWxKE94="; + hash = "sha256-pJveHjguNl8J67zu6O867iM/JlXM9VTAokIQYHvxUYs="; }; - npmDepsHash = "sha256-JvzrbyiJHbKNRHoGll7eSH4dD6Hj5qnrh4F/upHPntI="; + npmDepsHash = "sha256-SVjUt8xoBtuZJa0mUfZCf/XXxc8OxDU7FG8ZYPTM3j4="; nativeBuildInputs = [ jq From 913324be1957decc1c71fea8405bd41caf29d39c Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 21 Nov 2025 15:23:21 +0800 Subject: [PATCH 33/36] gemini-cli: disable auto update for real --- pkgs/by-name/ge/gemini-cli/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index d5a132cc16e1..5a67ae11d392 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -47,8 +47,16 @@ buildNpmPackage (finalAttrs: { # Remove node-pty dependency from packages/core/package.json ${jq}/bin/jq 'del(.optionalDependencies."node-pty")' packages/core/package.json > packages/core/package.json.tmp && mv packages/core/package.json.tmp packages/core/package.json - # Get rid of auto-update + # Ideal method to disable auto-update sed -i '/disableAutoUpdate: {/,/}/ s/default: false/default: true/' packages/cli/src/config/settingsSchema.ts + + # Disable auto-update for real because the default value in settingsSchema isn't cleanly applied + # https://github.com/google-gemini/gemini-cli/issues/13569 + substituteInPlace packages/cli/src/utils/handleAutoUpdate.ts \ + --replace-fail "settings.merged.general?.disableAutoUpdate ?? false" "settings.merged.general?.disableAutoUpdate ?? true" \ + --replace-fail "settings.merged.general?.disableAutoUpdate" "(settings.merged.general?.disableAutoUpdate ?? true)" + substituteInPlace packages/cli/src/ui/utils/updateCheck.ts \ + --replace-fail "settings.merged.general?.disableUpdateNag" "(settings.merged.general?.disableUpdateNag ?? true)" ''; installPhase = '' From e2bfb8412880975a05974c80850ab34984937522 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 21 Nov 2025 15:23:33 +0800 Subject: [PATCH 34/36] gemini-cli-bin: disable auto update for real --- pkgs/by-name/ge/gemini-cli-bin/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index 03384973e181..45132b79ec46 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -25,7 +25,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall install -D "$src" "$out/bin/gemini" - sed -i '/disableAutoUpdate: {/,/}/ s/default: false/default: true/' "$out/bin/gemini" + + # ideal method to disable auto-update + sed -i '/disableautoupdate: {/,/}/ s/default: false/default: true/' "$out/bin/gemini" + + # disable auto-update for real because the default value in settingsschema isn't cleanly applied + # https://github.com/google-gemini/gemini-cli/issues/13569 + substituteInPlace $out/bin/gemini \ + --replace-fail "settings.merged.general?.disableUpdateNag" "(settings.merged.general?.disableUpdateNag ?? true)" \ + --replace-fail "settings.merged.general?.disableAutoUpdate ?? false" "settings.merged.general?.disableAutoUpdate ?? true" \ + --replace-fail "settings.merged.general?.disableAutoUpdate" "(settings.merged.general?.disableAutoUpdate ?? true)" runHook postInstall ''; From 4c8ba6a20b781f9750af8790f07a533f00d14059 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Nov 2025 10:03:21 +0000 Subject: [PATCH 35/36] wesnoth-devel: 1.19.17 -> 1.19.18 --- pkgs/by-name/we/wesnoth/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix index b7a1b7be0254..a382d09da84c 100644 --- a/pkgs/by-name/we/wesnoth/package.nix +++ b/pkgs/by-name/we/wesnoth/package.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "wesnoth${suffix}"; - version = if enableDevel then "1.19.17" else "1.18.5"; + version = if enableDevel then "1.19.18" else "1.18.5"; src = fetchFromGitHub { owner = "wesnoth"; @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { tag = finalAttrs.version; hash = if enableDevel then - "sha256-8JFJR4ghL2uSI5zG63MPX5NwlvIc3/xR0SQ2FjG5JCw=" + "sha256-BZPS60MNg9w0nf/P+vwzp2voQ5Sb1imGJIjrpJm12R0=" else "sha256-0VZJAmaCg12x4S07H1kl5s2NGMEo/NSVnzMniREmPJk="; }; From 7ead09c510280853a8a535fdcce93db1479fb36d Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sat, 1 Mar 2025 21:41:12 +0100 Subject: [PATCH 36/36] arsenik: init at 0.2.0 Co-authored-by: Yohann Boniface --- nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/arsenik.nix | 130 ++++++++++++++++++++ pkgs/by-name/ar/arsenik/package.nix | 37 ++++++ 3 files changed, 168 insertions(+) create mode 100644 nixos/modules/services/hardware/arsenik.nix create mode 100644 pkgs/by-name/ar/arsenik/package.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d0a4f0b7db12..196871d14b22 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -637,6 +637,7 @@ ./services/hardware/actkbd.nix ./services/hardware/amdgpu.nix ./services/hardware/argonone.nix + ./services/hardware/arsenik.nix ./services/hardware/asusd.nix ./services/hardware/auto-cpufreq.nix ./services/hardware/auto-epp.nix diff --git a/nixos/modules/services/hardware/arsenik.nix b/nixos/modules/services/hardware/arsenik.nix new file mode 100644 index 000000000000..915c54a9e408 --- /dev/null +++ b/nixos/modules/services/hardware/arsenik.nix @@ -0,0 +1,130 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.services.arsenik; +in +{ + options.services.arsenik = { + enable = lib.mkEnableOption "A 33-key layout that works with all keyboards."; + package = lib.mkPackageOption pkgs "arsenik" { }; + tap_timeout = lib.mkOption { + default = 200; + description = "The key must be pressed twice in XX ms to enable repetitions."; + type = lib.types.int; + }; + hold_timeout = lib.mkOption { + default = 200; + description = "The key must be held XX ms to become a layer shift."; + type = lib.types.int; + }; + long_hold_timeout = lib.mkOption { + default = 300; + description = "Slightly higher value for typing keys, to prevent unexpected hold effect."; + type = lib.types.int; + }; + mac = lib.mkOption { + default = false; + description = "Original key arrangement on your keyboard: Mac or PC."; + type = lib.types.bool; + }; + anglemod = lib.mkOption { + default = false; + description = '' + Choose here if you want to add an angle mod: ZXCVB are shifted to the left. + See https://colemakmods.github.io/ergonomic-mods/angle.html for more details. + ''; + type = lib.types.bool; + }; + wide = lib.mkOption { + default = false; + description = "The right hand is moved one key to the right."; + type = lib.types.bool; + }; + lt = lib.mkOption { + default = false; + description = "Enable layer-taps."; + type = lib.types.bool; + }; + hrm = lib.mkOption { + default = false; + description = "Enable homerow."; + type = lib.types.bool; + }; + lafayette = lib.mkOption { + default = false; + description = "Add AltGr programmation layer like Ergo‑L"; + type = lib.types.bool; + }; + num = lib.mkOption { + default = false; + description = "Add NumRow layer"; + type = lib.types.bool; + }; + vim = lib.mkOption { + default = false; + description = "Navigation layer: ESDF or HJKL?"; + type = lib.types.bool; + }; + run = lib.mkOption { + default = "M-p"; + description = "The keyboard shortcut of your application launcher."; + type = lib.types.str; + }; + layout = lib.mkOption { + default = "ergol"; + description = '' + Your keyboard layout. Possible values are: + ergol qwerty-lafayette qwerty azerty qwertz bepo optimot + ''; + type = lib.types.str; + }; + }; + + config = lib.mkIf cfg.enable { + + assertions = [ + { + assertion = cfg.wide -> cfg.anglemod; + message = "service.arsenik.wide requires service.arsenik.anglemod"; + } + { + assertion = cfg.hrm -> cfg.lt; + message = "service.arsenik.hrm requires service.arsenik.lt"; + } + ]; + + services.kanata = + let + src = "${cfg.package}/share/arsenik"; + defsrc = "${if cfg.mac then "mac" else "pc"}${if cfg.wide then "_wide" else ""}${ + if cfg.anglemod then "_anglemod" else "" + }"; + base = "base${if cfg.lt then "_lt" else ""}${if cfg.hrm then "_hrm" else ""}"; + symbols = "symbols_${if cfg.lafayette then "lafayette" else "noop"}${ + if cfg.num then "_num" else "" + }"; + navigation = "navigation${if cfg.vim then "_vim" else ""}"; + alias = "${cfg.layout}_${if cfg.mac then "mac" else "pc"}"; + in + { + enable = true; + keyboards.arsenik.config = '' + (defvar + tap_timeout ${builtins.toString cfg.tap_timeout} + hold_timeout ${builtins.toString cfg.hold_timeout} + long_hold_timeout ${builtins.toString cfg.long_hold_timeout} + ) + (include ${src}/defsrc/${defsrc}.kbd) + (include ${src}/deflayer/${base}.kbd) + (include ${src}/deflayer/${symbols}.kbd) + (include ${src}/deflayer/${navigation}.kbd) + (defalias run ${cfg.run}) + (include ${src}/defalias/${alias}.kbd) + ''; + }; + }; +} diff --git a/pkgs/by-name/ar/arsenik/package.nix b/pkgs/by-name/ar/arsenik/package.nix new file mode 100644 index 000000000000..216d1e350482 --- /dev/null +++ b/pkgs/by-name/ar/arsenik/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "arsenik"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "OneDeadKey"; + repo = "arsenik"; + tag = finalAttrs.version; + hash = "sha256-qY+SRWvZoy3iwsoZbzN5+TVWNIe3WWXkUGu/9MT20AU="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + cp -r kanata $out/share/arsenik + + runHook postInstall + ''; + + meta = { + description = "33-key layout that works with all keyboards"; + homepage = "https://github.com/OneDeadKey/arsenik"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.all; + }; +})