From 2f7e7091a8a63cd306c8252cc12ac3c6c009949a Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sun, 21 Sep 2025 09:48:15 -0400
Subject: [PATCH 01/42] zig.hook: allow for global build flag overrides

---
 pkgs/development/compilers/zig/hook.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/zig/hook.nix b/pkgs/development/compilers/zig/hook.nix
index b199728eb7bd..2620414b6a2e 100644
--- a/pkgs/development/compilers/zig/hook.nix
+++ b/pkgs/development/compilers/zig/hook.nix
@@ -4,6 +4,7 @@
   zig,
   stdenv,
   xcbuild,
+  globalBuildFlags ? [ "-Dcpu=baseline" ],
 }:
 
 makeSetupHook {
@@ -47,10 +48,7 @@ makeSetupHook {
           else
             "-Drelease-safe=true";
       in
-      [
-        "-Dcpu=baseline"
-        releaseType
-      ];
+      globalBuildFlags ++ [ releaseType ];
   };
 
   passthru = { inherit zig; };

From 6ee69dd6475361a2b895cae880d980e62476d2a3 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 5 Oct 2025 00:44:00 +0000
Subject: [PATCH 02/42] libshumate: fix vapi file generation when cross
 compiling

cross-compiled `libshumate.dev` outputs were previously missing these
files:
- `$dev/share/vala/vapi/shumate-1.0.deps`
- `$dev/share/vala/vapi/shumate-1.0.vapi`

without these files, vala consumers of libshumate (such as
`pkgsCross.aarch64-multiplatform.pantheon.granite7`) fail to build.
---
 pkgs/by-name/li/libshumate/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix
index 6e9cbb678d06..2910d648498b 100644
--- a/pkgs/by-name/li/libshumate/package.nix
+++ b/pkgs/by-name/li/libshumate/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   gi-docgen,
   meson,
   ninja,
@@ -37,6 +38,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-OYQ2jgJZhis4ENHdyG0trdbTcqKzI3bM9K/3wuSMbTA=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Required for cross-compiled libshumate to get $dev/share/vala/vapi/shumate-1.0.{deps,vapi}
+      # https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/263
+      url = "https://gitlab.gnome.org/GNOME/libshumate/-/commit/8a8a5013ed69f443b84500b4f745079025863a32.patch";
+      name = "meson-use-find_program-instead-of-dependency-for-vapigen";
+      hash = "sha256-nYLUMLcghnWU/hlCWOHMmFIUdDa7UkX4TP7C4ftZVJM=";
+    })
+  ];
+
   depsBuildBuild = [
     # required to find native gi-docgen when cross compiling
     pkg-config
@@ -89,6 +100,8 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput share/doc/libshumate-1.0 "$devdoc"
   '';
 
+  strictDeps = true;
+
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "libshumate";

From 67f470757fe9e899db7236aeb8a8a5849435abe5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 09:53:51 +0000
Subject: [PATCH 03/42] davinci-resolve: 20.3 -> 20.3.1

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

diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix
index 7b5c8b55f4d3..ec22c2d055c7 100644
--- a/pkgs/by-name/da/davinci-resolve/package.nix
+++ b/pkgs/by-name/da/davinci-resolve/package.nix
@@ -34,7 +34,7 @@ let
   davinci = (
     stdenv.mkDerivation rec {
       pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
-      version = "20.3";
+      version = "20.3.1";
 
       nativeBuildInputs = [
         appimageTools.appimage-exec
@@ -56,9 +56,9 @@ let
             outputHashAlgo = "sha256";
             outputHash =
               if studioVariant then
-                "sha256-NaWnlFna/NaYNb4aaO++598mlpMsPFGL6nlXREBSAlI="
+                "sha256-JaP0O+bSc9wd2YTqRwRQo35kdDkq//5WMb+7MtC9S/A="
               else
-                "sha256-hVliyg6BBkY83INF7ZbO8myXX+FjC4RwgipfOH5cFAs=";
+                "sha256-3mZWP58UZYS4U1f9M3TZ9wyto0cGy+KdB+GIJlvCVng=";
 
             impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 

From 751750b710f4f65c18b09a5c69eec203dac9ce5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Dec 2025 09:48:55 +0000
Subject: [PATCH 04/42] railway: 4.12.0 -> 4.16.1

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

diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index 7a05ec034c07..740cb40dde2a 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "4.12.0";
+  version = "4.16.1";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-ViafZYAQCEfNJZpJgWVHG55+Ylkl3xndqT+zuNUDF04=";
+    hash = "sha256-ylmSsBGmYFLQExwFtI7gFwGmZeuIJy+QXQeCRdL669Y=";
   };
 
-  cargoHash = "sha256-CaB6sobEw+Z/R/zjGNonVhIiuX676P/4SA6nwoWWA7g=";
+  cargoHash = "sha256-Fk+2QRNJr2zFIKHOuEjoZbnwloGPCXP0Ilc26iKNI64=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 1e650af2e19d4ef95e8b1bc356080644891734c9 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 29 Dec 2025 19:15:45 +0100
Subject: [PATCH 05/42] nixos/yazi: refactor settings

Simply generate the settings submodule's attrset as opposed to mapping
and then converting a list to an attrset.
---
 nixos/modules/programs/yazi.nix | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/programs/yazi.nix b/nixos/modules/programs/yazi.nix
index b6c7e3133bd7..b109374a5a34 100644
--- a/nixos/modules/programs/yazi.nix
+++ b/nixos/modules/programs/yazi.nix
@@ -26,23 +26,17 @@ in
       type =
         with lib.types;
         submodule {
-          options = (
-            lib.listToAttrs (
-              map (
-                name:
-                lib.nameValuePair name (
-                  lib.mkOption {
-                    inherit (settingsFormat) type;
-                    default = { };
-                    description = ''
-                      Configuration included in `${name}.toml`.
+          options = lib.genAttrs files (
+            name:
+            lib.mkOption {
+              inherit (settingsFormat) type;
+              default = { };
+              description = ''
+                Configuration included in `${name}.toml`.
 
-                      See <https://yazi-rs.github.io/docs/configuration/${name}/> for documentation.
-                    '';
-                  }
-                )
-              ) files
-            )
+                See <https://yazi-rs.github.io/docs/configuration/${name}/> for documentation.
+              '';
+            }
           );
         };
       default = { };

From fa4d26349de2c492ee2bfdf3cc8d2bc75ab3de7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jan 2026 05:51:49 +0000
Subject: [PATCH 06/42] clouddrive2: 0.9.18 -> 0.9.21

---
 pkgs/by-name/cl/clouddrive2/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index 00b6fb81ba9a..07c244cab04d 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.18";
+  version = "0.9.21";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-FTddo953oYhAwSXTiLWIN2y3BV6Q+cy8sE6dNJKghiU=";
-        aarch64-linux = "sha256-j23/P9CDb+0+gheMMbxE7NyHmnhHmPRWLc9SvD27pRs=";
-        x86_64-darwin = "sha256-YiCkYrDldm5JcAheTCUC/gg1ZgMxMue/bcz1gEjXdy0=";
-        aarch64-darwin = "sha256-CbzA38bkavPGJko0x/JqBxkx5CP7wM6iDEB2aejZrN4=";
+        x86_64-linux = "sha256-Hvu6+5bDrq1qnxc3bCWnERd4CTzaGk8NlO4F75AKNR8=";
+        aarch64-linux = "sha256-2JAGvpwkEzmcElwojZpcujzTpoo+watUR1Xxog6mZRs=";
+        x86_64-darwin = "sha256-9/2x2zen361UxX1yw7c5xlRmLLdwao0yt0j9/By6aJc=";
+        aarch64-darwin = "sha256-lk6QpXPo7bZo4VoVjMxfo4ePZaFww2SJmLp2cIQiJk0=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

From 3f416090834d7e9b10ac61b9ae683e9923b59798 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 Jan 2026 13:15:26 +0100
Subject: [PATCH 07/42] python313Packages.murmurhash: 1.0.13 -> 1.0.15

---
 pkgs/development/python-modules/murmurhash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index ba1a3caa4d91..f9204953df2d 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "murmurhash";
-  version = "1.0.13";
+  version = "1.0.15";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-c3JG1B7gD/dLB7C9HwiIvjBNIDzmaOZCyGqmTt4w+Lc=";
+    hash = "sha256-WOKye3hH+eKm7fELR6jI3XCkcF9F3Mt792rq2s9WugE=";
   };
 
   postPatch = ''

From 4dd2592dd1f221dce283d832ffcfd058c2d24850 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 Jan 2026 13:20:07 +0100
Subject: [PATCH 08/42] python313Packages.murmurhash: modernize

---
 pkgs/development/python-modules/murmurhash/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index f9204953df2d..83bf70a02d22 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -3,15 +3,13 @@
   buildPythonPackage,
   cython,
   fetchPypi,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "murmurhash";
   version = "1.0.15";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -23,6 +21,8 @@ buildPythonPackage rec {
       --replace "'wheel>=0.32.0,<0.33.0'" ""
   '';
 
+  build-system = [ setuptools ];
+
   buildInputs = [ cython ];
 
   # No test
@@ -33,6 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Cython bindings for MurmurHash2";
     homepage = "https://github.com/explosion/murmurhash";
+    changelog = "https://github.com/explosion/murmurhash/releases/tag/release-v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aborsu ];
   };

From 60adbb477f9c5410aedade6b9d4eee74a4247eb2 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 3 Jan 2026 13:49:36 +0800
Subject: [PATCH 09/42] libretro.parallel-n64: fix build with gcc15

---
 .../emulators/libretro/cores/parallel-n64.nix |  8 +++
 .../cores/patches/parallel-n64-gcc15.patch    | 62 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/applications/emulators/libretro/cores/patches/parallel-n64-gcc15.patch

diff --git a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix
index a95a63558c1d..738804e10ae3 100644
--- a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix
+++ b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix
@@ -18,6 +18,14 @@ mkLibretroCore {
     hash = "sha256-Th8VqENewfTeRTH+lONN7ZTMLQ0G6901q6ZBNMgepL4=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    # Upstream considers this core legacy (for "potato PC") and won't fix.
+    # See: https://github.com/libretro/parallel-n64/issues/797
+    #   /nix/store/...-glibc-2.40-66-dev/include/bits/mathcalls-narrow.h:36:20: error: conflicting types for 'fsqrt'; have 'float(double)'
+    ./patches/parallel-n64-gcc15.patch
+  ];
+
   extraBuildInputs = [
     libGLU
     libGL
diff --git a/pkgs/applications/emulators/libretro/cores/patches/parallel-n64-gcc15.patch b/pkgs/applications/emulators/libretro/cores/patches/parallel-n64-gcc15.patch
new file mode 100644
index 000000000000..52e0bc3e64ea
--- /dev/null
+++ b/pkgs/applications/emulators/libretro/cores/patches/parallel-n64-gcc15.patch
@@ -0,0 +1,62 @@
+From 3a891c0450c4968afbe76c594c22347354bd8834 Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Sat, 3 Jan 2026 13:41:55 +0800
+Subject: [PATCH] Rename fsqrt to _fsqrt to avoid conflict
+
+---
+ mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h   | 2 +-
+ .../src/r4300/hacktarux_dynarec/hacktarux_dynarec.c       | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h b/mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h
+index 8161292..e256dd9 100644
+--- a/mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h
++++ b/mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h
+@@ -1650,7 +1650,7 @@ static INLINE void fchs(void)
+ }
+ 
+ 
+-static INLINE void fsqrt(void)
++static INLINE void _fsqrt(void)
+ {
+    put8(0xD9);
+    put8(0xFA);
+diff --git a/mupen64plus-core/src/r4300/hacktarux_dynarec/hacktarux_dynarec.c b/mupen64plus-core/src/r4300/hacktarux_dynarec/hacktarux_dynarec.c
+index 89fb982..2fc70d1 100644
+--- a/mupen64plus-core/src/r4300/hacktarux_dynarec/hacktarux_dynarec.c
++++ b/mupen64plus-core/src/r4300/hacktarux_dynarec/hacktarux_dynarec.c
+@@ -6317,13 +6317,13 @@ void gensqrt_d(void)
+ #ifdef __x86_64__
+    mov_xreg64_m64rel(RAX, (uint64_t *)(&reg_cop1_double[dst->f.cf.fs]));
+    fld_preg64_qword(RAX);
+-   fsqrt();
++   _fsqrt();
+    mov_xreg64_m64rel(RAX, (uint64_t *)(&reg_cop1_double[dst->f.cf.fd]));
+    fstp_preg64_qword(RAX);
+ #else
+    mov_eax_memoffs32((unsigned int *)(&reg_cop1_double[dst->f.cf.fs]));
+    fld_preg32_qword(EAX);
+-   fsqrt();
++   _fsqrt();
+    mov_eax_memoffs32((unsigned int *)(&reg_cop1_double[dst->f.cf.fd]));
+    fstp_preg32_qword(EAX);
+ #endif
+@@ -7301,13 +7301,13 @@ void gensqrt_s(void)
+ #ifdef __x86_64__
+    mov_xreg64_m64rel(RAX, (uint64_t *)(&reg_cop1_simple[dst->f.cf.fs]));
+    fld_preg64_dword(RAX);
+-   fsqrt();
++   _fsqrt();
+    mov_xreg64_m64rel(RAX, (uint64_t *)(&reg_cop1_simple[dst->f.cf.fd]));
+    fstp_preg64_dword(RAX);
+ #else
+    mov_eax_memoffs32((unsigned int *)(&reg_cop1_simple[dst->f.cf.fs]));
+    fld_preg32_dword(EAX);
+-   fsqrt();
++   _fsqrt();
+    mov_eax_memoffs32((unsigned int *)(&reg_cop1_simple[dst->f.cf.fd]));
+    fstp_preg32_dword(EAX);
+ #endif
+-- 
+2.52.0
+

From 0f4c0be99c72ec69d2a8985dce9df0d49ba91975 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 11:21:18 +0000
Subject: [PATCH 10/42] victorialogs: 1.40.0 -> 1.43.1

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

diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix
index 192b724da049..57a006c5e957 100644
--- a/pkgs/by-name/vi/victorialogs/package.nix
+++ b/pkgs/by-name/vi/victorialogs/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaLogs";
-  version = "1.40.0";
+  version = "1.43.1";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaLogs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-liHpejO6wVr3YEyWhBwakWlDfly7mujVhQn7Sl5Z1kE=";
+    hash = "sha256-Tez8XTOLcuuOOVXt3cgOfRyXldP1b9ox9N9Ddm28E7I=";
   };
 
   vendorHash = null;

From d0232660170aa2210755ec19c6b0eff08a3b1582 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 22:14:26 +0000
Subject: [PATCH 11/42] siyuan: 3.5.1 -> 3.5.2

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

diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index e23f7000aa5a..ddb8b5c044f7 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.1";
+  version = "3.5.2";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7fKvSK3gatEdIHAZuOzL6LdzLz4k97G+ZKpQh39yhbs=";
+    hash = "sha256-Rimb2OfohjTfaqVCZcoGDxpEfXvyp2CLqwqOjqAJjJg=";
   };
 
   kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-SqPegOTdjd8HrnXNIRUMAbDhKKrFR+xWZUuqblrZ10c=";
+    vendorHash = "sha256-PNFIWH6IL/Zj/eK/5M8ACICOeQi4WEBIh1aY4eyfkn4=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_9;
     fetcherVersion = 1;
-    hash = "sha256-bteZZ9sgYLLvOPSVbqm9E0Hb5x1UdWMu8DtpQHGjbPU=";
+    hash = "sha256-JTfCU5kWR2tvVNFT+PAzqKe8tUk4+uwwVgo85VOntck=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";

From b24c70a82f5789098c3baa224ad5495379038d0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Jan 2026 02:22:10 +0000
Subject: [PATCH 12/42] python3Packages.dom-toml: 2.1.0 -> 2.2.0

---
 pkgs/development/python-modules/dom-toml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix
index 3c54e8023d70..3783eff3b2fa 100644
--- a/pkgs/development/python-modules/dom-toml/default.nix
+++ b/pkgs/development/python-modules/dom-toml/default.nix
@@ -9,13 +9,13 @@
 }:
 buildPythonPackage rec {
   pname = "dom-toml";
-  version = "2.1.0";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "dom_toml";
-    hash = "sha256-XMDdEM4lZtNbwdlKbvFsBilx/wMYxvNwWADWHSB1raw=";
+    hash = "sha256-CY0Btma605qj2M2Rbuocc8Qxpp5iFRHTEZwAFgTyfZ8=";
   };
 
   build-system = [ flit-core ];

From 3b4cc4966c1f9f1e79a6d464da4723a9e34dafce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Jan 2026 03:39:49 +0000
Subject: [PATCH 13/42] easytier: 2.4.5 -> 2.5.0

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

diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix
index b81ca34bac16..19040c2e7f7a 100644
--- a/pkgs/by-name/ea/easytier/package.nix
+++ b/pkgs/by-name/ea/easytier/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "easytier";
-  version = "2.4.5";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "EasyTier";
     repo = "EasyTier";
     tag = "v${version}";
-    hash = "sha256-vGQHrpImPMF44LXVnKRpj47Nr534wTlVZJiBDm4GkGs=";
+    hash = "sha256-XnEfxWDKUTQFWYKtqetI7sLbOmGqw2BqpU5by1ajZGA=";
   };
 
-  cargoHash = "sha256-B9GkvSXyZXTBsnV7wbipjdZ0EkVrL/aw8Ff7uUvfKPo=";
+  cargoHash = "sha256-ueDulcv7DnwvMWYayc3hzBVtldX6gg7fP7YQpdUPq7c=";
 
   nativeBuildInputs = [
     protobuf

From f99d149cb6ae0fa4114afbc763c48eaa585f0827 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Jan 2026 08:34:54 +0000
Subject: [PATCH 14/42] python3Packages.nicegui: 3.1.0 -> 3.4.1

---
 pkgs/development/python-modules/nicegui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nicegui/default.nix b/pkgs/development/python-modules/nicegui/default.nix
index f4a97b00f078..be6dc3bced7d 100644
--- a/pkgs/development/python-modules/nicegui/default.nix
+++ b/pkgs/development/python-modules/nicegui/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "nicegui";
-  version = "3.1.0";
+  version = "3.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui";
     tag = "v${version}";
-    hash = "sha256-otHPWOdTrlmf2VQUOhr3196MhN6ihk97y5sOEmnXuAw=";
+    hash = "sha256-fZAGqFQQFLFi5jWlQb1SAQnAFEtt2C07vNZXfyUHIa0=";
   };
 
   pythonRelaxDeps = [ "requests" ];

From 7cefc0cfa7f93b54460ce9de2933a3c7ce25db55 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Tue, 30 Dec 2025 20:12:09 -0800
Subject: [PATCH 15/42] gurk-rs: fix NIX_LDFLAGS type error

---
 pkgs/by-name/gu/gurk-rs/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix
index ac0db5ce49fd..af84b6e0fd4d 100644
--- a/pkgs/by-name/gu/gurk-rs/package.nix
+++ b/pkgs/by-name/gu/gurk-rs/package.nix
@@ -38,10 +38,9 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ];
 
   env = {
-    NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      "-framework"
-      "AppKit"
-    ];
+    NIX_LDFLAGS = lib.optionalString (
+      stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
+    ) "-framework AppKit";
     OPENSSL_NO_VENDOR = true;
   };
 

From d3e34cfc657dc0af263f73e7571f7a62cec4c965 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Tue, 30 Dec 2025 20:20:29 -0800
Subject: [PATCH 16/42] gurk-rs: cleanup

---
 pkgs/by-name/gu/gurk-rs/package.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix
index af84b6e0fd4d..adc9d720de98 100644
--- a/pkgs/by-name/gu/gurk-rs/package.nix
+++ b/pkgs/by-name/gu/gurk-rs/package.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  stdenvNoCC,
   lib,
   protobuf,
   rustPlatform,
@@ -10,17 +10,16 @@
   writableTmpDirAsHomeHook,
   versionCheckHook,
   nix-update-script,
-  gurk-rs,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gurk-rs";
   version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "boxdot";
     repo = "gurk-rs";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-1vnyzKissOciLopWzWN2kmraFevYW/w32KVmP8qgUM4=";
   };
 
@@ -39,22 +38,18 @@ rustPlatform.buildRustPackage rec {
 
   env = {
     NIX_LDFLAGS = lib.optionalString (
-      stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
+      with stdenvNoCC.hostPlatform; (isDarwin && isx86_64)
     ) "-framework AppKit";
     OPENSSL_NO_VENDOR = true;
+    PROTOC = "${lib.getExe pkgsBuildHost.protobuf}";
   };
 
-  PROTOC = "${pkgsBuildHost.protobuf}/bin/protoc";
-
   useNextest = true;
 
   nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
 
   passthru.updateScript = nix-update-script { };
 
@@ -65,4 +60,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ devhell ];
   };
-}
+})

From a27f74848fb7718f0f03b13aa0ae9e25d4542778 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Sun, 4 Jan 2026 02:06:12 -0800
Subject: [PATCH 17/42] nxv: init at 0.1.2

---
 pkgs/by-name/nx/nxv/package.nix | 42 +++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/nx/nxv/package.nix

diff --git a/pkgs/by-name/nx/nxv/package.nix b/pkgs/by-name/nx/nxv/package.nix
new file mode 100644
index 000000000000..42087f68caed
--- /dev/null
+++ b/pkgs/by-name/nx/nxv/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nxv";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "jamesbrink";
+    repo = "nxv";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tKjb+B65ZrLIJ7aDYGC3kj71iAXoFmAaj5I8+o4EzlM=";
+    fetchSubmodules = true;
+  };
+
+  cargoHash = "sha256-RW3WrG1A/J1xuWWcHOARG6EEmSWWnDeycAtbppY52OI=";
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Find any version of any Nix package instantly";
+    longDescription = ''
+      nxv indexes the entire nixpkgs git history to help you discover
+      when packages were added, which versions existed, and the exact
+      commit to use with `nix shell nixpkgs/<commit>#package`.
+    '';
+    homepage = "https://nxv.urandom.io";
+    changelog = "https://github.com/jamesbrink/nxv/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "nxv";
+  };
+})

From 607edaef56847960ded34fdb0cd8ecbf959b6bc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Jan 2026 10:35:07 +0000
Subject: [PATCH 18/42] meld: 3.23.0 -> 3.23.1

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

diff --git a/pkgs/by-name/me/meld/package.nix b/pkgs/by-name/me/meld/package.nix
index 4d72e5d698cd..49ebf4782d93 100644
--- a/pkgs/by-name/me/meld/package.nix
+++ b/pkgs/by-name/me/meld/package.nix
@@ -22,13 +22,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meld";
-  version = "3.23.0";
+  version = "3.23.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${lib.versions.majorMinor version}/meld-${version}.tar.xz";
-    hash = "sha256-mDwqQkDgJaIQnHc4GYcQ6dawY8kQsEgzLRRpDPU4wqY=";
+    hash = "sha256-c/gnkkZjx8a0UadMg4UwTZn+qhPIH04KFx2ll8aENXQ=";
   };
 
   nativeBuildInputs = [

From 6122f6c4df066ba222de408d22754ea31c47f100 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 1 Jan 2026 13:29:58 -0500
Subject: [PATCH 19/42] blender: cleanup usage of python3Packages

This avoids needing to change a ton of references when updating the
input.
---
 pkgs/by-name/bl/blender/package.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index b458b7e7c057..1f190f65dc4e 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -95,8 +95,9 @@ let
     (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;
   vulkanSupport = !stdenv.hostPlatform.isDarwin;
 
-  python3 = python311Packages.python;
-  pyPkgsOpenusd = python311Packages.openusd.override (old: {
+  python3Packages = python311Packages;
+  python3 = python3Packages.python;
+  pyPkgsOpenusd = python3Packages.openusd.override (old: {
     opensubdiv = old.opensubdiv.override { inherit cudaSupport; };
     withOsl = false;
   });
@@ -131,7 +132,7 @@ stdenv'.mkDerivation (finalAttrs: {
       substituteInPlace source/creator/CMakeLists.txt \
         --replace-fail '${"$"}{LIBDIR}/python' \
                   '${python3}' \
-        --replace-fail '${"$"}{LIBDIR}/materialx/' '${python311Packages.materialx}/'
+        --replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.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 +150,12 @@ stdenv'.mkDerivation (finalAttrs: {
   cmakeFlags = [
     "-C../build_files/cmake/config/blender_release.cmake"
 
-    (lib.cmakeFeature "MaterialX_DIR" "${python311Packages.materialx}/lib/cmake/MaterialX")
+    (lib.cmakeFeature "MaterialX_DIR" "${python3Packages.materialx}/lib/cmake/MaterialX")
     (lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
     (lib.cmakeFeature "PYTHON_LIBPATH" "${python3}/lib")
     (lib.cmakeFeature "PYTHON_LIBRARY" "${python3.libPrefix}")
-    (lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python311Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
-    (lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python311Packages.numpy_1}/${python3.sitePackages}")
+    (lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
+    (lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python3Packages.numpy_1}/${python3.sitePackages}")
     (lib.cmakeFeature "PYTHON_VERSION" "${python3.pythonVersion}")
 
     (lib.cmakeBool "WITH_BUILDINFO" false)
@@ -221,7 +222,7 @@ stdenv'.mkDerivation (finalAttrs: {
     cmake
     llvmPackages.llvm.dev
     makeWrapper
-    python311Packages.wrapPython
+    python3Packages.wrapPython
   ]
   ++ lib.optionals cudaSupport [
     addDriverRunpath
@@ -263,7 +264,7 @@ stdenv'.mkDerivation (finalAttrs: {
     potrace
     pugixml
     python3
-    python311Packages.materialx
+    python3Packages.materialx
     rubberband
     zlib
     zstd
@@ -316,7 +317,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   pythonPath =
     let
-      ps = python311Packages;
+      ps = python3Packages;
     in
     [
       ps.materialx
@@ -362,13 +363,13 @@ stdenv'.mkDerivation (finalAttrs: {
 
   passthru = {
     python = python3;
-    pythonPackages = python311Packages;
+    pythonPackages = python3Packages;
 
     withPackages =
       f:
       (callPackage ./wrapper.nix { }).override {
         blender = finalAttrs.finalPackage;
-        extraModules = (f python311Packages);
+        extraModules = (f python3Packages);
       };
 
     tests = {

From 187291c1c3633e6975e9fa61b31288114551b9c8 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 30 Oct 2025 11:26:24 -0400
Subject: [PATCH 20/42] blender: rename hipSupport -> rocmSupport
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to e720baecf0371b0c92b6c1bddebe9f21ce2fd050 (Nov 2023), there was
no global config.rocmSupport, and Blender’s hipSupport param predates
that. Since the global config now exists, defer to that instead.

The closure size of various ROCm packages has also been reduced recently
in 32d957e0cd38f83fd7a40f9a3fe1dd04f5fd7f0f. At the time I wrote this,
`pkgsRocm.blender` was 3.1 GiB (vs. 2.5 GiB for `pkgs.blender`). So
remove the comment.

Add blender to the rocm release attrs so Hydra will build
`pkgsRocm.blender`.
---
 pkgs/by-name/bl/blender/package.nix                  | 12 ++++++------
 .../rocm-modules/6/release-attrPaths.json            |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 1f190f65dc4e..f4cec841f317 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -23,7 +23,6 @@
   gettext,
   glew,
   gmp,
-  hipSupport ? false,
   jackaudioSupport ? false,
   jemalloc,
   lib,
@@ -68,7 +67,8 @@
   potrace,
   pugixml,
   python311Packages, # must use python3Packages instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
-  rocmPackages, # comes with a significantly larger closure size
+  rocmPackages,
+  rocmSupport ? config.rocmSupport,
   rubberband,
   runCommand,
   shaderc,
@@ -139,7 +139,7 @@ stdenv'.mkDerivation (finalAttrs: {
         --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
                   '${lib.getLib brotli}/lib/libbrotlidec.dylib'
     '')
-    + (lib.optionalString hipSupport ''
+    + (lib.optionalString rocmSupport ''
       substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
       substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
       substituteInPlace extern/hipew/src/hiprtew.cc --replace-fail '"/opt/rocm/lib/libhiprt64.so"' '"${rocmPackages.hiprt}/lib/libhiprt64.so"'
@@ -161,7 +161,7 @@ stdenv'.mkDerivation (finalAttrs: {
     (lib.cmakeBool "WITH_BUILDINFO" false)
     (lib.cmakeBool "WITH_CPU_CHECK" false)
     (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" cudaSupport)
-    (lib.cmakeBool "WITH_CYCLES_DEVICE_HIP" hipSupport)
+    (lib.cmakeBool "WITH_CYCLES_DEVICE_HIP" rocmSupport)
     (lib.cmakeBool "WITH_CYCLES_DEVICE_ONEAPI" false)
     (lib.cmakeBool "WITH_CYCLES_DEVICE_OPTIX" cudaSupport)
     (lib.cmakeBool "WITH_CYCLES_EMBREE" embreeSupport)
@@ -188,7 +188,7 @@ stdenv'.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "OPTIX_ROOT_DIR" "${optix}")
     (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" true)
   ]
-  ++ lib.optionals hipSupport [
+  ++ lib.optionals rocmSupport [
     (lib.cmakeFeature "HIPRT_INCLUDE_DIR" "${rocmPackages.hiprt}/include")
     (lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" true)
     (lib.cmakeBool "WITH_CYCLES_HIP_BINARIES" true)
@@ -270,7 +270,7 @@ stdenv'.mkDerivation (finalAttrs: {
     zstd
   ]
   ++ lib.optional embreeSupport embree
-  ++ lib.optional hipSupport rocmPackages.clr
+  ++ lib.optional rocmSupport rocmPackages.clr
   ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
   ++ (
     if (!stdenv.hostPlatform.isDarwin) then
diff --git a/pkgs/development/rocm-modules/6/release-attrPaths.json b/pkgs/development/rocm-modules/6/release-attrPaths.json
index c77c53292c73..286734db1920 100644
--- a/pkgs/development/rocm-modules/6/release-attrPaths.json
+++ b/pkgs/development/rocm-modules/6/release-attrPaths.json
@@ -18,6 +18,7 @@
     "audiobookshelf",
     "babeldoc",
     "backgroundremover",
+    "blender",
     "btop",
     "btop-cuda",
     "c3d",

From d23e37dccaeebe99ede551f5ec89930e91b8b84c Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 18 Nov 2025 21:19:53 -0500
Subject: [PATCH 21/42] blender-hip: remove in favor of rocmSupport or
 pkgsRocm.blender

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 181e875e7708..c912bf17bc64 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -364,6 +364,7 @@ mapAliases {
   bitwarden_rs-sqlite = throw "'bitwarden_rs-sqlite' has been renamed to/replaced by 'vaultwarden-sqlite'"; # Converted to throw 2025-10-27
   bitwarden_rs-vault = throw "'bitwarden_rs-vault' has been renamed to/replaced by 'vaultwarden-vault'"; # Converted to throw 2025-10-27
   blas-reference = throw "blas-reference has been removed since it has been discontinued as free-standing package. It is now contained within lapack-reference."; # Added 2025-10-21
+  blender-hip = throw "blender-hip has been removed in favor of setting `config.rocmSupport = true` or using `pkgsRocm.blender`"; # Added 2026-01-04
   blender-with-packages = throw "blender-with-packages is deprecated in in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"; # Converted to throw 2025-10-26
   blockbench-electron = throw "'blockbench-electron' has been renamed to/replaced by 'blockbench'"; # Converted to throw 2025-10-27
   bloomeetunes = throw "bloomeetunes is unmaintained and has been removed"; # Added 2025-08-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 200bb64670e8..be7a0ea4133d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10367,8 +10367,6 @@ with pkgs;
     pinentry = pinentry-curses;
   };
 
-  blender-hip = blender.override { hipSupport = true; };
-
   blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix {
     inherit (haskellPackages) ghcWithPackages;
   };

From 9004fe02d822cefc7ee76ebee0f2bb0ad80291b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lima?= <me@limwa.pt>
Date: Sun, 4 Jan 2026 15:40:25 +0000
Subject: [PATCH 22/42] nixos/gnome: make package removals less repetitive

---
 .../services/desktop-managers/gnome.nix       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index dc9f8c11b138..bfad0efc7f65 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -75,6 +75,8 @@ let
   notExcluded =
     pkg: mkDefault (utils.disablePackageByName pkg config.environment.gnome.excludePackages);
 
+  removeExcluded =
+    pkgList: utils.removePackagesByName pkgList config.environment.gnome.excludePackages;
 in
 
 {
@@ -416,9 +418,9 @@ in
 
       services.orca.enable = notExcluded pkgs.orca;
 
-      fonts.packages = utils.removePackagesByName [
+      fonts.packages = removeExcluded [
         pkgs.adwaita-fonts
-      ] config.environment.gnome.excludePackages;
+      ];
 
       # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-48/elements/core/meta-gnome-core-shell.bst
       environment.systemPackages =
@@ -442,13 +444,12 @@ in
             pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks
           ];
         in
-        mandatoryPackages
-        ++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages;
+        mandatoryPackages ++ removeExcluded optionalPackages;
     })
 
     # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-apps.bst
     (lib.mkIf serviceCfg.core-apps.enable {
-      environment.systemPackages = utils.removePackagesByName [
+      environment.systemPackages = removeExcluded [
         pkgs.baobab
         pkgs.decibels
         pkgs.epiphany
@@ -473,7 +474,7 @@ in
         pkgs.simple-scan
         pkgs.snapshot
         pkgs.yelp
-      ] config.environment.gnome.excludePackages;
+      ];
 
       # Enable default program modules
       # Since some of these have a corresponding package, we only
@@ -507,7 +508,7 @@ in
     })
 
     (lib.mkIf serviceCfg.games.enable {
-      environment.systemPackages = utils.removePackagesByName [
+      environment.systemPackages = removeExcluded [
         pkgs.aisleriot
         pkgs.atomix
         pkgs.five-or-more
@@ -528,12 +529,12 @@ in
         pkgs.quadrapassel
         pkgs.swell-foop
         pkgs.tali
-      ] config.environment.gnome.excludePackages;
+      ];
     })
 
     # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-developer-tools.bst
     (lib.mkIf serviceCfg.core-developer-tools.enable {
-      environment.systemPackages = utils.removePackagesByName [
+      environment.systemPackages = removeExcluded [
         pkgs.dconf-editor
         pkgs.devhelp
         pkgs.d-spy
@@ -544,7 +545,7 @@ in
         # https://github.com/NixOS/nixpkgs/issues/60908
         # pkgs.gnome-boxes
         pkgs.sysprof
-      ] config.environment.gnome.excludePackages;
+      ];
 
       services.sysprof.enable = notExcluded pkgs.sysprof;
     })

From 1761d1595233a5f97dc0a35bb685d0546ce648d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 4 Jan 2026 18:19:30 +0100
Subject: [PATCH 23/42] python313Packages.dom-toml: add changelog to meta

---
 pkgs/development/python-modules/dom-toml/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix
index 3783eff3b2fa..fb58f3b2ca42 100644
--- a/pkgs/development/python-modules/dom-toml/default.nix
+++ b/pkgs/development/python-modules/dom-toml/default.nix
@@ -30,6 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Dom's tools for Tom's Obvious, Minimal Language";
     homepage = "https://github.com/domdfcoding/dom_toml";
+    changelog = "https://github.com/domdfcoding/dom_toml/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ tyberius-prime ];
   };

From 057788eb36f0cb41ea82ff63652201760d5779d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 4 Jan 2026 18:22:33 +0100
Subject: [PATCH 24/42] python313Packages.dom-toml: add pythonImportsCheck

---
 pkgs/development/python-modules/dom-toml/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix
index fb58f3b2ca42..bf9be3167422 100644
--- a/pkgs/development/python-modules/dom-toml/default.nix
+++ b/pkgs/development/python-modules/dom-toml/default.nix
@@ -27,6 +27,8 @@ buildPythonPackage rec {
     tomli
   ];
 
+  pythonImportsCheck = [ "dom_toml" ];
+
   meta = {
     description = "Dom's tools for Tom's Obvious, Minimal Language";
     homepage = "https://github.com/domdfcoding/dom_toml";

From 4bfdf91fcb0b5d8efc55d9510038641ecf1a3168 Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack@wilsdon.me>
Date: Sun, 4 Jan 2026 18:36:25 +0000
Subject: [PATCH 25/42] modrinth-app: fix file picker

Modrinth uses tauri-plugin-dialog which uses rfd to display file
pickers, however rfd only works with GTK 3.
---
 pkgs/by-name/mo/modrinth-app/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix
index 3047fe2aa192..baf52dc3f9c0 100644
--- a/pkgs/by-name/mo/modrinth-app/package.nix
+++ b/pkgs/by-name/mo/modrinth-app/package.nix
@@ -24,7 +24,7 @@
   pipewire,
   symlinkJoin,
   udev,
-  wrapGAppsHook4,
+  wrapGAppsHook3,
   xorg,
 }:
 
@@ -38,7 +38,7 @@ symlinkJoin {
 
   nativeBuildInputs = [
     glib
-    wrapGAppsHook4
+    wrapGAppsHook3
   ];
 
   buildInputs = [

From a56cd57f820aff743ba6aaa7894f88ed77f085a9 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 4 Jan 2026 21:31:18 +0100
Subject: [PATCH 26/42] yazi: 25.12.29 -> 26.1.4

Changelog: https://github.com/sxyazi/yazi/blob/main/CHANGELOG.md#v2614
Diff: https://github.com/sxyazi/yazi/compare/v25.12.29...v26.1.4
---
 pkgs/by-name/ya/yazi-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix
index 9efa57b0d93f..ab9d84051eed 100644
--- a/pkgs/by-name/ya/yazi-unwrapped/package.nix
+++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix
@@ -8,17 +8,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yazi";
-  version = "25.12.29";
+  version = "26.1.4";
 
   srcs = builtins.attrValues finalAttrs.passthru.srcs;
 
   sourceRoot = finalAttrs.passthru.srcs.code_src.name;
 
-  cargoHash = "sha256-AoUAAzbooKzaiMy9izYk7MSY/frfEuB9wMcdorXWIQw=";
+  cargoHash = "sha256-P1ijZsY1AYosWVyxdmDX1SN6KZsrlUqJ9cNfyVWV6mI=";
 
   env.YAZI_GEN_COMPLETIONS = true;
   env.VERGEN_GIT_SHA = "Nixpkgs";
-  env.VERGEN_BUILD_DATE = "2025-12-29";
+  env.VERGEN_BUILD_DATE = "2026-1-4";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ rust-jemalloc-sys ];
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       owner = "sxyazi";
       repo = "yazi";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-xOltBlD5nU8kMzh7GPoTtkDD8sEDAzTtaR3LRPDWRS0=";
+      hash = "sha256-dNDwlMM+k20c2Lnm+hqUvzu5l3Ip9GeP+nnj4WlDVdw=";
     };
 
     man_src = fetchFromGitHub {

From 7af005798d558157fc11326eaaff98f91a850a03 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 4 Jan 2026 20:54:04 +0000
Subject: [PATCH 27/42] vte: 0.82.2 -> 0.82.3

Changes: https://gitlab.gnome.org/GNOME/vte/-/compare/0.82.2...0.82.3
---
 pkgs/by-name/vt/vte/package.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index 9282bb97366b..fba620e727d1 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -39,7 +39,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vte";
-  version = "0.82.2";
+  version = "0.82.3";
 
   outputs = [
     "out"
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4Slar8RoKztVDxI13CZ5uqD3FXDY7VQ8ABwSg9UwvpE=";
+    hash = "sha256-bcYnj2/uMNB9GgPiujM1sepOjSlWzrWdhhlDEV2TCoU=";
   };
 
   patches = [
@@ -67,12 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.gnome.org/GNOME/vte/-/commit/f672ed15a88dd3e25c33aa0a5ef6f6d291a6d5c7.patch";
       hash = "sha256-JdLDild5j7marvR5n2heW9YD00+bwzJIoxDlzO5r/6w=";
     })
-
-    (fetchpatch {
-      name = "qemu-backspace.patch";
-      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/79d5fea437185e52a740130d5a276b83dfdcd558.patch";
-      hash = "sha256-28Cehw5uJuGG7maLGUl1TBwfIwuXpkLKSQ2lXauLlz0=";
-    })
   ];
 
   nativeBuildInputs = [

From 8ade1df0fe2717e6bcbd36a99f901fa4b1d3b063 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 4 Jan 2026 17:40:38 -0500
Subject: [PATCH 28/42] nix-top: 0.3.0 -> 0.4.0

for compatibility with nix >= 2.30
---
 pkgs/by-name/ni/nix-top/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nix-top/package.nix b/pkgs/by-name/ni/nix-top/package.nix
index 1f5717ed7ccb..bf334ad9b711 100644
--- a/pkgs/by-name/ni/nix-top/package.nix
+++ b/pkgs/by-name/ni/nix-top/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nix-top";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "jerith666";
     repo = "nix-top";
     rev = "v${version}";
-    hash = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54=";
+    hash = "sha256-dpH1qfAHt8kDEG1QMFcD67rOhDsWZuaw3WSUZdPx3oQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From e5362c5a8491047a2366d06e5d381fabee7cb7c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Jan 2026 23:16:24 +0000
Subject: [PATCH 29/42] libgdstk: 0.9.61 -> 0.9.62

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

diff --git a/pkgs/by-name/li/libgdstk/package.nix b/pkgs/by-name/li/libgdstk/package.nix
index 7ec5c8d0920a..bf2fe954b030 100644
--- a/pkgs/by-name/li/libgdstk/package.nix
+++ b/pkgs/by-name/li/libgdstk/package.nix
@@ -15,14 +15,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libgdstk";
-  version = "0.9.61";
+  version = "0.9.62";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "heitzmann";
     repo = "gdstk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-soU+6EbyOkHGvVq230twiRzywOskhkkXFr5akBpvgBw=";
+    hash = "sha256-NHz9PQMmOnJt09FDwLzy5t9hVbZrJ6Lf19iPYOB5B2A=";
   };
 
   nativeBuildInputs = [

From cf152dfd2db9829c2541df7398e4f86652682a3c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 5 Jan 2026 00:39:35 +0100
Subject: [PATCH 30/42] ensemble-chorus: fix build with GCC 15

---
 .../add-missing-cstdint-includes.patch        | 25 +++++++++++++++++++
 pkgs/by-name/en/ensemble-chorus/package.nix   |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/by-name/en/ensemble-chorus/add-missing-cstdint-includes.patch

diff --git a/pkgs/by-name/en/ensemble-chorus/add-missing-cstdint-includes.patch b/pkgs/by-name/en/ensemble-chorus/add-missing-cstdint-includes.patch
new file mode 100644
index 000000000000..79576250787a
--- /dev/null
+++ b/pkgs/by-name/en/ensemble-chorus/add-missing-cstdint-includes.patch
@@ -0,0 +1,25 @@
+diff --git a/sources/core/dsp.h b/sources/core/dsp.h
+index 5e3b1c6..b1a4f2d 100644
+--- a/sources/core/dsp.h
++++ b/sources/core/dsp.h
+@@ -5,6 +5,7 @@
+ #pragma once
+
+ #include <jsl/dynarray>
++#include <cstdint>
+
+ namespace dsp {
+
+ uint32_t fastrandom(uint32_t *pseed);
+
+diff --git a/sources/fl/main_controller.h b/sources/fl/main_controller.h
+index 9a7c6b0..e3d4f1a 100644
+--- a/sources/fl/main_controller.h
++++ b/sources/fl/main_controller.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ #include <memory>
++#include <cstdint>
+ class Message_Queue;
+ struct Basic_Message;
diff --git a/pkgs/by-name/en/ensemble-chorus/package.nix b/pkgs/by-name/en/ensemble-chorus/package.nix
index 87feeb3f144e..17668f30ced8 100644
--- a/pkgs/by-name/en/ensemble-chorus/package.nix
+++ b/pkgs/by-name/en/ensemble-chorus/package.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation {
   patches = [
     # fix compile error regarding packed attribute in 3rd party juice library
     ./juice-cxx-packing-fix.diff
+    ./add-missing-cstdint-includes.patch
   ];
 
   nativeBuildInputs = [

From f03278f29018884660086ab233b3625c0a4cfc2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francis=20Gagn=C3=A9?= <fragag1@gmail.com>
Date: Sun, 4 Jan 2026 18:05:46 -0500
Subject: [PATCH 31/42] srb2: fix build with gcc15

---
 pkgs/by-name/sr/srb2/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/sr/srb2/package.nix b/pkgs/by-name/sr/srb2/package.nix
index 92989db0bccf..0a9567759ff9 100644
--- a/pkgs/by-name/sr/srb2/package.nix
+++ b/pkgs/by-name/sr/srb2/package.nix
@@ -66,6 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
+  # Fix build with gcc15 (-std=gnu23)
+  # Note that upstream fixed compatibility with C23 as of commit 639b58c6d718452ef343a0bc927d043bed9e40d6,
+  # so it's likely this can be removed on the next version after 2.2.15.
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   cmakeFlags = [
     "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2"
     "-DGME_INCLUDE_DIR=${game-music-emu}/include"

From db8d7da31fbfed683fe0ee59a578e4a5eb33937a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francis=20Gagn=C3=A9?= <fragag1@gmail.com>
Date: Sun, 4 Jan 2026 18:11:42 -0500
Subject: [PATCH 32/42] srb2kart: fix build with gcc15

---
 pkgs/by-name/sr/srb2kart/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sr/srb2kart/package.nix b/pkgs/by-name/sr/srb2kart/package.nix
index 8015e5c39b21..db9a64591472 100644
--- a/pkgs/by-name/sr/srb2kart/package.nix
+++ b/pkgs/by-name/sr/srb2kart/package.nix
@@ -55,6 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
+  # Fix build with gcc15 (-std=gnu23)
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   cmakeFlags = [
     "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}"
     "-DGME_INCLUDE_DIR=${game-music-emu}/include"

From 045d3ea984ea15147fbd2d72141058fb5d788f70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Jan 2026 23:51:32 +0000
Subject: [PATCH 33/42] enzyme: 0.0.223 -> 0.0.234

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

diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index ac60f46c4216..a235e087e68b 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.223";
+  version = "0.0.234";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-J11NVgBT8wOrSEP7lQZMGu5Th0VFrWTzEs0tz8otgcc=";
+    hash = "sha256-FK1/Ezld9U+xWuQ92ekOighDFUJQ0WOweSHHIq+ZyvA=";
   };
 
   postPatch = ''

From a63c2cd5e6175a50c6e418eb1a646e3d74785480 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 5 Jan 2026 01:09:52 +0100
Subject: [PATCH 34/42] python313Packages.coincidence: init 0.6.6

Helper functions for pytest

https://github.com/python-coincidence/coincidence
---
 .../python-modules/coincidence/default.nix    | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/coincidence/default.nix

diff --git a/pkgs/development/python-modules/coincidence/default.nix b/pkgs/development/python-modules/coincidence/default.nix
new file mode 100644
index 000000000000..d0649f5ceaf1
--- /dev/null
+++ b/pkgs/development/python-modules/coincidence/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytest-regressions,
+  pytest-timeout,
+  pytestCheckHook,
+  toml,
+  typing-extensions,
+  whey,
+}:
+
+buildPythonPackage rec {
+  pname = "coincidence";
+  version = "0.6.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "python-coincidence";
+    repo = "coincidence";
+    tag = "v${version}";
+    hash = "sha256-ktSuUzAwMych6Y2eJWMUfG1a3mGypg8L20f/105RFXc=";
+  };
+
+  build-system = [ whey ];
+
+  dependencies = [ typing-extensions ];
+
+  nativeCheckInputs = [
+    pytest-regressions
+    pytest-timeout
+    pytestCheckHook
+    toml
+  ];
+
+  pythonImportsCheck = [ "coincidence" ];
+
+  meta = {
+    description = "Helper functions for pytest";
+    homepage = "https://github.com/python-coincidence/coincidence";
+    changelog = "https://github.com/python-coincidence/coincidence/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9f0fc43bfae..21bc493f9498 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2892,6 +2892,8 @@ self: super: with self; {
 
   coinbase-advanced-py = callPackage ../development/python-modules/coinbase-advanced-py { };
 
+  coincidence = callPackage ../development/python-modules/coincidence { };
+
   coincurve = callPackage ../development/python-modules/coincurve { inherit (pkgs) secp256k1; };
 
   coinmetrics-api-client = callPackage ../development/python-modules/coinmetrics-api-client { };

From 0cd78a32fc783c45f86941d3ddeffa8fdf5f5d05 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 5 Jan 2026 01:12:01 +0100
Subject: [PATCH 35/42] python313Packages.whey: add changelog to meta

---
 pkgs/development/python-modules/whey/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix
index 415bd2a09023..894572461032 100644
--- a/pkgs/development/python-modules/whey/default.nix
+++ b/pkgs/development/python-modules/whey/default.nix
@@ -76,6 +76,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple Python wheel builder for simple projects";
     homepage = "https://github.com/repo-helper/whey";
+    changelog = "https://github.com/repo-helper/whey/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ tyberius-prime ];
   };

From f4dcbabb741b2a25374c9b7e395466c0fea3d6d5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 5 Jan 2026 01:22:00 +0100
Subject: [PATCH 36/42] python313Packages.dom-toml: refactor

- add optional-dependencies
- don't run tests
---
 .../python-modules/dom-toml/default.nix       | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix
index bf9be3167422..8b94a193f4bd 100644
--- a/pkgs/development/python-modules/dom-toml/default.nix
+++ b/pkgs/development/python-modules/dom-toml/default.nix
@@ -1,38 +1,51 @@
 {
-  buildPythonPackage,
-  fetchPypi,
   lib,
-  flit-core,
-  setuptools,
+  attrs,
+  buildPythonPackage,
   domdf-python-tools,
-  tomli,
+  fetchFromGitHub,
+  flit-core,
+  pytestCheckHook,
+  setuptools,
+  tomli-w,
 }:
+
 buildPythonPackage rec {
   pname = "dom-toml";
   version = "2.2.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit version;
-    pname = "dom_toml";
-    hash = "sha256-CY0Btma605qj2M2Rbuocc8Qxpp5iFRHTEZwAFgTyfZ8=";
+  src = fetchFromGitHub {
+    owner = "domdfcoding";
+    repo = "dom_toml";
+    tag = "v${version}";
+    hash = "sha256-2kO/6spc+y/ltHf493JkSKI0vGuJu2a29fqsW/EDFxE=";
   };
 
   build-system = [ flit-core ];
 
-  nativeBuildInputs = [ setuptools ];
+  dependencies = [ domdf-python-tools ];
 
-  dependencies = [
-    domdf-python-tools
-    tomli
-  ];
+  optional-dependencies = {
+    all = [
+      attrs
+      tomli-w
+    ];
+    config = [
+      attrs
+      tomli-w
+    ];
+  };
+
+  # Circular dependency whey -> domdf-python-tools -> coincidence
+  doCheck = false;
 
   pythonImportsCheck = [ "dom_toml" ];
 
   meta = {
     description = "Dom's tools for Tom's Obvious, Minimal Language";
     homepage = "https://github.com/domdfcoding/dom_toml";
-    changelog = "https://github.com/domdfcoding/dom_toml/releases/tag/v${version}";
+    changelog = "https://github.com/domdfcoding/dom_toml/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ tyberius-prime ];
   };

From 4a60a71334768f8fed492cb0da6de17d6400945a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 00:40:58 +0000
Subject: [PATCH 37/42] netatalk: 4.3.2 -> 4.4.0

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

diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix
index c6111d502cc3..e5f418735096 100644
--- a/pkgs/by-name/ne/netatalk/package.nix
+++ b/pkgs/by-name/ne/netatalk/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "netatalk";
-  version = "4.3.2";
+  version = "4.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KXe0/RExgvDMGDM3uiPVcB+yvk4N/Ox+5XW01zpzjTo=";
+    hash = "sha256-GMoy3Gwl57o1KFlLeEN58BOIj6mED/xHjNH+9VUTglw=";
   };
 
   nativeBuildInputs = [

From f4de6c7c16a3860013237cc5b6f14278f6e29ac2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 01:09:58 +0000
Subject: [PATCH 38/42] cantus: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/by-name/ca/cantus/package.nix b/pkgs/by-name/ca/cantus/package.nix
index 2fc13a7ec16d..d39300e4557a 100644
--- a/pkgs/by-name/ca/cantus/package.nix
+++ b/pkgs/by-name/ca/cantus/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cantus";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "CodedNil";
     repo = "cantus";
     tag = version;
-    hash = "sha256-Mox8OGJFbQd3dy/I1O6OjqDa4FAFcZWiS+zOuTwV6js=";
+    hash = "sha256-U8a0LcNlaiLdba4z2LUBQkwrOrE/7S9OIQ4JJw1m4Ck=";
   };
 
-  cargoHash = "sha256-9+2+PkUA+s6v/Mrpo8M1lLemxClVONbbeHtric2z/Jw=";
+  cargoHash = "sha256-mpjcX5xuhsqr3Jxva8Oy1tQvM+29N3LHvym76Bs0uhk=";
 
   nativeBuildInputs = [
     pkg-config

From e3b06a0213d06590614196ff90be2f016f139706 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Mon, 5 Jan 2026 02:24:17 +0100
Subject: [PATCH 39/42] httptunnel: Compile with C17

---
 pkgs/by-name/ht/httptunnel/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ht/httptunnel/package.nix b/pkgs/by-name/ht/httptunnel/package.nix
index 5f1e6a55f8b1..2b618642243e 100644
--- a/pkgs/by-name/ht/httptunnel/package.nix
+++ b/pkgs/by-name/ht/httptunnel/package.nix
@@ -16,6 +16,10 @@ stdenv.mkDerivation {
     hash = "sha256-fUaVHE3nxq3fU7DYCvaQTOoMzax/qFH8cMegFLLybNk=";
   };
 
+  # httptunnel makes liberal use of old C features, just selecting an old version
+  # is easier than patching around language updates.
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   nativeBuildInputs = [
     autoreconfHook
   ];

From 36940de88c7fb50016eaaeffba3c0a550e06c831 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Mon, 5 Jan 2026 03:01:55 +0100
Subject: [PATCH 40/42] honggfuzz: patch in support for gcc15

---
 pkgs/by-name/ho/honggfuzz/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ho/honggfuzz/package.nix b/pkgs/by-name/ho/honggfuzz/package.nix
index 06f40e8b8a5d..9fa9071c091b 100644
--- a/pkgs/by-name/ho/honggfuzz/package.nix
+++ b/pkgs/by-name/ho/honggfuzz/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   makeWrapper,
   clang,
   llvm,
@@ -22,6 +23,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-/ra6g0qjjC8Lo8/n2XEbwnZ95yDHcGhYd5+TTvQ6FAc=";
   };
 
+  patches = [
+    # [PATCH] mangle: support gcc-15 with __attribute__((nonstring))
+    (fetchpatch2 {
+      url = "https://github.com/google/honggfuzz/commit/4cfa62f4fdb56e3027c1cb3aecf04812e786f0fd.patch?full_index=1";
+      hash = "sha256-79/GZfqTH1o/21P7At5ZPmvcCSYWAsVakSv5dNCT+XI=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace hfuzz_cc/hfuzz-cc.c \
       --replace '"clang' '"${clang}/bin/clang'

From 2b154b7762436bcd9255eca161911ba01ce6e25d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 03:02:04 +0000
Subject: [PATCH 41/42] pkgsite: 0-unstable-2025-12-23 -> 0-unstable-2026-01-01

---
 pkgs/by-name/pk/pkgsite/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 5c4562bfa15d..ead7791f81bf 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-12-23";
+  version = "0-unstable-2026-01-01";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "1a3bd3c788fea11057a8e696fd274c4c3f3e952c";
-    hash = "sha256-GnjzJhmH9mOBdpc+r3Hco0KFsTp4LMkbTn/oMBthemQ=";
+    rev = "3a74f05acd7522e74e16a35bdf80301dae44cfc9";
+    hash = "sha256-1YTCjaPf6t0Tn/u1ERBxoHeXAIMO4wsPIcODBPJjrlM=";
   };
 
-  vendorHash = "sha256-6wgJNDzUzSCkwzjqGwzpa63+0HoN5PapKxMBFBuu16M=";
+  vendorHash = "sha256-rruIjtXtFZ0MOJkWx4n+7apKGv4Pq6GrOWoQ3o+8KFs=";
 
   subPackages = [ "cmd/pkgsite" ];
 

From 33880cb92b4045d4b08409aa468240172a078da3 Mon Sep 17 00:00:00 2001
From: Jasi <jawsi@posteo.net>
Date: Sat, 3 Jan 2026 23:16:50 -0500
Subject: [PATCH 42/42] nixos/gnome: remove geary from default apps selection

---
 nixos/doc/manual/release-notes/rl-2605.section.md | 2 ++
 nixos/modules/services/desktop-managers/gnome.nix | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index ed4c83085e79..66a57940b24d 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -67,6 +67,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
 
 - The Bash implementation of the `nixos-rebuild` program is removed. All switchable systems now use the Python rewrite. Any prior usage of `system.rebuild.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub.
 
+- `services.desktopManager.gnome` no longer installs the Geary e-mail client since it is not part of the GNOME [core applications](https://apps.gnome.org/) list. Geary's position in the default favorite apps section has been replaced by GNOME Text Editor. To keep it installed, add `programs.geary.enable = true;` to your configuration.
+
 - The `networking.wireless` module has been security hardened: the `wpa_supplicant` daemon now runs under an unprivileged user with restricted access to the system.
 
   As part of these changes, `/etc/wpa_supplicant.conf` has been deprecated: the NixOS-generated configuration file is now linked to `/etc/wpa_supplicant/nixos.conf` and `/etc/wpa_supplicant/imperative.conf` has been added for imperatively configuring `wpa_supplicant` or when using [allowAuxiliaryImperativeNetworks](#opt-networking.wireless.allowAuxiliaryImperativeNetworks).
diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index dc9f8c11b138..0d4229e058b8 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -30,7 +30,7 @@ let
 
   defaultFavoriteAppsOverride = ''
     [org.gnome.shell]
-    favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop' ]
+    favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.TextEditor.desktop', 'org.gnome.Nautilus.desktop' ]
   '';
 
   nixos-background-light = pkgs.nixos-artwork.wallpapers.simple-blue;
@@ -479,7 +479,6 @@ in
       # Since some of these have a corresponding package, we only
       # enable that program module if the package hasn't been excluded
       # through `environment.gnome.excludePackages`
-      programs.geary.enable = notExcluded pkgs.geary;
       programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility;
       programs.seahorse.enable = notExcluded pkgs.seahorse;
       services.gnome.sushi.enable = notExcluded pkgs.sushi;