From 9a39fa94b285212625a1e948ad47560f8534fe04 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 19 Oct 2025 18:42:55 +0000 Subject: [PATCH 01/28] grafanaPlugins.victoriametrics-metrics-datasource: 0.19.4 -> 0.19.5 --- .../plugins/victoriametrics-metrics-datasource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix index 7159eb0747d2..fb1eb86c3063 100644 --- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "victoriametrics-metrics-datasource"; - version = "0.19.4"; - zipHash = "sha256-gpbBPyzWWiz9cENBWEHyDqBRMXypiEDDgdYFuQnsD5o="; + version = "0.19.5"; + zipHash = "sha256-wKLtfCI/onYPFrtP1EUrCbZ+OCHicshRZkZtltH6LzI="; meta = { description = "VictoriaMetrics metrics datasource for Grafana"; license = lib.licenses.agpl3Only; From 92597b5a5b9d4f310386bcb2af2fd6a68625df75 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 20 Oct 2025 20:22:46 -0500 Subject: [PATCH 02/28] nzbget: 25.3 -> 25.4 --- pkgs/by-name/nz/nzbget/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix index fc14d4964e83..04bc4baddadc 100644 --- a/pkgs/by-name/nz/nzbget/package.nix +++ b/pkgs/by-name/nz/nzbget/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "25.3"; + version = "25.4"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-ecTz+axqPOlRe0wi7IRiESn2JjLbalI+sQVKqrvrAoU="; + hash = "sha256-BP2kNgEDLVpW4TvUW2dToa3rnvGANZw2alBO75Jd2hs="; }; patches = [ From 428deb18ab93507bf685ab4a07788afc83103c94 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Wed, 22 Oct 2025 13:38:17 +0200 Subject: [PATCH 03/28] bat-extras: minor improvements --- pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix | 12 +++++++----- .../bat-extras/patches/disable-theme-tests.patch | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix index 7c7d36d397d0..34a526ff9e26 100644 --- a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix +++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix @@ -12,6 +12,7 @@ }: let cleanArgs = lib.flip removeAttrs [ + "name" "dependencies" "meta" ]; @@ -26,6 +27,7 @@ stdenv.mkDerivation ( finalAttrs: cleanArgs args // { + pname = name; inherit (core) version; src = core; @@ -35,14 +37,14 @@ stdenv.mkDerivation ( buildInputs = dependencies; # Patch shebangs now because our tests rely on them - postPatch = '' + postPatch = (args.postPatch or "") + '' patchShebangs --host bin/${name} ''; dontConfigure = true; - dontBuild = true; # we've already built + dontBuild = true; # we've already built it - doCheck = true; + doCheck = args.doCheck or true; nativeCheckInputs = [ bat bash @@ -52,7 +54,7 @@ stdenv.mkDerivation ( ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]); checkPhase = '' runHook preCheck - bash ./test.sh --compiled --suite ${name} + bash ./test.sh --compiled --suite ${name} --verbose --snapshot:show runHook postCheck ''; @@ -69,7 +71,7 @@ stdenv.mkDerivation ( runHook postInstall ''; - # We already patched + # We have already patched dontPatchShebangs = true; meta = core.meta // { mainProgram = name; } // meta; diff --git a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch b/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch index 695d350a2a30..31aad00c3028 100644 --- a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch +++ b/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch @@ -7,7 +7,7 @@ diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh test:batpipe_term_width() { description "Test support for BATPIPE_TERM_WIDTH" snapshot STDOUT -+ skip "bat-extras does not support `--theme` flag" ++ skip "bat-extras does not support '--theme' flag" export BATPIPE=color export BATPIPE_DEBUG_PARENT_EXECUTABLE=less @@ -20,7 +20,7 @@ diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh description "Snapshot test for colored output." snapshot stdout snapshot stderr -+ skip "bat-extras does not support `--theme` flag" ++ skip "bat-extras does not support '--theme' flag" require_rg @@ -28,7 +28,7 @@ diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh description "Should respect the BAT_STYLE variable." snapshot stdout snapshot stderr -+ skip "bat-extras does not support `--theme` flag" ++ skip "bat-extras does not support '--theme' flag" require_rg @@ -36,7 +36,7 @@ diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh description "Snapshot test for output without separator" snapshot stdout snapshot stderr -+ skip "bat-extras does not support `--theme` flag" ++ skip "bat-extras does not support '--theme' flag" require_rg From a996e5339e424e82b3d8be745d26a442a8b46934 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Wed, 22 Oct 2025 13:39:52 +0200 Subject: [PATCH 04/28] bat-extras: 2024.08.24 -> 2024.08.24-unstable-2025-02-22 --- .../tools/misc/bat-extras/modules/batpipe.nix | 9 +++- pkgs/tools/misc/bat-extras/modules/core.nix | 12 +++--- .../patches/batpipe-skip-outdated-test.patch | 12 ++++++ .../patches/disable-theme-tests.patch | 42 ------------------- 4 files changed, 25 insertions(+), 50 deletions(-) create mode 100644 pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch delete mode 100644 pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch diff --git a/pkgs/tools/misc/bat-extras/modules/batpipe.nix b/pkgs/tools/misc/bat-extras/modules/batpipe.nix index 2740444bb26d..1f1a0352094f 100644 --- a/pkgs/tools/misc/bat-extras/modules/batpipe.nix +++ b/pkgs/tools/misc/bat-extras/modules/batpipe.nix @@ -1,9 +1,16 @@ { buildBatExtrasPkg, less, + procps, }: buildBatExtrasPkg { name = "batpipe"; - dependencies = [ less ]; + dependencies = [ + less + procps + ]; + patches = [ + ../patches/batpipe-skip-outdated-test.patch + ]; meta.description = "Less (and soon bat) preprocessor for viewing more types of files in the terminal"; } diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix index b27f8be6e3e1..b7469055f903 100644 --- a/pkgs/tools/misc/bat-extras/modules/core.nix +++ b/pkgs/tools/misc/bat-extras/modules/core.nix @@ -9,15 +9,15 @@ nix-update-script, zsh, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bat-extras"; - version = "2024.08.24"; + version = "2024.08.24-unstable-2025-02-22"; src = fetchFromGitHub { owner = "eth-p"; repo = "bat-extras"; - tag = "v${version}"; - hash = "sha256-xkND/w6UNC58dC8WrsifwjqU9ZI4yUUq+ZljkhhUNT8="; + rev = "3860f0f1481f1d0e117392030f55ef19cc018ee4"; + hash = "sha256-9TEq/LzE1Pty1Z3WFWR/TaNNKPp2LGBr0jzGBkOEGQo="; fetchSubmodules = true; }; @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { dontConfigure = true; - patches = [ ../patches/disable-theme-tests.patch ]; - postPatch = '' patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh ''; @@ -72,7 +70,7 @@ stdenv.mkDerivation rec { # The per-script derivations will go ahead and patch the files they actually install. dontPatchShebangs = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "Bash scripts that integrate bat with various command line tools"; diff --git a/pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch new file mode 100644 index 000000000000..6ca368863d6c --- /dev/null +++ b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch @@ -0,0 +1,12 @@ +diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh +index e834f6e..2d9354d 100644 +--- a/test/suite/batpipe.sh ++++ b/test/suite/batpipe.sh +@@ -51,6 +51,7 @@ test:viewer_gzip() { + + test:batpipe_term_width() { + description "Test support for BATPIPE_TERM_WIDTH" ++ skip "Fails on a newer version of bat" + snapshot STDOUT + + export BATPIPE=color diff --git a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch b/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch deleted file mode 100644 index 31aad00c3028..000000000000 --- a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -Subject: [PATCH] skip tests depending on color theme -=================================================================== -diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh ---- a/test/suite/batpipe.sh (revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1) -+++ b/test/suite/batpipe.sh (date 1736621098865) -@@ -29,6 +29,7 @@ - test:batpipe_term_width() { - description "Test support for BATPIPE_TERM_WIDTH" - snapshot STDOUT -+ skip "bat-extras does not support '--theme' flag" - - export BATPIPE=color - export BATPIPE_DEBUG_PARENT_EXECUTABLE=less -Index: test/suite/batgrep.sh -=================================================================== -diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh ---- a/test/suite/batgrep.sh (revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1) -+++ b/test/suite/batgrep.sh (date 1736621086239) -@@ -58,6 +58,7 @@ - description "Snapshot test for colored output." - snapshot stdout - snapshot stderr -+ skip "bat-extras does not support '--theme' flag" - - require_rg - -@@ -118,6 +119,7 @@ - description "Should respect the BAT_STYLE variable." - snapshot stdout - snapshot stderr -+ skip "bat-extras does not support '--theme' flag" - - require_rg - -@@ -128,6 +130,7 @@ - description "Snapshot test for output without separator" - snapshot stdout - snapshot stderr -+ skip "bat-extras does not support '--theme' flag" - - require_rg - From 78f92255c2cf46f5bb1cac0c3823530096310759 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Wed, 22 Oct 2025 14:19:09 +0200 Subject: [PATCH 05/28] bat-extras: also test nushell --- .../misc/bat-extras/buildBatExtrasPkg.nix | 2 ++ .../tools/misc/bat-extras/modules/batpipe.nix | 7 +++++++ pkgs/tools/misc/bat-extras/modules/core.nix | 2 ++ .../batpipe-skip-detection-tests.patch | 20 +++++++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix index 34a526ff9e26..e4aaeedbd12b 100644 --- a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix +++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix @@ -8,6 +8,7 @@ fish, getconf, makeWrapper, + nushell, zsh, }: let @@ -49,6 +50,7 @@ stdenv.mkDerivation ( bat bash fish + nushell zsh ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]); diff --git a/pkgs/tools/misc/bat-extras/modules/batpipe.nix b/pkgs/tools/misc/bat-extras/modules/batpipe.nix index 1f1a0352094f..c8c9a754923d 100644 --- a/pkgs/tools/misc/bat-extras/modules/batpipe.nix +++ b/pkgs/tools/misc/bat-extras/modules/batpipe.nix @@ -1,4 +1,6 @@ { + lib, + stdenv, buildBatExtrasPkg, less, procps, @@ -9,8 +11,13 @@ buildBatExtrasPkg { less procps ]; + patches = [ ../patches/batpipe-skip-outdated-test.patch + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ../patches/batpipe-skip-detection-tests.patch ]; + meta.description = "Less (and soon bat) preprocessor for viewing more types of files in the terminal"; } diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix index b7469055f903..f145b666d21d 100644 --- a/pkgs/tools/misc/bat-extras/modules/core.nix +++ b/pkgs/tools/misc/bat-extras/modules/core.nix @@ -7,6 +7,7 @@ fish, getconf, nix-update-script, + nushell, zsh, }: stdenv.mkDerivation { @@ -41,6 +42,7 @@ stdenv.mkDerivation { nativeCheckInputs = [ bash fish + nushell zsh ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]); diff --git a/pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch new file mode 100644 index 000000000000..b051545647a8 --- /dev/null +++ b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch @@ -0,0 +1,20 @@ +diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh +index e834f6e..da87411 100644 +--- a/test/suite/batpipe.sh ++++ b/test/suite/batpipe.sh +@@ -12,6 +12,7 @@ test:detected_bash_shell() { + + test:detected_fish_shell() { + description "Test it can detect a fish shell." ++ skip "This test fails in the Nix sandbox" + + # Note: We don't use bash's `-c` option when testing with a fake fish shell. + # Bash `-c` will automatically exec() into the last process, which loses the +@@ -28,6 +29,7 @@ test:detected_fish_shell() { + + test:detected_nu_shell() { + description "Test it can detect a nushell shell." ++ skip "This test fails in the Nix sandbox" + + # Note: We don't use bash's `-c` option when testing with a fake nu shell. + # Bash `-c` will automatically exec() into the last process, which loses the From 46e297cf987ef4fb1eb3b4eac1f978a4c2b80316 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Wed, 22 Oct 2025 13:40:04 +0200 Subject: [PATCH 06/28] bat-extras.batgrep: disable tests --- pkgs/tools/misc/bat-extras/modules/batgrep.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/bat-extras/modules/batgrep.nix b/pkgs/tools/misc/bat-extras/modules/batgrep.nix index 8ce898761c5b..72fc2ee8c076 100644 --- a/pkgs/tools/misc/bat-extras/modules/batgrep.nix +++ b/pkgs/tools/misc/bat-extras/modules/batgrep.nix @@ -11,5 +11,8 @@ buildBatExtrasPkg { coreutils ripgrep ]; + # The tests are broken with the new bat 0.26.0 + # https://github.com/eth-p/bat-extras/issues/143 + doCheck = false; meta.description = "Quickly search through and highlight files using ripgrep"; } From c462b28b8c9ff045b9faa0beebd768e65868ab2a Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Sun, 26 Oct 2025 23:31:59 +0100 Subject: [PATCH 07/28] memos: fix update script nix-update now requires the pname to match Co-Authored-By: eljamm Co-Authored-By: Redlonghead --- pkgs/by-name/me/memos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index dfd9ea5bce99..e03386ab3af7 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -23,8 +23,8 @@ let }; memos-protobuf-gen = stdenvNoCC.mkDerivation { - name = "memos-protobuf-gen"; - inherit src; + pname = "memos-protobuf-gen"; + inherit version src; nativeBuildInputs = [ buf From d314657d1195d6dd43a2fcbdacb77e06156c5f7c Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Sun, 26 Oct 2025 23:37:02 +0100 Subject: [PATCH 08/28] memos: 0.25.1 -> 0.25.2 --- pkgs/by-name/me/memos/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index e03386ab3af7..e7bf782eb759 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -14,12 +14,12 @@ protoc-gen-validate, }: let - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "usememos"; repo = "memos"; rev = "v${version}"; - hash = "sha256-5CeeOpdXs+6Vus4er8JVhJM0a7BKtGsF4SPdOoX5xQk="; + hash = "sha256-Yag+OxhlWEhWumnB620QREm4G99osKzQNlGN+1YBMTQ="; }; memos-protobuf-gen = stdenvNoCC.mkDerivation { @@ -52,7 +52,7 @@ let outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-BOBnNcBp/vjTaS7N1z5kRWZoKokJXEMNs5rS32ZBtKU="; + outputHash = "sha256-j9jBxhDi1COowOh5sDjOuVJdHf2/RSwZ0cQUD/j2jt0="; }; memos-web = stdenvNoCC.mkDerivation (finalAttrs: { @@ -62,7 +62,7 @@ let inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/web"; fetcherVersion = 1; - hash = "sha256-qY3jPbdEy+lWoBV/xKNTGQ58xvcoBoG0vPwN5f9+wj4="; + hash = "sha256-qvxOY7ASAlYbT5Ju/8b3qiE9KgXkDIj1MZuVH0hmCOA="; }; pnpmRoot = "web"; nativeBuildInputs = [ @@ -93,7 +93,7 @@ buildGoModule { memos-protobuf-gen ; - vendorHash = "sha256-+v2OElo2ZC0OEhNsNe23J0PR0y1opm/HckW+vUmJ8e4="; + vendorHash = "sha256-Eihp7Kcu8AiPL2VEypxx8+8JwjHI8htoOv69xGrp560="; preBuild = '' rm -rf server/router/frontend/dist From b08c058249ebea7fe8e9838a242efb892e101c65 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 31 Oct 2025 21:00:04 +0800 Subject: [PATCH 09/28] vgmstream: fix build on darwin --- pkgs/by-name/vg/vgmstream/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix index d17e6585ecc8..6342295917e8 100644 --- a/pkgs/by-name/vg/vgmstream/package.nix +++ b/pkgs/by-name/vg/vgmstream/package.nix @@ -13,8 +13,14 @@ libao, speex, nix-update-script, + + audaciousSupport ? stdenv.hostPlatform.isLinux, }: +assert lib.assertMsg ( + audaciousSupport -> stdenv.hostPlatform.isLinux +) "Only Linux supports building the Audacious plugin."; + let # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake atrac9-src = fetchFromGitHub { @@ -54,10 +60,7 @@ stdenv.mkDerivation rec { ]; }; - outputs = [ - "out" - "audacious" - ]; + outputs = [ "out" ] ++ lib.optional audaciousSupport "audacious"; nativeBuildInputs = [ cmake @@ -71,8 +74,8 @@ stdenv.mkDerivation rec { libvorbis libao speex - audacious-bare - ]; + ] + ++ lib.optional audaciousSupport audacious-bare; preConfigure = '' substituteInPlace cmake/dependencies/audacious.cmake \ @@ -89,6 +92,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DATRAC9_PATH=${atrac9-src}" + (lib.cmakeBool "BUILD_AUDACIOUS" audaciousSupport) ] # Only supported on x86_64-linux ++ lib.optionals (stdenv.system == "x86_64-linux") [ From 4cbbf6da55bc28eb8a83bf34c214461cbe280eb8 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 31 Oct 2025 21:02:51 +0800 Subject: [PATCH 10/28] vgmstream: migrate to finalAttrs --- pkgs/by-name/vg/vgmstream/package.nix | 68 +++++++++++++-------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix index 6342295917e8..f1c3ef1a0447 100644 --- a/pkgs/by-name/vg/vgmstream/package.nix +++ b/pkgs/by-name/vg/vgmstream/package.nix @@ -21,45 +21,17 @@ assert lib.assertMsg ( audaciousSupport -> stdenv.hostPlatform.isLinux ) "Only Linux supports building the Audacious plugin."; -let - # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake - atrac9-src = fetchFromGitHub { - owner = "Thealexbarney"; - repo = "LibAtrac9"; - rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049"; - hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc="; - }; - - # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake - celt-0_6_1-src = fetchzip { - url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz"; - hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw="; - }; - celt-0_11_0-src = fetchzip { - url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz"; - hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E="; - }; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vgmstream"; version = "2055"; src = fetchFromGitHub { owner = "vgmstream"; repo = "vgmstream"; - tag = "r${version}"; + tag = "r${finalAttrs.version}"; hash = "sha256-GNsoWCTLDd49T639lKkLoyBWpWYocDP6gZB2e8ZUyEU="; }; - passthru.updateScript = nix-update-script { - attrPath = "vgmstream"; - extraArgs = [ - "--version-regex" - "r(.*)" - ]; - }; - outputs = [ "out" ] ++ lib.optional audaciousSupport "audacious"; nativeBuildInputs = [ @@ -86,21 +58,49 @@ stdenv.mkDerivation rec { # Therefore, CELT_0110_PATH needs to point to a mutable directory. lib.optionalString (stdenv.system == "x86_64-linux") '' mkdir -p dependencies/celt-0.11.0/ - cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/ + cp -r ${finalAttrs.passthru.sources.celt-0_11_0-src}/* dependencies/celt-0.11.0/ chmod -R +w dependencies/celt-0.11.0/ ''; cmakeFlags = [ - "-DATRAC9_PATH=${atrac9-src}" + "-DATRAC9_PATH=${finalAttrs.passthru.sources.atrac9-src}" (lib.cmakeBool "BUILD_AUDACIOUS" audaciousSupport) ] # Only supported on x86_64-linux ++ lib.optionals (stdenv.system == "x86_64-linux") [ - "-DCELT_0061_PATH=${celt-0_6_1-src}" + "-DCELT_0061_PATH=${finalAttrs.passthru.sources.celt-0_6_1-src}" "-DCELT_0110_PATH=../dependencies/celt-0.11.0" # libg719_decode omitted because it doesn't have a free software license ]; + passthru = { + updateScript = nix-update-script { + attrPath = "vgmstream"; + extraArgs = [ + "--version-regex" + "r(.*)" + ]; + }; + sources = { + # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake + atrac9-src = fetchFromGitHub { + owner = "Thealexbarney"; + repo = "LibAtrac9"; + rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049"; + hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc="; + }; + # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake + celt-0_6_1-src = fetchzip { + url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz"; + hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw="; + }; + celt-0_11_0-src = fetchzip { + url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz"; + hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E="; + }; + }; + }; + meta = with lib; { description = "Library for playback of various streamed audio formats used in video games"; homepage = "https://vgmstream.org"; @@ -114,4 +114,4 @@ stdenv.mkDerivation rec { ++ optional (stdenv.system == "x86_64-linux") bsd2; platforms = with platforms; unix; }; -} +}) From 5a967f4a1ec77245fafae1247979f75c03276eca Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 8 Jul 2025 20:08:38 +0200 Subject: [PATCH 11/28] nixos/kubo: increase maximum UDP buffer sizes The [quic-go wiki](https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes) now recommends a larger maximum send- and receive buffer size. The change to the documentation was made in April 2024: https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes/_compare/597639d834d5d6c242d37d49a02ed04ca65332c9...a3327deff89d2428d48596ce0e643531f9944f99. Without this change, the Kubo daemon will output this warning: ``` failed to sufficiently increase receive buffer size (was: 208 kiB, wanted: 7168 kiB, got: 4882 kiB). See https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes for details. ``` This can be seen while running the NixOS tests. --- nixos/modules/services/network-filesystems/kubo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 87d83971c706..8c1053f3a55a 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -330,8 +330,8 @@ in environment.variables.IPFS_PATH = fakeKuboRepo; # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes - boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 2500000; - boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 2500000; + boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 7500000; + boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 7500000; programs.fuse = lib.mkIf cfg.autoMount { userAllowOther = true; From 5fcc08a90708e5752f84e07bd6174f353dc23d28 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 19 Oct 2025 12:39:48 +0200 Subject: [PATCH 12/28] kubo: 0.36.0 -> 0.37.0 https://github.com/ipfs/kubo/releases/tag/v0.37.0 Kubo v0.37.0 embeds the repository migration from repo version v16 to v17 and the kubo-fs-repo-migrations package will not reveive any more updates. I'll keep the `kubo-fs-repo-migrations` and `kubo-migrator` packages around for now until a future version of Kubo no longer supports calling the external migration binaries. Since the (newest) migrations are now built into Kubo, the NixOS module now needs to call `ipfs repo migrate --to=xx --allow-downgrade` instead of `fs-repo-migrations --to xx -y`. The `--allow-downgrade` flag is only there for the unlikely situation that someone downgrades their local Kubo version with an overlay, separate channel input or similar means. It does however not work for rolling back the NixOS generation after a Kubo upgrade which increases the repo version (not all Kubo upgrades increase the repo version). This is because the Kubo version of the previous NixOS generation doesn't have the code for upgrading to or downgrading from the newer repo version. Since we only have one version of Kubo in Nixpkgs at a time, migrations cannot be tested automatically. I manually verified that `ipfs repo migrate` uses binaries like `fs-repo-15-to-16` provided by the `kubo-fs-repo-migrations` packages for older migrations. I also tested that the migration from v16 to v17 works on my machine using the NixOS module. --- nixos/modules/services/network-filesystems/kubo.nix | 10 ++++------ pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix | 3 ++- pkgs/by-name/ku/kubo/package.nix | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 8c1053f3a55a..de4718229797 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -167,7 +167,7 @@ in autoMigrate = lib.mkOption { type = lib.types.bool; default = true; - description = "Whether Kubo should try to run the fs-repo-migration at startup."; + description = "Whether Kubo should try to migrate its filesystem repository automatically."; }; enableGC = lib.mkOption { @@ -344,9 +344,6 @@ in createHome = false; uid = config.ids.uids.ipfs; description = "IPFS daemon user"; - packages = [ - pkgs.kubo-migrator - ]; }; }; @@ -377,6 +374,7 @@ in path = [ "/run/wrappers" cfg.package + pkgs.kubo-fs-repo-migrations # Used by 'ipfs repo migrate --to=...' ]; environment.IPFS_PATH = cfg.dataDir; @@ -388,7 +386,7 @@ in rm -vf "$IPFS_PATH/api" '' + lib.optionalString cfg.autoMigrate '' - '${lib.getExe pkgs.kubo-migrator}' -to '${cfg.package.repoVersion}' -y + '${lib.getExe cfg.package}' repo migrate '--to=${cfg.package.repoVersion}' --allow-downgrade '' + '' fi @@ -412,7 +410,7 @@ in serviceConfig = { ExecStart = [ "" - "${cfg.package}/bin/ipfs daemon ${kuboFlags}" + "${lib.getExe cfg.package} daemon ${kuboFlags}" ]; User = cfg.user; Group = cfg.group; diff --git a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix index 7496c1ed274c..463a79a43405 100644 --- a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix +++ b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix @@ -258,7 +258,8 @@ symlinkJoin { longDescription = '' This package contains all the individual migrations in the bin directory. This is used by fs-repo-migrations and could also be used by Kubo itself - when starting it like this: ipfs daemon --migrate + when starting it like this: `ipfs daemon --migrate` + or when calling `ipfs repo migrate --to=16`. ''; }; } diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index fc6930a8dfe7..5d18579daba1 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "kubo"; - version = "0.36.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.37.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "16"; # Also update kubo-migrator when changing the repo version + passthru.repoVersion = "17"; # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-JbWt6d1cX3F2lmivjszcxcyE+wKYk+Sy03xhb4E3oHw="; + hash = "sha256-/7yWGxqqbiUajkWF5/YL/HUpH0/aevutQwy70VJuieA="; }; # tarball contains multiple files/directories From b8f0ee5c0c22bb3879459271232e74b195e5c287 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 19 Oct 2025 15:08:25 +0200 Subject: [PATCH 13/28] kubo: 0.37.0 -> 0.38.2 https://github.com/ipfs/kubo/releases/tag/v0.38.0 https://github.com/ipfs/kubo/releases/tag/v0.38.1 https://github.com/ipfs/kubo/releases/tag/v0.38.2 --- pkgs/by-name/ku/kubo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index 5d18579daba1..70636ced3a48 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "kubo"; - version = "0.37.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.38.2"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "17"; + passthru.repoVersion = "18"; # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-/7yWGxqqbiUajkWF5/YL/HUpH0/aevutQwy70VJuieA="; + hash = "sha256-A02edHUZoU2oQk4OyCmc/wMfk3k+EWkdO2RxPGlUrXg="; }; # tarball contains multiple files/directories From 1204a9389a5b9bb3dcc550402af40be456e238bb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 1 Nov 2025 06:56:41 +0000 Subject: [PATCH 14/28] blur-effect: fix `cmake-4` build Without the change the build fails as https://hydra.nixos.org/build/310527669: CMake Error at CMakeLists.txt:1 (cmake_minimum_required): Compatibility with CMake < 3.5 has been removed from CMake. --- pkgs/by-name/bl/blur-effect/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/bl/blur-effect/package.nix b/pkgs/by-name/bl/blur-effect/package.nix index b194a7884134..1330442ab55a 100644 --- a/pkgs/by-name/bl/blur-effect/package.nix +++ b/pkgs/by-name/bl/blur-effect/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, cmake, gdk-pixbuf, @@ -20,6 +21,16 @@ stdenv.mkDerivation rec { sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj"; }; + patches = [ + # Pull cmake-4 fix: + # https://github.com/sonald/blur-effect/pull/7 + (fetchpatch { + name = "cmake-4.patch"; + url = "https://github.com/sonald/blur-effect/commit/76322ad8bd0e653726a6791eb8ebcc829cbb1b38.patch?full_index=1"; + hash = "sha256-f0PBhfdrcLCZBzYx+j8+qIG9boW3S4CSyz+bS9vFKRc="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake From 6fa61c1aa0997062a6c5f0318471a0abb63a1286 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 08:27:37 +0000 Subject: [PATCH 15/28] searxng: 0-unstable-2025-10-23 -> 0-unstable-2025-10-31 --- pkgs/by-name/se/searxng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 745c3b3b087e..0dcd47dcb9e5 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -13,14 +13,14 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2025-10-23"; + version = "0-unstable-2025-10-31"; pyproject = true; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "e363db970c77e9cab8f3611bb6b6f8a59646a035"; - hash = "sha256-phJRQ+euSTEmsn1wS5dgO8UPwAJ8cr8ov3K3fSzWQVA="; + rev = "b8e4ebdc0cd3b6dc5f58d8ff54deced2b14b13b1"; + hash = "sha256-qx4y79utIVyLWQlF/RN1TzHKCM/EMDv7tR9WGEbaYoQ="; }; nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; From 93c6bd84af86dbcffe20054bb226a04aa08522b7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Nov 2025 23:35:35 +0800 Subject: [PATCH 16/28] xdg-desktop-portal-xapp: Fix missing xapp schema This is especially a problem on non-Cinnamon desktops (we have xapp in cinnamon-gsettings-overrides packaging). --- pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix index bcb6d2d44c48..93cdd25fe14f 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix @@ -11,8 +11,8 @@ gtk3, gsettings-desktop-schemas, mate, - xdg-desktop-portal, xapp, + xdg-desktop-portal, }: stdenv.mkDerivation rec { @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { gtk3 gsettings-desktop-schemas # org.gnome.system.location mate.mate-desktop # org.mate.background + xapp # org.x.apps.portal xdg-desktop-portal ]; From 7cf8504f793408cf76fafe5638f6db1bf6fa2435 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Nov 2025 23:46:42 +0800 Subject: [PATCH 17/28] xapp: Wrap xapp-sn-watcher This is an executable. --- pkgs/by-name/xa/xapp/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index 5fffab2ae0a8..b0453410b136 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -96,6 +96,10 @@ stdenv.mkDerivation rec { # Fix gtk3 module target dir. Proper upstream solution should be using define_variable. env.PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib"; + preFixup = '' + wrapGApp $out/lib/xapps/xapp-sn-watcher + ''; + meta = with lib; { homepage = "https://github.com/linuxmint/xapp"; description = "Cross-desktop libraries and common resources"; From 37778c6666756eb2f00f92a900aad52fa1f78dbd Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sat, 1 Nov 2025 13:20:33 -0400 Subject: [PATCH 18/28] nixos/searx: correct redis/valkey rename error --- nixos/modules/services/networking/searx.nix | 30 +++++++++++++++------ 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index e64bf6a9e792..8603084f0658 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -13,7 +13,9 @@ let cfg = config.services.searx; - settingsFile = pkgs.writeText "settings.yml" (builtins.toJSON cfg.settings); + settingsFile = pkgs.writeText "settings.yml" ( + builtins.toJSON (builtins.removeAttrs cfg.settings [ "redis" ]) + ); faviconsSettingsFile = (pkgs.formats.toml { }).generate "favicons.toml" cfg.faviconsSettings; limiterSettingsFile = (pkgs.formats.toml { }).generate "limiter.toml" cfg.limiterSettings; @@ -79,12 +81,22 @@ in }; settings = mkOption { - type = types.submodule { - freeformType = settingType; - imports = [ - (mkRenamedOptionModule [ "redis" ] [ "valkey" ]) - ]; - }; + type = types.submodule ( + { config, ... }: + { + options = { + valkey = lib.mkOption { + internal = true; + default = { }; + }; + }; + config.valkey = lib.mkIf (config ? redis) ( + lib.warn "Obsolete option `services.searx.settings.redis' is used. It was renamed to `services.searx.settings.valkey'" config.redis + ); + + freeformType = settingType; + } + ); default = { }; example = literalExpression '' { @@ -287,7 +299,9 @@ in ] )) "s" }://${cfg.domain}/"; - valkey.url = lib.mkIf cfg.redisCreateLocally "unix://${config.services.redis.servers.searx.unixSocket}"; + valkey = lib.mkIf cfg.redisCreateLocally { + url = "unix://${config.services.redis.servers.searx.unixSocket}"; + }; }; }; From 03a0f3eefcff3622e3b6595f1973d0842ce32a9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 18:38:24 +0000 Subject: [PATCH 19/28] xremap: 0.14.2 -> 0.14.3 --- pkgs/by-name/xr/xremap/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix index eb7939f9f189..ae68a1135a58 100644 --- a/pkgs/by-name/xr/xremap/package.nix +++ b/pkgs/by-name/xr/xremap/package.nix @@ -43,13 +43,13 @@ assert ( ); rustPlatform.buildRustPackage (finalAttrs: { pname = "xremap${variant.suffix or ""}"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "xremap"; repo = "xremap"; tag = "v${finalAttrs.version}"; - hash = "sha256-5BHet5kKpmJFpjga7QZoLPydtzs5iPX5glxP4YvsYx0="; + hash = "sha256-UHkwTz5KEDAqXKpN/YVzY0xP7b6nN8WkPilzpF8YU3A="; }; nativeBuildInputs = [ pkg-config ]; @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildNoDefaultFeatures = true; buildFeatures = variant.features; - cargoHash = "sha256-NZNLO+wmzEdIZPp5Zu81m/ux8Au+8EMq31QpuZN9l5w="; + cargoHash = "sha256-ucyBQPCskHwz8rYzOULJ3enL6rhvpLxJzS7sTNwuBW4="; passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants; From 15b63acaf70168f69124a9987ae60f45171c3fea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 19:07:08 +0000 Subject: [PATCH 20/28] python3Packages.temporalio: 1.18.1 -> 1.18.2 --- pkgs/development/python-modules/temporalio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix index deda5f3bdc1b..f2d6a29d4be9 100644 --- a/pkgs/development/python-modules/temporalio/default.nix +++ b/pkgs/development/python-modules/temporalio/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "temporalio"; - version = "1.18.1"; + version = "1.18.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "temporalio"; repo = "sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-53UDG6eN7Jv8nUUh84I1SX9Gc+gZK66o6e4pqe9aWq4="; + hash = "sha256-EUys/UMblFVzICvMZmcGUXAqmtjPOdJKgtIx5TFB/9U="; fetchSubmodules = true; }; From 63c6dfb7ec8e977d25688091bff8dbf4f72f9776 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 21:13:22 +0000 Subject: [PATCH 21/28] fna3d: 25.10 -> 25.11 --- pkgs/by-name/fn/fna3d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix index dc63bb22113e..ece22b880717 100644 --- a/pkgs/by-name/fn/fna3d/package.nix +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "fna3d"; - version = "25.10"; + version = "25.11"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FNA3D"; tag = version; fetchSubmodules = true; - hash = "sha256-Hbj1GGKSFaP2C7V0II6x6euxRDc/BYSK00cVsFMKGEw="; + hash = "sha256-4+bJWmNagUtKJJHIHefQM7Tiu39+l4OE9q51c34DiEk="; }; cmakeFlags = [ From 0abec8eac557c2c9e52ce428dae637babeb55b71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Nov 2025 00:51:30 +0000 Subject: [PATCH 22/28] python3Packages.bitsandbytes: 0.48.1 -> 0.48.2 --- pkgs/development/python-modules/bitsandbytes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index 125386dec9b6..1cd1ef0b98e7 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -26,7 +26,7 @@ let pname = "bitsandbytes"; - version = "0.48.1"; + version = "0.48.2"; brokenConditions = lib.attrsets.filterAttrs (_: cond: cond) { "CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport; @@ -78,7 +78,7 @@ buildPythonPackage { owner = "bitsandbytes-foundation"; repo = "bitsandbytes"; tag = version; - hash = "sha256-OkhWv5Mb/cnWJteCXvDEkWQvK+QK26YQex39yWIezrQ="; + hash = "sha256-gtNOMxLeYTCZK5MVdpjOFOw6rxvqS+XJmY1Meiuz0Rw="; }; patches = [ From ce38be4442a326369862e703b4dafe24ca1fec4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Nov 2025 02:24:19 +0000 Subject: [PATCH 23/28] _1password-gui: 8.11.14 -> 8.11.16 --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 60fc6b2e723b..f0da36a7578b 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,28 +1,28 @@ { "stable": { "linux": { - "version": "8.11.14", + "version": "8.11.16", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.14.x64.tar.gz", - "hash": "sha256-LdGw2AVDiQXwGAz9abEeoCosQUdr5q978OMo+kXATIc=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.16.x64.tar.gz", + "hash": "sha256-LZ0V296GLLdeokj3mgD0LnQCHqlMHnMwPLHlwI5b1K0=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.14.arm64.tar.gz", - "hash": "sha256-U+wJEH5NwWuPV+Oy6RJ+dki4lJB2A9aOVjvRSkm6zfY=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.16.arm64.tar.gz", + "hash": "sha256-itykcOtXCtODeJ7CtasN8M4Aq8DCV2pumpy646PADiE=" } } }, "darwin": { - "version": "8.11.14", + "version": "8.11.16", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.14-x86_64.zip", - "hash": "sha256-GXbwYxFNw6R8UdKxPL6k2lQF4uabFRgaEKNaFzecnZ0=" + "url": "https://downloads.1password.com/mac/1Password-8.11.16-x86_64.zip", + "hash": "sha256-puVz4k5jSFgkExE78sdxawCtVJzAqtP9jEEc+H4geMY=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.14-aarch64.zip", - "hash": "sha256-rViZC9b6kOaqkNNJibABmWu0Z5PEtBQE0jGtaUdd4LY=" + "url": "https://downloads.1password.com/mac/1Password-8.11.16-aarch64.zip", + "hash": "sha256-xuN6l5ejj7SZp1uGhAIaha+qMUfStZm2kTkPJU9pnos=" } } } From 5d41406ecfe3a1bfc3fefeda9d99bb190130b559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 2 Nov 2025 03:44:56 +0100 Subject: [PATCH 24/28] topgrade: 16.0.4 -> 16.1.2 Diff: https://github.com/topgrade-rs/topgrade/compare/v16.0.4...v16.1.2 Changelog: https://github.com/topgrade-rs/topgrade/releases/tag/v16.1.2 --- pkgs/by-name/to/topgrade/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix index 7a01f13de2a8..97807599db2e 100644 --- a/pkgs/by-name/to/topgrade/package.nix +++ b/pkgs/by-name/to/topgrade/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "16.0.4"; + version = "16.1.2"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-b/xzmC49ETGtcf9ekrSkq75cKxSL4ZrvKPkparwz6zU="; + hash = "sha256-oDIEvBM7TDJlnkZSHkbtIUGRJ+RK48u9S4tuMeKSwO0="; }; - cargoHash = "sha256-d6jX+3ZcCswhKy5SsSpvXZL9el70+OyIa7lYQ3B/o8M="; + cargoHash = "sha256-9jfKnjCbxo47qUWYdqBHoObxth3pporRZ0oauCkWwkc="; nativeBuildInputs = [ installShellFiles From 542f16f85f79e233fe4bec7c9c11fa9fa7a3d09c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Nov 2025 02:54:25 +0000 Subject: [PATCH 25/28] fetchmail: 6.5.7 -> 6.6.0 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index f25cc0a69017..ab61a26c5a32 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.5.7"; + version = "6.6.0"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - hash = "sha256-c+trHUIbWYaGatSmt3fBFAo5AFKYxjv4R95TeXbL+9s="; + hash = "sha256-e5wZ5mg+gn1VZ1GqXbXUS5Yeh76LMIdTW0kJuhtZMhw="; }; buildInputs = [ From 5ecffc5205805a20609d4cc7bd160c28446e8e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 1 Nov 2025 20:27:38 -0700 Subject: [PATCH 26/28] fetchmail: move to pkgs/by-name --- .../fetchmail/default.nix => by-name/fe/fetchmail/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{applications/misc/fetchmail/default.nix => by-name/fe/fetchmail/package.nix} (100%) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/by-name/fe/fetchmail/package.nix similarity index 100% rename from pkgs/applications/misc/fetchmail/default.nix rename to pkgs/by-name/fe/fetchmail/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27a3db1de03a..0495fd741b74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10951,7 +10951,6 @@ with pkgs; ]; }; - fetchmail = callPackage ../applications/misc/fetchmail { }; fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { }; firewalld-gui = firewalld.override { withGui = true; }; From 27b3cce3f2501df4499769154b9a6879ad415368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 1 Nov 2025 20:29:58 -0700 Subject: [PATCH 27/28] fetchmail_7: move to pkgs/by-name --- .../fetchmail/v7.nix => by-name/fe/fetchmail_7/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/fetchmail/v7.nix => by-name/fe/fetchmail_7/package.nix} (100%) diff --git a/pkgs/applications/misc/fetchmail/v7.nix b/pkgs/by-name/fe/fetchmail_7/package.nix similarity index 100% rename from pkgs/applications/misc/fetchmail/v7.nix rename to pkgs/by-name/fe/fetchmail_7/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0495fd741b74..0130772f5741 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10951,8 +10951,6 @@ with pkgs; ]; }; - fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { }; - firewalld-gui = firewalld.override { withGui = true; }; fldigi = callPackage ../applications/radio/fldigi { From 568735719ba4dbb7308c3b096c237893fb76339a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Nov 2025 03:49:50 +0000 Subject: [PATCH 28/28] terraform-providers.auth0_auth0: 1.32.0 -> 1.33.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 7f41f4cee947..093947426af2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -63,13 +63,13 @@ "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g=" }, "auth0_auth0": { - "hash": "sha256-59GW5hWNTWc1OyoEuHLSRRw5HFYfTV+Tp6vB5Jj5Gtw=", + "hash": "sha256-+Bd+Nc16DqKcO6srCyNjYoEWvckJA8z5GyoGYylh2rg=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.32.0", + "rev": "v1.33.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-z0YJIZ3PSZany4acKYOIP575qg8iaBJcDhlhzr+RptU=" + "vendorHash": "sha256-xeng27kJrugxYZfZatrTLG0gql3xDJlnDWJ9pNFOp0c=" }, "aviatrixsystems_aviatrix": { "hash": "sha256-V1JRVOMHQu5KlPFw7q/qZuHlJjdVSQotI9w7s88v8GM=",