From 68d15236990e1698355e4afced968aa1c97b0cb5 Mon Sep 17 00:00:00 2001
From: Cottand <nico.dc@outlook.com>
Date: Tue, 25 Nov 2025 20:21:57 +0000
Subject: [PATCH 01/39] nomad_1_11: init at 1.11.0

---
 .../networking/cluster/nomad/default.nix            | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                     |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index c21adc70c2b7..ad8b43fa8ab0 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   buildGo124Module,
+  buildGo125Module,
   fetchFromGitHub,
   nixosTests,
   installShellFiles,
@@ -88,6 +89,18 @@ rec {
 
   nomad = nomad_1_10;
 
+  nomad_1_11 = generic {
+    buildGoModule = buildGo125Module;
+    version = "1.11.0";
+    hash = "sha256-ETC9zJVup/BLivsBWVez5/OLpl7cjdlIRACVK9ga3Io=";
+    vendorHash = "sha256-WqGWEjaPicpmkARSEQ/bqw8+GSemh1fcM3pb4BGjZpU=";
+    license = lib.licenses.bsl11;
+    passthru.tests.nomad = nixosTests.nomad;
+    preCheck = ''
+      export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
+    '';
+  };
+
   nomad_1_10 = generic {
     buildGoModule = buildGo124Module;
     version = "1.10.5";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbbb70b760a7..e99ea3023865 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3462,6 +3462,7 @@ with pkgs;
     nomad
     nomad_1_9
     nomad_1_10
+    nomad_1_11
     ;
 
   nth = with python3Packages; toPythonApplication name-that-hash;

From ea80c95461ac13f42c8a1caff491796fb7def352 Mon Sep 17 00:00:00 2001
From: Cottand <nico.dc@outlook.com>
Date: Tue, 25 Nov 2025 20:22:16 +0000
Subject: [PATCH 02/39] nomad_1_11, nomad_1_10, nomad_1_9: remove obsolete
 go.mod patch

---
 pkgs/applications/networking/cluster/nomad/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index ad8b43fa8ab0..9d2070ca82b1 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -41,12 +41,6 @@ let
           inherit hash;
         };
 
-        # Nomad requires Go 1.24.6, but nixpkgs doesn't have it in unstable yet.
-        postPatch = ''
-          substituteInPlace go.mod \
-            --replace-warn "go 1.24.6" "go 1.24.5"
-        '';
-
         nativeBuildInputs = [ installShellFiles ];
 
         ldflags = [

From 6e4354cc1e60e91184202509cb7edcb7b6c736cf Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 13 Dec 2025 09:55:06 +0100
Subject: [PATCH 03/39] freetube: 0.23.12 -> 0.23.12-unstable-2025-12-13

---
 pkgs/by-name/fr/freetube/package.nix           | 11 ++++++-----
 .../fr/freetube/patch-build-script.patch       | 18 +++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index 6bbb8df57cd2..b0a0fa1519ef 100644
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -20,13 +20,14 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "freetube";
-  version = "0.23.12";
+  version = "0.23.12-unstable-2025-12-13";
 
   src = fetchFromGitHub {
     owner = "FreeTubeApp";
     repo = "FreeTube";
-    tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-DH5uT3dPDFZnFYoiMjxpNouNDRbWDctVqvDwHpUlnkY=";
+    # tag = "v${finalAttrs.version}-beta";
+    rev = "6717114de5653b08caec20b7bf3f3217723866a4";
+    hash = "sha256-PfK4Ny8MyBJ9Xw6ozJUzu+4rX+/rLWNac3lE8dBNPE0=";
   };
 
   # Darwin requires writable Electron dist
@@ -38,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       ''
     else
       ''
-        ln -s ${electron.dist} electron-dist
+        ln -s ${electron.dist} source/electron-dist
       '';
 
   patches = [
@@ -49,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-sM9CkDnATSEUf/uuUyT4JuRmjzwa1WzIyNYEw69MPtU=";
+    hash = "sha256-at/Kq7M8qSjlDmB6R4z51VRZRvkKAGyjU6sgHho8tBQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fr/freetube/patch-build-script.patch b/pkgs/by-name/fr/freetube/patch-build-script.patch
index c543391605dd..91aa139eed4c 100644
--- a/pkgs/by-name/fr/freetube/patch-build-script.patch
+++ b/pkgs/by-name/fr/freetube/patch-build-script.patch
@@ -1,13 +1,13 @@
-diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
-index 5b79d961..9f5945d2 100644
---- a/_scripts/ebuilder.config.js
-+++ b/_scripts/ebuilder.config.js
-@@ -1,6 +1,8 @@
- const { name, productName } = require('../package.json')
+diff --git a/_scripts/ebuilder.config.mjs b/_scripts/ebuilder.config.mjs
+index 55e72b227..d218f5ac4 100644
+--- a/_scripts/ebuilder.config.mjs
++++ b/_scripts/ebuilder.config.mjs
+@@ -2,6 +2,8 @@ import packageDetails from '../package.json' with { type: 'json' }
  
- const config = {
+ /** @type {import('electron-builder').Configuration} */
+ export default {
 +  electronVersion: "@electron-version@",
 +  electronDist: "electron-dist",
-   appId: `io.freetubeapp.${name}`,
-   copyright: 'Copyleft © 2020-2024 freetubeapp@protonmail.com',
+   appId: `io.freetubeapp.${packageDetails.name}`,
+   copyright: 'Copyleft © 2020-2025 freetubeapp@protonmail.com',
    // asar: false,

From 2607723b2847947851675a530c39aad061cac9df Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 17 Dec 2025 03:57:05 +0100
Subject: [PATCH 04/39] openvscode-server: 1.103.1 -> 1.106.3

---
 pkgs/by-name/op/openvscode-server/package.nix | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix
index ab5bb984538a..8fdde59bcfe9 100644
--- a/pkgs/by-name/op/openvscode-server/package.nix
+++ b/pkgs/by-name/op/openvscode-server/package.nix
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openvscode-server";
-  version = "1.103.1";
+  version = "1.106.3";
 
   src = fetchFromGitHub {
     owner = "gitpod-io";
     repo = "openvscode-server";
     rev = "openvscode-server-v${finalAttrs.version}";
-    hash = "sha256-Co0MF8Yr60Ppv6Zv85nJeua2S5Rnye6wGB1hTWNpMm4=";
+    hash = "sha256-wcmk35oqJ6d5MR9YnqC/pR0pC03/vCFCd9KLRByQWqk=";
   };
 
   ## fetchNpmDeps doesn't correctly process git dependencies
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
         inherit (finalAttrs) src nativeBuildInputs;
         outputHashMode = "recursive";
         outputHashAlgo = "sha256";
-        outputHash = "sha256-xK4qfzkWuOsEyP1+6cY5Dhrr5wNW3eOJBTyQaE6gTcc=";
+        outputHash = "sha256-FnlzXlhu72G9dUnezzc62qH2TG5mU9EJNe9akWtR6zg=";
         env = {
           FORCE_EMPTY_CACHE = true;
           FORCE_GIT_DEPS = true;
@@ -69,10 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
         mkdir $out
         for p in $(find -name package-lock.json)
         do (
-          ${prefetch-npm-deps}/bin/prefetch-npm-deps "$p" "$out"
-          local lockpath=$out/lockfiles/$p
-          mkdir -p "$(dirname $lockpath)"
-          mv $out/package-lock.json "$lockpath"
+          echo "Prefetching $p"
+          ${prefetch-npm-deps}/bin/prefetch-npm-deps "$p" "$out/$(dirname $p)"
         )
         done
       '';
@@ -89,9 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_NODEJS_BUILDNPMPACKAGE = "1";
     npm_config_nodedir = nodejs;
     npm_config_node_gyp = "${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js";
-
-    # use local npm cache (see <nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh>)
-    npm_config_cache = finalAttrs.nodeModules;
     npm_config_offline = true;
     npm_config_progress = false;
 
@@ -145,12 +140,9 @@ stdenv.mkDerivation (finalAttrs: {
   preConfigure = ''
     export HOME=$TMPDIR/home
     mkdir -p $HOME
-    mkdir -p $TMPDIR/cache/_cacache
-    # ln -s $nodeModules/_cacache/* $TMPDIR/cache/_cacache
-    # mkdir -p $TMPDIR/cache
-    cp -R $nodeModules/_cacache $TMPDIR/cache
+    mkdir -p $TMPDIR
+    cp -R $nodeModules $TMPDIR/cache
     chmod -R +w $TMPDIR/cache
-    export npm_config_cache=$TMPDIR/cache
   '';
 
   configurePhase = ''
@@ -167,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
         echo >&2 "File exists $p/node_modules"
         exit 0
       fi
-      npm ci --ignore-scripts
+      npm_config_cache=$TMPDIR/cache/$p npm ci --ignore-scripts
       patchShebangs node_modules
     )
     done
@@ -186,13 +178,10 @@ stdenv.mkDerivation (finalAttrs: {
   ''
   ## node-pty build fix
   + ''
-    substituteInPlace remote/node_modules/node-pty/scripts/post-install.js \
-      --replace-fail "npx node-gyp" "$npm_config_node_gyp"
-  ''
-  ## rebuild native binaries
-  + ''
-    echo >&2 "Rebuilding from source in ./remote"
-    npm --offline --prefix ./remote rebuild --build-from-source
+    find -path node_modules/node-pty/scripts/gen-compile-commands.js \
+         -exec substituteInPlace {} \
+                 --replace-fail "npx node-gyp" "$npm_config_node_gyp" \
+               \;
   ''
   ## run postinstall scripts
   + ''
@@ -200,11 +189,16 @@ stdenv.mkDerivation (finalAttrs: {
       if jq -e ".scripts.postinstall" {} >-
       then
         echo >&2 "Running postinstall script in $(dirname {})"
-        npm --offline --prefix=$(dirname {}) run postinstall
+        npm --prefix=$(dirname {}) run postinstall
       fi
       exit 0
     ' \;
   ''
+  ## rebuild native binaries
+  + ''
+    echo >&2 "Rebuilding from source in ./remote"
+    npm --prefix ./remote rebuild --build-from-source
+  ''
   + ''
     runHook postConfigure
   '';

From ae8cfcef4e804c177d310aceaa83b08f7e897970 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Dec 2025 21:08:59 +0000
Subject: [PATCH 05/39] openapi-generator-cli: 7.17.0 -> 7.18.0

---
 pkgs/by-name/op/openapi-generator-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openapi-generator-cli/package.nix b/pkgs/by-name/op/openapi-generator-cli/package.nix
index d749b8364138..20ebc46eebd9 100644
--- a/pkgs/by-name/op/openapi-generator-cli/package.nix
+++ b/pkgs/by-name/op/openapi-generator-cli/package.nix
@@ -10,7 +10,7 @@
 
 let
   jre = jre_headless;
-  version = "7.17.0";
+  version = "7.18.0";
   mainProgram = "openapi-generator-cli";
   this = maven.buildMavenPackage {
     inherit version;
@@ -21,10 +21,10 @@ let
       owner = "OpenAPITools";
       repo = "openapi-generator";
       tag = "v${version}";
-      hash = "sha256-9jO+u08wrxW0RcXTGDh8mpPp9Eu2PwRifKNsso6s3QM=";
+      hash = "sha256-D7F4fbgXqUMH0ZOsnGtB3gVWmans0MPdD7ix6ImXsfA=";
     };
 
-    mvnHash = "sha256-PiLpJponpJUXakdno+KGxzDvZG6jYRPp3t5q/G5JX+M=";
+    mvnHash = "sha256-17siKb+TIYAuY1p7+1mcc3QY+Rfnsoy+CJiWT5LFM0w=";
     mvnParameters = "-Duser.home=$TMPDIR";
     doCheck = false;
 

From 1a0a0ef0abe8fcc840daa5a6d2962fbfa4eb29f8 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:34:27 -0500
Subject: [PATCH 06/39] akkoma: remove all-packages.nix definition

---
 pkgs/by-name/ak/akkoma/package.nix | 12 +++++++++++-
 pkgs/top-level/all-packages.nix    | 11 -----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ak/akkoma/package.nix b/pkgs/by-name/ak/akkoma/package.nix
index 02f4e56fcd2c..22157be35fb4 100644
--- a/pkgs/by-name/ak/akkoma/package.nix
+++ b/pkgs/by-name/ak/akkoma/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  beamPackages,
+  beam_minimal,
   fetchFromGitea,
   cmake,
   file,
@@ -8,6 +8,16 @@
   nix-update-script,
 }:
 
+let
+  beamPackages = beam_minimal.packages.erlang_26.extend (
+    self: super: {
+      elixir = self.elixir_1_16;
+      rebar3 = self.rebar3WithPlugins {
+        plugins = with self; [ pc ];
+      };
+    }
+  );
+in
 beamPackages.mixRelease rec {
   pname = "akkoma";
   version = "3.17.0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69aeee083d1c..c1e012f2a55d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -974,17 +974,6 @@ with pkgs;
 
   opnplug = adlplug.override { type = "OPN"; };
 
-  akkoma = callPackage ../by-name/ak/akkoma/package.nix {
-    beamPackages = beam_minimal.packages.erlang_26.extend (
-      self: super: {
-        elixir = self.elixir_1_16;
-        rebar3 = self.rebar3WithPlugins {
-          plugins = with self; [ pc ];
-        };
-      }
-    );
-  };
-
   akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix {
     python3 = python311;
   };

From 7c3cdbd07aee72cfa307c4ca6d83c303d1b0422e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:37:01 -0500
Subject: [PATCH 07/39] akkoma-admin-fe: remove all-packages.nix definition

---
 pkgs/by-name/ak/akkoma-admin-fe/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ak/akkoma-admin-fe/package.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix
index e60d6588b254..c5f04681b40d 100644
--- a/pkgs/by-name/ak/akkoma-admin-fe/package.nix
+++ b/pkgs/by-name/ak/akkoma-admin-fe/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitea,
   yarn-berry_3,
   nodejs,
-  python3,
+  python311,
   pkg-config,
   libsass,
   xcbuild,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     yarn-berry
     nodejs
     pkg-config
-    python3
+    python311
     libsass
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1e012f2a55d..9d9f55192857 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -974,10 +974,6 @@ with pkgs;
 
   opnplug = adlplug.override { type = "OPN"; };
 
-  akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix {
-    python3 = python311;
-  };
-
   aegisub = callPackage ../by-name/ae/aegisub/package.nix (
     {
       luajit = luajit.override { enable52Compat = true; };

From 0f1821011f48af43ced446f274c42bc1eb4a0599 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:38:22 -0500
Subject: [PATCH 08/39] alsa-utils: remove all-packages.nix definition

---
 pkgs/by-name/al/alsa-utils/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix
index b137ca9c9aee..d046b2d6ea85 100644
--- a/pkgs/by-name/al/alsa-utils/package.nix
+++ b/pkgs/by-name/al/alsa-utils/package.nix
@@ -14,7 +14,7 @@
   procps,
   tree,
   which,
-  fftw,
+  fftwFloat,
   pipewire,
   withPipewireLib ? true,
   symlinkJoin,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     ncurses
     libsamplerate
-    fftw
+    fftwFloat
   ];
 
   configureFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d9f55192857..b448d14a7cd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9553,10 +9553,6 @@ with pkgs;
 
   alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
 
-  alsa-utils = callPackage ../by-name/al/alsa-utils/package.nix {
-    fftw = fftwFloat;
-  };
-
   arm-trusted-firmware = callPackage ../misc/arm-trusted-firmware { };
   inherit (arm-trusted-firmware)
     buildArmTrustedFirmware

From eda379518c72d5e736472de86f2ee5a5450c2c00 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:39:29 -0500
Subject: [PATCH 09/39] aquamarine: remove all-packages.nix definition

---
 pkgs/by-name/aq/aquamarine/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
index e0ab69ecc1d6..c458f0521c0c 100644
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gcc15Stdenv,
   cmake,
   fetchFromGitHub,
   hwdata,
@@ -21,7 +21,7 @@
   wayland-protocols,
   wayland-scanner,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "aquamarine";
   version = "0.10.0";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b448d14a7cd5..86421b33c675 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1948,10 +1948,6 @@ with pkgs;
     cairo = cairo.override { xcbSupport = true; };
   };
 
-  aquamarine = callPackage ../by-name/aq/aquamarine/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
   hyprshade = python3Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
 
   hyprlandPlugins = recurseIntoAttrs (

From 4e793c067dba26ebdf3410859901ff01761dcfd9 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:51:14 -0500
Subject: [PATCH 10/39] armips: remove all-packages.nix definition

---
 pkgs/by-name/ar/armips/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix    | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ar/armips/package.nix b/pkgs/by-name/ar/armips/package.nix
index 72c1bada4f56..a4881193b7da 100644
--- a/pkgs/by-name/ar/armips/package.nix
+++ b/pkgs/by-name/ar/armips/package.nix
@@ -1,11 +1,11 @@
 {
-  stdenv,
+  clangStdenv,
   lib,
   fetchFromGitHub,
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+clangStdenv.mkDerivation rec {
   pname = "armips";
   version = "0.11.0";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86421b33c675..a50a177c3a86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4152,10 +4152,6 @@ with pkgs;
   adaptivecppWithCuda = adaptivecpp.override { cudaSupport = true; };
   adaptivecppWithRocm = adaptivecpp.override { rocmSupport = true; };
 
-  armips = callPackage ../by-name/ar/armips/package.nix {
-    stdenv = clangStdenv;
-  };
-
   binaryen = callPackage ../development/compilers/binaryen {
     nodejs = nodejs-slim;
     inherit (python3Packages) filecheck;

From 0895c91db5617499f0fa6e506c7f2763a517eeec Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:51:52 -0500
Subject: [PATCH 11/39] art: remove all-packages.nix definition

---
 pkgs/by-name/ar/art/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index c77839ddf6d8..92ac5803cffa 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -22,7 +22,7 @@
   lcms2,
   libraw,
   libiptcdata,
-  fftw,
+  fftwSinglePrec,
   expat,
   pcre2,
   libsigcxx,
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     lcms2
     libraw
     libiptcdata
-    fftw
+    fftwSinglePrec
     expat
     pcre2
     libsigcxx
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a50a177c3a86..80896545f4b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12603,10 +12603,6 @@ with pkgs;
   anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { };
   ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });
 
-  art = callPackage ../by-name/ar/art/package.nix {
-    fftw = fftwSinglePrec;
-  };
-
   arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { };
 
   beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix {

From 765c80109267fd53db941f674f2bfcae8e101b9c Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:53:36 -0500
Subject: [PATCH 12/39] atf: remove all-packages.nix definition

---
 pkgs/by-name/at/atf/package.nix | 11 ++++++++---
 pkgs/top-level/all-packages.nix |  6 ------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix
index 8f0aa01360ae..326419c5f72a 100644
--- a/pkgs/by-name/at/atf/package.nix
+++ b/pkgs/by-name/at/atf/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  darwin,
   fetchFromGitHub,
   fetchpatch,
   autoreconfHook,
@@ -8,7 +9,11 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+let
+  # atf is a dependency of libiconv. Avoid an infinite recursion with `pkgsStatic` by using a bootstrap stdenv.
+  stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
   pname = "atf";
   version = "0.23";
 
@@ -26,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
         --replace-fail 'atf_test_program{name="srcdir_test"}' ""
     ''
     # These tests fail on Darwin.
-    + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) ''
+    + lib.optionalString (finalAttrs.doInstallCheck && stdenv'.hostPlatform.isDarwin) ''
       substituteInPlace atf-c/detail/process_test.c \
         --replace-fail 'ATF_TP_ADD_TC(tp, status_coredump);' ""
     ''
     # This test fails on Linux.
-    + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) ''
+    + lib.optionalString (finalAttrs.doInstallCheck && stdenv'.hostPlatform.isLinux) ''
       substituteInPlace atf-c/detail/fs_test.c \
         --replace-fail 'ATF_TP_ADD_TC(tp, eaccess);' ""
     '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80896545f4b7..c2f68372fc15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8539,12 +8539,6 @@ with pkgs;
 
   ### DEVELOPMENT / TESTING TOOLS
 
-  atf = callPackage ../by-name/at/atf/package.nix {
-    stdenv =
-      # atf is a dependency of libiconv. Avoid an infinite recursion with `pkgsStatic` by using a bootstrap stdenv.
-      if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
-  };
-
   ### DEVELOPMENT / LIBRARIES / AGDA
 
   agdaPackages = recurseIntoAttrs (

From 0c37b832966338ab66082d7f7013bb4c77c017ec Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:55:45 -0500
Subject: [PATCH 13/39] basalt-monado: remove all-packages.nix definition

---
 pkgs/by-name/ba/basalt-monado/package.nix | 6 +++++-
 pkgs/top-level/all-packages.nix           | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix
index 9df8831d84da..12ff1f3905da 100644
--- a/pkgs/by-name/ba/basalt-monado/package.nix
+++ b/pkgs/by-name/ba/basalt-monado/package.nix
@@ -25,6 +25,10 @@
   cudaPackages,
   enableCuda ? config.cudaSupport,
 }:
+
+let
+  opencv' = opencv.override { enableGtk3 = true; };
+in
 stdenv.mkDerivation {
   pname = "basalt-monado";
   version = "0-unstable-2025-09-25";
@@ -57,7 +61,7 @@ stdenv.mkDerivation {
     libGL
     lz4
     magic-enum
-    opencv.cxxdev
+    opencv'.cxxdev
     onetbb
     xorg.libX11
   ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2f68372fc15..5be2e8adcf34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -277,10 +277,6 @@ with pkgs;
 
   cve = with python3Packages; toPythonApplication cvelib;
 
-  basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {
-    opencv = opencv.override { enableGtk3 = true; };
-  };
-
   bloodhound-py = with python3Packages; toPythonApplication bloodhound-py;
 
   # Zip file format only allows times after year 1980, which makes e.g. Python

From e49c019252d6722d856be3702b1e4c4d59576a91 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:59:14 -0500
Subject: [PATCH 14/39] bazel_7: remove all-packages.nix definition

---
 pkgs/by-name/ba/bazel_7/package.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix     |  7 -------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ba/bazel_7/package.nix b/pkgs/by-name/ba/bazel_7/package.nix
index a30d5ad78086..dffa79c2f7c4 100644
--- a/pkgs/by-name/ba/bazel_7/package.nix
+++ b/pkgs/by-name/ba/bazel_7/package.nix
@@ -12,7 +12,8 @@
   buildFHSEnv,
   # this package (through the fixpoint glass)
   # TODO probably still need for tests at some point
-  bazel_self,
+  bazel_7,
+  bazel_self ? bazel_7,
   # native build inputs
   runtimeShell,
   zip,
@@ -35,10 +36,11 @@
   # Apple dependencies
   cctools,
   libtool,
-  sigtool,
+  darwin,
   # Allow to independently override the jdks used to build and run respectively
-  buildJdk,
-  runJdk,
+  jdk21_headless,
+  buildJdk ? jdk21_headless,
+  runJdk ? jdk21_headless,
   # Toggle for hacks for running bazel under buildBazelPackage:
   # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
   # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
@@ -417,7 +419,7 @@ stdenv.mkDerivation rec {
         # don't use system installed Xcode to run clang, use Nix clang instead
         sed -i -E \
           -e "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
-          -e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \
+          -e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${darwin.sigtool}/bin/codesign;" \
           scripts/bootstrap/compile.sh \
           tools/osx/BUILD
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5be2e8adcf34..0268e35bb987 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5923,13 +5923,6 @@ with pkgs;
 
   bazel = bazel_7;
 
-  bazel_7 = callPackage ../by-name/ba/bazel_7/package.nix {
-    inherit (darwin) sigtool;
-    buildJdk = jdk21_headless;
-    runJdk = jdk21_headless;
-    bazel_self = bazel_7;
-  };
-
   buildifier = bazel-buildtools;
   buildozer = bazel-buildtools;
   unused_deps = bazel-buildtools;

From d97483e657e52d013c055b3186c6d0f0aabb775e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 19:59:57 -0500
Subject: [PATCH 15/39] biblioteca: remove all-packages.nix definition

---
 pkgs/by-name/bi/biblioteca/package.nix | 6 +++---
 pkgs/top-level/all-packages.nix        | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix
index d35040b3ad11..8c8bba890b5c 100644
--- a/pkgs/by-name/bi/biblioteca/package.nix
+++ b/pkgs/by-name/bi/biblioteca/package.nix
@@ -12,7 +12,7 @@
   gtk4,
   gobject-introspection,
   libadwaita,
-  webkitgtk,
+  webkitgtk_6_0,
   coreutils,
   makeShellWrapper,
   wrapGAppsHook4,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk4
     gobject-introspection
     libadwaita
-    webkitgtk
+    webkitgtk_6_0
     glib-networking
   ];
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
       gtk4.devdoc
       glib.devdoc
       libadwaita.devdoc
-      webkitgtk.devdoc
+      webkitgtk_6_0.devdoc
       gobject-introspection.devdoc
     ]
     ++ extraDocsPackage;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0268e35bb987..117574ff9e84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14091,10 +14091,6 @@ with pkgs;
     libcpr = libcpr_1_10_5;
   };
 
-  biblioteca = callPackage ../by-name/bi/biblioteca/package.nix {
-    webkitgtk = webkitgtk_6_0;
-  };
-
   libpostalWithData = callPackage ../by-name/li/libpostal/package.nix {
     withData = true;
   };

From dee6e0af21188a6e594b9d3bd92607f325377b82 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 20:01:25 -0500
Subject: [PATCH 16/39] blender: remove all-packages.nix definition

---
 pkgs/by-name/bl/blender/package.nix | 24 ++++++++++++------------
 pkgs/top-level/all-packages.nix     |  4 ----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index c27f27613067..b458b7e7c057 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -67,7 +67,7 @@
   pkg-config,
   potrace,
   pugixml,
-  python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
+  python311Packages, # must use python3Packages instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
   rocmPackages, # comes with a significantly larger closure size
   rubberband,
   runCommand,
@@ -95,8 +95,8 @@ let
     (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;
   vulkanSupport = !stdenv.hostPlatform.isDarwin;
 
-  python3 = python3Packages.python;
-  pyPkgsOpenusd = python3Packages.openusd.override (old: {
+  python3 = python311Packages.python;
+  pyPkgsOpenusd = python311Packages.openusd.override (old: {
     opensubdiv = old.opensubdiv.override { inherit cudaSupport; };
     withOsl = false;
   });
@@ -131,7 +131,7 @@ stdenv'.mkDerivation (finalAttrs: {
       substituteInPlace source/creator/CMakeLists.txt \
         --replace-fail '${"$"}{LIBDIR}/python' \
                   '${python3}' \
-        --replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
+        --replace-fail '${"$"}{LIBDIR}/materialx/' '${python311Packages.materialx}/'
       substituteInPlace build_files/cmake/platform/platform_apple.cmake \
         --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
                   '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
@@ -149,12 +149,12 @@ stdenv'.mkDerivation (finalAttrs: {
   cmakeFlags = [
     "-C../build_files/cmake/config/blender_release.cmake"
 
-    (lib.cmakeFeature "MaterialX_DIR" "${python3Packages.materialx}/lib/cmake/MaterialX")
+    (lib.cmakeFeature "MaterialX_DIR" "${python311Packages.materialx}/lib/cmake/MaterialX")
     (lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
     (lib.cmakeFeature "PYTHON_LIBPATH" "${python3}/lib")
     (lib.cmakeFeature "PYTHON_LIBRARY" "${python3.libPrefix}")
-    (lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
-    (lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python3Packages.numpy_1}/${python3.sitePackages}")
+    (lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python311Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
+    (lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python311Packages.numpy_1}/${python3.sitePackages}")
     (lib.cmakeFeature "PYTHON_VERSION" "${python3.pythonVersion}")
 
     (lib.cmakeBool "WITH_BUILDINFO" false)
@@ -221,7 +221,7 @@ stdenv'.mkDerivation (finalAttrs: {
     cmake
     llvmPackages.llvm.dev
     makeWrapper
-    python3Packages.wrapPython
+    python311Packages.wrapPython
   ]
   ++ lib.optionals cudaSupport [
     addDriverRunpath
@@ -263,7 +263,7 @@ stdenv'.mkDerivation (finalAttrs: {
     potrace
     pugixml
     python3
-    python3Packages.materialx
+    python311Packages.materialx
     rubberband
     zlib
     zstd
@@ -316,7 +316,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   pythonPath =
     let
-      ps = python3Packages;
+      ps = python311Packages;
     in
     [
       ps.materialx
@@ -362,13 +362,13 @@ stdenv'.mkDerivation (finalAttrs: {
 
   passthru = {
     python = python3;
-    pythonPackages = python3Packages;
+    pythonPackages = python311Packages;
 
     withPackages =
       f:
       (callPackage ./wrapper.nix { }).override {
         blender = finalAttrs.finalPackage;
-        extraModules = (f python3Packages);
+        extraModules = (f python311Packages);
       };
 
     tests = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 117574ff9e84..3d7f247f2577 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10387,10 +10387,6 @@ with pkgs;
     pinentry = pinentry-curses;
   };
 
-  blender = callPackage ../by-name/bl/blender/package.nix {
-    python3Packages = python311Packages;
-  };
-
   blender-hip = blender.override { hipSupport = true; };
 
   blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix {

From da56e4218376d22ac5e29a28bbb410e431bc7a91 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 20:02:28 -0500
Subject: [PATCH 17/39] bluespec: remove all-packages.nix definition

---
 pkgs/by-name/bl/bluespec/package.nix | 3 ++-
 pkgs/top-level/all-packages.nix      | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index ec1bf56298e2..c5eeb8e962d9 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -17,7 +17,8 @@
   yices, # bsc uses a patched version of yices
   zlib,
   ghc,
-  gmp-static,
+  gmp,
+  gmp-static ? gmp.override { withStatic = true; },
   iverilog,
   asciidoctor,
   texliveFull,
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d7f247f2577..f8906ddaff80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4153,10 +4153,6 @@ with pkgs;
     inherit (python3Packages) filecheck;
   };
 
-  bluespec = callPackage ../by-name/bl/bluespec/package.nix {
-    gmp-static = gmp.override { withStatic = true; };
-  };
-
   codon = callPackage ../development/compilers/codon {
     inherit (llvmPackages) lld stdenv;
   };

From 3ed381ca4a48ff56bf9b4234cfd1fc4695dfe558 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 20:02:57 -0500
Subject: [PATCH 18/39] cantata: remove all-packages.nix definition

---
 pkgs/by-name/ca/cantata/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix     | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix
index 7f64c6c1d881..709bd0322c2a 100644
--- a/pkgs/by-name/ca/cantata/package.nix
+++ b/pkgs/by-name/ca/cantata/package.nix
@@ -25,7 +25,7 @@
   withHttpStream ? true,
   gst_all_1,
   withReplaygain ? true,
-  ffmpeg,
+  ffmpeg_6,
   speex,
   mpg123,
   withMtp ? true,
@@ -92,7 +92,7 @@ let
       ];
       enable = withReplaygain;
       pkgs = [
-        ffmpeg
+        ffmpeg_6
         speex
         mpg123
       ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8906ddaff80..df2ef2e107c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14075,10 +14075,6 @@ with pkgs;
     fltk = fltk13;
   };
 
-  cantata = callPackage ../by-name/ca/cantata/package.nix {
-    ffmpeg = ffmpeg_6;
-  };
-
   libkazv = callPackage ../by-name/li/libkazv/package.nix {
     libcpr = libcpr_1_10_5;
   };

From 8d37de2ef5e993deb03953c693de7f7a8a6e0b15 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 20:03:24 -0500
Subject: [PATCH 19/39] clang-uml: remove all-packages.nix definition

---
 pkgs/by-name/cl/clang-uml/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix       | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix
index fd1871133b14..36b22f932f97 100644
--- a/pkgs/by-name/cl/clang-uml/package.nix
+++ b/pkgs/by-name/cl/clang-uml/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  stdenv,
+  clangStdenv,
   cmake,
   pkg-config,
   installShellFiles,
@@ -15,7 +15,7 @@
   enableLibcxx ? false,
   debug ? false,
 }:
-stdenv.mkDerivation (finalAttrs: {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "clang-uml";
   version = "0.6.2";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df2ef2e107c3..3bbd0581ee1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -319,10 +319,6 @@ with pkgs;
 
   chef-cli = callPackage ../tools/misc/chef-cli { };
 
-  clang-uml = callPackage ../by-name/cl/clang-uml/package.nix {
-    stdenv = clangStdenv;
-  };
-
   cope = callPackage ../by-name/co/cope/package.nix {
     perl = perl538;
     perlPackages = perl538Packages;

From 492c4dd0b09fb67093f621a3b7efcc3018556f08 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 20:04:14 -0500
Subject: [PATCH 20/39] clash-verge-rev: remove all-packages.nix definition

---
 pkgs/by-name/cl/clash-verge-rev/package.nix   | 4 ++--
 pkgs/by-name/cl/clash-verge-rev/unwrapped.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix
index 5cd94a72e5a6..8033100ba783 100644
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@@ -8,7 +8,7 @@
   wrapGAppsHook3,
   v2ray-geoip,
   v2ray-domain-list-community,
-  libsoup,
+  libsoup_3,
 }:
 let
   pname = "clash-verge-rev";
@@ -38,7 +38,7 @@ let
       pnpm-hash
       vendor-hash
       meta
-      libsoup
+      libsoup_3
       ;
   };
 
diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
index 843c3f572a24..be53a106eb6f 100644
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@@ -23,7 +23,7 @@
   kdePackages,
   libayatana-appindicator,
   libsForQt5,
-  libsoup,
+  libsoup_3,
   openssl,
   webkitgtk_4_1,
 }:
@@ -106,7 +106,7 @@ rustPlatform.buildRustPackage {
 
   buildInputs = [
     libayatana-appindicator
-    libsoup
+    libsoup_3
     openssl
     webkitgtk_4_1
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bbd0581ee1c..2e61398d100a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14079,10 +14079,6 @@ with pkgs;
     withData = true;
   };
 
-  clash-verge-rev = callPackage ../by-name/cl/clash-verge-rev/package.nix {
-    libsoup = libsoup_3;
-  };
-
   gpac-unstable = callPackage ../by-name/gp/gpac/package.nix {
     releaseChannel = "unstable";
   };

From c475a2f94c71579171641396c887bc95776a3d80 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 20:06:48 -0500
Subject: [PATCH 21/39] cope: remove all-packages.nix definition

---
 pkgs/by-name/co/cope/package.nix | 8 +++++---
 pkgs/top-level/all-packages.nix  | 5 -----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix
index 96fca7559688..a138bd01cb9e 100644
--- a/pkgs/by-name/co/cope/package.nix
+++ b/pkgs/by-name/co/cope/package.nix
@@ -1,10 +1,12 @@
 {
   lib,
   fetchFromGitHub,
-  perl,
-  perlPackages,
+  perl538Packages,
   makeWrapper,
 }:
+let
+  perlPackages = perl538Packages;
+in
 perlPackages.buildPerlPackage {
   pname = "cope";
   version = "0-unstable-2025-06-20";
@@ -50,7 +52,7 @@ perlPackages.buildPerlPackage {
         if [[ -f "$script" && -x "$script" ]]; then
           wrapProgram "$script" \
             --set PERL5LIB "${perlPath}:$out/lib/perl5/site_perl"
-          sed -i "1s|^#!.*perl|#!${perl}/bin/perl|" "$out/libexec/.''${script##*/}-wrapped"
+          sed -i "1s|^#!.*perl|#!${perlPackages.perl}/bin/perl|" "$out/libexec/.''${script##*/}-wrapped"
         fi
       done
       rm -r $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e61398d100a..283430f8be83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -319,11 +319,6 @@ with pkgs;
 
   chef-cli = callPackage ../tools/misc/chef-cli { };
 
-  cope = callPackage ../by-name/co/cope/package.nix {
-    perl = perl538;
-    perlPackages = perl538Packages;
-  };
-
   coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });
 
   cup-docker-noserver = cup-docker.override { withServer = false; };

From b63f34d55422b6c2af309d40271cc62c08f03773 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 10 Dec 2025 20:07:32 -0500
Subject: [PATCH 22/39] cp2k: remove all-packages.nix definition

---
 pkgs/by-name/cp/cp2k/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix  | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix
index 69c6777c9fc6..711e8802fda4 100644
--- a/pkgs/by-name/cp/cp2k/package.nix
+++ b/pkgs/by-name/cp/cp2k/package.nix
@@ -12,7 +12,7 @@
   fftw,
   libint,
   libvori,
-  libxc,
+  libxc_7,
   dftd4,
   simple-dftd3,
   tblite,
@@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
     gsl
     libint
     libvori
-    libxc
+    libxc_7
     libxsmm
     mpi
     spglib
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 283430f8be83..4ee519a81938 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13044,10 +13044,6 @@ with pkgs;
 
   siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; };
 
-  cp2k = callPackage ../by-name/cp/cp2k/package.nix {
-    libxc = pkgs.libxc_7;
-  };
-
   ### SCIENCE/BIOLOGY
 
   cd-hit = callPackage ../applications/science/biology/cd-hit {

From 43ee30d5acc391d1eff367449c91b7bbbd5a70e6 Mon Sep 17 00:00:00 2001
From: Rane <rane+git@junkyard.systems>
Date: Sun, 28 Dec 2025 19:49:43 +1100
Subject: [PATCH 23/39] nixos/xen: Remove redundant kernel modules

---
 nixos/modules/virtualisation/xen-dom0.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index ba4b92779197..92e40f77b82a 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -720,15 +720,6 @@ in
         "xen-blkback"
         "xen-netback"
         "xen-pciback"
-        "evtchn"
-        "gntdev"
-        "netbk"
-        "blkbk"
-        "xen-scsibk"
-        "usbbk"
-        "pciback"
-        "xen-acpi-processor"
-        "blktap2"
         "tun"
         "netxen_nic"
         "xen_wdt"

From b505295e58f8ced9421b91e450cd3ac0f22bead6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Dec 2025 12:27:24 +0000
Subject: [PATCH 24/39] mirrord: 3.178.0 -> 3.179.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 6917af413f3b..2d5c79932518 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.178.0",
+  "version": "3.179.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_linux_x86_64",
-      "hash": "sha256-UFG/N5qNuBuBnmD6FDJk3Ly+zKGaUtOEO+7H82VFeFc="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_x86_64",
+      "hash": "sha256-VStFqwOut1VnspK7963VvR5tnEEmASiWxHj8riiPUCg="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_linux_aarch64",
-      "hash": "sha256-/K9VoCHacmPZuv0ycvt9GPrDG/xDPlq6AP3zAO0Lmlo="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_aarch64",
+      "hash": "sha256-mK+b3oCCZ098MMYQtRoXo1BuAlxz+4rtdB7EN1vDO38="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_mac_universal",
-      "hash": "sha256-l3ho45nkazyk8byirvq5J0ZMmrqcMasUMUYBj88bh24="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal",
+      "hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_mac_universal",
-      "hash": "sha256-l3ho45nkazyk8byirvq5J0ZMmrqcMasUMUYBj88bh24="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal",
+      "hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM="
     }
   }
 }

From a42c0418b643b81f5ea04379113f52585277ded0 Mon Sep 17 00:00:00 2001
From: Angel J <78835633+iamanaws@users.noreply.github.com>
Date: Sun, 28 Dec 2025 08:12:03 -0800
Subject: [PATCH 25/39] fasmg: add iamanaws as maintainer

Signed-off-by: Angel J <78835633+iamanaws@users.noreply.github.com>
---
 pkgs/by-name/fa/fasmg/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix
index 546eb5a43f6d..f1ce0c8c4673 100644
--- a/pkgs/by-name/fa/fasmg/package.nix
+++ b/pkgs/by-name/fa/fasmg/package.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     mainProgram = "fasmg";
     homepage = "https://flatassembler.net";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.iamanaws ];
     platforms = with lib.platforms; lib.intersectLists (linux ++ darwin) x86;
   };
 }

From dc6d5243d41a145b2ddc1f832995e9cd74e74a6b Mon Sep 17 00:00:00 2001
From: Angel J <78835633+iamanaws@users.noreply.github.com>
Date: Sun, 28 Dec 2025 08:12:30 -0800
Subject: [PATCH 26/39] fasm: add iamanaws as maintainer

Signed-off-by: Angel J <78835633+iamanaws@users.noreply.github.com>
---
 pkgs/development/compilers/fasm/bin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
index 2b496cfb1fa4..2d33d126edad 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://flatassembler.net/download.php";
     license = lib.licenses.bsd2;
     mainProgram = "fasm";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.iamanaws ];
     platforms = [
       "i686-linux"
       "x86_64-linux"

From e0ec2f2b509c746d03a338f8ac379a70b72b070f Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 29 Dec 2025 00:33:41 +0800
Subject: [PATCH 27/39] limine: 10.5.1 -> 10.6.0

---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index a83dc8824125..9862c8fa2314 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -47,14 +47,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "10.5.1";
+  version = "10.6.0";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-sD41QQJ3zGDHinynlj5lpZoOPVPyutMCLDnNZNmttHI=";
+    hash = "sha256-rNLPfDHYVGOzO7pnv7w+l8kevmKPFFJ3O5MtPN6YlG4=";
   };
 
   enableParallelBuilding = true;

From 6a0cd793f7ea679d0881bc21e0f9497751518677 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Dec 2025 16:48:27 +0000
Subject: [PATCH 28/39] s7: 11.7-unstable-2025-12-19 ->
 11.7-unstable-2025-12-27

---
 pkgs/by-name/s7/s7/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index 2e420a04a186..5718f91fa25a 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.7-unstable-2025-12-19";
+  version = "11.7-unstable-2025-12-27";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "7fb6a59b5150e6146c6d3df3bb9e9cba7ae449bc";
-    hash = "sha256-nZMvdlaVyI2zH0r8yrZn1ESN+7/Wk2D+OWujzPahnZU=";
+    rev = "3cccb2a354966fc4b7e30182b1b0956a8a84523c";
+    hash = "sha256-uLo/DvTfOU615wMm/Qgp89wdqTeSlAt0Vqv99fUPwjw=";
   };
 
   buildInputs =

From 7f3ad94f7ba6ba1afe9ebf8a84a259b77af1c771 Mon Sep 17 00:00:00 2001
From: obsoleszenz <obsoleszenz@riseup.net>
Date: Sun, 28 Dec 2025 20:23:54 +0100
Subject: [PATCH 29/39] inkscape: 1.4.2 -> 1.4.3

---
 .../graphics/inkscape/default.nix             | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 329353210fe5..4b3ad8215705 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -74,7 +74,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "inkscape";
-  version = "1.4.2";
+  version = "1.4.3";
   outputs = [
     "out"
     "man"
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-IABTDHkX5SYMnoV1pxVP9pJmQ9IAZIfXFOMEqWPwx4I=";
+    sha256 = "sha256-6DosPbVwtsWh/w/M/nCYg3s/a9dLEzVnk3yKkXEO0dE=";
   };
 
   # Inkscape hits the ARGMAX when linking on macOS. It appears to be
@@ -101,26 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
       # Fix path to ps2pdf binary
       inherit ghostscript;
     })
-    (fetchpatch {
-      name = "fix-build-poppler-25.06.0.patch";
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/40f5b15b7e29908b79c54e81db6f340936102e08.patch";
-      hash = "sha256-bYRd/KUh/7qFb7x0EuUgQYA9P8abcTf5XS67gzaAiXA=";
-    })
-    (fetchpatch {
-      name = "fix-build-poppler-25.07.0.patch";
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/8ae83ca81bbaebcc0ff0abe82300d56d2c94e6f9.patch";
-      hash = "sha256-s7UMnv1pAiQA/HL5CEdBwCn4v/tsphc0MSnBJAoqolY=";
-    })
-    (fetchpatch {
-      name = "fix-build-poppler-25.09.0.patch";
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/f48b429827dca510b41a5671d467e574ef348625.patch";
-      hash = "sha256-9CfmkTGMVHjZiiE3zvi4YOrytcir8a7O2z3PrhjcohI=";
-    })
-    (fetchpatch {
-      name = "fix-build-poppler-25.10.0.patch";
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/4dba481fe898c6317696d50b109f5aed8f269c19.patch";
-      hash = "sha256-FFCkMU+Ec2qobG4ru89NPcM9Gxw8ZyFV+6jpW8ZwgE4=";
-    })
   ];
 
   postPatch = ''

From f74a638f790a1b3b3c1584d79128383a862ac0b8 Mon Sep 17 00:00:00 2001
From: c6rg0 <gdrozbik08@gmail.com>
Date: Sun, 28 Dec 2025 22:21:36 +0000
Subject: [PATCH 30/39] zsh-you-should-use: 1.10.0 -> 1.10.1

---
 pkgs/by-name/zs/zsh-you-should-use/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix
index cea990d28ef0..16bc645c1c97 100644
--- a/pkgs/by-name/zs/zsh-you-should-use/package.nix
+++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zsh-you-should-use";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "MichaelAquilina";
     repo = "zsh-you-should-use";
     tag = finalAttrs.version;
-    hash = "sha256-dG6E6cOKu2ZvtkwxMXx/op3rbevT1QSOQTgw//7GmSk=";
+    hash = "sha256-u3abhv9ewq3m4QsnsxT017xdlPm3dYq5dqHNmQhhcpI=";
   };
 
   strictDeps = true;

From a2454c53c7837e5dcb303697a5b69f7561e25541 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Dec 2025 22:58:15 +0000
Subject: [PATCH 31/39] siyuan: 3.5.0 -> 3.5.1

---
 pkgs/by-name/si/siyuan/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 8145a5d2b3c3..e23f7000aa5a 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -36,20 +36,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-h7oYlxz9Loh4HiZDeQdWV9ycWfCaNNifgFLo1d5zOJk=";
+    hash = "sha256-7fKvSK3gatEdIHAZuOzL6LdzLz4k97G+ZKpQh39yhbs=";
   };
 
   kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-Q6Bpcgav9ClM+d723jYmuunybEP5iHt9nF5ssQ1kokQ=";
+    vendorHash = "sha256-SqPegOTdjd8HrnXNIRUMAbDhKKrFR+xWZUuqblrZ10c=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {

From ce4ae9b6542f46036090d6bdbd3be32eef6c6a50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Dec 2025 00:39:02 +0000
Subject: [PATCH 32/39] jack-link: 0.2.5 -> 0.2.6

---
 pkgs/by-name/ja/jack-link/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jack-link/package.nix b/pkgs/by-name/ja/jack-link/package.nix
index 2b1d32a5fbbb..9d0368f0fa89 100644
--- a/pkgs/by-name/ja/jack-link/package.nix
+++ b/pkgs/by-name/ja/jack-link/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jack-link";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "rncbc";
     repo = "jack_link";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UYyVGc9/NOLzFD/31zB9lhUJW8G/PGt7VkSBjntpymw=";
+    hash = "sha256-mZ74nkiAQHkJAZYHTsNcQnrisaUIyHwEDUbrvOL6CAU=";
     fetchSubmodules = true;
   };
 

From 326bc144c06ad7b4c949c5014c3829e8d924a7f9 Mon Sep 17 00:00:00 2001
From: 0xda157 <da157@voidq.com>
Date: Sun, 28 Dec 2025 16:49:39 -0800
Subject: [PATCH 33/39] maintainers: add da157 key fingerprint

---
 maintainers/maintainer-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ef0630bf5779..66f7345251c0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5686,6 +5686,7 @@
     github = "0xda157";
     githubId = 153149335;
     name = "0xda157";
+    keys = [ { fingerprint = "5A66 FF95 36DE B501 DDD2  1647 B7AC 1B10 365D 45FF"; } ];
   };
   dabao1955 = {
     email = "dabao1955@163.com";

From 87395828986fb57a0edab39d23e32a274120b5cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Dec 2025 01:07:30 +0000
Subject: [PATCH 34/39] fosrl-newt: 1.7.0 -> 1.8.1

---
 pkgs/by-name/fo/fosrl-newt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index 5cce3cb1d2c8..2748f03d30dc 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "newt";
-  version = "1.7.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "newt";
     tag = version;
-    hash = "sha256-R6X9DOu1iGS/a4d5kmKoBZI0L5k7S0w3SHHFQnQH/ho=";
+    hash = "sha256-ndgigIk/3/cPZaJHfxWh6XvtAJe3S57sEwNTMBH0lSE=";
   };
 
   vendorHash = "sha256-5Xr6mwPtsqEliKeKv2rhhp6JC7u3coP4nnhIxGMqccU=";

From f5e50a3ca0e8db2fd85a6caab79b65e9cf24358c Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sun, 28 Dec 2025 17:30:05 -0800
Subject: [PATCH 35/39] zsh-you-should-use: add `meta.changelog`

---
 pkgs/by-name/zs/zsh-you-should-use/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix
index cea990d28ef0..c891d8704431 100644
--- a/pkgs/by-name/zs/zsh-you-should-use/package.nix
+++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix
@@ -33,6 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/MichaelAquilina/zsh-you-should-use";
+    changelog = "https://github.com/MichaelAquilina/zsh-you-should-use/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3;
     description = "ZSH plugin that reminds you to use existing aliases for commands you just typed";
     maintainers = with lib.maintainers; [ tomodachi94 ];

From 55aa51511d07b916138f5b876c111a7431e5f09f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Dec 2025 02:02:37 +0000
Subject: [PATCH 36/39] everest: 6064 -> 6088

---
 pkgs/by-name/ev/everest-bin/package.nix |  6 +++---
 pkgs/by-name/ev/everest/deps.json       | 19 ++-----------------
 pkgs/by-name/ev/everest/package.nix     |  6 +++---
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix
index 696b95a59229..820d35b4c046 100644
--- a/pkgs/by-name/ev/everest-bin/package.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -8,15 +8,15 @@
 
 let
   pname = "everest";
-  version = "6064";
+  version = "6088";
   phome = "$out/lib/Celeste";
 in
 stdenvNoCC.mkDerivation {
   inherit pname version;
   src = fetchzip {
-    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6064.0/main.zip";
+    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6088.0/main.zip";
     extension = "zip";
-    hash = "sha256-9NFaQNxy+2XCLr7JloxaobsNGCwJ8BLXrI5gq+8KOi0=";
+    hash = "sha256-npcjx7KOCe8T4MyK1d8Z485+XlvkMgjJ5m0PN5TbpgU=";
   };
   buildInputs = [
     icu
diff --git a/pkgs/by-name/ev/everest/deps.json b/pkgs/by-name/ev/everest/deps.json
index 6a228fef7f00..8c68d82ec8a2 100644
--- a/pkgs/by-name/ev/everest/deps.json
+++ b/pkgs/by-name/ev/everest/deps.json
@@ -26,8 +26,8 @@
   },
   {
     "pname": "KeraLua",
-    "version": "1.3.2",
-    "hash": "sha256-15C9K/S9L3yzB4wmDRNWQoWNskUVcm6qZjCbQQFGMPI="
+    "version": "1.4.7",
+    "hash": "sha256-Hr8Cs+dwmDU7ZdtLaSmAvsZ+EN3zwuazb6EjUam/cCc="
   },
   {
     "pname": "MAB.DotIgnore",
@@ -64,11 +64,6 @@
     "version": "7.0.20",
     "hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="
   },
-  {
-    "pname": "Microsoft.Build.Tasks.Git",
-    "version": "1.1.0",
-    "hash": "sha256-cwZU5VeF6aRZJqoIevJtF9hdYC1rKEf1GuqgCmoVAzE="
-  },
   {
     "pname": "Microsoft.Build.Tasks.Git",
     "version": "8.0.0",
@@ -194,21 +189,11 @@
     "version": "1.0.3",
     "hash": "sha256-vVIonl+4dlCQuxibOZoGR3o1DAhjAYpFW15dnkUpjMk="
   },
-  {
-    "pname": "Microsoft.SourceLink.Common",
-    "version": "1.1.0",
-    "hash": "sha256-bVbHHr6Mo1NUdaaQgfj1GvGPzrobRlYb2pI7f4VDslk="
-  },
   {
     "pname": "Microsoft.SourceLink.Common",
     "version": "8.0.0",
     "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="
   },
-  {
-    "pname": "Microsoft.SourceLink.GitHub",
-    "version": "1.1.0",
-    "hash": "sha256-Y5zUGJfiSj8/rQ1lK0t5Zje8rjoUhgbWrR8IpwtzB34="
-  },
   {
     "pname": "Microsoft.SourceLink.GitHub",
     "version": "8.0.0",
diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix
index c51be78a6419..da5570875879 100644
--- a/pkgs/by-name/ev/everest/package.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "everest";
-  version = "6064";
+  version = "6088";
   phome = "$out/lib/Celeste";
 in
 buildDotnetModule {
@@ -20,11 +20,11 @@ buildDotnetModule {
   src = fetchFromGitHub {
     owner = "EverestAPI";
     repo = "Everest";
-    rev = "b5257c4a51642ca0cdda7b0e4b7287e9d1fb45e3";
+    rev = "d7bc4c2716b747d243fa4347b98422766b3d8b5a";
     fetchSubmodules = true;
     # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
     # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
-    hash = "sha256-aGZ0n9iBg5gnNEtZCWxhdEeIdmmKJuzuQBpdlc7P6QE=";
+    hash = "sha256-aCeqEqSxpLZjO8xskjcBjrKOFFGun1TxK88P2VO6BEg=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];

From 49485fde85c9e5607a3d6028c5c2c791c0136171 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Dec 2025 02:36:53 +0000
Subject: [PATCH 37/39] ticker: 5.1.0 -> 5.2.0

---
 pkgs/by-name/ti/ticker/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix
index cd82a0449d96..19bf92d11418 100644
--- a/pkgs/by-name/ti/ticker/package.nix
+++ b/pkgs/by-name/ti/ticker/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "ticker";
-  version = "5.1.0";
+  version = "5.2.0";
 
   src = fetchFromGitHub {
     owner = "achannarasappa";
     repo = "ticker";
     tag = "v${version}";
-    hash = "sha256-/W/BZzrIkz/3F2jzQGJ79UycrdEBVTMF+YncCS5TibE=";
+    hash = "sha256-GH+2as3aK462cTguGekbB4HchVzC1HdBsXwJHwAh47Q=";
   };
 
   vendorHash = "sha256-EKc9QRDSOD4WetCXORjMUlaFqh0+B3Aa3m5SR1WiKN4=";

From e52af2a5ac48105efe639f81f115902efe4931ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Dec 2025 03:58:16 +0000
Subject: [PATCH 38/39] terraform-providers.spacelift-io_spacelift: 1.40.0 ->
 1.42.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 5754b0d7c43d..d6a318fa7158 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1229,13 +1229,13 @@
     "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
   },
   "spacelift-io_spacelift": {
-    "hash": "sha256-leXROTarkEHfDmJVLS7kSU3Z27dCF/BfZwBsnujlB90=",
+    "hash": "sha256-GSGKjV5tuwTyPvdwd/Z8t9g7LFkkg4gHKhI3FYt00gQ=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.40.0",
+    "rev": "v1.42.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-cX5K221Jnq701Nb+2bC1LmXVL7YvkZ8dkc2wYjDNOSw="
+    "vendorHash": "sha256-XNPXjqrrTIC3WrpvDBP7veAYgmYws9FdF4W3j6ewRPk="
   },
   "splunk-terraform_signalfx": {
     "hash": "sha256-Wixg+biff6OER/nXYa+WGXG7svs4T3E/qwPlV5xJEao=",

From d6074f373e512ee00da0c784dc4d0deee6898686 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Dec 2025 05:21:52 +0000
Subject: [PATCH 39/39] resterm: 0.12.0 -> 0.13.2

---
 pkgs/by-name/re/resterm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix
index c15bd6080c82..ace87b2c7bee 100644
--- a/pkgs/by-name/re/resterm/package.nix
+++ b/pkgs/by-name/re/resterm/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "resterm";
-  version = "0.12.0";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "unkn0wn-root";
     repo = "resterm";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-fqCJXWmmvgGpdJ+mAP2rizQUX3gQdN6rYW5dqkvWFns=";
+    sha256 = "sha256-CA1+Sa9fqeTaz37FCJGErShinMP6cSNoCtuifdyLUpk=";
   };
 
   vendorHash = "sha256-Kj60MkxqRYORANalbJnjgtHMDgxOUOeaF1opqcYnVww=";