From 62e0bfa544f0596a81a9a8cf5c5402e39410be3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Oct 2025 15:28:42 +0000
Subject: [PATCH 001/235] python3Packages.cucumber-tag-expressions: 6.2.0 ->
 7.0.0

---
 .../python-modules/cucumber-tag-expressions/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
index 300ec1eadf87..747f3dcc5772 100644
--- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
+++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "cucumber-tag-expressions";
-  version = "6.2.0";
+  version = "7.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cucumber";
     repo = "tag-expressions";
     tag = "v${version}";
-    hash = "sha256-m6CmRs/Fz2e9GTtHrE3FF8GPK2vs6i37xcI3BM64rlc=";
+    hash = "sha256-U8x7c4NeP9GdwormQD79RWcAA2B39Yvrf/Zk0xTUtNA=";
   };
 
   sourceRoot = "${src.name}/python";

From 37912b225e5b066786189865d8b2e33440ebc30b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Nov 2025 20:00:49 +0000
Subject: [PATCH 002/235] phpExtensions.maxminddb: 1.12.1 -> 1.13.1

---
 pkgs/development/php-packages/maxminddb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix
index ccc350bcbdde..a4caea5f8c1d 100644
--- a/pkgs/development/php-packages/maxminddb/default.nix
+++ b/pkgs/development/php-packages/maxminddb/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   pname = "maxminddb";
-  version = "1.12.1";
+  version = "1.13.1";
 in
 buildPecl {
   inherit pname version;
@@ -15,7 +15,7 @@ buildPecl {
     owner = "maxmind";
     repo = "MaxMind-DB-Reader-php";
     rev = "v${version}";
-    sha256 = "sha256-VsQOztF4TN3XgJjf3mZa1/Y5+6ounbkLRAzawLSX+BI=";
+    sha256 = "sha256-rOS6XAap94AtFSZnQO8kEXDRUfr1Y5IhWKRxP6fxSio=";
   };
 
   prePatch = ''

From 0245de2fef7109d257ac24974d05edd425729437 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Dec 2025 08:03:48 +0000
Subject: [PATCH 003/235] phpExtensions.phalcon: 5.9.3 -> 5.10.0

---
 pkgs/development/php-packages/phalcon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix
index 1f81088f7251..41fe9ff8755c 100644
--- a/pkgs/development/php-packages/phalcon/default.nix
+++ b/pkgs/development/php-packages/phalcon/default.nix
@@ -9,13 +9,13 @@
 
 buildPecl rec {
   pname = "phalcon";
-  version = "5.9.3";
+  version = "5.10.0";
 
   src = fetchFromGitHub {
     owner = "phalcon";
     repo = "cphalcon";
     rev = "v${version}";
-    hash = "sha256-1+8+kIaKvgQCE+qvZOkYOW/RdDv4ln0njC5VzL9jvnQ=";
+    hash = "sha256-2dk/AjOWG2oJ3BoBODO9H4S32Jc/Z+W3qxvMkfR5oKE=";
   };
 
   internalDeps = [

From fd7accae30e4abb73c04736051c462aecba36c6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Dec 2025 14:22:32 +0000
Subject: [PATCH 004/235] phpExtensions.swoole: 6.0.2 -> 6.1.6

---
 pkgs/development/php-packages/swoole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix
index bb86442b4bc2..933817c70b8c 100644
--- a/pkgs/development/php-packages/swoole/default.nix
+++ b/pkgs/development/php-packages/swoole/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "6.0.2";
+  version = "6.1.6";
 in
 buildPecl {
   inherit version;
@@ -19,7 +19,7 @@ buildPecl {
     owner = "swoole";
     repo = "swoole-src";
     rev = "v${version}";
-    hash = "sha256-mCJj0vLpJinxK/EfPq+CeVWnoxouqClOKYbrgj7GNDc=";
+    hash = "sha256-gbN9CsuSRnttK0GmssLmhpqygkArDqtgkXZbzJhpFlM=";
   };
 
   buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ];

From 3b03e197146fe2cbf635adbd652b233ffeb10deb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 Jan 2026 02:50:11 +0000
Subject: [PATCH 005/235] xmrig-mo: 6.24.0-mo1 -> 6.25.0-mo1

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

diff --git a/pkgs/by-name/xm/xmrig-mo/package.nix b/pkgs/by-name/xm/xmrig-mo/package.nix
index d6f550b366a4..cca1e11cabe1 100644
--- a/pkgs/by-name/xm/xmrig-mo/package.nix
+++ b/pkgs/by-name/xm/xmrig-mo/package.nix
@@ -6,13 +6,13 @@
 
 xmrig.overrideAttrs (oldAttrs: rec {
   pname = "xmrig-mo";
-  version = "6.24.0-mo1";
+  version = "6.25.0-mo1";
 
   src = fetchFromGitHub {
     owner = "MoneroOcean";
     repo = "xmrig";
     rev = "v${version}";
-    hash = "sha256-l3dN1lKn+Vt2JPmBm452kRe39UCnW3TIhUbHXkHXBrM=";
+    hash = "sha256-+537nSbTi3IjU1PtKrGKoBMxYmdT2sxMJSk4RxoFpiw=";
   };
 
   meta = {

From 03e4b579841a00a51e4767701321db3cad8c4e63 Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Tue, 23 Dec 2025 18:15:25 +0800
Subject: [PATCH 006/235] geph: remove geph5-client-gui

https://github.com/geph-official/geph5/commit/f2221fb8386312daf2cef05483ebb353ff48bdb4
---
 .../manual/release-notes/rl-2605.section.md   |  2 +
 pkgs/by-name/ge/geph/package.nix              | 48 ++-----------------
 pkgs/by-name/ge/geph/settings_default.yaml    | 23 ---------
 3 files changed, 7 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/by-name/ge/geph/settings_default.yaml

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index cd40062aca34..f2a7f12fa567 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -55,6 +55,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
 
 - `services.pingvin-share` has been removed as the `pingvin-share.backend` package was broken and the project was archived upstream.
 
+- `geph` package's built-in GUI `geph5-client-gui` has been [removed](https://github.com/geph-official/geph5/commit/f2221fb8386312daf2cef05483ebb353ff48bdb4) by the upstream. All users who wish to continue using the GUI should install the `gephgui-wry`, which is consistent with the official release version.
+
 ## Other Notable Changes {#sec-release-26.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix
index a9ed2d243775..26c45b43dce3 100644
--- a/pkgs/by-name/ge/geph/package.nix
+++ b/pkgs/by-name/ge/geph/package.nix
@@ -3,17 +3,11 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
-  libxkbcommon,
   openssl,
   rust-jemalloc-sys-unprefixed,
   sqlite,
-  vulkan-loader,
-  wayland,
   iproute2,
   iptables,
-  libglvnd,
-  copyDesktopItems,
-  makeDesktopItem,
   nix-update-script,
 }:
 let
@@ -24,29 +18,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "geph5";
-  version = "0.2.86";
+  version = "0.2.93";
 
   src = fetchFromGitHub {
     owner = "geph-official";
     repo = "geph5";
     rev = "geph5-client-v${finalAttrs.version}";
-    hash = "sha256-68b6czefoqLskdqhc9kDIoS8eDCKu56lqvX8Jz47C3k=";
+    hash = "sha256-ZYcGW6Ssauf5BUs75KBV+4Zub2ZCVN29cWTxeNi87cI=";
   };
 
-  cargoHash = "sha256-CoYnP83Ci5Jp3Hunm2+xdXBu0mlhADf4jyfLSIXZ0jI=";
+  cargoHash = "sha256-0Ml8tgWghxhDJzUMMD+YGwy3fyFjKcNjbV8MDJW8rZk=";
 
   postPatch = ''
     substituteInPlace binaries/geph5-client/src/vpn/*.sh \
       --replace-fail 'PATH=' 'PATH=${binPath}:'
-
-    # This setting is dumped from https://github.com/geph-official/gephgui-wry/blob/a85a632448e548f69f9d1eea3d06a4bdc8be3d57/src/daemon.rs#L230
-    cat ${./settings_default.yaml} | base32 -w 0  | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567' '0123456789ABCDEFGHJKMNPQRSTVWXYZ' | sed 's/=//g' > binaries/geph5-client-gui/src/settings_default.yaml.base32
   '';
 
-  nativeBuildInputs = [
-    pkg-config
-    copyDesktopItems
-  ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     openssl
@@ -69,39 +57,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=traffcount::tests::test_traffic_count_basic"
     # Requires network
     "--skip=dns::tests::resolve_google"
+    "--skip=tests::test_clib"
     # Never finish
     "--skip=tests::test_blind_sign"
     "--skip=tests::test_generate_secret_key"
     "--skip=tests::ping_pong"
   ];
 
-  desktopItems = [
-    (makeDesktopItem {
-      name = "Geph5";
-      desktopName = "Geph5";
-      icon = "geph5";
-      exec = "geph5-client-gui";
-      categories = [ "Network" ];
-      comment = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
-    })
-  ];
-
-  postInstall = ''
-    install -m 444 -D binaries/geph5-client-gui/icon.png $out/share/icons/hicolor/512x512/apps/geph5.png
-  '';
-
-  postFixup = ''
-    # Add required but not explicitly requested libraries
-    patchelf --add-rpath '${
-      lib.makeLibraryPath [
-        wayland
-        libxkbcommon
-        vulkan-loader
-        libglvnd
-      ]
-    }' "$out/bin/geph5-client-gui"
-  '';
-
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"
diff --git a/pkgs/by-name/ge/geph/settings_default.yaml b/pkgs/by-name/ge/geph/settings_default.yaml
deleted file mode 100644
index 3121ebccdeb8..000000000000
--- a/pkgs/by-name/ge/geph/settings_default.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-exit_constraint: auto
-
-broker:
-  race:
-    - fronted:
-        front: https://www.cdn77.com/
-        host: 1826209743.rsc.cdn77.org
-    - fronted:
-        front: https://www.vuejs.org/
-        host: svitania-naidallszei-2.netlify.app
-        override_dns:
-          - 75.2.60.5:443
-    - fronted:
-        front: https://www.vuejs.org/
-        host: svitania-naidallszei-3.netlify.app
-        override_dns:
-          - 75.2.60.5:443
-    - aws_lambda:
-        function_name: geph-lambda-bouncer
-        region: us-east-1
-        obfs_key: 855MJGAMB58MCPJBB97NADJ36D64WM2T:C4TN2M1H68VNMRVCCH57GDV2C5VN6V3RB8QMWP235D0P4RT2ACV7GVTRCHX3EC37
-
-spoof_dns: true

From 0f699812d619fe0daa6a2eb2b1dc8fb2cbe2322a Mon Sep 17 00:00:00 2001
From: usertam <code@usertam.dev>
Date: Thu, 8 Jan 2026 16:25:30 +0800
Subject: [PATCH 007/235] lightway: 0-unstable-2025-09-19 ->
 0-unstable-2026-01-02

---
 .../backport-darwin-address-calc-fix.patch    | 398 ++++++++++++++++++
 pkgs/by-name/li/lightway/package.nix          |  17 +-
 2 files changed, 411 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/li/lightway/backport-darwin-address-calc-fix.patch

diff --git a/pkgs/by-name/li/lightway/backport-darwin-address-calc-fix.patch b/pkgs/by-name/li/lightway/backport-darwin-address-calc-fix.patch
new file mode 100644
index 000000000000..9d5c684555ef
--- /dev/null
+++ b/pkgs/by-name/li/lightway/backport-darwin-address-calc-fix.patch
@@ -0,0 +1,398 @@
+From 9228741450f627da1dba800b44da03db8df44b32 Mon Sep 17 00:00:00 2001
+From: Samuel Tam <samuel.tam@expressvpn.com>
+Date: Fri, 9 Jan 2026 18:12:12 +0800
+Subject: [PATCH] ARM64 ASM: Darwin specific address calc fix
+
+Don't use ':lo12:' in Darwin specific address calculation code.
+@PAGEOFF is indicating this.
+---
+ wolfcrypt/src/port/arm/armv8-mlkem-asm.S  | 74 +++++++++++------------
+ wolfcrypt/src/port/arm/armv8-sha3-asm.S   |  4 +-
+ wolfcrypt/src/port/arm/armv8-sha512-asm.S |  8 +--
+ 3 files changed, 43 insertions(+), 43 deletions(-)
+
+diff --git a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
+index a45475c..1ded4af 100644
+--- a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
++++ b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
+@@ -168,21 +168,21 @@ _mlkem_ntt:
+ 	add  x2, x2, :lo12:L_mlkem_aarch64_zetas
+ #else
+ 	adrp x2, L_mlkem_aarch64_zetas@PAGE
+-	add  x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
++	add  x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x3, L_mlkem_aarch64_zetas_qinv
+ 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
+ #else
+ 	adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
+-	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
++	add  x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x4, L_mlkem_aarch64_consts
+ 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x4, L_mlkem_aarch64_consts@PAGE
+-	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	add	x1, x0, #0x100
+ 	ldr	q4, [x4]
+@@ -1562,21 +1562,21 @@ _mlkem_invntt:
+ 	add  x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
+ #else
+ 	adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
+-	add  x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
++	add  x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x3, L_mlkem_aarch64_zetas_inv_qinv
+ 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
+ #else
+ 	adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
+-	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
++	add  x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x4, L_mlkem_aarch64_consts
+ 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x4, L_mlkem_aarch64_consts@PAGE
+-	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	add	x1, x0, #0x100
+ 	ldr	q8, [x4]
+@@ -3013,21 +3013,21 @@ _mlkem_ntt_sqrdmlsh:
+ 	add  x2, x2, :lo12:L_mlkem_aarch64_zetas
+ #else
+ 	adrp x2, L_mlkem_aarch64_zetas@PAGE
+-	add  x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
++	add  x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x3, L_mlkem_aarch64_zetas_qinv
+ 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
+ #else
+ 	adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
+-	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
++	add  x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x4, L_mlkem_aarch64_consts
+ 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x4, L_mlkem_aarch64_consts@PAGE
+-	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	add	x1, x0, #0x100
+ 	ldr	q4, [x4]
+@@ -4195,21 +4195,21 @@ _mlkem_invntt_sqrdmlsh:
+ 	add  x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
+ #else
+ 	adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
+-	add  x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
++	add  x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x3, L_mlkem_aarch64_zetas_inv_qinv
+ 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
+ #else
+ 	adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
+-	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
++	add  x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x4, L_mlkem_aarch64_consts
+ 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x4, L_mlkem_aarch64_consts@PAGE
+-	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	add	x1, x0, #0x100
+ 	ldr	q8, [x4]
+@@ -5532,14 +5532,14 @@ _mlkem_basemul_mont:
+ 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
+ #else
+ 	adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
+-	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
++	add  x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x4, L_mlkem_aarch64_consts
+ 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x4, L_mlkem_aarch64_consts@PAGE
+-	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldr	q1, [x4]
+ 	ldp	q2, q3, [x1]
+@@ -6230,14 +6230,14 @@ _mlkem_basemul_mont_add:
+ 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
+ #else
+ 	adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
+-	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
++	add  x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x4, L_mlkem_aarch64_consts
+ 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x4, L_mlkem_aarch64_consts@PAGE
+-	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldr	q1, [x4]
+ 	ldp	q2, q3, [x1]
+@@ -6991,7 +6991,7 @@ _mlkem_csubq_neon:
+ 	add  x1, x1, :lo12:L_mlkem_aarch64_q
+ #else
+ 	adrp x1, L_mlkem_aarch64_q@PAGE
+-	add  x1, x1, :lo12:L_mlkem_aarch64_q@PAGEOFF
++	add  x1, x1, L_mlkem_aarch64_q@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldr	q20, [x1]
+ 	ld4	{v0.8h, v1.8h, v2.8h, v3.8h}, [x0], #0x40
+@@ -7172,7 +7172,7 @@ _mlkem_add_reduce:
+ 	add  x2, x2, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x2, L_mlkem_aarch64_consts@PAGE
+-	add  x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x2, x2, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldr	q0, [x2]
+ 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
+@@ -7363,7 +7363,7 @@ _mlkem_add3_reduce:
+ 	add  x3, x3, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x3, L_mlkem_aarch64_consts@PAGE
+-	add  x3, x3, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x3, x3, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldr	q0, [x3]
+ 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
+@@ -7594,7 +7594,7 @@ _mlkem_rsub_reduce:
+ 	add  x2, x2, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x2, L_mlkem_aarch64_consts@PAGE
+-	add  x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x2, x2, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldr	q0, [x2]
+ 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
+@@ -7785,7 +7785,7 @@ _mlkem_to_mont:
+ 	add  x1, x1, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x1, L_mlkem_aarch64_consts@PAGE
+-	add  x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x1, x1, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldr	q0, [x1]
+ 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
+@@ -7999,7 +7999,7 @@ _mlkem_to_mont_sqrdmlsh:
+ 	add  x1, x1, :lo12:L_mlkem_aarch64_consts
+ #else
+ 	adrp x1, L_mlkem_aarch64_consts@PAGE
+-	add  x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
++	add  x1, x1, L_mlkem_aarch64_consts@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldr	q0, [x1]
+ 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
+@@ -8226,21 +8226,21 @@ _mlkem_to_msg_neon:
+ 	add  x2, x2, :lo12:L_mlkem_to_msg_low
+ #else
+ 	adrp x2, L_mlkem_to_msg_low@PAGE
+-	add  x2, x2, :lo12:L_mlkem_to_msg_low@PAGEOFF
++	add  x2, x2, L_mlkem_to_msg_low@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x3, L_mlkem_to_msg_high
+ 	add  x3, x3, :lo12:L_mlkem_to_msg_high
+ #else
+ 	adrp x3, L_mlkem_to_msg_high@PAGE
+-	add  x3, x3, :lo12:L_mlkem_to_msg_high@PAGEOFF
++	add  x3, x3, L_mlkem_to_msg_high@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x4, L_mlkem_to_msg_bits
+ 	add  x4, x4, :lo12:L_mlkem_to_msg_bits
+ #else
+ 	adrp x4, L_mlkem_to_msg_bits@PAGE
+-	add  x4, x4, :lo12:L_mlkem_to_msg_bits@PAGEOFF
++	add  x4, x4, L_mlkem_to_msg_bits@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldr	q0, [x2]
+ 	ldr	q1, [x3]
+@@ -8506,14 +8506,14 @@ _mlkem_from_msg_neon:
+ 	add  x2, x2, :lo12:L_mlkem_from_msg_q1half
+ #else
+ 	adrp x2, L_mlkem_from_msg_q1half@PAGE
+-	add  x2, x2, :lo12:L_mlkem_from_msg_q1half@PAGEOFF
++	add  x2, x2, L_mlkem_from_msg_q1half@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x3, L_mlkem_from_msg_bits
+ 	add  x3, x3, :lo12:L_mlkem_from_msg_bits
+ #else
+ 	adrp x3, L_mlkem_from_msg_bits@PAGE
+-	add  x3, x3, :lo12:L_mlkem_from_msg_bits@PAGEOFF
++	add  x3, x3, L_mlkem_from_msg_bits@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ld1	{v2.16b, v3.16b}, [x1]
+ 	ldr	q1, [x2]
+@@ -9517,28 +9517,28 @@ _mlkem_rej_uniform_neon:
+ 	add  x4, x4, :lo12:L_mlkem_rej_uniform_mask
+ #else
+ 	adrp x4, L_mlkem_rej_uniform_mask@PAGE
+-	add  x4, x4, :lo12:L_mlkem_rej_uniform_mask@PAGEOFF
++	add  x4, x4, L_mlkem_rej_uniform_mask@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x5, L_mlkem_aarch64_q
+ 	add  x5, x5, :lo12:L_mlkem_aarch64_q
+ #else
+ 	adrp x5, L_mlkem_aarch64_q@PAGE
+-	add  x5, x5, :lo12:L_mlkem_aarch64_q@PAGEOFF
++	add  x5, x5, L_mlkem_aarch64_q@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x6, L_mlkem_rej_uniform_bits
+ 	add  x6, x6, :lo12:L_mlkem_rej_uniform_bits
+ #else
+ 	adrp x6, L_mlkem_rej_uniform_bits@PAGE
+-	add  x6, x6, :lo12:L_mlkem_rej_uniform_bits@PAGEOFF
++	add  x6, x6, L_mlkem_rej_uniform_bits@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x7, L_mlkem_rej_uniform_indices
+ 	add  x7, x7, :lo12:L_mlkem_rej_uniform_indices
+ #else
+ 	adrp x7, L_mlkem_rej_uniform_indices@PAGE
+-	add  x7, x7, :lo12:L_mlkem_rej_uniform_indices@PAGEOFF
++	add  x7, x7, L_mlkem_rej_uniform_indices@PAGEOFF
+ #endif /* __APPLE__ */
+ 	eor	v1.16b, v1.16b, v1.16b
+ 	eor	v12.16b, v12.16b, v12.16b
+@@ -9754,7 +9754,7 @@ _mlkem_sha3_blocksx3_neon:
+ 	add  x27, x27, :lo12:L_sha3_aarch64_r
+ #else
+ 	adrp x27, L_sha3_aarch64_r@PAGE
+-	add  x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
++	add  x27, x27, L_sha3_aarch64_r@PAGEOFF
+ #endif /* __APPLE__ */
+ 	str	x0, [x29, #40]
+ 	ld4	{v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
+@@ -10079,7 +10079,7 @@ _mlkem_shake128_blocksx3_seed_neon:
+ 	add  x28, x28, :lo12:L_sha3_aarch64_r
+ #else
+ 	adrp x28, L_sha3_aarch64_r@PAGE
+-	add  x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
++	add  x28, x28, L_sha3_aarch64_r@PAGEOFF
+ #endif /* __APPLE__ */
+ 	str	x0, [x29, #40]
+ 	add	x0, x0, #32
+@@ -10426,7 +10426,7 @@ _mlkem_shake256_blocksx3_seed_neon:
+ 	add  x28, x28, :lo12:L_sha3_aarch64_r
+ #else
+ 	adrp x28, L_sha3_aarch64_r@PAGE
+-	add  x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
++	add  x28, x28, L_sha3_aarch64_r@PAGEOFF
+ #endif /* __APPLE__ */
+ 	str	x0, [x29, #40]
+ 	add	x0, x0, #32
+@@ -10774,7 +10774,7 @@ _mlkem_sha3_blocksx3_neon:
+ 	add  x27, x27, :lo12:L_sha3_aarch64_r
+ #else
+ 	adrp x27, L_sha3_aarch64_r@PAGE
+-	add  x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
++	add  x27, x27, L_sha3_aarch64_r@PAGEOFF
+ #endif /* __APPLE__ */
+ 	str	x0, [x29, #40]
+ 	ld4	{v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
+@@ -11184,7 +11184,7 @@ _mlkem_shake128_blocksx3_seed_neon:
+ 	add  x28, x28, :lo12:L_sha3_aarch64_r
+ #else
+ 	adrp x28, L_sha3_aarch64_r@PAGE
+-	add  x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
++	add  x28, x28, L_sha3_aarch64_r@PAGEOFF
+ #endif /* __APPLE__ */
+ 	str	x0, [x29, #40]
+ 	add	x0, x0, #32
+@@ -11616,7 +11616,7 @@ _mlkem_shake256_blocksx3_seed_neon:
+ 	add  x28, x28, :lo12:L_sha3_aarch64_r
+ #else
+ 	adrp x28, L_sha3_aarch64_r@PAGE
+-	add  x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
++	add  x28, x28, L_sha3_aarch64_r@PAGEOFF
+ #endif /* __APPLE__ */
+ 	str	x0, [x29, #40]
+ 	add	x0, x0, #32
+diff --git a/wolfcrypt/src/port/arm/armv8-sha3-asm.S b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
+index 411349f..6089f8c 100644
+--- a/wolfcrypt/src/port/arm/armv8-sha3-asm.S
++++ b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
+@@ -95,7 +95,7 @@ _BlockSha3_crypto:
+ 	add  x1, x1, :lo12:L_SHA3_transform_crypto_r
+ #else
+ 	adrp x1, L_SHA3_transform_crypto_r@PAGE
+-	add  x1, x1, :lo12:L_SHA3_transform_crypto_r@PAGEOFF
++	add  x1, x1, L_SHA3_transform_crypto_r@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ld4	{v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
+ 	ld4	{v4.d, v5.d, v6.d, v7.d}[0], [x0], #32
+@@ -268,7 +268,7 @@ _BlockSha3_base:
+ 	add  x27, x27, :lo12:L_SHA3_transform_base_r
+ #else
+ 	adrp x27, L_SHA3_transform_base_r@PAGE
+-	add  x27, x27, :lo12:L_SHA3_transform_base_r@PAGEOFF
++	add  x27, x27, L_SHA3_transform_base_r@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ldp	x1, x2, [x0]
+ 	ldp	x3, x4, [x0, #16]
+diff --git a/wolfcrypt/src/port/arm/armv8-sha512-asm.S b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
+index 514e5de..ee64e6e 100644
+--- a/wolfcrypt/src/port/arm/armv8-sha512-asm.S
++++ b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
+@@ -165,14 +165,14 @@ _Transform_Sha512_Len_neon:
+ 	add  x3, x3, :lo12:L_SHA512_transform_neon_len_k
+ #else
+ 	adrp x3, L_SHA512_transform_neon_len_k@PAGE
+-	add  x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
++	add  x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
+ #endif /* __APPLE__ */
+ #ifndef __APPLE__
+ 	adrp x27, L_SHA512_transform_neon_len_r8
+ 	add  x27, x27, :lo12:L_SHA512_transform_neon_len_r8
+ #else
+ 	adrp x27, L_SHA512_transform_neon_len_r8@PAGE
+-	add  x27, x27, :lo12:L_SHA512_transform_neon_len_r8@PAGEOFF
++	add  x27, x27, L_SHA512_transform_neon_len_r8@PAGEOFF
+ #endif /* __APPLE__ */
+ 	ld1	{v11.16b}, [x27]
+ 	# Load digest into working vars
+@@ -1070,7 +1070,7 @@ L_sha512_len_neon_start:
+ 	add  x3, x3, :lo12:L_SHA512_transform_neon_len_k
+ #else
+ 	adrp x3, L_SHA512_transform_neon_len_k@PAGE
+-	add  x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
++	add  x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
+ #endif /* __APPLE__ */
+ 	subs	w2, w2, #0x80
+ 	bne	L_sha512_len_neon_begin
+@@ -1211,7 +1211,7 @@ _Transform_Sha512_Len_crypto:
+ 	add  x4, x4, :lo12:L_SHA512_trans_crypto_len_k
+ #else
+ 	adrp x4, L_SHA512_trans_crypto_len_k@PAGE
+-	add  x4, x4, :lo12:L_SHA512_trans_crypto_len_k@PAGEOFF
++	add  x4, x4, L_SHA512_trans_crypto_len_k@PAGEOFF
+ #endif /* __APPLE__ */
+ 	# Load first 16 64-bit words of K permanently
+ 	ld1	{v8.2d, v9.2d, v10.2d, v11.2d}, [x4], #0x40
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/li/lightway/package.nix b/pkgs/by-name/li/lightway/package.nix
index 82c22ee4df25..3e54c025f346 100644
--- a/pkgs/by-name/li/lightway/package.nix
+++ b/pkgs/by-name/li/lightway/package.nix
@@ -10,16 +10,25 @@
 
 rustPlatform.buildRustPackage {
   pname = "lightway";
-  version = "0-unstable-2025-09-19";
+  version = "0-unstable-2026-01-02";
 
   src = fetchFromGitHub {
     owner = "expressvpn";
     repo = "lightway";
-    rev = "dac72eb8af0994de020d71d24114717ecfb9804d";
-    hash = "sha256-oHxHJ4D/Xg/zAFiI0bMX3Dc05HXIjk+ZHuGY03cwY+c=";
+    rev = "8e21da7ab3a97ab75235264e85fa8615f7b0f33b";
+    hash = "sha256-1YpXaxPm1BMALhRU25FH5PLJ1IIRfcYA3W6e4c8Si+w=";
   };
 
-  cargoHash = "sha256-RFlac10XFJXT3Giayy31kZ3Nn1Q+YsPt/zCdkSV0Atk=";
+  cargoHash = "sha256-4SIE/kGRd2I3sqO+IgItO1PBQHeFv9N4erfVe/9re7A=";
+
+  # Backport fix for Darwin address calculation to vendored wolfSSL 5.8.2.
+  # https://github.com/wolfSSL/wolfssl/pull/9537
+  # Drop when Lightway bumps wolfSSL past commit 5c2c459, or > 5.8.4.
+  postPatch = ''
+    patch -Np1 \
+      -d $cargoDepsCopy/wolfssl-sys-2.0.0/wolfssl-src \
+      -i ${./backport-darwin-address-calc-fix.patch}
+  '';
 
   cargoBuildFlags = lib.cli.toCommandLineGNU { } {
     package = [

From 644351e2b3f25be04096befef83154b02647d6a8 Mon Sep 17 00:00:00 2001
From: Mohamed Hisham Abdelzaher <mohamed.hisham.abdelzaher@gmail.com>
Date: Sun, 11 Jan 2026 19:20:49 +0200
Subject: [PATCH 008/235] maintainers: add MH0386

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9957aad44a31..e61074877c4a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17024,6 +17024,13 @@
     githubId = 68288772;
     name = "Markus Heinrich";
   };
+  MH0386 = {
+    name = "Mohamed Hisham Abdelzaher";
+    email = "mohamed.hisham.abdelzaher@gmail.com";
+    github = "MH0386";
+    githubId = 77013511;
+    matrix = "@mh0386:matrix.org";
+  };
   mh182 = {
     email = "mh182@chello.at";
     github = "mh182";

From 34151015bc604a7de15d128bc281cc9c1965a42a Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 15 Jan 2026 00:25:38 +0100
Subject: [PATCH 009/235] whitebophir: use nodejs_24

---
 pkgs/by-name/wh/whitebophir/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/wh/whitebophir/package.nix b/pkgs/by-name/wh/whitebophir/package.nix
index 555f8f77c811..a25476bba334 100644
--- a/pkgs/by-name/wh/whitebophir/package.nix
+++ b/pkgs/by-name/wh/whitebophir/package.nix
@@ -2,13 +2,10 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  nodejs_20,
+  nodejs,
   runtimeShell,
 }:
 
-let
-  nodejs = nodejs_20;
-in
 buildNpmPackage rec {
   pname = "whitebophir";
   version = "1.19.1";

From 71a974b484758952e87c639dccc20b54c9987b5f Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Thu, 15 Jan 2026 12:58:46 +1100
Subject: [PATCH 010/235] android-translation-layer: 0-unstable-2025-09-14 ->
 0-unstable-2026-01-08

---
 pkgs/by-name/an/android-translation-layer/package.nix | 6 +++---
 pkgs/by-name/ar/art-standalone/package.nix            | 6 +++---
 pkgs/by-name/bi/bionic-translation/package.nix        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/an/android-translation-layer/package.nix b/pkgs/by-name/an/android-translation-layer/package.nix
index 63c5bcec6098..c40a55978d1f 100644
--- a/pkgs/by-name/an/android-translation-layer/package.nix
+++ b/pkgs/by-name/an/android-translation-layer/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation {
   pname = "android-translation-layer";
-  version = "0-unstable-2025-09-14";
+  version = "0-unstable-2026-01-08";
 
   src = fetchFromGitLab {
     owner = "android_translation_layer";
     repo = "android_translation_layer";
-    rev = "9de91586994af5078decda17db92ce50c5673951";
-    hash = "sha256-iRjP++WzLsV7oDGNdF3m9JJJS7zLrG5W46U3h39H5uk=";
+    rev = "b4d749b9b7f1a8620b976f03a2924d0661f7232f";
+    hash = "sha256-SeMxbqyD3MXDR4fHans7pdQSa/SLoWOl9QhnpH7CWCY=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ar/art-standalone/package.nix b/pkgs/by-name/ar/art-standalone/package.nix
index 9b4434f9876b..f6d383897132 100644
--- a/pkgs/by-name/ar/art-standalone/package.nix
+++ b/pkgs/by-name/ar/art-standalone/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "art-standalone";
-  version = "0-unstable-2025-09-03";
+  version = "0-unstable-2025-10-09";
 
   src = fetchFromGitLab {
     owner = "android_translation_layer";
     repo = "art_standalone";
-    rev = "10d60509c9073791f9eca1d2b8443d40a40edc05";
-    hash = "sha256-Xg6s58jymma1sNb6P7pwWFpYq1O6GoynrgPeLZRD+rI=";
+    rev = "e78bf68917bcaaf58fef3960cd88793b3b7f39cc";
+    hash = "sha256-0r6Ap41AMSHhZpMJ5QoWiGGcHPj35et4kiA20xs9uLs=";
   };
 
   patches = [
diff --git a/pkgs/by-name/bi/bionic-translation/package.nix b/pkgs/by-name/bi/bionic-translation/package.nix
index ac4dd2c2f324..9e22b92f86d7 100644
--- a/pkgs/by-name/bi/bionic-translation/package.nix
+++ b/pkgs/by-name/bi/bionic-translation/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bionic-translation";
-  version = "0-unstable-2025-07-07";
+  version = "0-unstable-2025-11-25";
 
   src = fetchFromGitLab {
     owner = "android_translation_layer";
     repo = "bionic_translation";
-    rev = "18c65637bf02dba86415dd009036b72f62cbb37d";
-    hash = "sha256-cqmWT9mbYJRLaX1Ey0lDfRFYM7JXuwayDN4o2WJIAVc=";
+    rev = "5c31d4366fbb0af70690e72e5a861e7b44ffb1ef";
+    hash = "sha256-dlHjx6+yymvIjDEs2TZexZUIUz32iKD0r+H4AJ89xig=";
   };
 
   nativeBuildInputs = [

From 6e5f736d5266c8ce6f7b475c98d8d682007ad469 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 Jan 2026 23:03:43 +0000
Subject: [PATCH 011/235] android-studio: 2025.2.2.8 -> 2025.2.3.9

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index c2604cdeabdf..c7a8431f4390 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -16,8 +16,8 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2025.2.2.8"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Patch 1"
-    sha256Hash = "sha256-xs9ABQ9f8/gtxcoiZkf/xEtmTOj6rb4Ty+w70/+C4Ss=";
+    version = "2025.2.3.9"; # "Android Studio Otter 3 Feature Drop | 2025.2.3"
+    sha256Hash = "sha256-mG6myss22nI/LIVQzM19jNPouLe7JEbTqL85u6+Rq8E=";
   };
   betaVersion = {
     version = "2025.2.3.7"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 2"

From 949c7f9b18488f13eccf54624ba7f0397b6d68a5 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Thu, 15 Jan 2026 20:32:37 -0500
Subject: [PATCH 012/235] libbaseencode: drop

---
 pkgs/by-name/li/libbaseencode/package.nix | 27 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/by-name/li/libbaseencode/package.nix

diff --git a/pkgs/by-name/li/libbaseencode/package.nix b/pkgs/by-name/li/libbaseencode/package.nix
deleted file mode 100644
index c86a2909a9f4..000000000000
--- a/pkgs/by-name/li/libbaseencode/package.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libbaseencode";
-  version = "1.0.15";
-
-  src = fetchFromGitHub {
-    owner = "paolostivanin";
-    repo = "libbaseencode";
-    rev = "v${version}";
-    sha256 = "sha256-WiE+ZMX4oZieER1pu43aSWytkxfkQdX+S3JI98XPpL4=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "Library written in C for encoding and decoding data using base32 or base64 (RFC-4648)";
-    homepage = "https://github.com/paolostivanin/libbaseencode";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ alexbakker ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dd9ba3ff6253..1d1ae99fcc32 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -875,6 +875,7 @@ mapAliases {
   libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
   libayatana-appindicator-gtk3 = throw "'libayatana-appindicator-gtk3' has been renamed to/replaced by 'libayatana-appindicator'"; # Converted to throw 2025-10-27
   libayatana-indicator-gtk3 = throw "'libayatana-indicator-gtk3' has been renamed to/replaced by 'libayatana-indicator'"; # Converted to throw 2025-10-27
+  libbaseencode = throw "'libbaseencode' has been removed because it was deprecated and archived upstream. Consider using 'libcotp' instead"; # Added 2026-01-15
   libbencodetools = throw "'libbencodetools' has been renamed to/replaced by 'bencodetools'"; # Converted to throw 2025-10-27
   libbpf_1 = throw "'libbpf_1' has been renamed to/replaced by 'libbpf'"; # Converted to throw 2025-10-27
   libbson = throw "'libbson' has been renamed to/replaced by 'mongoc'"; # Converted to throw 2025-10-27

From 35b20dfd9ec9a4d8953ffd8877e8c82b801b5bf7 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Fri, 16 Jan 2026 13:58:29 +0000
Subject: [PATCH 013/235] nixos/bluesky-pds: prefer goat & add rate limit by
 deafult

see
https://github.com/bluesky-social/pds/commit/65c9efc6d5177141552136a7e51b1ac9413cb889
and
https://github.com/bluesky-social/pds/commit/9a72155fee4e7e1de0e0add5454c5571b89e05e0
---
 .../modules/services/web-apps/bluesky-pds.nix | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-apps/bluesky-pds.nix b/nixos/modules/services/web-apps/bluesky-pds.nix
index c19a791a16b1..426c4ca7a961 100644
--- a/nixos/modules/services/web-apps/bluesky-pds.nix
+++ b/nixos/modules/services/web-apps/bluesky-pds.nix
@@ -17,6 +17,7 @@ let
     concatMapStringsSep
     types
     literalExpression
+    optional
     ;
 
   pdsadminWrapper =
@@ -32,7 +33,7 @@ let
           ${getExe pkgs.bluesky-pdsadmin} "$@"
     '';
 in
-# All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh
+# All defaults are from https://github.com/bluesky-social/pds/blob/9a72155fee4e7e1de0e0add5454c5571b89e05e0/installer.sh
 {
   imports = [
     (lib.mkRenamedOptionModule [ "services" "pds" "enable" ] [ "services" "bluesky-pds" "enable" ])
@@ -130,6 +131,12 @@ in
             default = "true";
             description = "Enable logging";
           };
+
+          PDS_RATE_LIMITS_ENABLED = mkOption {
+            type = types.nullOr types.str;
+            default = "true";
+            description = "Enable rate limiting";
+          };
         };
       };
 
@@ -162,19 +169,27 @@ in
     };
 
     pdsadmin = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        defaultText = false;
+        description = "Add pdsadmin script to PATH";
+      };
+    };
+
+    goat = {
       enable = mkOption {
         type = types.bool;
         default = cfg.enable;
         defaultText = literalExpression "config.services.bluesky-pds.enable";
-        description = "Add pdsadmin script to PATH";
+        description = "Add goat to PATH";
       };
     };
   };
 
   config = mkIf cfg.enable {
-    environment = mkIf cfg.pdsadmin.enable {
-      systemPackages = [ pdsadminWrapper ];
-    };
+    environment.systemPackages =
+      optional cfg.pdsadmin.enable pdsadminWrapper ++ optional cfg.goat.enable pkgs.atproto-goat;
 
     systemd.services.bluesky-pds = {
       description = "bluesky pds";

From e5e5ff045d52d071f0ea6fb73459bc127b79f846 Mon Sep 17 00:00:00 2001
From: Christoph Jabs <contact@christophjabs.info>
Date: Fri, 16 Jan 2026 10:52:52 +0200
Subject: [PATCH 014/235] cadical: 2.2.0 -> 3.0.0

---
 pkgs/by-name/ca/cadical/package.nix   | 5 +++--
 pkgs/by-name/ca/cadical_2/package.nix | 6 ++++++
 pkgs/by-name/st/stp/package.nix       | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/ca/cadical_2/package.nix

diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix
index f3269d749265..7cc3cdf1e68e 100644
--- a/pkgs/by-name/ca/cadical/package.nix
+++ b/pkgs/by-name/ca/cadical/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   copyPkgconfigItems,
   makePkgconfigItem,
-  version ? "2.2.0",
+  version ? "3.0.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
     rev = "rel-${version}";
     hash =
       {
-        "2.2.0" = "sha256-6O0lz0YJzk1eJblQ0/f9PnSYqD8WoendIZioQiGUpCg=";
+        "3.0.0" = "sha256-pymbSC6bwQQ0YCtJd3xWZiC22UEkFiKSLObSOnoQj9I=";
+        "2.2.1" = "sha256-dYRaw9DI63Nqz0IJkfQYU4y00KSfq1Xv0xZuL1G15CY=";
         "2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4=";
         "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc=";
       }
diff --git a/pkgs/by-name/ca/cadical_2/package.nix b/pkgs/by-name/ca/cadical_2/package.nix
new file mode 100644
index 000000000000..657d086ae196
--- /dev/null
+++ b/pkgs/by-name/ca/cadical_2/package.nix
@@ -0,0 +1,6 @@
+{
+  cadical,
+  version ? "2.2.1",
+}:
+
+cadical.override { inherit version; }
diff --git a/pkgs/by-name/st/stp/package.nix b/pkgs/by-name/st/stp/package.nix
index f6b63167cbd8..45eb1b76ca84 100644
--- a/pkgs/by-name/st/stp/package.nix
+++ b/pkgs/by-name/st/stp/package.nix
@@ -15,7 +15,7 @@
   minisat,
   cryptominisat,
   gmp,
-  cadical,
+  cadical_2,
   gtest,
   lit,
   outputcheck,
@@ -85,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: {
       cadicalDependency = symlinkJoin {
         name = "stp-${finalAttrs.version}-cadical";
         paths = [
-          cadical.lib
-          cadical.dev
+          cadical_2.lib
+          cadical_2.dev
         ];
       };
     in

From 19eb85c5a6456c9c743758d10332756f418eabbb Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 18 Jan 2026 17:05:21 +0100
Subject: [PATCH 015/235] perl.pkgs.Test2Harness: Disable tests on powerpc64

---
 pkgs/top-level/perl-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 112db2c2d0be..85911f186dac 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -33240,9 +33240,10 @@ with self;
       ./scripts/yath test -j $NIX_BUILD_CORES
     '';
 
-    # The t/integration/preload.t test is broken on riscv64
+    # The t/integration/preload.t test is broken on riscv64 & powerpc64
     # https://github.com/Test-More/Test2-Harness/issues/290
-    doCheck = !stdenv.hostPlatform.isRiscV;
+    doCheck =
+      !stdenv.hostPlatform.isRiscV && !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian);
 
     propagatedBuildInputs = [
       DataUUID

From 455f2607a00a50a7e22fe9090f0d01027843ff3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 19:57:28 +0000
Subject: [PATCH 016/235] jdt-language-server: 1.54.0 -> 1.55.0

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

diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix
index 938cde7c5513..255b2ef73785 100644
--- a/pkgs/by-name/jd/jdt-language-server/package.nix
+++ b/pkgs/by-name/jd/jdt-language-server/package.nix
@@ -7,15 +7,15 @@
 }:
 
 let
-  timestamp = "202511261751";
+  timestamp = "202601131729";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "jdt-language-server";
-  version = "1.54.0";
+  version = "1.55.0";
 
   src = fetchurl {
     url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
-    hash = "sha256-GikaJpvYizxASCGRIpYaUuyAhyr7x6PzQnCyznf3oUw=";
+    hash = "sha256-kGJ8nwNwTbtATzdlFiXQdRwHirdTQkYCPVOtzqFBG5E=";
   };
 
   sourceRoot = ".";

From b596934b7a058e940fd1eb34d9c94472cd134d16 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 19 Jan 2026 01:21:18 +0200
Subject: [PATCH 017/235] luaPackages.wrapLua: Fix the wrapper on cross

The wrapper was using a makeWrapper targeting the buildPlatform

This is a leftover from a fix I did before I converted luaPackages to
use makeScopeWithSplicing

Fixes: https://www.github.com/NixOS/nixpkgs/issues/481454
---
 pkgs/top-level/lua-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index bc5b3bb649ae..e2a42938108b 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -65,9 +65,7 @@ rec {
     ;
 
   # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH
-  wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix {
-    inherit (pkgs.buildPackages) makeSetupHook makeWrapper;
-  };
+  wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { };
 
   luarocks_bootstrap = toLuaModule (callPackage ../development/tools/misc/luarocks/default.nix { });
 

From 668ef2c9eca986c88f0d54b6338a6f788a2be6a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 Jan 2026 20:10:36 +0000
Subject: [PATCH 018/235] openlinkhub: 0.7.3 -> 0.7.5

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

diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix
index e218679edffc..b377af8d1585 100644
--- a/pkgs/by-name/op/openlinkhub/package.nix
+++ b/pkgs/by-name/op/openlinkhub/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "openlinkhub";
-  version = "0.7.3";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "jurkovic-nikola";
     repo = "OpenLinkHub";
     tag = version;
-    hash = "sha256-Q9caDjiEQl2TAS6Myb3lHh9Th+/XPunMSTA06IMespM=";
+    hash = "sha256-Jq31ZcJtl0ZmjNsMOiTTt2eZIIYn2DRVPE4Q5FTx6OM=";
   };
 
   proxyVendor = true;

From 910f83935c9b11d14b324ecd46be832cb0fb5e11 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Mon, 19 Jan 2026 18:09:06 -0500
Subject: [PATCH 019/235] shipwright: 9.1.1 -> 9.1.2

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

diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 0bf826f36a6b..8ea8c34e5141 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -117,12 +117,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shipwright";
-  version = "9.1.1";
+  version = "9.1.2";
   src = fetchFromGitHub {
     owner = "harbourmasters";
     repo = "shipwright";
     tag = finalAttrs.version;
-    hash = "sha256-TEP2YNKUuAnvLg+aDOkMmYfPQIjUXWYOhprfqsr8EgQ=";
+    hash = "sha256-kFi5yo+CGH67NU7haDAbzWCURzsUYMlRzx66XGvh0a0=";
     fetchSubmodules = true;
     fetchTags = true;
     deepClone = true;

From df96e2cfd357bcd7972d958df4bc038ec2edab7d Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Mon, 19 Jan 2026 18:05:45 -0500
Subject: [PATCH 020/235] Revert "shipwright: enable fetchTags (#473003)"

This reverts commit 95ba41fa4fb5e1beac1fc1caa3e18ac36ec913e7, reversing
changes made to 92feab454b1d0616f8a9218f26ae530a3a9d76b3.
---
 pkgs/by-name/sh/shipwright/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 8ea8c34e5141..86c5d68a0619 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -124,7 +124,6 @@ stdenv.mkDerivation (finalAttrs: {
     tag = finalAttrs.version;
     hash = "sha256-kFi5yo+CGH67NU7haDAbzWCURzsUYMlRzx66XGvh0a0=";
     fetchSubmodules = true;
-    fetchTags = true;
     deepClone = true;
     postFetch = ''
       cd $out

From 211d07047f1ec429e0ee8e0cd7d2ddf1403b1d33 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 19 Jan 2026 19:17:42 -0500
Subject: [PATCH 021/235] notion: fix build with GCC 15

Fixes: #481398
Tracking: #475479
---
 pkgs/by-name/no/notion/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index 7d52d18312b3..b53dcd200445 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   fontconfig,
   gettext,
   groff,
@@ -30,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-L7WL8zn1Qkf5sqrhqZJqFe4B1l9ULXI3pt3Jpc87huk=";
   };
 
+  patches = [
+    # GCC 15 fix
+    (fetchpatch2 {
+      url = "https://github.com/raboof/notion/commit/89c92f49abfeae1168ad343d4f529a52d0edd78c.patch?full_index=1";
+      hash = "sha256-+4GGeY2j7B54Ffw5gFNpG4704Egc7rA6w5z0sZG8210=";
+    })
+  ];
+
   nativeBuildInputs = [
     gettext
     groff

From e1e2f27c78a0b117726780ccb5eda09f88868328 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 20 Jan 2026 15:20:05 +0200
Subject: [PATCH 022/235] luaPackages.buildLuarocksPackage: Get the final
 derivation picked by mkDerivation instead of using the raw list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
   … while evaluating attribute 'propagatedBuildInputs' of derivation 'wrap-lua-hook'
     at /home/art/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:600:13:
      599|             depsHostHostPropagated = elemAt (elemAt propagatedDependencies 1) 0;
      600|             propagatedBuildInputs = elemAt (elemAt propagatedDependencies 1) 1;
         |             ^
      601|             depsTargetTargetPropagated = elemAt (elemAt propagatedDependencies 2) 0;
   … while calling the 'getAttr' builtin
     at «nix-internal»/derivation-internal.nix:50:17:
       49|     value = commonAttrs // {
       50|       outPath = builtins.getAttr outputName strict;
         |                 ^
       51|       drvPath = strict.drvPath;
   … while calling the 'derivationStrict' builtin
     at «nix-internal»/derivation-internal.nix:37:12:
       36|
       37|   strict = derivationStrict drvAttrs;
         |            ^
       38|
   … while evaluating derivation 'make-shell-wrapper-hook'
     whose name attribute is located at /home/art/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:541:13
   … while evaluating attribute 'shell' of derivation 'make-shell-wrapper-hook'
     at /home/art/nixgits/my-nixpkgs/pkgs/top-level/all-packages.nix:716:7:
      715|       # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not  __raw)
      716|       shell =
         |       ^
      717|         if targetPackages ? runtimeShell then
   … while calling the 'throw' builtin
     at /home/art/nixgits/my-nixpkgs/pkgs/top-level/all-packages.nix:720:11:
      719|         else
      720|           throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs";
         |           ^
      721|     };
   error: makeWrapper/makeShellWrapper must be in nativeBuildInputs
```
---
 .../development/interpreters/lua-5/build-luarocks-package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
index 736c9463521f..2c7450aa40d2 100644
--- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
@@ -142,7 +142,7 @@ let
         luarocksConfig =
           let
             externalDepsGenerated = lib.filter (drv: !drv ? luaModule) (
-              self.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs
+              self.finalPackage.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs
             );
 
             generatedConfig = luaLib.generateLuarocksConfig {
@@ -157,7 +157,7 @@ let
               # closure, as it doesn't have a rock tree :)
               # luaLib.hasLuaModule
               requiredLuaRocks = lib.filter luaLib.hasLuaModule (
-                lua.pkgs.requiredLuaModules (self.nativeBuildInputs ++ self.propagatedBuildInputs)
+                lua.pkgs.requiredLuaModules (self.finalPackage.nativeBuildInputs ++ self.propagatedBuildInputs)
               );
             };
 

From 2f2bf625055e4a1ae88d17b7773148357059697f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 20 Jan 2026 08:16:57 -0800
Subject: [PATCH 023/235] python312Packages.py-libzfs: 24.04.0 -> 25.10.1

Diff: https://github.com/truenas/py-libzfs/compare/TS-24.04.0...TS-25.10.1
---
 pkgs/development/python-modules/py-libzfs/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix
index 3b6395232ec4..de4d805addf9 100644
--- a/pkgs/development/python-modules/py-libzfs/default.nix
+++ b/pkgs/development/python-modules/py-libzfs/default.nix
@@ -10,21 +10,17 @@
 
 buildPythonPackage rec {
   pname = "py-libzfs";
-  version = "24.04.0";
+  version = "25.10.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "truenas";
     repo = "py-libzfs";
     rev = "TS-${version}";
-    hash = "sha256-Uiu0RNE06++iNWUNcKpbZvreT2D7/EqHlFZJXKe3F4A=";
+    hash = "sha256-kme5qUG0Nsya8HxU/oMHP1AidoMMOob/EON8sZMzKKI=";
   };
 
   patches = [
-    (fetchpatch2 {
-      url = "https://github.com/truenas/py-libzfs/commit/b5ffe1f1d6097df6e2f5cc6dd3c968872ec60804.patch";
-      hash = "sha256-6r5hQ/o7c4vq4Tfh0l1WbeK3AuPvi+1wzkwkIn1qEes=";
-    })
     # Upstream has open PR. Debian uses the patch.
     # https://github.com/truenas/py-libzfs/pull/277
     (fetchpatch2 {

From fb2418260e4a4183623faa05a54594a8abe5d6a0 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 20 Jan 2026 22:45:11 +0100
Subject: [PATCH 024/235] python3Packages.klayout: fix darwin build

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

diff --git a/pkgs/development/python-modules/klayout/default.nix b/pkgs/development/python-modules/klayout/default.nix
index 08a06b34e9b5..21028747e798 100644
--- a/pkgs/development/python-modules/klayout/default.nix
+++ b/pkgs/development/python-modules/klayout/default.nix
@@ -38,6 +38,10 @@ buildPythonPackage rec {
     fixDarwinDylibNames
   ];
 
+  # Ensure that there is enough space for the `fixDarwinDylibNames` hook to
+  # update the install names of the output dylibs.
+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
+
   pythonImportsCheck = [ "klayout" ];
 
   meta = {

From eeac7f90c9d31fb2b104fc848e44c7aa35aaef61 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyu@yiyuzhou.io>
Date: Tue, 20 Jan 2026 21:07:23 -0800
Subject: [PATCH 025/235] bcachefs-tools: 1.35.1 -> 1.35.2

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

diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix
index 9ff5b574e67e..8fcf78acd5c9 100644
--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@@ -28,18 +28,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bcachefs-tools";
-  version = "1.35.1";
+  version = "1.35.2";
 
   src = fetchFromGitHub {
     owner = "koverstreet";
     repo = "bcachefs-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1p2zbzQLza8w+hu+5OjPr+Lh6q6Kh9HdVxFkuCl2x8o=";
+    hash = "sha256-YreeoI9ct3Gt0za3bW4cFP8mA3mrgpVnHVUzfX1m5CI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-OlXkshfEXtY6fDBqhEJQhWhPjwQ5ofDIZ9IuchchKxk=";
+    hash = "sha256-1TxACD4xXZ3BfVdoQUCzWe5Ovv0tKw6ALBw0+tRLOaQ=";
   };
 
   postPatch = ''

From 5b7aeab9a645a3b65ec9edd9bc1cf2592496cca8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 Jan 2026 12:56:48 +0000
Subject: [PATCH 026/235] android-studio-tools: 13114758 -> 14742923

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

diff --git a/pkgs/by-name/an/android-studio-tools/package.nix b/pkgs/by-name/an/android-studio-tools/package.nix
index 21cf5da0d646..a461d9b81ec7 100644
--- a/pkgs/by-name/an/android-studio-tools/package.nix
+++ b/pkgs/by-name/an/android-studio-tools/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "android-studio-tools";
-  version = "13114758";
+  version = "14742923";
 
   src = fetchzip {
     # The only difference between the Linux and Mac versions is a single comment at the top of all the scripts
     # Therefore, we will use the Linux version and just patch the comment
-    url = "https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip";
-    hash = "sha256-dt8nwjL8wyRfBZOedCPYXh7zyeMUeH0gOPpTcpxCegU=";
+    url = "https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip";
+    hash = "sha256-oimC4ToDFIa8Rlv+5RB+swl8M5PHdX4omlrMZMQEx8M=";
   };
 
   postPatch = ''

From 7270a95b86887360273f07ce23a0c0f795bf7460 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 21 Jan 2026 20:40:56 +0100
Subject: [PATCH 027/235] gurobi: 13.0.0 -> 13.0.1

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

diff --git a/pkgs/by-name/gu/gurobi/package.nix b/pkgs/by-name/gu/gurobi/package.nix
index c4f46219617e..d99af02c6525 100644
--- a/pkgs/by-name/gu/gurobi/package.nix
+++ b/pkgs/by-name/gu/gurobi/package.nix
@@ -16,14 +16,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gurobi";
-  version = "13.0.0";
+  version = "13.0.1";
 
   src = fetchurl {
     url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_${platform}.tar.gz";
     hash =
       {
-        aarch64-linux = "sha256-0wFhMzLK1QViDc0ZLM/oVemtRW0g+FRJRFFOL/eiOFE=";
-        x86_64-linux = "sha256-mEVUVXCeizSzQDLtkNS/EkaxT0MToxL3x3UGb/XB9lI=";
+        aarch64-linux = "sha256-MQDqu95e+fJ00FGtYVw2FlkZ6uhl5eTFefpsA0ti+jI=";
+        x86_64-linux = "sha256-7GIyF6xfoGV3madS7XwCshQfu5wP80Ep1uH4yaj+Ttg=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 19268d860b20429269c885c75759cc18641e825c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 21 Jan 2026 20:41:20 +0100
Subject: [PATCH 028/235] python3Packages.gurobipy: 13.0.0 -> 13.0.1

---
 .../python-modules/gurobipy/default.nix       | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix
index 7243c2ea8672..55c0b731a2b8 100644
--- a/pkgs/development/python-modules/gurobipy/default.nix
+++ b/pkgs/development/python-modules/gurobipy/default.nix
@@ -10,21 +10,26 @@ let
   format = "wheel";
   pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   platforms = rec {
-    aarch64-darwin = "macosx_10_13_universal2";
+    aarch64-darwin =
+      if pyShortVersion == "cp314" then "macosx_10_15_universal2" else "macosx_10_13_universal2";
     aarch64-linux = "manylinux_2_26_aarch64";
     x86_64-darwin = aarch64-darwin;
     x86_64-linux = "manylinux2014_x86_64.manylinux_2_17_x86_64";
   };
   platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
   hashes = rec {
-    cp312-aarch64-darwin = "sha256-qbdDlsAHHrRDijyLgYZMVKjoqxBPEFhNf+ZHQ0Qo+08=";
-    cp312-aarch64-linux = "sha256-1cfo6K3h1l6hzbHNIK2H0Y9uejjyFWAYlczUSvyTLOE=";
+    cp312-aarch64-darwin = "sha256-hQ9VN5Wl8RQ53ShE5q/LqzgNsZHX27W7b05rGeH95jc=";
+    cp312-aarch64-linux = "sha256-wKQjIAmhM+Smk3XzzlR8ZtwxJpr8hvbV15QTfSMxuE8=";
     cp312-x86_64-darwin = cp312-aarch64-darwin;
-    cp312-x86_64-linux = "sha256-nXcNqkw/Chn+tmcRa1GaQSjTgn3wdnaUbskLOyOSEpo=";
-    cp313-aarch64-darwin = "sha256-9anXslqv9KIxf/Dt7xCAqF6/tQFDlWwOMkQookmXDBE=";
-    cp313-aarch64-linux = "sha256-0x5gOK+m0LygVFuh6hGfNyaWXclNdfuBppqq7Pu3FoI=";
+    cp312-x86_64-linux = "sha256-yISDKQFJYKZAxXE2vyrcanXcc3FvUHKcpshtaLnwtrI=";
+    cp313-aarch64-darwin = "sha256-j8E8zsPr1m4q7p1i4ihUuzPSczbRKuZGWp0C/oNx0Lc=";
+    cp313-aarch64-linux = "sha256-QvHfssbnKwoBmcqqBbOP2wLclJ7xol6054n8XqUtk44=";
     cp313-x86_64-darwin = cp313-aarch64-darwin;
-    cp313-x86_64-linux = "sha256-rSAMw5aAp+Emz2Xlo2GXrbVsvKRw/CcxcF441N/IsTw=";
+    cp313-x86_64-linux = "sha256-wVm6yMfrL0rMgVebo/WGAyb7LKOp139g8U0GhgCbRoc=";
+    cp314-aarch64-darwin = "sha256-QCytKZtPSzdGDKg0LjFbJS/y5whqa8mcotNfecYXPVw=";
+    cp314-aarch64-linux = "sha256-qHAOVJwmZ6ojUDSmFJrxaiE4unwfns0VtVdUcEq2zq8=";
+    cp314-x86_64-darwin = cp314-aarch64-darwin;
+    cp314-x86_64-linux = "sha256-WUSCCjJ4uWTwxIsasIOizEmZ9HuZBoWVV0F3wPiXOCY=";
   };
   hash =
     hashes."${pyShortVersion}-${stdenv.system}"
@@ -32,7 +37,7 @@ let
 in
 buildPythonPackage rec {
   pname = "gurobipy";
-  version = "13.0.0";
+  version = "13.0.1";
   inherit format;
 
   src = fetchPypi {

From 10c50b1eb9ba57600a6a91138f99b10962b04d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 21 Jan 2026 16:45:51 -0800
Subject: [PATCH 029/235] python3Packages.essent-dynamic-pricing: 0.2.7 ->
 0.3.1

Diff: https://github.com/jaapp/py-essent-dynamic-pricing/compare/0.2.7...v0.3.1

Changelog: https://github.com/jaapp/py-essent-dynamic-pricing/releases/tag/v0.3.1
---
 .../python-modules/essent-dynamic-pricing/default.nix      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/essent-dynamic-pricing/default.nix b/pkgs/development/python-modules/essent-dynamic-pricing/default.nix
index 73e8eb909fbf..b30e6a2dccce 100644
--- a/pkgs/development/python-modules/essent-dynamic-pricing/default.nix
+++ b/pkgs/development/python-modules/essent-dynamic-pricing/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "essent-dynamic-pricing";
-  version = "0.2.7";
+  version = "0.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jaapp";
     repo = "py-essent-dynamic-pricing";
-    tag = version;
-    hash = "sha256-jYSyFZ4b6zyfIvT9KkvffH2CteHgy844O76UjUcaTq0=";
+    tag = "v${version}";
+    hash = "sha256-98dh9XNXIVDI0w0/RqEGnDbDpQQoaZz/TvMIl6t3c3o=";
   };
 
   build-system = [ hatchling ];
@@ -36,6 +36,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://github.com/jaapp/py-essent-dynamic-pricing/releases/tag/${src.tag}";
     description = "Async client for Essent dynamic energy prices";
     homepage = "https://github.com/jaapp/py-essent-dynamic-pricing";
     license = lib.licenses.mit;

From ad60ff793718c10a892e38ab515719a0e9abb036 Mon Sep 17 00:00:00 2001
From: Yuxuan Shui <yshuiv7@gmail.com>
Date: Thu, 22 Jan 2026 05:53:36 +0000
Subject: [PATCH 030/235] rocm-modules: use clr.localGpuTargets everywhere

---
 pkgs/development/rocm-modules/hipcub/default.nix     | 2 +-
 pkgs/development/rocm-modules/hipfft/default.nix     | 2 +-
 pkgs/development/rocm-modules/hiprand/default.nix    | 2 +-
 pkgs/development/rocm-modules/hipsparse/default.nix  | 2 +-
 pkgs/development/rocm-modules/mivisionx/default.nix  | 2 +-
 pkgs/development/rocm-modules/rocalution/default.nix | 2 +-
 pkgs/development/rocm-modules/rocprim/default.nix    | 2 +-
 pkgs/development/rocm-modules/rocthrust/default.nix  | 2 +-
 pkgs/development/rocm-modules/rocwmma/default.nix    | 2 +-
 pkgs/development/rocm-modules/rpp/default.nix        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix
index d0a7f7815bf4..9a6fb3cd2587 100644
--- a/pkgs/development/rocm-modules/hipcub/default.nix
+++ b/pkgs/development/rocm-modules/hipcub/default.nix
@@ -11,7 +11,7 @@
   gbenchmark,
   buildTests ? false,
   buildBenchmarks ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:
 
 # CUB can also be used as a backend instead of rocPRIM.
diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix
index 0439197337cd..b1726c6208bb 100644
--- a/pkgs/development/rocm-modules/hipfft/default.nix
+++ b/pkgs/development/rocm-modules/hipfft/default.nix
@@ -15,7 +15,7 @@
   buildTests ? false,
   buildBenchmarks ? false,
   buildSamples ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:
 
 # Can also use cuFFT
diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix
index 8854b4dc4827..dfa32eabca5f 100644
--- a/pkgs/development/rocm-modules/hiprand/default.nix
+++ b/pkgs/development/rocm-modules/hiprand/default.nix
@@ -9,7 +9,7 @@
   rocrand,
   gtest,
   buildTests ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix
index 033250e16725..8c7981ac3fea 100644
--- a/pkgs/development/rocm-modules/hipsparse/default.nix
+++ b/pkgs/development/rocm-modules/hipsparse/default.nix
@@ -13,7 +13,7 @@
   buildTests ? false,
   buildBenchmarks ? false,
   buildSamples ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:
 
 # This can also use cuSPARSE as a backend instead of rocSPARSE
diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix
index 40107372e408..9fe480c40ad1 100644
--- a/pkgs/development/rocm-modules/mivisionx/default.nix
+++ b/pkgs/development/rocm-modules/mivisionx/default.nix
@@ -25,7 +25,7 @@
   useOpenCL ? false,
   useCPU ? false,
   buildDocs ? false, # Needs internet
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix
index e40b0598a856..3e5ed45332d1 100644
--- a/pkgs/development/rocm-modules/rocalution/default.nix
+++ b/pkgs/development/rocm-modules/rocalution/default.nix
@@ -17,7 +17,7 @@
   buildTests ? false,
   buildBenchmarks ? false,
   buildSamples ? false,
-  gpuTargets ? [ ], # gpuTargets = [ "gfx803" "gfx900:xnack-" "gfx906:xnack-" ... ]
+  gpuTargets ? clr.localGpuTargets or [ ], # gpuTargets = [ "gfx803" "gfx900:xnack-" "gfx906:xnack-" ... ]
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix
index f1769f266292..9c6b8632811a 100644
--- a/pkgs/development/rocm-modules/rocprim/default.nix
+++ b/pkgs/development/rocm-modules/rocprim/default.nix
@@ -10,7 +10,7 @@
   gbenchmark,
   buildTests ? false,
   buildBenchmarks ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix
index 940bedc8fa83..370cbb7231e0 100644
--- a/pkgs/development/rocm-modules/rocthrust/default.nix
+++ b/pkgs/development/rocm-modules/rocthrust/default.nix
@@ -10,7 +10,7 @@
   gtest,
   buildTests ? false,
   buildBenchmarks ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix
index 6b3800c83b12..9df686e80816 100644
--- a/pkgs/development/rocm-modules/rocwmma/default.nix
+++ b/pkgs/development/rocm-modules/rocwmma/default.nix
@@ -14,7 +14,7 @@
   buildExtendedTests ? false,
   buildBenchmarks ? false,
   buildSamples ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix
index bfa3849a3987..a6bde2eca82b 100644
--- a/pkgs/development/rocm-modules/rpp/default.nix
+++ b/pkgs/development/rocm-modules/rpp/default.nix
@@ -14,7 +14,7 @@
   buildDocs ? false, # Needs internet
   useOpenCL ? false,
   useCPU ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:
 
 stdenv.mkDerivation (finalAttrs: {

From 9d02adc0cb291789d03501afc8007fea6a33ef91 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 22 Jan 2026 13:56:47 +0200
Subject: [PATCH 031/235] intel2200BGFirmware: split doc output

---
 pkgs/by-name/in/intel2200BGFirmware/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/intel2200BGFirmware/package.nix b/pkgs/by-name/in/intel2200BGFirmware/package.nix
index 6fd21c618244..de67d222b3d0 100644
--- a/pkgs/by-name/in/intel2200BGFirmware/package.nix
+++ b/pkgs/by-name/in/intel2200BGFirmware/package.nix
@@ -13,13 +13,18 @@ stdenvNoCC.mkDerivation rec {
     hash = "sha256-xoGMEcGMwDDVX/g/ZLK62P7vSF53QvhPlKYdgRpiWL0=";
   };
 
+  outputs = [
+    "out"
+    "doc"
+  ];
+
   installPhase = ''
     runHook preInstall
 
     install -D -m644 ipw2200-bss.fw     $out/lib/firmware/ipw2200-bss.fw
     install -D -m644 ipw2200-ibss.fw    $out/lib/firmware/ipw2200-ibss.fw
     install -D -m644 ipw2200-sniffer.fw $out/lib/firmware/ipw2200-sniffer.fw
-    install -D -m644 LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE
+    install -D -m644 LICENSE.ipw2200-fw ''${!outputDoc}/share/doc/intel2200BGFirmware/LICENSE
 
     runHook postInstall
   '';

From 7317f53279c6b568501263558c99feb12c8882d9 Mon Sep 17 00:00:00 2001
From: ivanbrennan <ivan.brennan@gmail.com>
Date: Sat, 17 Jan 2026 17:33:37 -0500
Subject: [PATCH 032/235] pam_fde_boot_pw: init at 0-unstable-2025-02-14
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add pam_fde_boot_pw, a PAM module that transfers a password from the
kernel keyring (for example, the passphrase used to unlock an encrypted
disk) into the PAM session. This enables user-space keyrings, such as
gnome-keyring, to be automatically unlocked.

Unlike pam_systemd_loadkey, which operates in the authentication phase
via an auth rule, pam_fde_boot_pw integrates into the session phase via
a session rule. This makes it effective for greetd auto-login setups,
where the authentication stack is skipped entirely.

An example configuration could contain:

    # Enable a systemd-based initrd so the LUKS passphrase entered at boot
    # is stored in the kernel keyring.
    boot.initrd.systemd.enable = true;

    # Configure the login PAM stack to unlock the user’s default GNOME
    # keyring when a password is available.
    security.pam.services.login.enableGnomeKeyring = true;

    # Configure greetd’s PAM stack to:
    #  - delegate most operations to login's PAM stack
    #  - transfer the LUKS passphrase into the PAM session during auto-login
    #  - inject the passphrase for use by gnome-keyring
    security.pam.services.greetd.text = ''
      auth      substack      login
      account   include       login
      password  substack      login
      session   optional      ${pkgs.pam_fde_boot_pw}/lib/security/pam_fde_boot_pw.so inject_for=gkr
      session   include       login
    '';

    services.greetd = {
      enable = true;
      settings = {
        # Automatically start a user session on boot.
        initial_session = {
          command = "sway";
          user = "john";
        };

        # Start a greeter after the initial session exits.
        default_session = {
          command = "${pkgs.cage}/bin/cage -s -d -- gtkgreet";
        };
      };
    };
---
 pkgs/by-name/pa/pam_fde_boot_pw/package.nix | 51 +++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/pa/pam_fde_boot_pw/package.nix

diff --git a/pkgs/by-name/pa/pam_fde_boot_pw/package.nix b/pkgs/by-name/pa/pam_fde_boot_pw/package.nix
new file mode 100644
index 000000000000..59f087daea56
--- /dev/null
+++ b/pkgs/by-name/pa/pam_fde_boot_pw/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromSourcehut,
+  meson,
+  ninja,
+  pkg-config,
+  pam,
+  keyutils,
+}:
+
+stdenv.mkDerivation {
+  pname = "pam_fde_boot_pw";
+  version = "0-unstable-2025-02-14";
+
+  src = fetchFromSourcehut {
+    owner = "~kennylevinsen";
+    repo = "pam_fde_boot_pw";
+    rev = "49bf498fd8d13f73e4a24221818a8a5d2af20088";
+    hash = "sha256-dS9ufryg3xfxgUzJKDgrvMZP2qaYH+WJQFw1ogl1isc=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    pam
+    keyutils
+  ];
+
+  mesonFlags = [
+    (lib.mesonOption "pam-mod-dir" "${placeholder "out"}/lib/security")
+  ];
+
+  meta = {
+    description = "PAM module for leveraging disk encryption password in the PAM session";
+    longDescription = ''
+      pam_fde_boot_pw transfers a password from the kernel keyring (for example,
+      the passphrase used to unlock an encrypted disk) into the PAM session.
+      This enables user-space keyrings, such as gnome-keyring, to be
+      automatically unlocked.
+    '';
+    homepage = "https://git.sr.ht/~kennylevinsen/pam_fde_boot_pw";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ivanbrennan ];
+  };
+}

From 45c1249c8a0c557bc833574f67949be5aa29bdc7 Mon Sep 17 00:00:00 2001
From: Samuel Ainsworth <skainsworth@gmail.com>
Date: Thu, 22 Jan 2026 17:52:09 -0500
Subject: [PATCH 033/235] python3Packages.ducc0: 0.39.1 -> 0.40.0

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

diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix
index f782562c94a6..7262ba256ab8 100644
--- a/pkgs/development/python-modules/ducc0/default.nix
+++ b/pkgs/development/python-modules/ducc0/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "ducc0";
-  version = "0.39.1";
+  version = "0.40.0";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "mtr";
     repo = "ducc";
     tag = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-8nM7Jnxx1NoQQwL0VyPGLzdq1UW5apjxKa1ksq2Qh6U=";
+    hash = "sha256-0QzCY9E79hRrLQwxrB6t04NUM6sDQmWIyl/y0H0R3ak=";
   };
 
   postPatch = ''

From 6a69c715d23419257f10e400919ba37fdc714961 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 Jan 2026 22:57:42 +0000
Subject: [PATCH 034/235] jellyfin-tui: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index e540277cf49f..8f85c39e915d 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jellyfin-tui";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "dhonus";
     repo = "jellyfin-tui";
     tag = "v${version}";
-    hash = "sha256-AzeIoPdFfuzDrSPcAWqYq9sTHpLR222cz7BMHgVpmNA=";
+    hash = "sha256-D3AzGrh04D05+v+t3gVZU68KlHM9HbaAx5dY2utJeFU=";
   };
 
-  cargoHash = "sha256-a08yTZAzBSldSJ+TulU10aF+wLYCAxCA4WRMNfZOWFw=";
+  cargoHash = "sha256-u8W67NYHZh798bgGfwpXhQxZ/BZFUCZ+gWAr5Pv/W8M=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From b0fdb2e32a740d76619ab424adf33c65c01c674d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 19 Jan 2026 14:55:51 +0100
Subject: [PATCH 035/235] android-studio: use pname and version instead of name

---
 pkgs/applications/editors/android-studio/common.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 8c837cfdd851..a4ac00d73bf3 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -80,11 +80,11 @@
 }:
 
 let
-  drvName = "android-studio-${channel}-${version}";
   filename = "android-studio-${version}-linux.tar.gz";
 
   androidStudio = stdenv.mkDerivation {
-    name = "${drvName}-unwrapped";
+    pname = "${pname}-unwrapped";
+    inherit version;
 
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/${filename}";
@@ -228,7 +228,7 @@ let
   # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS
   # environment is used as a work around for that.
   fhsEnv = buildFHSEnv {
-    pname = "${drvName}-fhs-env";
+    pname = "${pname}-fhs-env";
     inherit version;
     multiPkgs = pkgs: [
       ncurses5
@@ -245,8 +245,9 @@ let
       androidStudio,
       androidSdk ? null,
     }:
-    runCommand drvName
+    runCommand "${pname}-${version}"
       {
+        inherit pname version;
         startScript =
           let
             hasAndroidSdk = androidSdk != null;
@@ -283,7 +284,7 @@ let
                 unset ANDROID_HOME
               fi
             ''}
-            exec ${fhsEnv}/bin/${drvName}-fhs-env ${lib.getExe androidStudio} "$@"
+            exec ${lib.getExe fhsEnv} ${lib.getExe androidStudio} "$@"
           '';
         preferLocalBuild = true;
         allowSubstitutes = false;
@@ -292,7 +293,6 @@ let
             withSdk = androidSdk: mkAndroidStudioWrapper { inherit androidStudio androidSdk; };
           in
           {
-            inherit version;
             unwrapped = androidStudio;
             full = withSdk androidenv.androidPkgs.androidsdk;
             inherit withSdk;

From 0291e2649e75883a0b641e7b2414e223b4539138 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 23 Jan 2026 09:01:57 +0000
Subject: [PATCH 036/235] python3Packages.torchtune: skip failing tests on
 x86_64-linux

---
 pkgs/development/python-modules/torchtune/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/torchtune/default.nix b/pkgs/development/python-modules/torchtune/default.nix
index ce757924e984..61d4a5e1eefa 100644
--- a/pkgs/development/python-modules/torchtune/default.nix
+++ b/pkgs/development/python-modules/torchtune/default.nix
@@ -111,6 +111,14 @@ buildPythonPackage (finalAttrs: {
     "test_forward_with_curr_pos"
     "test_forward_with_packed_pos"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+    # RuntimeError: Error in dlopen:
+    # /tmp/yae2xK/mha/data/aotinductor/model/ckk2zlroqn6hgq5vvpy7bcjikztqmwqkek3njxe2gvvwp244hjny.wrapper.so:
+    # cannot enable executable stack as shared object requires: Invalid argument
+    "test_attention_aoti"
+    "test_tile_positional_embedding_aoti"
+    "test_tiled_token_positional_embedding_aoti"
+  ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
     # Fatal Python error: Segmentation fault
     "test_forward_gqa"

From 494359cf70fd5dcc504651e81073faf579ca3be1 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 23 Jan 2026 11:11:36 +0100
Subject: [PATCH 037/235] flare: use pname and version instead of name

---
 pkgs/by-name/fl/flare/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fl/flare/package.nix b/pkgs/by-name/fl/flare/package.nix
index 97ecef417fa0..40816cf42efd 100644
--- a/pkgs/by-name/fl/flare/package.nix
+++ b/pkgs/by-name/fl/flare/package.nix
@@ -6,7 +6,8 @@
 }:
 
 buildEnv {
-  name = "flare-1.14";
+  pname = "flare";
+  version = "1.14";
 
   paths = [
     (callPackage ./engine.nix { })

From ed6b0a3c1a285be898f4ade539aadd61f31e386b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 23 Jan 2026 10:41:30 +0000
Subject: [PATCH 038/235] python3Packages.executorch: skip failing tests on
 x86_64-linux

---
 pkgs/development/python-modules/executorch/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix
index 95d8a94df950..bc2daeadad6b 100644
--- a/pkgs/development/python-modules/executorch/default.nix
+++ b/pkgs/development/python-modules/executorch/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   pkgs,
   buildPythonPackage,
   fetchFromGitHub,
@@ -198,6 +199,15 @@ buildPythonPackage (finalAttrs: {
     "test_resnet18_export_to_executorch"
     "test_resnet50_export_to_executorch"
     "test_vit_export_to_executorch"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+    # RuntimeError: Error in dlopen:
+    # /tmp/AP8CBk/vision_encoder/data/aotinductor/model/chm6ca425mbz7jdmmwcbnyrm6x6tedrfmaoyr4vee625vxhjibbt.wrapper.so:
+    # cannot enable executable stack as shared object requires: Invalid argument
+    "TestImageTransform"
+    "test_flamingo_vision_encoder"
+    "test_llama3_2_text_decoder_aoti"
+    "test_tile_positional_embedding_aoti"
   ];
 
   meta = {

From 3cbd76e51f54186437ab9e16552d54ce26cc219d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Jan 2026 12:46:21 +0200
Subject: [PATCH 039/235] nilfs-utils: split man & dev outputs

---
 pkgs/by-name/ni/nilfs-utils/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ni/nilfs-utils/package.nix b/pkgs/by-name/ni/nilfs-utils/package.nix
index 11be16b0b432..85be191214b9 100644
--- a/pkgs/by-name/ni/nilfs-utils/package.nix
+++ b/pkgs/by-name/ni/nilfs-utils/package.nix
@@ -51,6 +51,12 @@ stdenv.mkDerivation rec {
     find . -name .libs -exec rm -rf -- {} +
   '';
 
+  outputs = [
+    "out"
+    "man"
+    "dev"
+  ];
+
   meta = {
     description = "NILFS utilities";
     maintainers = [ lib.maintainers.raskin ];

From cc83154976d6440b3736f4ed5da16d935c5a7c3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Jan 2026 12:35:33 +0000
Subject: [PATCH 040/235] simgear: 2024.1.3 -> 2024.1.4

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

diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix
index a4f76566cc64..ceb75ffa3579 100644
--- a/pkgs/by-name/si/simgear/package.nix
+++ b/pkgs/by-name/si/simgear/package.nix
@@ -28,7 +28,7 @@
   c-ares,
 }:
 let
-  version = "2024.1.3";
+  version = "2024.1.4";
 in
 stdenv.mkDerivation rec {
   pname = "simgear";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "flightgear";
     repo = "simgear";
     tag = version;
-    hash = "sha256-1zbw/lIjTbVwhxHPvXRlxPmYJeWmKvPE/RDrTL0PXb4=";
+    hash = "sha256-WJI15egN1H+EAIaFuI3svYCvM0xzsIGcIPsZgLsvBc0=";
   };
 
   nativeBuildInputs = [ cmake ];

From b80b16d3bbb901c9073b0deb3a77af61c7475e9e Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 23 Jan 2026 10:21:13 +0100
Subject: [PATCH 041/235] onlyoffice-documentserver: reintroduce mobile assets

These got lost in #473316
---
 pkgs/by-name/x2/x2t/package.nix               | 120 ++++++++++++++++--
 .../x2/x2t/web-apps-mobile-no-spinner.patch   |  20 +++
 pkgs/by-name/x2/x2t/web-apps-no-mobile.patch  |  13 ++
 3 files changed, 143 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/x2/x2t/web-apps-mobile-no-spinner.patch
 create mode 100644 pkgs/by-name/x2/x2t/web-apps-no-mobile.patch

diff --git a/pkgs/by-name/x2/x2t/package.nix b/pkgs/by-name/x2/x2t/package.nix
index 79c1f78f0e03..9d619cdfd18e 100644
--- a/pkgs/by-name/x2/x2t/package.nix
+++ b/pkgs/by-name/x2/x2t/package.nix
@@ -15,14 +15,15 @@
   icu,
   jdk,
   lib,
-  # workaround https://github.com/NixOS/nixpkgs/issues/477805
   nodejs_22,
   # needs to be static and built with MD2 support!
   openssl,
   pkg-config,
+  python3,
   qt5,
   runCommand,
   stdenv,
+  writers,
   writeScript,
   x2t,
   grunt-cli,
@@ -30,7 +31,6 @@
 
 let
   qmake = qt5.qmake;
-  libv8 = nodejs_22.libv8;
   fixIcu = writeScript "fix-icu.sh" ''
     substituteInPlace \
       $BUILDRT/Common/3dParty/icu/icu.pri \
@@ -131,8 +131,90 @@ let
     rev = core-rev;
     hash = "sha256-RSoCRcUGnavcNdZEfmBdtxJbEXhiOvbA8IwSeGBkWcs=";
   };
+  # mini implementation of https://github.com/kentcdodds/cross-env
+  # because that was not trivial to package and we don't need most
+  # of its functionality anyway
+  cross-env = writers.writePython3Bin "cross-env" { } ''
+    import os
+    import subprocess
+    import sys
+
+    env = os.environ
+    cmd = []
+
+    for k in sys.argv[1:]:
+        if '=' in k:
+            env[k.split('=')[0]] = k.split('=')[1]
+        else:
+            cmd += [k]
+
+    subprocess.run(cmd, env=env)
+  '';
+  # rev that the 'web-apps' submodule in documentserver points at
+  web-apps-rev = "c2074bbff69902490d49fa7fb511801a11c581f4";
+  web-apps-hash = "sha256-i+m8a1b8RaVmyUAC+FiEdSyXmPWse9XaJaaLL7iq73o=";
+  web-apps-mobile = buildNpmPackage (finalAttrs: {
+    name = "web-apps-mobile";
+
+    src = fetchFromGitHub {
+      owner = "ONLYOFFICE";
+      repo = "web-apps";
+      rev = web-apps-rev;
+      hash = web-apps-hash;
+    };
+
+    patches = [
+      # the spinner floods the output to the point of
+      # exhausting memory...
+      ./web-apps-mobile-no-spinner.patch
+    ];
+
+    sourceRoot = "${finalAttrs.src.name}/vendor/framework7-react";
+
+    npmDepsHash = "sha256-EBUseLFZ5Hc1DHRWL/2erOjlxfm4wHgyIURi5XTXNP8=";
+
+    dontNpmBuild = true;
+
+    preBuild = ''
+      export PRODUCT_VERSION=${version}
+      # 'd' is for 'debug'
+      export BUILD_NUMBER=$(echo "${web-apps-rev}" | tr d _)
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      chmod u+wx ../../apps/*/mobile
+
+      npm run deploy-word
+      mkdir -p $out/documenteditor/mobile
+      mv ../../apps/documenteditor/mobile/css $out/documenteditor/mobile
+      mv ../../apps/documenteditor/mobile/dist $out/documenteditor/mobile
+      mv ../../apps/documenteditor/mobile/index.html $out/documenteditor/mobile
+
+      npm run deploy-cell
+      mkdir -p $out/spreadsheeteditor/mobile
+      mv ../../apps/spreadsheeteditor/mobile/css $out/spreadsheeteditor/mobile
+      mv ../../apps/spreadsheeteditor/mobile/dist $out/spreadsheeteditor/mobile
+      mv ../../apps/spreadsheeteditor/mobile/index.html $out/spreadsheeteditor/mobile
+
+      npm run deploy-slide
+      mkdir -p $out/presentationeditor/mobile
+      mv ../../apps/presentationeditor/mobile/css $out/presentationeditor/mobile
+      mv ../../apps/presentationeditor/mobile/dist $out/presentationeditor/mobile
+      mv ../../apps/presentationeditor/mobile/index.html $out/presentationeditor/mobile
+
+      npm run deploy-visio
+      mkdir -p $out/visioeditor/mobile
+      mv ../../apps/visioeditor/mobile/css $out/visioeditor/mobile
+      mv ../../apps/visioeditor/mobile/dist $out/visioeditor/mobile
+      mv ../../apps/visioeditor/mobile/index.html $out/visioeditor/mobile
+
+      runHook postInstall
+    '';
+  });
   web-apps = buildNpmPackage (finalAttrs: {
-    name = "onlyoffice-core-webapps";
+    name = "onlyoffice-core-web-apps";
 
     # workaround for https://github.com/NixOS/nixpkgs/issues/477803
     nodejs = nodejs_22;
@@ -141,13 +223,16 @@ let
       owner = "ONLYOFFICE";
       repo = "web-apps";
       # rev that the 'web-apps' submodule in documentserver points at
-      rev = "c2074bbff69902490d49fa7fb511801a11c581f4";
-      hash = "sha256-i+m8a1b8RaVmyUAC+FiEdSyXmPWse9XaJaaLL7iq73o=";
+      rev = web-apps-rev;
+      hash = web-apps-hash;
     };
     sourceRoot = "${finalAttrs.src.name}/build";
 
     patches = [
       ./web-apps-avoid-phantomjs.patch
+      # mobile resources are created separately
+      # in the web-apps-mobile derivation
+      ./web-apps-no-mobile.patch
     ];
 
     npmDepsHash = "sha256-Uen7gl6w/0A4MDk+7j+exkdwfCYqMSPJidad8AM60eQ=";
@@ -163,6 +248,10 @@ let
 
     preBuild = ''
       export PRODUCT_VERSION=${version}
+
+      # for device_scale.js
+      chmod u+rwx ../..
+      ln -s ${sdkjs.src} ../../sdkjs
     '';
 
     postBuild = ''
@@ -173,13 +262,20 @@ let
       mkdir -p ./node_modules/optipng-bin/vendor
       ln -s ${optipng}/bin/optipng ./node_modules/optipng-bin/vendor/optipng
 
-      grunt --force
+      grunt
     '';
 
     installPhase = ''
       runHook preInstall
 
-      cp -r ../deploy/web-apps $out
+      mv ../deploy/web-apps $out
+
+      for component in documenteditor spreadsheeteditor presentationeditor visioeditor; do
+        ln -s ${web-apps-mobile}/$component/mobile/css $out/apps/$component/mobile/css
+        rm -r $out/apps/$component/mobile/dist
+        ln -s ${web-apps-mobile}/$component/mobile/dist $out/apps/$component/mobile/dist
+        ln -s ${web-apps-mobile}/$component/mobile/index.html $out/apps/$component/mobile/index.html
+      done
 
       runHook postInstall
     '';
@@ -220,7 +316,8 @@ let
     installPhase = ''
       runHook preInstall
 
-      cp -r ../deploy/sdkjs $out
+      mv ../deploy/sdkjs $out
+      cp ../common/device_scale.js $out/common
 
       runHook postInstall
     '';
@@ -633,8 +730,9 @@ let
 
       echo "== v8 =="
       mkdir -p Common/3dParty/v8_89/v8/out.gn/linux_64
-      ln -s ${libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj
-      tar xf ${libv8.src} --one-top-level=/tmp/xxxxx
+      # using nodejs_22 here is a workaround for https://github.com/NixOS/nixpkgs/issues/477805
+      ln -s ${nodejs_22.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj
+      tar xf ${nodejs_22.libv8.src} --one-top-level=/tmp/xxxxx
       for i in /tmp/xxxxx/*/deps/v8/*; do
         cp -r $i Common/3dParty/v8_89/v8/
       done
@@ -868,6 +966,8 @@ buildCoreComponent "X2tConverter/build/Qt" {
       fb2file
       iworkfile
       web-apps
+      web-apps-mobile
+      cross-env
       sdkjs
       dictionaries
       ;
diff --git a/pkgs/by-name/x2/x2t/web-apps-mobile-no-spinner.patch b/pkgs/by-name/x2/x2t/web-apps-mobile-no-spinner.patch
new file mode 100644
index 000000000000..b07f420dc4d6
--- /dev/null
+++ b/pkgs/by-name/x2/x2t/web-apps-mobile-no-spinner.patch
@@ -0,0 +1,20 @@
+diff --git a/vendor/framework7-react/build/build.js b/vendor/framework7-react/build/build.js
+index 50828275f1..48a609e033 100644
+--- a/build/build.js
++++ b/build/build.js
+@@ -12,14 +12,13 @@ Promise.all([
+     const { default: ora } = oramodule,
+         { default: chalk } = chalkmodule;
+ 
+-    const spinner = ora(env === 'production' ? 'building for production...' : 'building development version...').start();
++    console.log(env === 'production' ? 'building for production...' : 'building development version...');
+ 
+     rm('./www/', (removeErr) => {
+       if (removeErr) throw removeErr;
+ 
+       webpack(config, (err, stats) => {
+         if (err) throw err;
+-        spinner.stop();
+ 
+         process.stdout.write(`${stats.toString({
+           colors: true,
diff --git a/pkgs/by-name/x2/x2t/web-apps-no-mobile.patch b/pkgs/by-name/x2/x2t/web-apps-no-mobile.patch
new file mode 100644
index 000000000000..288af88e42ad
--- /dev/null
+++ b/pkgs/by-name/x2/x2t/web-apps-no-mobile.patch
@@ -0,0 +1,13 @@
+diff --git a/build/Gruntfile.js b/build/Gruntfile.js
+index 044fa02213..d4fac2ff01 100644
+--- a/Gruntfile.js
++++ b/Gruntfile.js
+@@ -830,7 +830,7 @@ module.exports = function(grunt) {
+                                                             'replace:writeVersion', 'replace:prepareHelp', 'clean:postbuild']);
+ 
+     grunt.registerTask('deploy-app-mobile',             ['mobile-app-init', 'clean:deploy', /*'cssmin',*/ /*'copy:template-backup',*/
+-                                                            'htmlmin', /*'requirejs',*/ 'exec:webpack_install', 'exec:webpack_app_build', /*'copy:template-restore',*/
++                                                            'htmlmin', /*'requirejs',*/ /*'exec:webpack_install', 'exec:webpack_app_build',*/ /*'copy:template-restore',*/
+                                                             /*'clean:template-backup',*/ 'copy:localization', 'copy:index-page',
+                                                             'copy:images-app', 'copy:webpack-dist', 'concat', 'json-minify'/*,*/
+                                                             /*'replace:writeVersion', 'replace:fixResourceUrl'*/]);

From 28e364016e6c2521bb6eb7d33a2c4de27ac4d73e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Jan 2026 14:18:27 +0000
Subject: [PATCH 042/235] roslyn-ls: 5.3.0-2.25604.5 -> 5.4.0-2.26062.9

---
 pkgs/by-name/ro/roslyn-ls/deps.json   | 78 +++++++++++++--------------
 pkgs/by-name/ro/roslyn-ls/package.nix |  6 +--
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index d55208802ca9..33418dc5fc0d 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@@ -73,15 +73,15 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.11.0",
-    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.11.0/microsoft.codeanalysis.analyzers.3.11.0.nupkg"
+    "version": "5.3.0-2.25625.1",
+    "hash": "sha256-3SvBNBYQtwJ6My2i66QkaznakuumyCksU7++97I0krU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.3.0-2.25625.1/microsoft.codeanalysis.analyzers.5.3.0-2.25625.1.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-    "version": "3.11.0-beta1.24081.1",
-    "hash": "sha256-5UN//A8oc2w+UoxAwWmXWRXykQD+2mpa1hbJrAfh2Lg=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.bannedapianalyzers.3.11.0-beta1.24081.1.nupkg"
+    "version": "5.4.0-2.26060.102",
+    "hash": "sha256-OxqQo5NUVs1UuWTc/DiAHUY693VJDQCPv5CXuh9x1ow=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.4.0-2.26060.102/microsoft.codeanalysis.bannedapianalyzers.5.4.0-2.26060.102.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
@@ -109,9 +109,9 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
-    "version": "3.11.0-beta1.24081.1",
-    "hash": "sha256-nXx0MSYXVzdr0jcNo9aZLocZU1ywN+n/vdD2kYBh5TI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"
+    "version": "5.4.0-2.26060.102",
+    "hash": "sha256-E5JTn3ZWGipvAkCA6khC0gKtEv+LJm5k64KwlcnwbNg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.4.0-2.26060.102/microsoft.codeanalysis.publicapianalyzers.5.4.0-2.26060.102.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -127,21 +127,21 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "11.0.0-beta.25603.2",
-    "hash": "sha256-xXwq/ffFnDXjMnrzKUAT3Du31tKso7aNW4VBvABHX4M=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25603.2/microsoft.dotnet.arcade.sdk.11.0.0-beta.25603.2.nupkg"
+    "version": "11.0.0-beta.26055.1",
+    "hash": "sha256-7CNAmWFoehsYuE04wgK2MjUrHNXgYIzWGSTVOjpfKPM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.26055.1/microsoft.dotnet.arcade.sdk.11.0.0-beta.26055.1.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.FileBasedPrograms",
-    "version": "10.0.200-preview.0.25556.104",
-    "hash": "sha256-IZMj0EGno5ZlJiicdK+Kxg97IvDaWheVxuMlCPmN1wI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/8ea23ec3-b9b2-4976-90d7-7c4a6f529fdc/nuget/v3/flat2/microsoft.dotnet.filebasedprograms/10.0.200-preview.0.25556.104/microsoft.dotnet.filebasedprograms.10.0.200-preview.0.25556.104.nupkg"
+    "version": "11.0.100-alpha.1.26060.102",
+    "hash": "sha256-2wcbDTV7kJqbRlHaGRtWQw5tBhYP0JBXGPjZcyluU0E=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a57d0dd1-b586-4233-8880-21626fab1f1a/nuget/v3/flat2/microsoft.dotnet.filebasedprograms/11.0.100-alpha.1.26060.102/microsoft.dotnet.filebasedprograms.11.0.100-alpha.1.26060.102.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "11.0.0-beta.25603.2",
-    "hash": "sha256-qLUHUextwX33sSm4oK0N4qpbGEZpz6qOw5kabpJ9Xkk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25603.2/microsoft.dotnet.xlifftasks.11.0.0-beta.25603.2.nupkg"
+    "version": "11.0.0-beta.26055.1",
+    "hash": "sha256-LHQOeR3DyMj30ofpJa7n2gvs6z5qrSrZ4CewTA9bjsk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.26055.1/microsoft.dotnet.xlifftasks.11.0.0-beta.26055.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -253,9 +253,9 @@
   },
   {
     "pname": "Microsoft.ServiceHub.Analyzers",
-    "version": "4.9.11-beta",
-    "hash": "sha256-v4vgNHVeTwxnETMNVxtBzQrnacVF0GyKs/PQSDcAJ1c=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.9.11-beta/microsoft.servicehub.analyzers.4.9.11-beta.nupkg"
+    "version": "4.9.14-beta",
+    "hash": "sha256-VV99hhKmo87BlxUO2nAPeLmsJ/LE35/L2fne/ZkjfcI=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.9.14-beta/microsoft.servicehub.analyzers.4.9.14-beta.nupkg"
   },
   {
     "pname": "Microsoft.ServiceHub.Client",
@@ -265,9 +265,9 @@
   },
   {
     "pname": "Microsoft.ServiceHub.Framework",
-    "version": "4.9.11-beta",
-    "hash": "sha256-sAdzwH8lt1Z44YMGYTTwMSS8uceK8FXWR5h1p3Iu1OQ=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.9.11-beta/microsoft.servicehub.framework.4.9.11-beta.nupkg"
+    "version": "4.9.14-beta",
+    "hash": "sha256-yA/03/aQEepEBSQHilfn3uYQVkEXtOLsH6llghEAuKM=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.9.14-beta/microsoft.servicehub.framework.4.9.14-beta.nupkg"
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
@@ -313,9 +313,9 @@
   },
   {
     "pname": "Microsoft.VisualStudio.Threading",
-    "version": "17.15.20-alpha",
-    "hash": "sha256-/0oB9YozrbcEoew5Tvh0OEE/b3iFHWmO1nzsmS2iDRA=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.15.20-alpha/microsoft.visualstudio.threading.17.15.20-alpha.nupkg"
+    "version": "17.15.22-alpha",
+    "hash": "sha256-LO8aishMaE97UkwqBv21lbmKZNHoKqKrRlbBvkcIGQ4=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.15.22-alpha/microsoft.visualstudio.threading.17.15.22-alpha.nupkg"
   },
   {
     "pname": "Microsoft.VisualStudio.Threading.Analyzers",
@@ -337,9 +337,9 @@
   },
   {
     "pname": "Microsoft.VisualStudio.Threading.Only",
-    "version": "17.15.20-alpha",
-    "hash": "sha256-cBFSercx77Jqw4Z8Af5lu57a2xUmudETNywGN43JR8U=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.only/17.15.20-alpha/microsoft.visualstudio.threading.only.17.15.20-alpha.nupkg"
+    "version": "17.15.22-alpha",
+    "hash": "sha256-+st04bceIFbmImRdFGNZ7DDYKl8Vd+TjTE/xiJQwZcs=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.only/17.15.22-alpha/microsoft.visualstudio.threading.only.17.15.22-alpha.nupkg"
   },
   {
     "pname": "Microsoft.VisualStudio.Utilities.Internal",
@@ -445,9 +445,9 @@
   },
   {
     "pname": "Roslyn.Diagnostics.Analyzers",
-    "version": "3.11.0-beta1.24081.1",
-    "hash": "sha256-wIOhKwvYetwytnuNX0uNC5oyBDU7xAhLqzTvyuGDVMM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg"
+    "version": "5.4.0-2.26060.102",
+    "hash": "sha256-XUTC2E3EdZ4Y+fwL1NoPK1GELYHDLgqlQbwLDWghZ/w=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.4.0-2.26060.102/roslyn.diagnostics.analyzers.5.4.0-2.26060.102.nupkg"
   },
   {
     "pname": "SQLitePCLRaw.bundle_green",
@@ -481,9 +481,9 @@
   },
   {
     "pname": "StreamJsonRpc",
-    "version": "2.23.39-alpha",
-    "hash": "sha256-3gQz0m7BhU6dTj6cDgaY/TFIn0Tl0+CAJl6SXRr4Oxg=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.23.39-alpha/streamjsonrpc.2.23.39-alpha.nupkg"
+    "version": "2.23.41-alpha",
+    "hash": "sha256-zTq/O6hLbOvcpzPwWxKE7a2NdetdFwPOAYw1afvCAbM=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.23.41-alpha/streamjsonrpc.2.23.41-alpha.nupkg"
   },
   {
     "pname": "System.Buffers",
@@ -511,9 +511,9 @@
   },
   {
     "pname": "System.CommandLine",
-    "version": "3.0.0-alpha.1.25570.101",
-    "hash": "sha256-j7PBGIeUwbV/jodHa0CNu4i/+D8mQqFMY2E7k3ALJAY=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-alpha.1.25570.101/system.commandline.3.0.0-alpha.1.25570.101.nupkg"
+    "version": "3.0.0-alpha.1.26060.102",
+    "hash": "sha256-jvTFAZTJWGooqjR1qS86UAOTw1RCaVzNBlBUov404ss=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-alpha.1.26060.102/system.commandline.3.0.0-alpha.1.26060.102.nupkg"
   },
   {
     "pname": "System.ComponentModel.Composition",
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 5c8f3f2eba9d..5777ebae4a9d 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -38,18 +38,18 @@ in
 buildDotnetModule (finalAttrs: rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.111.2-prerelease";
+  vsVersion = "2.113.22-prerelease";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-oP+mKOvsbc+/NnqJvounE75BlE6UJTIAnmYTBNQlMFA=";
+    hash = "sha256-rGkQfyKoRlEa7L7H9iFQkKTCD4dU3OP97XDtRFRAHnc=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.3.0-2.25604.5";
+  version = "5.4.0-2.26062.9";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;

From 6db348ad34005efce96567082717ccc0756f2675 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Mon, 19 Jan 2026 23:40:24 +0800
Subject: [PATCH 043/235] isabelle: fixup and make vscode work

Replace the electron binary and remove unused libs, and fixes the platforms.
---
 pkgs/by-name/is/isabelle/package.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index c0c9d040127a..1a4fef548cc9 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -19,6 +19,7 @@
   isabelle-components,
   symlinkJoin,
   fetchhg,
+  electron,
 }:
 
 let
@@ -192,10 +193,15 @@ stdenv.mkDerivation (finalAttrs: {
     arch=${
       if stdenv.hostPlatform.system == "aarch64-linux" then "arm64-linux" else stdenv.hostPlatform.system
     }
-    for f in contrib/*/$arch/{z3,nunchaku,spass,zipperposition}; do
+    for f in contrib/*/$arch/{z3,nunchaku,SPASS,zipperposition}; do
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.hostPlatform.isAarch64 " || true"}
     done
     patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process
+
+    ln -sf ${electron}/bin/electron contrib/vscodium-*/*/electron
+    rm contrib/vscodium-*/*/*.so{,.*}
+    rm contrib/vscodium-*/*/chrome*
+
     for d in contrib/kodkodi-*/jni/$arch; do
       patchelf --set-rpath "${
         lib.concatStringsSep ":" [
@@ -279,7 +285,12 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [
       lib.maintainers.jvanbruegge
     ];
-    platforms = lib.platforms.unix;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
   };
 
   passthru.withComponents =

From 48d6c3310aabaee019107634b6460d2c5501a931 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Tue, 20 Jan 2026 00:20:09 +0800
Subject: [PATCH 044/235] isabelle: fix permission of copied files

some files are copied from the nix store and may not be writeable, so set them writeable on copy
---
 pkgs/by-name/is/isabelle/fix-copied-permissions.patch | 10 ++++++++++
 pkgs/by-name/is/isabelle/package.nix                  |  6 ++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/by-name/is/isabelle/fix-copied-permissions.patch

diff --git a/pkgs/by-name/is/isabelle/fix-copied-permissions.patch b/pkgs/by-name/is/isabelle/fix-copied-permissions.patch
new file mode 100644
index 000000000000..5bfbd583ac34
--- /dev/null
+++ b/pkgs/by-name/is/isabelle/fix-copied-permissions.patch
@@ -0,0 +1,10 @@
+--- a/src/Pure/System/isabelle_system.scala
++++ b/src/Pure/System/isabelle_system.scala
+@@ -214,6 +214,7 @@ object Isabelle_System {
+         Files.copy(src.toPath, target.toPath,
+           StandardCopyOption.COPY_ATTRIBUTES,
+           StandardCopyOption.REPLACE_EXISTING)
++        target.setWritable(true)
+       }
+       catch {
+         case ERROR(msg) =>
diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index 1a4fef548cc9..2348d50d9bdf 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -119,6 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
     net-tools
   ];
 
+  patches = [
+    # Make "isabelle build" work when generating documents
+    # See: https://github.com/NixOS/nixpkgs/issues/289529
+    ./fix-copied-permissions.patch
+  ];
+
   propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ procps ];
 
   sourceRoot = "${finalAttrs.dirname}${lib.optionalString stdenv.hostPlatform.isDarwin ".app"}";

From 78dbd6c9b40cc0c471fa8f93850cebb48d37fb01 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Tue, 20 Jan 2026 00:22:06 +0800
Subject: [PATCH 045/235] isabelle-linter: change stdenv

---
 pkgs/by-name/is/isabelle/components/isabelle-linter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix
index 879cf0520bb0..f87f2603f36a 100644
--- a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix
+++ b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix
@@ -1,11 +1,11 @@
 {
-  stdenv,
+  stdenvNoCC,
   lib,
   fetchFromGitHub,
   isabelle,
 }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "isabelle-linter";
   version = "2025-1-1.0.0";
 

From 2016a39d8d6bf6201b5108ecfc45d37008d85e40 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Tue, 20 Jan 2026 00:39:22 +0800
Subject: [PATCH 046/235] isabelle: add sempiternal-aurora as maintainer

---
 pkgs/by-name/is/isabelle/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index 2348d50d9bdf..b98d7b615d4d 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -290,6 +290,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     maintainers = [
       lib.maintainers.jvanbruegge
+      lib.maintainers.sempiternal-aurora
     ];
     platforms = [
       "x86_64-linux"

From 3ca9b73b03a7b7d30569479484178dc515c28e63 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Tue, 20 Jan 2026 21:33:42 +0800
Subject: [PATCH 047/235] isaebelle: 2025.1 -> 2025.2

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

diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index b98d7b615d4d..971053bbfe6f 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -88,7 +88,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "isabelle";
-  version = "2025-1";
+  version = "2025-2";
 
   dirname = "Isabelle${finalAttrs.version}";
 
@@ -96,17 +96,17 @@ stdenv.mkDerivation (finalAttrs: {
     if stdenv.hostPlatform.isDarwin then
       fetchurl {
         url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_macos.tar.gz";
-        hash = "sha256-WKlrsXP6oZHy6NTaaQYpddtgE2QGhBZ4uKai61dtQ14=";
+        hash = "sha256-jxh0luKV8WmVLpRHRa+eSuAMnBzS7UytvPfYmOREkT4=";
       }
     else if stdenv.hostPlatform.isx86 then
       fetchurl {
         url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux.tar.gz";
-        hash = "sha256-0SA28X3fIKMV3wZtlJvBxq9MZkI6GevVuSNzgqJ4xQU=";
+        hash = "sha256-ogpQe8fBJw2L6WqfP77AY0U4d4nS3CxNPfYmDUe/szw=";
       }
     else
       fetchurl {
         url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux_arm.tar.gz";
-        hash = "sha256-BUhdK8qhdV2Den+4bbdd9T6MD/BtGpxp+1Axj21NxrI=";
+        hash = "sha256-ZQqWabSgh2da+zQpTYLe0vBwTUfVgN2e1FzdyfF2S90=";
       };
 
   nativeBuildInputs = [ java ];

From ea3ab172b725876cd90886799afcb062ef2d1210 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Tue, 20 Jan 2026 21:34:18 +0800
Subject: [PATCH 048/235] isabelle: Use nix built csdp and cvc5

Replace the bundled binaries of csdp and cvc5 with ones built by nix,
matching the versions expected by isabelle. Also export the isabelle
specific packages through passthru for testing
---
 pkgs/by-name/is/isabelle/package.nix | 84 +++++++++++++++++++---------
 1 file changed, 58 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index 971053bbfe6f..c44851d0e337 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -12,6 +12,8 @@
   verit,
   vampire,
   eprover-ho,
+  cvc5,
+  csdp,
   rlwrap,
   perl,
   procps,
@@ -85,6 +87,16 @@ let
     '';
   };
 
+  cvc5' = cvc5.overrideAttrs {
+    version = "1.2.0";
+    src = fetchFromGitHub {
+      owner = "cvc5";
+      repo = "cvc5";
+      tag = "cvc5-1.2.0";
+      hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
+    };
+  };
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "isabelle";
@@ -117,6 +129,8 @@ stdenv.mkDerivation (finalAttrs: {
     vampire'
     eprover-ho
     net-tools
+    cvc5'
+    csdp
   ];
 
   patches = [
@@ -158,6 +172,17 @@ stdenv.mkDerivation (finalAttrs: {
       VAMPIRE_EXTRA_OPTIONS="--mode casc"
     EOF
 
+    cat >contrib/cvc5-*/etc/settings <<EOF
+      CVC5_HOME=${cvc5'}
+      CVC5_VERSION=${cvc5'.version}
+      CVC5_SOLVER=${cvc5'}/bin/cvc5
+      CVC5_INSTALLED=yes
+    EOF
+
+    cat >contrib/csdp-*/etc/settings <<EOF
+      ISABELLE_CSDP=${csdp}/bin/csdp
+    EOF
+
     cat >contrib/polyml-*/etc/settings <<EOF
       ML_SYSTEM_64=true
       ML_SYSTEM=${polyml'.name}
@@ -174,7 +199,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
 
-    for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do
+    for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* \
+                contrib/e-* contrib/cvc5-* contrib/csdp-*; do
       rm -rf $comp/${if stdenv.hostPlatform.isx86 then "x86" else "arm"}*
     done
     rm -rf contrib/*/src
@@ -300,32 +326,38 @@ stdenv.mkDerivation (finalAttrs: {
     ];
   };
 
-  passthru.withComponents =
-    f:
-    let
-      isabelle = finalAttrs.finalPackage;
-      base = "$out/${isabelle.dirname}";
-      components = f isabelle-components;
-    in
-    symlinkJoin {
-      name = "isabelle-with-components-${isabelle.version}";
-      paths = [ isabelle ] ++ (map (c: c.override { inherit isabelle; }) components);
+  passthru = {
+    vampire = vampire';
+    polyml = polyml';
+    cvc5 = cvc5';
+    sha1 = sha1;
+    withComponents =
+      f:
+      let
+        isabelle = finalAttrs.finalPackage;
+        base = "$out/${isabelle.dirname}";
+        components = f isabelle-components;
+      in
+      symlinkJoin {
+        name = "isabelle-with-components-${isabelle.version}";
+        paths = [ isabelle ] ++ (map (c: c.override { inherit isabelle; }) components);
 
-      postBuild = ''
-        rm $out/bin/*
+        postBuild = ''
+          rm $out/bin/*
 
-        cd ${base}
-        rm bin/*
-        cp ${isabelle}/${isabelle.dirname}/bin/* bin/
-        rm etc/components
-        cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components
+          cd ${base}
+          rm bin/*
+          cp ${isabelle}/${isabelle.dirname}/bin/* bin/
+          rm etc/components
+          cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components
 
-        export HOME=$TMP
-        bin/isabelle install $out/bin
-        patchShebangs $out/bin
-      ''
-      + lib.concatMapStringsSep "\n" (c: ''
-        echo contrib/${c.pname}-${c.version} >> ${base}/etc/components
-      '') components;
-    };
+          export HOME=$TMP
+          bin/isabelle install $out/bin
+          patchShebangs $out/bin
+        ''
+        + lib.concatMapStringsSep "\n" (c: ''
+          echo contrib/${c.pname}-${c.version} >> ${base}/etc/components
+        '') components;
+      };
+  };
 })

From aaa4f5a35d8e2fd964686012c5aa4e73a6648ac2 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 11 Jan 2026 17:43:34 +0200
Subject: [PATCH 049/235] vscode/generic: remove unused deps

---
 pkgs/applications/editors/vscode/generic.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 1c22a86b7dac..cb2748d12733 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -7,8 +7,6 @@
   makeDesktopItem,
   unzip,
   libsecret,
-  libXScrnSaver,
-  libxshmfence,
   buildPackages,
   at-spi2-atk,
   autoPatchelfHook,
@@ -24,7 +22,6 @@
   buildFHSEnv,
   wayland,
   libglvnd,
-  libkrb5,
   openssl,
   webkitgtk_4_1,
 
@@ -225,13 +222,10 @@ stdenv.mkDerivation (
 
     buildInputs = [
       libsecret
-      libXScrnSaver
-      libxshmfence
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       alsa-lib
       at-spi2-atk
-      libkrb5
       libgbm
       nss
       nspr

From 44c52a5a2e122d8b598460af89e36912ecb8fc9e Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 11 Jan 2026 17:44:05 +0200
Subject: [PATCH 050/235] buildVcode: init

---
 pkgs/applications/editors/vscode/generic.nix  | 154 ++++++++++--------
 pkgs/applications/editors/vscode/vscode.nix   |   4 +-
 pkgs/applications/editors/vscode/vscodium.nix |   4 +-
 pkgs/by-name/an/antigravity/package.nix       |  50 +++---
 pkgs/by-name/co/code-cursor/package.nix       |  11 +-
 pkgs/by-name/ki/kiro/package.nix              |   5 +-
 pkgs/by-name/wi/windsurf/package.nix          |   5 +-
 pkgs/top-level/all-packages.nix               |  16 +-
 8 files changed, 118 insertions(+), 131 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index cb2748d12733..7658d5c719d4 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -10,6 +10,7 @@
   buildPackages,
   at-spi2-atk,
   autoPatchelfHook,
+  buildFHSEnv,
   alsa-lib,
   libgbm,
   nss,
@@ -17,21 +18,21 @@
   xorg,
   systemdLibs,
   fontconfig,
+  imagemagick,
   libdbusmenu,
   glib,
-  buildFHSEnv,
   wayland,
   libglvnd,
   openssl,
   webkitgtk_4_1,
-
-  # Populate passthru.tests
-  tests,
+  ripgrep,
 
   # needed to fix "Save as Root"
   asar,
   bash,
+}:
 
+{
   # Attributes inherit from specific versions
   version,
   vscodeVersion ? version,
@@ -51,10 +52,15 @@
   vscodeServer ? null,
   sourceExecutableName ? executableName,
   useVSCodeRipgrep ? false,
-  ripgrep,
   hasVsceSign ? false,
   patchVSCodePath ? true,
-  imagemagick,
+
+  # Populate passthru.tests
+  tests,
+
+  # Customize FHS environment
+  # Function that takes default buildFHSEnv arguments and returns modified arguments
+  customizeFHSEnv ? args: args,
 }:
 
 stdenv.mkDerivation (
@@ -74,82 +80,86 @@ stdenv.mkDerivation (
       {
         additionalPkgs ? pkgs: [ ],
       }:
-      buildFHSEnv {
-        # also determines the name of the wrapped command
-        pname = executableName;
-        inherit version;
+      let
+        defaultArgs = {
+          # also determines the name of the wrapped command
+          pname = executableName;
+          inherit version;
 
-        # additional libraries which are commonly needed for extensions
-        targetPkgs =
-          pkgs:
-          (with pkgs; [
-            # ld-linux-x86-64-linux.so.2 and others
-            glibc
+          # additional libraries which are commonly needed for extensions
+          targetPkgs =
+            pkgs:
+            (with pkgs; [
+              # ld-linux-x86-64-linux.so.2 and others
+              glibc
 
-            # dotnet
-            curl
-            icu
-            libunwind
-            libuuid
-            lttng-ust
-            openssl
-            zlib
+              # dotnet
+              curl
+              icu
+              libunwind
+              libuuid
+              lttng-ust
+              openssl
+              zlib
 
-            # mono
-            krb5
+              # mono
+              krb5
 
-            # Needed for headless browser-in-vscode based plugins such as
-            # anything based on Puppeteer https://pptr.dev .
-            # e.g. Roo Code
-            glib
-            nspr
-            nss
-            dbus
-            at-spi2-atk
-            cups
-            expat
-            libxkbcommon
-            xorg.libX11
-            xorg.libXcomposite
-            xorg.libXdamage
-            xorg.libxcb
-            xorg.libXext
-            xorg.libXfixes
-            xorg.libXrandr
-            cairo
-            pango
-            alsa-lib
-            libgbm
-            udev
-            libudev0-shim
-          ])
-          ++ additionalPkgs pkgs;
+              # Needed for headless browser-in-vscode based plugins such as
+              # anything based on Puppeteer https://pptr.dev .
+              # e.g. Roo Code
+              glib
+              nspr
+              nss
+              dbus
+              at-spi2-atk
+              cups
+              expat
+              libxkbcommon
+              xorg.libX11
+              xorg.libXcomposite
+              xorg.libXdamage
+              xorg.libxcb
+              xorg.libXext
+              xorg.libXfixes
+              xorg.libXrandr
+              cairo
+              pango
+              alsa-lib
+              libgbm
+              udev
+              libudev0-shim
+            ])
+            ++ additionalPkgs pkgs;
 
-        extraBwrapArgs = [
-          "--bind-try /etc/nixos/ /etc/nixos/"
-          "--ro-bind-try /etc/xdg/ /etc/xdg/"
-        ];
+          extraBwrapArgs = [
+            "--bind-try /etc/nixos/ /etc/nixos/"
+            "--ro-bind-try /etc/xdg/ /etc/xdg/"
+          ];
 
-        # symlink shared assets, including icons and desktop entries
-        extraInstallCommands = ''
-          ln -s "${finalAttrs.finalPackage}/share" "$out/"
-        '';
+          # symlink shared assets, including icons and desktop entries
+          extraInstallCommands = ''
+            ln -s "${finalAttrs.finalPackage}/share" "$out/"
+          '';
 
-        runScript = "${finalAttrs.finalPackage}/bin/${executableName}";
+          runScript = "${finalAttrs.finalPackage}/bin/${executableName}";
 
-        # vscode likes to kill the parent so that the
-        # gui application isn't attached to the terminal session
-        dieWithParent = false;
+          # vscode likes to kill the parent so that the
+          # gui application isn't attached to the terminal session
+          dieWithParent = false;
 
-        passthru = {
-          inherit executableName;
-          inherit (finalAttrs.finalPackage) pname version; # for home-manager module
+          passthru = {
+            inherit executableName;
+            inherit (finalAttrs.finalPackage) pname version; # for home-manager module
+          };
+
+          meta = meta // {
+            description = "Wrapped variant of ${pname} which launches in a FHS compatible environment, should allow for easy usage of extensions without nix-specific modifications";
+          };
         };
-
-        meta = meta // {
-          description = "Wrapped variant of ${pname} which launches in a FHS compatible environment, should allow for easy usage of extensions without nix-specific modifications";
-        };
-      };
+        customizedArgs = customizeFHSEnv defaultArgs;
+      in
+      buildFHSEnv customizedArgs;
   in
   {
 
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 259614e37fb4..f7d67e8d8baf 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   stdenvNoCC,
-  callPackage,
+  buildVscode,
   fetchurl,
   nixosTests,
   srcOnly,
@@ -51,7 +51,7 @@ let
   # This is used for VS Code - Remote SSH test
   rev = "585eba7c0c34fd6b30faac7c62a42050bfbc0086";
 in
-callPackage ./generic.nix {
+buildVscode {
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 97158b30c964..e305001a7a01 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  callPackage,
+  buildVscode,
   fetchurl,
   nixosTests,
   commandLineArgs ? "",
@@ -38,7 +38,7 @@ let
 
   sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) ".";
 in
-callPackage ./generic.nix rec {
+buildVscode rec {
   inherit sourceRoot commandLineArgs useVSCodeRipgrep;
 
   # Please backport all compatible updates to the stable release.
diff --git a/pkgs/by-name/an/antigravity/package.nix b/pkgs/by-name/an/antigravity/package.nix
index ca56db0b01cb..1c6b5427ea99 100644
--- a/pkgs/by-name/an/antigravity/package.nix
+++ b/pkgs/by-name/an/antigravity/package.nix
@@ -1,11 +1,9 @@
 {
   lib,
   stdenv,
-  callPackage,
-  vscode-generic,
+  buildVscode,
   fetchurl,
   jq,
-  buildFHSEnv,
   writeShellScript,
   coreutils,
   commandLineArgs ? "",
@@ -19,7 +17,7 @@ let
     information.sources."${hostPlatform.system}"
       or (throw "antigravity: unsupported system ${hostPlatform.system}");
 in
-(callPackage vscode-generic {
+(buildVscode {
   inherit commandLineArgs useVSCodeRipgrep;
   inherit (information) version vscodeVersion;
   pname = "antigravity";
@@ -34,32 +32,30 @@ in
 
   sourceRoot = if hostPlatform.isDarwin then "Antigravity.app" else "Antigravity";
 
-  # When running inside an FHS environment, try linking Google Chrome or Chromium
-  # to the hardcoded Playwright search path: /opt/google/chrome/chrome
-  buildFHSEnv =
-    args:
-    buildFHSEnv (
-      args
-      // {
-        extraBuildCommands = (args.extraBuildCommands or "") + ''
-          mkdir -p "$out/opt/google/chrome"
-        '';
-        extraBwrapArgs = (args.extraBwrapArgs or [ ]) ++ [ "--tmpfs /opt/google/chrome" ];
-        runScript = writeShellScript "antigravity-wrapper" ''
-          for candidate in google-chrome-stable google-chrome chromium-browser chromium; do
-            if target=$(command -v "$candidate"); then
-              ${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome
-              break
-            fi
-          done
-          exec ${args.runScript} "$@"
-        '';
-      }
-    );
-
   tests = { };
   updateScript = ./update.js;
 
+  # When running inside an FHS environment, try linking Google Chrome or Chromium
+  # to the hardcoded Playwright search path: /opt/google/chrome/chrome
+  customizeFHSEnv =
+    args:
+    args
+    // {
+      extraBwrapArgs = (args.extraBwrapArgs or [ ]) ++ [ "--tmpfs /opt/google/chrome" ];
+      extraBuildCommands = (args.extraBuildCommands or "") + ''
+        mkdir -p "$out/opt/google/chrome"
+      '';
+      runScript = writeShellScript "antigravity-wrapper" ''
+        for candidate in google-chrome-stable google-chrome chromium-browser chromium; do
+          if target=$(command -v "$candidate"); then
+            ${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome
+            break
+          fi
+        done
+        exec ${args.runScript} "$@"
+      '';
+    };
+
   meta = {
     mainProgram = "antigravity";
     description = "Agentic development platform, evolving the IDE into the agent-first era";
diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 126a7929ef38..99356a8a7c64 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -1,8 +1,7 @@
 {
   lib,
   stdenv,
-  callPackage,
-  vscode-generic,
+  buildVscode,
   fetchurl,
   appimageTools,
   undmg,
@@ -24,7 +23,7 @@ let
 
   source = sources.${hostPlatform.system};
 in
-(callPackage vscode-generic rec {
+(buildVscode rec {
   inherit useVSCodeRipgrep;
   inherit (sourcesJson) version vscodeVersion;
   commandLineArgs = finalCommandLineArgs;
@@ -66,7 +65,7 @@ in
     homepage = "https://cursor.com";
     changelog = "https://cursor.com/changelog";
     license = lib.licenses.unfree;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [
       aspauldingcode
       prince213
@@ -83,8 +82,4 @@ in
   (oldAttrs: {
     nativeBuildInputs =
       (oldAttrs.nativeBuildInputs or [ ]) ++ lib.optionals hostPlatform.isDarwin [ undmg ];
-
-    passthru = (oldAttrs.passthru or { }) // {
-      inherit sources;
-    };
   })
diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix
index 41235eda4bc1..ff46dff52ecb 100644
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@@ -1,8 +1,7 @@
 {
   lib,
   stdenv,
-  callPackage,
-  vscode-generic,
+  buildVscode,
   fetchurl,
   extraCommandLineArgs ? "",
   useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin,
@@ -11,7 +10,7 @@
 let
   sources = (lib.importJSON ./sources.json).${stdenv.hostPlatform.system};
 in
-(callPackage vscode-generic {
+(buildVscode {
   inherit useVSCodeRipgrep;
   commandLineArgs = extraCommandLineArgs;
 
diff --git a/pkgs/by-name/wi/windsurf/package.nix b/pkgs/by-name/wi/windsurf/package.nix
index c2138ae24d31..6f5e6c97c769 100644
--- a/pkgs/by-name/wi/windsurf/package.nix
+++ b/pkgs/by-name/wi/windsurf/package.nix
@@ -1,8 +1,7 @@
 {
   lib,
   stdenv,
-  callPackage,
-  vscode-generic,
+  buildVscode,
   fetchurl,
   nixosTests,
   commandLineArgs ? "",
@@ -13,7 +12,7 @@ let
     (lib.importJSON ./info.json)."${stdenv.hostPlatform.system}"
       or (throw "windsurf: unsupported system ${stdenv.hostPlatform.system}");
 in
-callPackage vscode-generic {
+buildVscode {
   inherit commandLineArgs useVSCodeRipgrep;
 
   inherit (info) version vscodeVersion;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62ad43344497..5c948b946b56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11856,6 +11856,8 @@ with pkgs;
   vscode-fhs = vscode.fhs;
   vscode-fhsWithPackages = vscode.fhsWithPackages;
 
+  buildVscode = callPackage ../applications/editors/vscode/generic.nix { };
+
   vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix { };
 
   vscode-utils = callPackage ../applications/editors/vscode/extensions/vscode-utils.nix { };
@@ -11870,25 +11872,11 @@ with pkgs;
   vscodium-fhs = vscodium.fhs;
   vscodium-fhsWithPackages = vscodium.fhsWithPackages;
 
-  antigravity = callPackage ../by-name/an/antigravity/package.nix {
-    vscode-generic = ../applications/editors/vscode/generic.nix;
-  };
   antigravity-fhs = antigravity.fhs;
   antigravity-fhsWithPackages = antigravity.fhsWithPackages;
 
-  code-cursor = callPackage ../by-name/co/code-cursor/package.nix {
-    vscode-generic = ../applications/editors/vscode/generic.nix;
-  };
   code-cursor-fhs = code-cursor.fhs;
   code-cursor-fhsWithPackages = code-cursor.fhsWithPackages;
-
-  windsurf = callPackage ../by-name/wi/windsurf/package.nix {
-    vscode-generic = ../applications/editors/vscode/generic.nix;
-  };
-
-  kiro = callPackage ../by-name/ki/kiro/package.nix {
-    vscode-generic = ../applications/editors/vscode/generic.nix;
-  };
   kiro-fhs = kiro.fhs;
   kiro-fhsWithPackages = kiro.fhsWithPackages;
 

From e157104d21f0818309cd789057768b8d104ae9e3 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 11 Jan 2026 19:16:41 +0200
Subject: [PATCH 051/235] code-cursor: remove overrideAttrs

---
 pkgs/applications/editors/vscode/generic.nix |  3 +++
 pkgs/by-name/co/code-cursor/package.nix      | 11 +++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 7658d5c719d4..36917ed70beb 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -58,6 +58,8 @@
   # Populate passthru.tests
   tests,
 
+  extraNativeBuildInputs ? [ ],
+
   # Customize FHS environment
   # Function that takes default buildFHSEnv arguments and returns modified arguments
   customizeFHSEnv ? args: args,
@@ -256,6 +258,7 @@ stdenv.mkDerivation (
       unzip
       imagemagick
     ]
+    ++ extraNativeBuildInputs
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       autoPatchelfHook
       asar
diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 99356a8a7c64..edff54ed1988 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -23,7 +23,7 @@ let
 
   source = sources.${hostPlatform.system};
 in
-(buildVscode rec {
+buildVscode rec {
   inherit useVSCodeRipgrep;
   inherit (sourcesJson) version vscodeVersion;
   commandLineArgs = finalCommandLineArgs;
@@ -45,6 +45,9 @@ in
     else
       source;
 
+  # for unpacking the DMG
+  extraNativeBuildInputs = lib.optionals hostPlatform.isDarwin [ undmg ];
+
   sourceRoot =
     if hostPlatform.isLinux then "${pname}-${version}-extracted/usr/share/cursor" else "Cursor.app";
 
@@ -78,8 +81,4 @@ in
     ++ lib.platforms.darwin;
     mainProgram = "cursor";
   };
-}).overrideAttrs
-  (oldAttrs: {
-    nativeBuildInputs =
-      (oldAttrs.nativeBuildInputs or [ ]) ++ lib.optionals hostPlatform.isDarwin [ undmg ];
-  })
+}

From ea19fb333284c82dea6f909828691659818beb81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Jan 2026 16:29:30 +0000
Subject: [PATCH 052/235] phpPackages.composer: 2.9.3 -> 2.9.4

---
 pkgs/development/php-packages/composer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index cab170d1ae81..aff96e3b8396 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -13,13 +13,13 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "composer";
-  version = "2.9.3";
+  version = "2.9.4";
 
   src = fetchFromGitHub {
     owner = "composer";
     repo = "composer";
     tag = finalAttrs.version;
-    hash = "sha256-H5/YY0CKFlLdvEMzj3fr5QsEro0Y2/8gZInLQDbGR30=";
+    hash = "sha256-OzruOfYKiNgHx7bj6dVY+QtfSUzLEIqBhwATaWV1YAQ=";
   };
 
   nativeBuildInputs = [
@@ -33,7 +33,7 @@ php.buildComposerProject2 (finalAttrs: {
     inherit (finalAttrs.passthru) pharHash;
   };
 
-  vendorHash = "sha256-4RFIegm7NFTpEbW11BtKB2BV+5VrSAhNrk125PcrBTw=";
+  vendorHash = "sha256-EHvZfRL3xM2oG8m/8nHTOSjDIlp1FuMH+eYtbaqMz+Y=";
 
   postInstall = ''
     wrapProgram $out/bin/composer \

From 48dde2b8ff052bc7fdba1ef92e7a24385b363d95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Jan 2026 17:38:53 +0000
Subject: [PATCH 053/235] sydbox: 3.48.4 -> 3.48.5

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

diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 95e9d3dbb6ae..7aa4e3bd243c 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sydbox";
-  version = "3.48.4";
+  version = "3.48.5";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rDJrmwBq2OSCqBOTtN2FncGwBzAafLUbjkgmfDVPYag=";
+    hash = "sha256-G2vp1hSY29D+50vMQWsiAznwiLe/Gs9zRRBOkCPfOlw=";
   };
 
-  cargoHash = "sha256-fq7XksglWJJzHBbnILVWn76xMUdR+pwc0W4S1P0SuNQ=";
+  cargoHash = "sha256-9GpmO5AqijlaLVRQAM+9r+caDGJYfzsG1zzYLlK8n1o=";
 
   nativeBuildInputs = [
     mandoc

From 52a22ceb72fdb9c7ddb8a3e5a4021866d46b9400 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Fri, 23 Jan 2026 20:34:46 +0100
Subject: [PATCH 054/235] hns: init at 1.0.8

---
 pkgs/by-name/hn/hns/package.nix | 43 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/hn/hns/package.nix

diff --git a/pkgs/by-name/hn/hns/package.nix b/pkgs/by-name/hn/hns/package.nix
new file mode 100644
index 000000000000..dd4072eb9e05
--- /dev/null
+++ b/pkgs/by-name/hn/hns/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+}:
+
+python3.pkgs.buildPythonApplication (finalAttrs: {
+  pname = "hns";
+  version = "1.0.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "primaprashant";
+    repo = "hns";
+    tag = finalAttrs.version;
+    hash = "sha256-VO9EX8aIudijAyzTH9cXIa1magN+wkIE0lsP+DGl8hw=";
+  };
+
+  build-system = [
+    python3.pkgs.hatchling
+  ];
+
+  dependencies = with python3.pkgs; [
+    click
+    faster-whisper
+    numpy
+    pyperclip
+    requests
+    rich
+    sounddevice
+  ];
+
+  pythonImportsCheck = [
+    "hns"
+  ];
+
+  meta = {
+    description = "Speech-to-text CLI to transcribe voice from microphone directly to clipboard";
+    homepage = "https://hns-cli.dev";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ afh ];
+  };
+})

From f3349d371986b9eba071a13ee97f57800c81cd16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Jan 2026 19:55:31 +0000
Subject: [PATCH 055/235] kodiPackages.sponsorblock: 0.5.0 -> 0.6.0

---
 pkgs/applications/video/kodi/addons/sponsorblock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/sponsorblock/default.nix b/pkgs/applications/video/kodi/addons/sponsorblock/default.nix
index 399234b9e7e9..e09a41a0f62b 100644
--- a/pkgs/applications/video/kodi/addons/sponsorblock/default.nix
+++ b/pkgs/applications/video/kodi/addons/sponsorblock/default.nix
@@ -8,13 +8,13 @@
 buildKodiAddon rec {
   pname = "sponsorblock";
   namespace = "script.service.sponsorblock";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "siku2";
     repo = namespace;
     rev = "v${version}";
-    hash = "sha256-IBgh2kdPgCy+HHrR7UZxTgjF1LR77ABGlUp3PgaobNM=";
+    hash = "sha256-9+0gIY12C+bZNsCRzla1IFmtVZiiGnS4TL3srkOBWsQ=";
   };
 
   propagatedBuildInputs = [

From 0ec3676e95e1564348e8203b85aaeb3109731d5c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 23 Jan 2026 21:09:45 +0100
Subject: [PATCH 056/235] freefilesync: 14.6 -> 14.7

---
 pkgs/by-name/fr/freefilesync/package.nix      |  4 +--
 .../skip-missing-Animal.dat.patch             | 32 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix
index 7daeacb412f7..2887b84b11a7 100644
--- a/pkgs/by-name/fr/freefilesync/package.nix
+++ b/pkgs/by-name/fr/freefilesync/package.nix
@@ -29,7 +29,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "freefilesync";
-  version = "14.6";
+  version = "14.7";
 
   src = fetchurl {
     url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
       rm -f "$out"
       tryDownload "$url" "$out"
     '';
-    hash = "sha256-OST2QIhPhKl9Qh4nHIno5XAJmLPNki0bU5A1ZXcUVTw=";
+    hash = "sha256-WMSaKA3OA63V6Vis83vXa+y0ZRE0YxgXiB8YAyTSTc8=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/fr/freefilesync/skip-missing-Animal.dat.patch b/pkgs/by-name/fr/freefilesync/skip-missing-Animal.dat.patch
index 844fb35598ee..64a34aeaba40 100644
--- a/pkgs/by-name/fr/freefilesync/skip-missing-Animal.dat.patch
+++ b/pkgs/by-name/fr/freefilesync/skip-missing-Animal.dat.patch
@@ -2,29 +2,29 @@ diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/g
 index a40eea3..23ec896 100644
 --- a/FreeFileSync/Source/ui/gui_generated.cpp
 +++ b/FreeFileSync/Source/ui/gui_generated.cpp
-@@ -5573,8 +5573,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
-     wxBoxSizer* bSizer183;
-     bSizer183 = new wxBoxSizer( wxHORIZONTAL );
+@@ -5553,8 +5553,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
+ 	wxBoxSizer* bSizer183;
+ 	bSizer183 = new wxBoxSizer( wxHORIZONTAL );
  
--    m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
--    bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+-	m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+-	bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
  
-     wxPanel* m_panel39;
-     m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-@@ -5587,13 +5585,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
-     m_staticTextDonate->Wrap( -1 );
-     m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
+ 	wxPanel* m_panel39;
+ 	m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+@@ -5567,13 +5565,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
+ 	m_staticTextDonate->Wrap( -1 );
+ 	m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
  
--    bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
+-	bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
  
  
-     m_panel39->SetSizer( bSizer184 );
-     m_panel39->Layout();
-     bSizer184->Fit( m_panel39 );
--    bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
+ 	m_panel39->SetSizer( bSizer184 );
+ 	m_panel39->Layout();
+ 	bSizer184->Fit( m_panel39 );
+-	bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
  
  
-     m_panelDonate->SetSizer( bSizer183 );
+ 	m_panelDonate->SetSizer( bSizer183 );
 diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
 index 933fe81..734201f 100644
 --- a/FreeFileSync/Source/ui/small_dlgs.cpp

From 960da78ae26d1b79a0f387c5e2663f44b8fb5587 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Jan 2026 22:34:40 +0000
Subject: [PATCH 057/235] gradle-completion: 1.6.0 -> 9.3.0

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

diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix
index 67c9555f9bb7..0f23e1576f64 100644
--- a/pkgs/by-name/gr/gradle-completion/package.nix
+++ b/pkgs/by-name/gr/gradle-completion/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gradle-completion";
-  version = "1.6.0";
+  version = "9.3.0";
 
   src = fetchFromGitHub {
     owner = "gradle";
     repo = "gradle-completion";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HY/woUOzkRVb6ekIaQrY1+5pKxd5+cpG74+xqzpkazs=";
+    hash = "sha256-kmjlEO0MI7+OwZqgwkv5z8iX1iAZDiIpqevoeb1sDUU=";
   };
 
   nativeBuildInputs = [

From 20ca66ac687a6f2b5350ad972fbeba5678322431 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 22 Jan 2026 01:31:04 +0200
Subject: [PATCH 058/235] ci(bot): add token fallback for labeler actions

Use github.token when app token is not available (in forks).
---
 .github/workflows/bot.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index 9eb5911aadb5..44198e2e2735 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -97,7 +97,7 @@ jobs:
           github.event_name == 'pull_request_target' &&
           !contains(fromJSON(inputs.headBranch).type, 'development')
         with:
-          repo-token: ${{ steps.app-token.outputs.token }}
+          repo-token: ${{ steps.app-token.outputs.token || github.token }}
           configuration-path: .github/labeler.yml # default
           sync-labels: true
 
@@ -107,7 +107,7 @@ jobs:
           github.event_name == 'pull_request_target' &&
           !contains(fromJSON(inputs.headBranch).type, 'development')
         with:
-          repo-token: ${{ steps.app-token.outputs.token }}
+          repo-token: ${{ steps.app-token.outputs.token || github.token }}
           configuration-path: .github/labeler-no-sync.yml
           sync-labels: false
 
@@ -120,7 +120,7 @@ jobs:
           github.event_name == 'pull_request_target' &&
           contains(fromJSON(inputs.headBranch).type, 'development')
         with:
-          repo-token: ${{ steps.app-token.outputs.token }}
+          repo-token: ${{ steps.app-token.outputs.token || github.token }}
           configuration-path: .github/labeler-development-branches.yml
           sync-labels: true
 

From 0557411308fa3914d23a120b2b0c74b654c0223c Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 22 Jan 2026 01:31:49 +0200
Subject: [PATCH 059/235] ci(bot): add fork compatibility for maintainer map

In forks without merge-group history, return empty maintainer
map instead of throwing an error.
---
 ci/github-script/bot.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index f0155e8edd1c..415593c7aec4 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -9,6 +9,9 @@ module.exports = async ({ github, context, core, dry }) => {
 
   const artifactClient = new DefaultArtifactClient()
 
+  // Detect if running in a fork (not NixOS/nixpkgs)
+  const isFork = context.repo.owner !== 'NixOS'
+
   async function downloadMaintainerMap(branch) {
     let run
 
@@ -68,9 +71,18 @@ module.exports = async ({ github, context, core, dry }) => {
 
     // We get here when none of the 10 commits we looked at contained a maintainer map.
     // For the master branch, we don't have any fallback options, so we error out.
-    // For other branches, we select a suitable fallback below.
-    if (branch === 'master') throw new Error('No maintainer map found.')
+    // In forks without merge-group history, return empty map to allow testing.
+    if (branch === 'master') {
+      if (isFork) {
+        core.warning(
+          'No maintainer map found. Using empty map (expected in forks without merge-group history).',
+        )
+        return {}
+      }
+      throw new Error('No maintainer map found.')
+    }
 
+    // For other branches, we select a suitable fallback below.
     const { stable, version } = classify(branch)
 
     const release = `release-${version}`

From 033eccc028fb63d3537d3383041d7009b3466ec3 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 22 Jan 2026 01:32:17 +0200
Subject: [PATCH 060/235] ci(bot): add fork compatibility for team lookups

Forks don't have NixOS teams, return empty list to avoid 404.
---
 ci/github-script/bot.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 415593c7aec4..f812df3c565f 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -121,6 +121,11 @@ module.exports = async ({ github, context, core, dry }) => {
       return []
     }
 
+    // Forks don't have NixOS teams, return empty list
+    if (isFork) {
+      return []
+    }
+
     if (!members[team_slug]) {
       members[team_slug] = github.paginate(github.rest.teams.listMembersInOrg, {
         org: context.repo.owner,

From bb0ec76b447f21063beb0448b61cd54d85096735 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 22 Jan 2026 01:45:07 +0200
Subject: [PATCH 061/235] ci(bot): auto-label new package PRs with '8.has:
 package (new)'

Checks all PR commit messages for ': init at' pattern and
requires eval to report added packages (attrdiff.added).
---
 ci/github-script/bot.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index f812df3c565f..ba53aded5e37 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -321,9 +321,28 @@ module.exports = async ({ github, context, core, dry }) => {
         expectedHash: artifact.digest,
       })
 
-      const evalLabels = JSON.parse(
+      const changedPaths = JSON.parse(
         await readFile(`${pull_number}/changed-paths.json`, 'utf-8'),
-      ).labels
+      )
+      const evalLabels = changedPaths.labels
+
+      // Fetch all PR commits to check their messages for package patterns
+      const prCommits = await github.paginate(github.rest.pulls.listCommits, {
+        ...context.repo,
+        pull_number,
+        per_page: 100,
+      })
+      const commitMessages = prCommits.map((c) => c.commit.message)
+
+      // Label new package PRs: "packagename: init at X.Y.Z"
+      // Exclude NixOS module commits like "nixos/timekpr: init at 0.5.8"
+      const newPackagePattern = /(?<!nixos\/\S+): init at\b/
+      const hasNewPackages = changedPaths.attrdiff?.added?.length > 0
+      const commitsIndicateNewPackage = commitMessages.some((msg) =>
+        newPackagePattern.test(msg),
+      )
+      evalLabels['8.has: package (new)'] =
+        hasNewPackages && commitsIndicateNewPackage
 
       // TODO: Get "changed packages" information from list of changed by-name files
       // in addition to just the Eval results, to make this work for these packages

From bf5645a0edffd6d7bfe8048a023b8255427cdb71 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 22 Jan 2026 01:45:41 +0200
Subject: [PATCH 062/235] ci(bot): auto-label package updates with '8.has:
 package (update)'

Checks all PR commit messages for version update pattern
like 'packagename: X.Y.Z -> A.B.C'.

Matches: 1.2.3, 0-unstable-2024-01-15, 1.3rc1, alpha, unstable
---
 ci/github-script/bot.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index ba53aded5e37..b3c3af8ec389 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -344,6 +344,15 @@ module.exports = async ({ github, context, core, dry }) => {
       evalLabels['8.has: package (new)'] =
         hasNewPackages && commitsIndicateNewPackage
 
+      // Label package update PRs: "packagename: X.Y.Z -> A.B.C"
+      // Matches versions like: 1.2.3, 0-unstable-2024-01-15, 1.3rc1, alpha, unstable
+      // Exclude NixOS module commits like "nixos/ncps: types.str -> types.path"
+      const updatePackagePattern = /(?<!nixos\/\S+): [\w.-]+ (->|→) [\w.-]+/
+      const commitsIndicateUpdate = commitMessages.some((msg) =>
+        updatePackagePattern.test(msg),
+      )
+      evalLabels['8.has: package (update)'] = commitsIndicateUpdate
+
       // TODO: Get "changed packages" information from list of changed by-name files
       // in addition to just the Eval results, to make this work for these packages
       // when Eval results have expired as well.

From 2ae7fb8d6961a4fb948202eb574a7b447b96a1ad Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 21 Apr 2025 21:57:11 +0200
Subject: [PATCH 063/235] zmk-studio: init at 0.3.1

---
 .../zm/zmk-studio/darwin-dont-sign.patch      | 13 +++
 pkgs/by-name/zm/zmk-studio/package.nix        | 98 +++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 pkgs/by-name/zm/zmk-studio/darwin-dont-sign.patch
 create mode 100644 pkgs/by-name/zm/zmk-studio/package.nix

diff --git a/pkgs/by-name/zm/zmk-studio/darwin-dont-sign.patch b/pkgs/by-name/zm/zmk-studio/darwin-dont-sign.patch
new file mode 100644
index 000000000000..794a5464dca7
--- /dev/null
+++ b/pkgs/by-name/zm/zmk-studio/darwin-dont-sign.patch
@@ -0,0 +1,13 @@
+diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
+index 8fd57bf..6a27557 100644
+--- a/src-tauri/tauri.conf.json
++++ b/src-tauri/tauri.conf.json
+@@ -33,7 +33,7 @@
+       "exceptionDomain": "",
+       "frameworks": [],
+       "providerShortName": null,
+-      "signingIdentity": "-"
++      "signingIdentity": null
+     },
+     "resources": [],
+     "shortDescription": "",
diff --git a/pkgs/by-name/zm/zmk-studio/package.nix b/pkgs/by-name/zm/zmk-studio/package.nix
new file mode 100644
index 000000000000..a9d65a64e7b1
--- /dev/null
+++ b/pkgs/by-name/zm/zmk-studio/package.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  npm-lockfile-fix,
+
+  cargo-tauri,
+  makeBinaryWrapper,
+  nodejs,
+  npmHooks,
+  pkg-config,
+  wrapGAppsHook3,
+
+  glib-networking,
+  udev,
+  webkitgtk_4_1,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "zmk-studio";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "zmkfirmware";
+    repo = "zmk-studio";
+    tag = "v${finalAttrs.version}";
+
+    postFetch = ''
+      # add missing integrity fields to lockfile
+      ${lib.getExe npm-lockfile-fix} $out/package-lock.json
+    '';
+
+    hash = "sha256-7UwY+272JNqzQf1juOzDkiW2DNKHC5xg4cGguwAgwNc=";
+  };
+
+  patches = [
+    ./darwin-dont-sign.patch
+  ];
+
+  # building the download page requires the app to fetch the github API at build-time
+  # this page would only ever be visited if it wasn't built with tauri, so we disable it instead
+  postPatch = ''
+    # turn `npm run generate-data` into a NOOP
+    substituteInPlace package.json \
+      --replace-fail '"generate-data": "' '"generate-data": "true || '
+
+    # remove download page
+    rm download.html src/download.tsx src/DownloadPage.tsx
+    substituteInPlace vite.config.ts \
+      --replace-fail 'download: "./download.html",' ""
+  '';
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = "src-tauri";
+
+  cargoHash = "sha256-BNX2vhsHaSk3eiadVPH6To0CgbOEGJ1JVKkW3Hw7QH0=";
+
+  npmDeps = fetchNpmDeps {
+    name = "zmk-studio-${finalAttrs.version}-npm-deps";
+    inherit (finalAttrs) src patches;
+    hash = "sha256-htCqTX/w1GP3b8wBD9p60Lwpjr2V7sv05unRv2IrP1A=";
+  };
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs
+    npmHooks.npmConfigHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking # for image loading
+    udev
+    webkitgtk_4_1
+  ];
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    makeWrapper "$out/Application/ZMK Studio.app/Contents/MacOS/zmk-studio" "$out/bin/zmk-studio"
+  '';
+
+  meta = {
+    description = "Tool for runtime keymap updates on ZMK-powered devices without reflashing firmware";
+    homepage = "https://github.com/zmkfirmware/zmk-studio";
+    changelog = "https://github.com/zmkfirmware/zmk-studio/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    mainProgram = "zmk-studio";
+    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})

From ddec51db1ebc3ad1ebab693db764c97dcc034706 Mon Sep 17 00:00:00 2001
From: Igor Svistoun <igor@svistoun.com>
Date: Fri, 23 Jan 2026 21:29:32 -0500
Subject: [PATCH 064/235] searxng: fix 2026-01-11 relaxing markdown-it-py

---
 pkgs/by-name/se/searxng/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index bdde132fe399..962ea9de7e4c 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -31,6 +31,7 @@ python.pkgs.toPythonModule (
       "flask-babel"
       "httpx-socks"
       "lxml"
+      "markdown-it-py"
       "msgspec"
       "typer-slim"
       "whitenoise"

From d0490c74d15d37a445ddb906f6d58a42ca9d3169 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 Jan 2026 10:53:40 +0800
Subject: [PATCH 065/235] mate.eom: 1.28.0 -> 1.28.1

https://github.com/mate-desktop/eom/compare/v1.28.0...v1.28.1
---
 pkgs/desktops/mate/eom/default.nix | 32 ++++++++++++++++--------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 46b8fc44a01b..e8d86ae5898c 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -1,8 +1,11 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
+  autoconf-archive,
+  autoreconfHook,
+  gtk-doc,
+  mate-common,
   pkg-config,
   gettext,
   itstool,
@@ -18,31 +21,31 @@
   mate-desktop,
   hicolor-icon-theme,
   wrapGAppsHook3,
+  yelp-tools,
   gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eom";
-  version = "1.28.0";
+  version = "1.28.1";
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/eom-${finalAttrs.version}.tar.xz";
-    sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "eom";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2MO8z30Styv5vAnNVFpETAZtZ+LMbgBSDq1mUQZ9X1c=";
   };
 
-  patches = [
-    # Switch to girepository-2.0
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/eom/raw/84b45dc6302f378926be390d39a7cca3ec4f26ea/f/libpeas1_pygobject352.patch";
-      hash = "sha256-HcwWXAnVzz5uuAz8Mljci2FA72TZJTD28qLvczXVtZU=";
-    })
-  ];
-
   nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
+    gtk-doc
+    mate-common # mate-common.m4 macros
     pkg-config
     gettext
     itstool
     wrapGAppsHook3
+    yelp-tools
   ];
 
   buildInputs = [
@@ -62,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   passthru.updateScript = gitUpdater {
-    url = "https://git.mate-desktop.org/eom";
     odd-unstable = true;
     rev-prefix = "v";
   };

From 5d1962feb011037ed5f4b4af8d4fd7e56675fbfd Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 Jan 2026 03:28:56 +0000
Subject: [PATCH 066/235] thunar: 4.20.6 -> 4.20.7

https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.20.6...thunar-4.20.7
---
 pkgs/by-name/th/thunar-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/th/thunar-unwrapped/package.nix b/pkgs/by-name/th/thunar-unwrapped/package.nix
index f52ce309c469..a417ad65ff47 100644
--- a/pkgs/by-name/th/thunar-unwrapped/package.nix
+++ b/pkgs/by-name/th/thunar-unwrapped/package.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "thunar";
-  version = "4.20.6";
+  version = "4.20.7";
 
   outputs = [
     "out"
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "xfce";
     repo = "thunar";
     tag = "thunar-${finalAttrs.version}";
-    hash = "sha256-Ll1mJEkkxYGASWQ2z7GRiubNjggqeHXzgGSXQK+10qs=";
+    hash = "sha256-ii3ObvKCTXube3rnn+JdCsxTZDubrKcevBgpiGVbL/c=";
   };
 
   nativeBuildInputs = [

From 4411e6457f7b1f75c78b90b5289a989f28f1e35c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 23 Jan 2026 20:25:42 -0800
Subject: [PATCH 067/235] libdeltachat: 2.38.0 -> 2.39.0

Diff: https://github.com/chatmail/core/compare/v2.38.0...v2.39.0

Changelog: https://github.com/chatmail/core/blob/v2.39.0/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index e197f6a9c080..10d3907cde96 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "2.38.0";
+  version = "2.39.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${version}";
-    hash = "sha256-XDxmX0tucNUmJAgDgRtD9sYG1/URWWUOTx7PQ1PBTYY=";
+    hash = "sha256-gVRm0bMGmKap4k4g6h+TvdJlK3VBj7HKyABTNrjd7rw=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit version src;
-    hash = "sha256-I13Us7H3DqbAfdEsmHgMBVgvsBZP9Sh21eqYGF7VoSw=";
+    hash = "sha256-hcyOhefNOt6YyLqFM1ZJWwohmcOJo/NjW6rLSlWUDnU=";
   };
 
   nativeBuildInputs = [

From 183ba01353407b1d71bad11045bf1b098ccd52dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 08:34:16 +0000
Subject: [PATCH 068/235] python3Packages.compit-inext-api: 0.3.4 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/compit-inext-api/default.nix b/pkgs/development/python-modules/compit-inext-api/default.nix
index 7e916a839432..a31b22f51419 100644
--- a/pkgs/development/python-modules/compit-inext-api/default.nix
+++ b/pkgs/development/python-modules/compit-inext-api/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "compit-inext-api";
-  version = "0.3.4";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Przemko92";
     repo = "compit-inext-api";
     tag = version;
-    hash = "sha256-J3V7ahETbCTJW/6jYvF9BbuIffVvbMH329nO1bmVKEw=";
+    hash = "sha256-DlNkDfV3fp/7DetiIDx3yi8SfJHV4sFIMHEam5rcYrg=";
   };
 
   build-system = [ setuptools ];

From 5a903aaa4a97e9559fbf0663ecdeddd809a36a2e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 24 Jan 2026 11:12:20 +0100
Subject: [PATCH 069/235] victoriatraces: 0.7.0 -> 0.7.1

ChangeLog: https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/v0.7.1
---
 pkgs/by-name/vi/victoriatraces/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriatraces/package.nix b/pkgs/by-name/vi/victoriatraces/package.nix
index 051dde820502..3e95d91af5a5 100644
--- a/pkgs/by-name/vi/victoriatraces/package.nix
+++ b/pkgs/by-name/vi/victoriatraces/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaTraces";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaTraces";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MWPw2SJlqjQCyBYT++A0KcwccdpTP7Ome4RfA7lcjAM=";
+    hash = "sha256-Hli0JNQ0XpLXI10ol5fdmhk35/SFSo1o/SiVmYVWlCs=";
   };
 
   vendorHash = null;

From a0caa967cac4233115603f228d218b41b3654c57 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 24 Jan 2026 11:12:40 +0100
Subject: [PATCH 070/235] python313Packages.compit-inext-api: migrate to
 finalAttrs

---
 .../development/python-modules/compit-inext-api/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/compit-inext-api/default.nix b/pkgs/development/python-modules/compit-inext-api/default.nix
index a31b22f51419..df4447dda815 100644
--- a/pkgs/development/python-modules/compit-inext-api/default.nix
+++ b/pkgs/development/python-modules/compit-inext-api/default.nix
@@ -7,7 +7,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "compit-inext-api";
   version = "0.5.0";
   pyproject = true;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Przemko92";
     repo = "compit-inext-api";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-DlNkDfV3fp/7DetiIDx3yi8SfJHV4sFIMHEam5rcYrg=";
   };
 
@@ -37,4 +37,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.dotlambda ];
   };
-}
+})

From d1231dce4da2697ab77d3cce0a4adca92da7b2ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 24 Jan 2026 11:16:55 +0100
Subject: [PATCH 071/235] python313Packages.compit-inext-api: add changelog to
 meta

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

diff --git a/pkgs/development/python-modules/compit-inext-api/default.nix b/pkgs/development/python-modules/compit-inext-api/default.nix
index df4447dda815..cf490fa619f2 100644
--- a/pkgs/development/python-modules/compit-inext-api/default.nix
+++ b/pkgs/development/python-modules/compit-inext-api/default.nix
@@ -34,6 +34,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python client for the Compit iNext API";
     homepage = "https://github.com/Przemko92/compit-inext-api";
+    changelog = "https://github.com/Przemko92/compit-inext-api/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.dotlambda ];
   };

From ab07ba2a678ef610c97e910ece52b8decdb4dcd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 10:27:34 +0000
Subject: [PATCH 072/235] scummvm: 2.9.1 -> 2026.1.0

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

diff --git a/pkgs/by-name/sc/scummvm/package.nix b/pkgs/by-name/sc/scummvm/package.nix
index 15831abecef0..a489cfb4e026 100644
--- a/pkgs/by-name/sc/scummvm/package.nix
+++ b/pkgs/by-name/sc/scummvm/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "scummvm";
-  version = "2.9.1";
+  version = "2026.1.0";
 
   src = fetchFromGitHub {
     owner = "scummvm";
     repo = "scummvm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+MM47piuXuIBmAQd0g/cAg5t02qSQ0sw/DwFrMUSIAA=";
+    hash = "sha256-wgMOhQ6yHk4dG94J4EdHTxsaCqapyFhJU1GjRuQY8TY=";
   };
 
   nativeBuildInputs = [ nasm ];

From 6e1ba18a2777f2240198093575031204ba253edc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 10:40:42 +0000
Subject: [PATCH 073/235] mpls: 0.16.1 -> 0.17.0

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

diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix
index b2e71a124d95..4bcfd83c4686 100644
--- a/pkgs/by-name/mp/mpls/package.nix
+++ b/pkgs/by-name/mp/mpls/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "mpls";
-  version = "0.16.1";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "mhersson";
     repo = "mpls";
     tag = "v${version}";
-    hash = "sha256-O//9AeJ9x8WF+0ub6KK91efPr9Hdbx1Ab4X0oaUhwss=";
+    hash = "sha256-DDvjTbACn9qCmfJR6rcGQxVNik9wUCiNYxiYMsEkMXc=";
   };
 
   vendorHash = "sha256-QtNQnJtYLmSTTLwKKQ8P6O6wyctgwN8OcGZkMXa+Ark=";

From 47418eaf4ed7000bedde80203153f7bda95e7544 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 10 Dec 2025 21:02:48 +0800
Subject: [PATCH 074/235] pantheon.mutter: 46.8 -> 48.7

https://github.com/GNOME/mutter/blob/48.7/NEWS
---
 .../mu/{mutter46 => mutter48}/package.nix     | 36 +++++++++++++------
 pkgs/desktops/pantheon/default.nix            |  2 +-
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 28 insertions(+), 11 deletions(-)
 rename pkgs/by-name/mu/{mutter46 => mutter48}/package.nix (77%)

diff --git a/pkgs/by-name/mu/mutter46/package.nix b/pkgs/by-name/mu/mutter48/package.nix
similarity index 77%
rename from pkgs/by-name/mu/mutter46/package.nix
rename to pkgs/by-name/mu/mutter48/package.nix
index c2045eeb3060..17c973d1751d 100644
--- a/pkgs/by-name/mu/mutter46/package.nix
+++ b/pkgs/by-name/mu/mutter48/package.nix
@@ -8,13 +8,16 @@
   gobject-introspection,
   cairo,
   colord,
+  docutils,
   lcms2,
   pango,
   libstartup_notification,
   libcanberra,
   ninja,
   xvfb-run,
+  libadwaita,
   libxcvt,
+  libGL,
   libICE,
   libX11,
   libXcomposite,
@@ -27,7 +30,6 @@
   libxkbfile,
   xkeyboard_config,
   libxkbcommon,
-  libXrender,
   libxcb,
   libXrandr,
   libXinerama,
@@ -69,7 +71,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "46.8";
+  version = "48.7";
 
   outputs = [
     "out"
@@ -80,13 +82,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+8CDVEr7O4Vn18pobCF/g3sG+UeNbiV0FZ/5ocjhyWI=";
+    hash = "sha256-7BAqo8uw45ABIGYnrKMFUxRVX3BgneXmwrfvzR+pDyA=";
   };
 
   mesonFlags = [
     "-Degl_device=true"
     "-Dinstalled_tests=false" # TODO: enable these
-    "-Dtests=false"
+    "-Dtests=disabled"
+    # For NVIDIA proprietary driver up to 470.
+    # https://src.fedoraproject.org/rpms/mutter/pull-request/49
     "-Dwayland_eglstream=true"
     "-Dprofiler=true"
     "-Dxwayland_path=${lib.getExe xwayland}"
@@ -104,13 +108,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     desktop-file-utils
+    docutils # for rst2man
     gettext
+    glib
     libxcvt
     meson
     ninja
     xvfb-run
     pkg-config
     python3
+    python3.pkgs.argcomplete # for register-python-argcomplete
     wayland-scanner
     wrapGAppsHook4
     gi-docgen
@@ -134,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
     libgbm
     libei
     libdisplay-info
+    libGL
     libgudev
     libinput
     libstartup_notification
@@ -162,36 +170,43 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbfile
     xkeyboard_config
     libxkbcommon
-    libXrender
     libxcb
     libXrandr
     libXinerama
     libXau
+
+    # for gdctl shebang
+    (python3.withPackages (pp: [
+      pp.pygobject3
+      pp.argcomplete
+    ]))
   ];
 
   postPatch = ''
     patchShebangs src/backends/native/gen-default-modes.py
-  '';
 
-  postInstall = ''
-    ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
+    # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3981
+    substituteInPlace src/frames/main.c \
+      --replace-fail "libadwaita-1.so.0" "${libadwaita}/lib/libadwaita-1.so.0"
   '';
 
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
     # TODO: Move this into a directory devhelp can find.
-    moveToOutput "share/mutter-14/doc" "$devdoc"
+    moveToOutput "share/mutter-${finalAttrs.passthru.libmutter_api_version}/doc" "$devdoc"
   '';
 
   # Install udev files into our own tree.
   env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
 
   separateDebugInfo = true;
+  strictDeps = true;
 
   doInstallCheck = true;
 
   passthru = {
-    libdir = "${finalAttrs.finalPackage}/lib/mutter-14";
+    libmutter_api_version = "16"; # bumped each dev cycle
+    libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}";
 
     tests = {
       libdirExists = runCommand "mutter-libdir-exists" { } ''
@@ -208,6 +223,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Window manager for GNOME";
     mainProgram = "mutter";
     homepage = "https://gitlab.gnome.org/GNOME/mutter";
+    changelog = "https://gitlab.gnome.org/GNOME/mutter/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
     license = lib.licenses.gpl2Plus;
     teams = [ lib.teams.pantheon ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index 2b3b53bc6e4d..ce88d24e09d1 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -45,7 +45,7 @@ lib.makeScope pkgs.newScope (
 
     teams = [ lib.teams.pantheon ];
 
-    mutter = pkgs.mutter46;
+    mutter = pkgs.mutter48;
 
     # Using 43 to match Mutter used in Pantheon
     gnome-settings-daemon = pkgs.gnome-settings-daemon46;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ab2536fbbed8..1f1ae3d2d466 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1216,6 +1216,7 @@ mapAliases {
   mumps_par = throw "'mumps_par' has been renamed to/replaced by 'mumps-mpi'"; # Converted to throw 2025-10-27
   mustache-tcl = throw "'mustache-tcl' has been renamed to/replaced by 'tclPackages.mustache-tcl'"; # Converted to throw 2025-10-27
   mutt-with-sidebar = throw "'mutt-with-sidebar' has been renamed to/replaced by 'mutt'"; # Converted to throw 2025-10-27
+  mutter46 = throw "'mutter46' has been removed, no longer used by Pantheon"; # Added 2026-01-24
   muzika = throw "muzika was discontinued upstream in november 2024"; # Added 2025-12-15;
   mx-puppet-discord = throw "mx-puppet-discord was removed since the packaging was unmaintained and was the sole user of sha1 hashes in nixpkgs"; # Added 2025-07-24
   mysql-client = throw "mysql-client has been replaced by mariadb.client"; # Converted to throw 2025-10-26

From d9871383f673e9040c331b070e735d6fa6f341ad Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 10 Dec 2025 21:08:42 +0800
Subject: [PATCH 075/235] pantheon.gnome-settings-daemon: 46.0 -> 48.1

https://github.com/GNOME/gnome-settings-daemon/blob/48.1/NEWS
---
 .../add-gnome-session-ctl-option.patch        |  0
 .../fix-paths.patch                           |  0
 .../package.nix                               | 25 ++++++++++++++++---
 pkgs/desktops/pantheon/default.nix            |  4 +--
 pkgs/top-level/aliases.nix                    |  1 +
 5 files changed, 24 insertions(+), 6 deletions(-)
 rename pkgs/by-name/gn/{gnome-settings-daemon46 => gnome-settings-daemon48}/add-gnome-session-ctl-option.patch (100%)
 rename pkgs/by-name/gn/{gnome-settings-daemon46 => gnome-settings-daemon48}/fix-paths.patch (100%)
 rename pkgs/by-name/gn/{gnome-settings-daemon46 => gnome-settings-daemon48}/package.nix (81%)

diff --git a/pkgs/by-name/gn/gnome-settings-daemon46/add-gnome-session-ctl-option.patch b/pkgs/by-name/gn/gnome-settings-daemon48/add-gnome-session-ctl-option.patch
similarity index 100%
rename from pkgs/by-name/gn/gnome-settings-daemon46/add-gnome-session-ctl-option.patch
rename to pkgs/by-name/gn/gnome-settings-daemon48/add-gnome-session-ctl-option.patch
diff --git a/pkgs/by-name/gn/gnome-settings-daemon46/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon48/fix-paths.patch
similarity index 100%
rename from pkgs/by-name/gn/gnome-settings-daemon46/fix-paths.patch
rename to pkgs/by-name/gn/gnome-settings-daemon48/fix-paths.patch
diff --git a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix b/pkgs/by-name/gn/gnome-settings-daemon48/package.nix
similarity index 81%
rename from pkgs/by-name/gn/gnome-settings-daemon46/package.nix
rename to pkgs/by-name/gn/gnome-settings-daemon48/package.nix
index 550c7c6d1023..02c1d8ee6940 100644
--- a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix
+++ b/pkgs/by-name/gn/gnome-settings-daemon48/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   replaceVars,
+  buildPackages,
   fetchurl,
   meson,
   ninja,
@@ -36,15 +37,17 @@
   tzdata,
   gcr_4,
   gnome-session-ctl,
+  udevCheckHook,
+  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-settings-daemon";
-  version = "46.0";
+  version = "48.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
-    hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c=";
+    hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4=";
   };
 
   patches = [
@@ -56,17 +59,24 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  depsBuildBuild = [
+    buildPackages.stdenv.cc
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
     perl
     gettext
+    glib
     libxml2
     libxslt
     docbook_xsl
     wrapGAppsHook3
     python3
+    udevCheckHook
   ];
 
   buildInputs = [
@@ -87,14 +97,19 @@ stdenv.mkDerivation (finalAttrs: {
     polkit
     geocode-glib_2
     geoclue2
-    systemd
     libgudev
     libwacom
     gcr_4
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
   ];
 
   mesonFlags = [
     "-Dudev_dir=${placeholder "out"}/lib/udev"
+    (lib.mesonBool "systemd" withSystemd)
+  ]
+  ++ lib.optionals withSystemd [
     "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
   ];
 
@@ -103,12 +118,14 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
 
   postPatch = ''
-    for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do
+    for f in plugins/power/gsd-power-constants-update.pl; do
       chmod +x $f
       patchShebangs $f
     done
   '';
 
+  doInstallCheck = true;
+
   meta = {
     description = "GNOME Settings Daemon";
     homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/";
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index ce88d24e09d1..aa243007a710 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -47,8 +47,8 @@ lib.makeScope pkgs.newScope (
 
     mutter = pkgs.mutter48;
 
-    # Using 43 to match Mutter used in Pantheon
-    gnome-settings-daemon = pkgs.gnome-settings-daemon46;
+    # Using 48 to match Mutter used in Pantheon
+    gnome-settings-daemon = pkgs.gnome-settings-daemon48;
 
     elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1f1ae3d2d466..7189c4978b2e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -778,6 +778,7 @@ mapAliases {
   gnome-passwordsafe = throw "'gnome-passwordsafe' has been renamed to/replaced by 'gnome-secrets'"; # Converted to throw 2025-10-27
   gnome-recipes = throw "'gnome-recipes' has been removed due to lack of upstream maintenance and dependency on insecure libraries"; # Added 2025-09-06
   gnome-resources = throw "'gnome-resources' has been renamed to/replaced by 'resources'"; # Converted to throw 2025-10-27
+  gnome-settings-daemon46 = throw "'gnome-settings-daemon46' has been removed, no longer used by Pantheon"; # Added 2026-01-24
   gns3Packages = throw "'gns3Packages' has been removed. Use 'gns3-gui' and 'gns3-server' instead."; # Added 2026-01-18
   gnu-cobol = throw "'gnu-cobol' has been renamed to/replaced by 'gnucobol'"; # Converted to throw 2025-10-27
   gnubik = throw "'gnubik' has been removed due to lack of maintenance upstream and its dependency on GTK 2"; # Added 2025-09-16

From 3a340acb9e678ee1b6acc28a914a7f6831490646 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 7 Jan 2026 22:20:56 +0800
Subject: [PATCH 076/235] pantheon.gala: Backport crash fixes for mutter 48

---
 pkgs/desktops/pantheon/desktop/gala/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 95abbb9bef08..77ede83f3b64 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -26,15 +26,17 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "gala";
-  version = "8.4.0";
+  version = "8.4.0-unstable-2026-01-06";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "gala";
-    tag = version;
-    hash = "sha256-Tb6+NfJ2/WRJb3R/W8oBJ5HIT8vwQUxiwqKul2hzlXY=";
+    # Contains crash fixes for mutter 48.
+    # nixpkgs-update: no auto update
+    rev = "8fb60a9c9b04245913733208df1c061d6c353a35";
+    hash = "sha256-GBNrcUAC7UBdyrqoja81bD1oVHjLXWhnDz3gtjMbjII=";
   };
 
   depsBuildBuild = [ pkg-config ];

From 8a1aca456d982ccf76fd63a6dac5b5013a3ee71c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 7 Jan 2026 22:24:36 +0800
Subject: [PATCH 077/235] pantheon.elementary-greeter: Backport crash fixes for
 mutter 48

---
 .../pantheon/desktop/elementary-greeter/default.nix    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 01956edfda2f..003d7b79e9fa 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -31,15 +31,17 @@
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "elementary-greeter";
-  version = "8.1.2";
+  version = "8.1.2-unstable-2025-01-12";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "greeter";
-    tag = version;
-    hash = "sha256-PIhvSY+p66B/dYmgmAioVbVLEUQgoMKNnKGE4HSquI4=";
+    # Contains crash fixes for mutter 48.
+    # nixpkgs-update: no auto update
+    rev = "5510466126f7aa3412a21c055d59f8eb5fcc8d29";
+    hash = "sha256-30XvdeibAptwH4L5MDPPrqQJF0GuPCwwvRc51DgxZp0=";
   };
 
   patches = [

From 36fadaf216daec0f6acf1eb663a448ec84ded50e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 15:43:53 +0000
Subject: [PATCH 078/235] hifile: 0.9.14.0 -> 0.9.15.1

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

diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix
index 8c0b479a9325..67c97d485a36 100644
--- a/pkgs/by-name/hi/hifile/package.nix
+++ b/pkgs/by-name/hi/hifile/package.nix
@@ -2,8 +2,8 @@
   lib,
   appimageTools,
   fetchurl,
-  version ? "0.9.14.0",
-  hash ? "sha256-ABAGXTszJPdmVuRuJddZ2VgMhiABtAYFuxAteP8S44w=",
+  version ? "0.9.15.1",
+  hash ? "sha256-MvzvTa+05oTBVHgoKyGwsC/Ab02RABL2rcUguNICr2o=",
 }:
 
 let

From cb8c4247775a72e1e24746c23d67b07b931237ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 16:19:30 +0000
Subject: [PATCH 079/235] python3Packages.unstructured-client: 0.42.8 -> 0.42.9

---
 .../python-modules/unstructured-client/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix
index afec345dacc8..1b2d0a98b7cb 100644
--- a/pkgs/development/python-modules/unstructured-client/default.nix
+++ b/pkgs/development/python-modules/unstructured-client/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "unstructured-client";
-  version = "0.42.8";
+  version = "0.42.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-python-client";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BXHJOkTZdAnpf38WdHugcwYyWuURylbYTjaKoPt7O5A=";
+    hash = "sha256-+neZK7I5qjidLlM298TrVl5mGFBdGZdxAdFaJIf0tNk=";
   };
 
   preBuild = ''

From 33f082b3054e841fae30beaed1162db254149b02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 16:24:49 +0000
Subject: [PATCH 080/235] goda: 0.7.1 -> 0.8.1

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

diff --git a/pkgs/by-name/go/goda/package.nix b/pkgs/by-name/go/goda/package.nix
index 284d0238ba52..b230824caeab 100644
--- a/pkgs/by-name/go/goda/package.nix
+++ b/pkgs/by-name/go/goda/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "goda";
-  version = "0.7.1";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "loov";
     repo = "goda";
     rev = "v${version}";
-    hash = "sha256-byRficALfYADK2lXskAvYeLxwrzOQXACTLlDRrMoHrw=";
+    hash = "sha256-Cwt2tIP8S+76meuUT/GDUcMGKhJKBg3qGFwen2sEG8I=";
   };
 
-  vendorHash = "sha256-AkO3Ag2FiAC46ZXmG3mVhhWpcaw/Z3oik2cyGmoJFpc=";
+  vendorHash = "sha256-ZDiDAabLUGa/NFs2EQpwWAd8ypxUZ32I8AOeYCm/ntA=";
 
   passthru.updateScript = nix-update-script { };
 

From 27df624d2809996fd628294a579ccb9887543465 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 16:30:08 +0000
Subject: [PATCH 081/235] python3Packages.python-gvm: 26.9.0 -> 26.9.1

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

diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix
index c2a5e831f105..65b81d735ad3 100644
--- a/pkgs/development/python-modules/python-gvm/default.nix
+++ b/pkgs/development/python-modules/python-gvm/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-gvm";
-  version = "26.9.0";
+  version = "26.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "python-gvm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9aqX6/Xb0E4+Ar95NwaCXxPTF0m9zLgzQSSacQqaPyc=";
+    hash = "sha256-ZClhWPo0Tnx62RE/YzADq2QmUnpWdPBX98IIXK0sfOA=";
   };
 
   build-system = [ poetry-core ];

From 0eb8d180d80c101a41e0bb4295ce89d19a26f1e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 16:43:55 +0000
Subject: [PATCH 082/235] python3Packages.meross-iot: 0.4.10.3 -> 0.4.10.4

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

diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index 865fd09978a8..fefa39ae3025 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "meross-iot";
-  version = "0.4.10.3";
+  version = "0.4.10.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "albertogeniola";
     repo = "MerossIot";
     tag = version;
-    hash = "sha256-VxwOigIyLTeP1P9uyiavsu14zTjuLCZuka+2cLqJDUw=";
+    hash = "sha256-9y8/q218hD7BZIbjJvzwmc9bEzWZI+OrA8ERW36ya3w=";
   };
 
   build-system = [ setuptools ];

From a22e908e854e880fe0907c1242c05450602489e8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 24 Jan 2026 19:38:40 +0200
Subject: [PATCH 083/235] brotab: replace susbstitution with pythonRelaxDeps

---
 pkgs/by-name/br/brotab/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix
index 90000a4e1264..a46bc6f3b482 100644
--- a/pkgs/by-name/br/brotab/package.nix
+++ b/pkgs/by-name/br/brotab/package.nix
@@ -37,12 +37,11 @@ python3Packages.buildPythonApplication rec {
     setuptools
   ];
 
-  postPatch = ''
-    substituteInPlace requirements/base.txt \
-      --replace-fail "Flask==2.0.2" "Flask>=2.0.2" \
-      --replace-fail "psutil==5.8.0" "psutil>=5.8.0" \
-      --replace-fail "requests==2.24.0" "requests>=2.24.0"
-  '';
+  pythonRelaxDeps = [
+    "flask"
+    "psutil"
+    "requests"
+  ];
 
   __darwinAllowLocalNetworking = true;
 

From cd1f456b7763b1d95bb78af290cf5f80f8e3fff1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 17:47:50 +0000
Subject: [PATCH 084/235] debian-devscripts: 2.26.4 -> 2.26.5

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

diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index 391cbfea9f00..52753b1f4e56 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -30,14 +30,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "debian-devscripts";
-  version = "2.26.4";
+  version = "2.26.5";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "devscripts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QGveq9PZfy/m+ah4gBvZDMkVWS50oj1f4SJsKcCKGug=";
+    hash = "sha256-Fwl7UGIe0DcqKRWC/rm1Sa1DfxX4I35yJVSmfxERK6k=";
   };
 
   patches = [

From 04cbae83857fddb05697b28b2f6471e73e6a1387 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 24 Jan 2026 18:49:30 +0100
Subject: [PATCH 085/235] grafana-image-renderer: 5.2.3 -> 5.4.0

ChangeLogs:
* https://github.com/grafana/grafana-image-renderer/releases/tag/v5.3.0
* https://github.com/grafana/grafana-image-renderer/releases/tag/v5.4.0
---
 pkgs/by-name/gr/grafana-image-renderer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix
index 500f58f36a94..4671853acf65 100644
--- a/pkgs/by-name/gr/grafana-image-renderer/package.nix
+++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix
@@ -6,19 +6,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafana-image-renderer";
-  version = "5.2.3";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-image-renderer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YoJ50PhpxXQLpZpq+fLiN2uYU1C6w8C2UVun/klee4E=";
+    hash = "sha256-rCFdjM5ZBHcfl4/WXM4CPdLlIprJr3HATboBF89sMFA=";
   };
 
   vendorHash = "sha256-kGLvstSkucM0tN5l+Vp78IP9EwDx62kukAiOwYD4Vfs=";
 
   postPatch = ''
-    substituteInPlace go.mod --replace-fail 'go 1.25.5' 'go 1.25.4'
+    substituteInPlace go.mod --replace-fail 'go 1.25.6' 'go 1.25.5'
   '';
 
   subPackages = [ "." ];

From 341d164b89fa0fa0bba34f0e5f7db0cc764cd08f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 24 Jan 2026 20:03:49 +0200
Subject: [PATCH 086/235] brotab: install native messaging hosts files properly

---
 pkgs/by-name/br/brotab/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix
index a46bc6f3b482..f34acc69bb54 100644
--- a/pkgs/by-name/br/brotab/package.nix
+++ b/pkgs/by-name/br/brotab/package.nix
@@ -43,6 +43,16 @@ python3Packages.buildPythonApplication rec {
     "requests"
   ];
 
+  postInstall = ''
+    substituteInPlace $out/config/*json \
+      --replace-fail '$PWD/brotab_mediator.py' $out/bin/bt_mediator
+    mkdir -p $out/lib/mozilla/native-messaging-hosts
+    mv $out/config/firefox_mediator.json $out/lib/mozilla/native-messaging-hosts
+    mkdir -p $out/etc/chromium/native-messaging-hosts
+    mv $out/config/chromium_mediator.json $out/etc/chromium/native-messaging-hosts
+    rmdir $out/config
+  '';
+
   __darwinAllowLocalNetworking = true;
 
   nativeCheckInputs = with python3Packages; [

From d5588763c0abd08f326dc95b5a4b79f343a6429e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 24 Jan 2026 19:34:16 +0200
Subject: [PATCH 087/235] brotab: 1.4.2 -> 1.5.0

Diff: https://github.com/balta2ar/brotab/compare/1.4.2...1.5.0
---
 pkgs/by-name/br/brotab/package.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix
index f34acc69bb54..61cbf7603302 100644
--- a/pkgs/by-name/br/brotab/package.nix
+++ b/pkgs/by-name/br/brotab/package.nix
@@ -1,31 +1,21 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch,
   python3Packages,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "brotab";
-  version = "1.4.2";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "balta2ar";
     repo = "brotab";
     tag = version;
-    hash = "sha256-HKKjiW++FwjdorqquSCIdi1InE6KbMbFKZFYHBxzg8Q=";
+    hash = "sha256-Pv5tEDL11brc/n3TuFcad9kTr7Jb/Bt7JFb29HuX/28=";
   };
 
-  patches = [
-    # https://github.com/balta2ar/brotab/pull/102
-    (fetchpatch {
-      name = "remove-unnecessary-pip-import.patch";
-      url = "https://github.com/balta2ar/brotab/commit/825cd48f255c911aabbfb495f6b8fc73f27d3fe5.patch";
-      hash = "sha256-IN28AOLPKPUc3KkxIGFMpZNNXA1+O12NxS+Hl4KMXbg=";
-    })
-  ];
-
   build-system = with python3Packages; [
     setuptools
   ];
@@ -34,6 +24,7 @@ python3Packages.buildPythonApplication rec {
     flask
     psutil
     requests
+    werkzeug
     setuptools
   ];
 
@@ -41,6 +32,8 @@ python3Packages.buildPythonApplication rec {
     "flask"
     "psutil"
     "requests"
+    "werkzeug"
+    "setuptools"
   ];
 
   postInstall = ''
@@ -50,6 +43,8 @@ python3Packages.buildPythonApplication rec {
     mv $out/config/firefox_mediator.json $out/lib/mozilla/native-messaging-hosts
     mkdir -p $out/etc/chromium/native-messaging-hosts
     mv $out/config/chromium_mediator.json $out/etc/chromium/native-messaging-hosts
+    mkdir -p $out/lib/albert
+    mv $out/config/Brotab.qss $out/lib/albert
     rmdir $out/config
   '';
 

From f9c418d366e537a5fcb6b35b286f12aa9e987bf8 Mon Sep 17 00:00:00 2001
From: hustlerone <nine-ball@tutanota.com>
Date: Sat, 24 Jan 2026 12:07:01 +0100
Subject: [PATCH 088/235] ps3-disc-dumper: 4.4.0 -> 4.4.1

Bugfix release, some discs wouldn't be detected before
---
 pkgs/by-name/ps/ps3-disc-dumper/deps.json   | 80 ++++++++++-----------
 pkgs/by-name/ps/ps3-disc-dumper/package.nix |  4 +-
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/ps/ps3-disc-dumper/deps.json b/pkgs/by-name/ps/ps3-disc-dumper/deps.json
index 136abb3d1a3e..f6de2b33c809 100644
--- a/pkgs/by-name/ps/ps3-disc-dumper/deps.json
+++ b/pkgs/by-name/ps/ps3-disc-dumper/deps.json
@@ -1,8 +1,8 @@
 [
   {
     "pname": "Avalonia",
-    "version": "11.3.8",
-    "hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g="
+    "version": "11.3.11",
+    "hash": "sha256-FSMuXVA5q5L5evwos5bIsuT81suO8FbCjEF3OvAL9p0="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -11,53 +11,53 @@
   },
   {
     "pname": "Avalonia.BuildServices",
-    "version": "11.3.1",
-    "hash": "sha256-JYcA/DgTHRJ02/FcURqtJnXYhhdzki8DGECLkZ4zONg="
+    "version": "11.3.2",
+    "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.8",
-    "hash": "sha256-X/ggsRzsN7o3O4Iw4uvjgOdlW58Xbe8Jpv4llRuFcoA="
+    "version": "11.3.11",
+    "hash": "sha256-oFivO8/0rir4BwQsTeWs3bSnb7RmldwxYmI77j5pt8k="
   },
   {
     "pname": "Avalonia.Fonts.Inter",
-    "version": "11.3.8",
-    "hash": "sha256-EaUjJZ+K+5HaSJ1hmLgwuH4HGp1N2s1TNJogZulpVT8="
+    "version": "11.3.11",
+    "hash": "sha256-S0DWwcZHulVUIckiv2HM1Vbqno64c/Xt+mPhZp1tfsA="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.8",
-    "hash": "sha256-XJogaWo4ZNg/PvckA6D5EEuyQneYUKDePnT9snNwaHs="
+    "version": "11.3.11",
+    "hash": "sha256-UE2/w9cw3YDzsw3HuhI2sTPy8reH9C71ufmHOpzvlSQ="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.8",
-    "hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw="
+    "version": "11.3.11",
+    "hash": "sha256-vw67lp/oOt+2lqdJ5PK2FY93jqPTcgZqOAXLtSXlJ8s="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.8",
-    "hash": "sha256-pCIcQuTTcpik4xg5x8Y/QuXaW/GmNny/5ZBVr0bhmNU="
+    "version": "11.3.11",
+    "hash": "sha256-l1f3rVygtI268llwbN0NvTDSfXwZE3CyRw8w5tbHBC4="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.8",
-    "hash": "sha256-FeJ6tdgeGKHkv0JKPOq2eHTxaDTT0t2yJ7wavBKnr68="
+    "version": "11.3.11",
+    "hash": "sha256-89TGu50JfEVFo+QZgyOR0uOagC/xoJvqfnrHep3W/cc="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.3.8",
-    "hash": "sha256-fVXc8+WPRa3YkX4EIt/Wjz9hnI7y6pv3P1cCBhEPgOg="
+    "version": "11.3.11",
+    "hash": "sha256-tiJ0xAFf0UVSH7LASPtg/7ils7+vZjw2UKBMydyUR3Q="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.8",
-    "hash": "sha256-YwzyF4YJtCzcLpGxDe6U3Tpxjcqft8mcYjUNnL2Ockg="
+    "version": "11.3.11",
+    "hash": "sha256-6/NG4OrB/4YisXzJ51GPuq3uDn8oEUWyJRAqejyMCQw="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.8",
-    "hash": "sha256-SlAWkiaGYc+Ynq4QcO3/xorz2EIWWyrZcHXIk7F68i0="
+    "version": "11.3.11",
+    "hash": "sha256-2fiQvKxU/r71UOAQgy0zwSHVCM2uG2sdEUhObd5TrQQ="
   },
   {
     "pname": "CommunityToolkit.Mvvm",
@@ -91,33 +91,33 @@
   },
   {
     "pname": "LTRData.DiscUtils.Core",
-    "version": "1.0.70",
-    "hash": "sha256-JkhbjVxQRipBp83zj2c5UyDHwEj/ubVi3r3GZ42onbI="
+    "version": "1.0.73",
+    "hash": "sha256-lcGzIigsoAI15hXh3bGwH05cIjZThHQbWPcCf4THgpk="
   },
   {
     "pname": "LTRData.DiscUtils.Iso9660",
-    "version": "1.0.70",
-    "hash": "sha256-HU15n+1yxQdgxPtEXNZ9FRhX6TMa9YevrI+gkODdMco="
+    "version": "1.0.73",
+    "hash": "sha256-7YJQ1102N2DdQqJKE6V9L1NVAHsM5FFYxlYnIj+MACk="
   },
   {
     "pname": "LTRData.DiscUtils.OpticalDisk",
-    "version": "1.0.70",
-    "hash": "sha256-lRof+dic1S/M8Llxy34NAbPkipYm9RRwNBl2oywS9KY="
+    "version": "1.0.73",
+    "hash": "sha256-FRhI9BWX2OcQvF4X9jV2wvBNcA4kV/ewXlr/m96Tjrg="
   },
   {
     "pname": "LTRData.DiscUtils.Streams",
-    "version": "1.0.70",
-    "hash": "sha256-wM3hkrr3nv1vzgkzVw/e4m/VwMGvwzSTm8jnN/Tt4I4="
+    "version": "1.0.73",
+    "hash": "sha256-Mh+6y6MrGAepwHYFihpPWsZy77cszt1aUbmbPYNbhf0="
   },
   {
     "pname": "LTRData.DiscUtils.Udf",
-    "version": "1.0.70",
-    "hash": "sha256-cmv6YkU/tS94w8/QZwrdJkDtxicXjhqyZ3GsdJYxjLQ="
+    "version": "1.0.73",
+    "hash": "sha256-uzH6wilWY1wTJYAe86jsudWVQ5qFI2hL+fDiDCaLslA="
   },
   {
     "pname": "LTRData.Extensions",
-    "version": "1.0.20",
-    "hash": "sha256-K/y4fOHXQ3HbgwisjVbKmCz0lHEPilG+Icdj5choJg8="
+    "version": "1.0.22",
+    "hash": "sha256-wI3vdyeZ9teU4WaWOwfLxem7KCcVVRkWOIdg+YBdXBE="
   },
   {
     "pname": "MicroCom.Runtime",
@@ -171,17 +171,17 @@
   },
   {
     "pname": "System.IO.Hashing",
-    "version": "10.0.0",
-    "hash": "sha256-zq3baIIsQ1kaY4CVl0vpkDcZb2ZNwT7wC0wDqzEN5oI="
+    "version": "10.0.2",
+    "hash": "sha256-EJJnwGFb3pA25VbUqXfK/p1h07vPoxoYqz3GiaGHuP8="
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.21.2",
-    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+    "version": "0.23.0",
+    "hash": "sha256-YIkrazOeITsW7YDm15AvTqMKj7D2PDJtb+gqUuCdvLA="
   },
   {
     "pname": "WmiLight",
-    "version": "6.16.0",
-    "hash": "sha256-R2L7HLEkGEWFtiLDVqXNHyszPUlLdP/jm4hX8iAmHkk="
+    "version": "7.1.0",
+    "hash": "sha256-tEMgIkptFVfMEqOce4aawypWpVveaynJC/lKJiat8nU="
   }
 ]
diff --git a/pkgs/by-name/ps/ps3-disc-dumper/package.nix b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
index 7868cd8726f4..282cc1a35ed5 100644
--- a/pkgs/by-name/ps/ps3-disc-dumper/package.nix
+++ b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
@@ -10,13 +10,13 @@
 
 buildDotnetModule rec {
   pname = "ps3-disc-dumper";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "13xforever";
     repo = "ps3-disc-dumper";
     tag = "v${version}";
-    hash = "sha256-urIeR6iVL5DDqzOUfI291WYArrEpLzNg7pnvjACUuk8=";
+    hash = "sha256-Bq0HZZIXWUBiD89lX3CWtlgwEhoHfVpKJh2hKdLNweY=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_10_0;

From 2e7c177e51f75a847207b6d0c5032fc723a8fa43 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Jan 2026 15:44:24 +0000
Subject: [PATCH 089/235] swim: 0.13.0 -> 0.16.0

Diff: https://gitlab.com/spade-lang/swim/-/compare/v0.13.0...v0.16.0

Changelog: https://gitlab.com/spade-lang/swim/-/blob/v0.16.0/CHANGELOG.md
---
 pkgs/by-name/sw/swim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix
index 353065cc663c..0b56dd642b9b 100644
--- a/pkgs/by-name/sw/swim/package.nix
+++ b/pkgs/by-name/sw/swim/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "swim";
-  version = "0.13.0";
+  version = "0.16.0";
 
   src = fetchFromGitLab {
     owner = "spade-lang";
     repo = "swim";
     rev = "v${version}";
-    hash = "sha256-0H45kOIwFMdp+eIQJNutLUC/jEpWKsPfEZXDUOUa12g=";
+    hash = "sha256-8JUy5gMZv7qzksrnoCwS4Wxk8xvy02sYGKHxwncAy7c=";
   };
 
-  cargoHash = "sha256-fF+43tZzr6lxVovMCIaDwf9JKweqiMMR+BNojIqQREY=";
+  cargoHash = "sha256-M4gwOAEPN3J7Ftirotbdk/UOE0hqbYpxBDO65YPXxBc=";
 
   preConfigure = ''
     # de-vendor spade git submodule

From 84cf1e4bc70e3447e3e331503d7bf5cd2ff6b70f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Jan 2026 15:44:00 +0000
Subject: [PATCH 090/235] spade: 0.13.0 -> 0.16.0

Diff: https://gitlab.com/spade-lang/spade/-/compare/v0.13.0...0.16.0

Changelog: https://gitlab.com/spade-lang/spade/-/blob/v0.16.0/CHANGELOG.md
---
 pkgs/by-name/sp/spade/package.nix | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix
index f431abb2de03..97b89f94cb78 100644
--- a/pkgs/by-name/sp/spade/package.nix
+++ b/pkgs/by-name/sp/spade/package.nix
@@ -10,24 +10,24 @@
   git,
   pkg-config,
   openssl,
-  python312,
+  python314,
   swim,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "spade";
-  version = "0.13.0";
+  version = "0.16.0";
 
   src = fetchFromGitLab {
     owner = "spade-lang";
     repo = "spade";
     rev = "v${version}";
-    hash = "sha256-eWeEbwIm+PC0XHmvV3xZqUIcA01arnalbGFtPTUP9tg=";
+    hash = "sha256-Q9LiyCkrHQxnTorAqPOykS4F06c01pYPW9t82xEn6DY=";
     # only needed for vatch, which contains test data
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-YMUeHr9eUOYIcO7PbaFgZa0Ib10GMF+jT10ZCSG7PNo=";
+  cargoHash = "sha256-zuj34DpQKu7uWYgL/JTq7zLTPvZKQ/eedBXrkN1Pvg0=";
 
   # TODO: somehow respect https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit
   passthru.updateScript = _experimental-update-script-combinators.sequence [
@@ -55,8 +55,19 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     openssl
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ python312 ];
-  env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-L${python312}/lib/python3.12/config-3.12-darwin -lpython3.12";
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    python314
+  ];
+  env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-L${python314}/lib/python3.14/config-3.14-darwin -lpython3.14";
+
+  cargoBuildFlags = [
+    "--workspace"
+    # TODO: --exclude the excluded crates listed in release.sh?
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # "Undefined symbols for architecture arm:" ...
+    "--exclude=spade-surfer-plugin"
+  ];
 
   passthru.tests = {
     inherit swim;

From 950e77450ddf2b204cb67bbb5e03d83c2afca764 Mon Sep 17 00:00:00 2001
From: M0ustach3 <37956764+M0ustach3@users.noreply.github.com>
Date: Sat, 24 Jan 2026 20:09:49 +0100
Subject: [PATCH 091/235] fosrl-newt: 1.8.1 -> 1.9.0

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

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index 2204da49223e..01da2d2a7e0c 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "newt";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "newt";
     tag = version;
-    hash = "sha256-ndgigIk/3/cPZaJHfxWh6XvtAJe3S57sEwNTMBH0lSE=";
+    hash = "sha256-Ya+OVSChGmiZ8JTAfl/im8fOhLCC+r6JKSlH+CnSwP8=";
   };
 
-  vendorHash = "sha256-5Xr6mwPtsqEliKeKv2rhhp6JC7u3coP4nnhIxGMqccU=";
+  vendorHash = "sha256-Sib6AUCpMgxlMpTc2Esvs+UU0yduVOxWUgT44FHAI+k=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From fa090e3b605a6fbc9643ffcea89fa557f4490956 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 24 Jan 2026 16:13:21 -0300
Subject: [PATCH 092/235] microsoft-edge: 144.0.3719.82 -> 144.0.3719.92

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

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 475a8c79db00..4782101959d6 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -162,11 +162,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "144.0.3719.82";
+  version = "144.0.3719.92";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-W7wT+1aNF7ZuhYPQ2VAvVgJ+5GWsopEnDM9FhdpxBIg=";
+    hash = "sha256-fi1vQIc069HS7t/pF+bC/QBbyZbpQvggUyt9pjKZUBo=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 2bf6179b2e357cdcef6e2aa254661172bf889812 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 24 Jan 2026 14:32:12 -0500
Subject: [PATCH 093/235] google-chrome: symlink $out/bin/google-chrome-stable
 to $out/bin/google-chrome

---
 pkgs/by-name/go/google-chrome/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index b11bf84e58ab..725cecc5be8e 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -96,6 +96,9 @@
 
   # For QT support
   qt6,
+
+  # Create a symlink at $out/bin/google-chrome
+  withSymlink ? true,
 }:
 
 let
@@ -268,6 +271,10 @@ let
 
       runHook postInstall
     '';
+
+    postInstall = lib.optionalString withSymlink ''
+      ln -s $out/bin/google-chrome-stable $out/bin/google-chrome
+    '';
   });
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
@@ -305,6 +312,10 @@ let
         --add-flags ${lib.escapeShellArg commandLineArgs}
       runHook postInstall
     '';
+
+    postInstall = lib.optionalString withSymlink ''
+      ln -s $out/bin/google-chrome-stable $out/bin/google-chrome
+    '';
   });
 
   passthru.updateScript = ./update.sh;

From b424739ee7e62e3fd8d83db31057802eb81be4ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 20:29:55 +0000
Subject: [PATCH 094/235] curv: 0.5-unstable-2026-01-17 ->
 0.5-unstable-2026-01-23

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

diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix
index 865b021bf54e..63f7b5152933 100644
--- a/pkgs/by-name/cu/curv/package.nix
+++ b/pkgs/by-name/cu/curv/package.nix
@@ -22,14 +22,14 @@
 
 stdenv.mkDerivation {
   pname = "curv";
-  version = "0.5-unstable-2026-01-17";
+  version = "0.5-unstable-2026-01-23";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "doug-moen";
     repo = "curv";
-    rev = "1c2eb68e47e3c61a98e39cd3c50f90691c5a268d";
-    hash = "sha256-PuRBnJswrg+PjtU6ize+PjoBpQSSEzO2CeCx9mQF+3w=";
+    rev = "17d03b534c69976ed60936beb8b7cc38e8c12c13";
+    hash = "sha256-qQLcRCha01b6ClUSPO2jMBDJsN28EhqzakTLu1medAQ=";
     fetchSubmodules = true;
   };
 

From b67a90b4ce1506f4e87fb155ef541f982db80481 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 20:43:01 +0000
Subject: [PATCH 095/235] llama-cpp: 7815 -> 7823

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 9f056e6e73f1..cd6816ddcf9b 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -74,13 +74,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "7815";
+  version = "7823";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-KeLi/DsbSbTNK7EwDOugsJaYEAU3JLOYno59hgJgXhc=";
+    hash = "sha256-3NLIX2bAxaxkpPRMzxWfcEhJDke2q4TWAyWjXIa/Wpk=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From f0e8699e668d58580500a82beff4b67cfb37b451 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 5 Jan 2026 13:45:17 -0500
Subject: [PATCH 096/235] slimserver: fix perl 5.42 runtime compatibility

---
 pkgs/by-name/sl/slimserver/package.nix | 91 +++++++-------------------
 1 file changed, 25 insertions(+), 66 deletions(-)

diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix
index 1241c5717bc7..6de031572e4d 100644
--- a/pkgs/by-name/sl/slimserver/package.nix
+++ b/pkgs/by-name/sl/slimserver/package.nix
@@ -45,100 +45,59 @@ perlPackages.buildPerlPackage rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
+  # slimserver vendors quite a few CPAN packages
+  # this list is intended to only replace compiled modules
+  # which can be found in CPAN/arch in the slimserver repo
+  # replacements are added here AND removed in prePatch to
+  # avoid module mismatches
   buildInputs =
     with perlPackages;
     [
-      AnyEvent
-      ArchiveZip
-      AsyncUtil
       AudioScan
-      CarpAssert
-      CarpClan
-      CGI
-      ClassAccessor
-      ClassAccessorChained
-      ClassC3
-      # ClassC3Componentised # Error: DBIx::Class::Row::throw_exception(): DBIx::Class::Relationship::BelongsTo::belongs_to(): Can't infer join condition for track
-      ClassDataInheritable
-      ClassInspector
-      ClassISA
-      ClassMember
-      ClassSingleton
-      ClassVirtual
       ClassXSAccessor
-      CompressRawZlib
-      CryptOpenSSLRSA
-      DataDump
-      DataPage
-      DataURIEncode
       DBDSQLite
       DBI
-      # DBIxClass # https://github.com/LMS-Community/slimserver/issues/138
       DigestSHA1
       EncodeDetect
       EV
-      ExporterLite
-      FileBOM
-      FileCopyRecursive
-      # FileNext # https://github.com/LMS-Community/slimserver/pull/1140
-      FileReadBackwards
-      FileSlurp
-      FileWhich
       HTMLParser
-      HTTPCookies
-      HTTPDaemon
-      HTTPMessage
       ImageScale
       IOAIO
       IOInterface
       IOSocketSSL
-      IOString
       JSONXS
       JSONXSVersionOneAndTwo
-      # LogLog4perl # Internal error: Root Logger not initialized.
-      LWP
-      LWPProtocolHttps
       MP3CutGapless
-      NetHTTP
-      NetHTTPSNB
-      PathClass
-      ProcBackground
-      # SQLAbstract # DBI Exception: DBD::SQLite::db prepare_cached failed: no such function: ARRAY
-      SQLAbstractLimit
       SubName
       TemplateToolkit
-      TextUnidecode
-      TieCacheLRU
-      TieCacheLRUExpires
-      TieRegexpHash
-      TimeDate
-      URI
-      URIFind
-      UUIDTiny
       XMLParser
-      XMLSimple
       YAMLLibYAML
     ]
-    # ++ (lib.optional stdenv.hostPlatform.isDarwin perlPackages.MacFSEvents)
-    ++ (lib.optional stdenv.hostPlatform.isLinux perlPackages.LinuxInotify2);
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      LinuxInotify2
+    ];
 
   prePatch = ''
     # remove vendored binaries
     rm -rf Bin
 
-    # remove most vendored modules, keeping necessary ones
-    mkdir -p CPAN_used/Class/C3/ CPAN_used/SQL/ CPAN_used/File/
-    rm -r CPAN/SQL/Abstract/Limit.pm
-    cp -rv CPAN/Class/C3/Componentised.pm CPAN_used/Class/C3/
-    cp -rv CPAN/DBIx CPAN_used/
-    cp -rv CPAN/File/Next.pm CPAN_used/File/
-    cp -rv CPAN/Log CPAN_used/
-    cp -rv CPAN/SQL/* CPAN_used/SQL/
-    rm -r CPAN
-    mv CPAN_used CPAN
-
-    # another set of vendored/modified modules exist in lib, more selectively cleaned for now
-    rm -rf lib/Audio
+    # remove precompiled cpan modules
+    rm -rf CPAN/arch
+    # remove the precompiled modules, they come from buildInputs
+    rm -rf CPAN/Class/XSAccessor{,.pm}
+    rm -rf CPAN/DBD{,.pm}
+    rm -rf CPAN/DBI{,.pm}
+    rm -rf CPAN/Digest/SHA1{,.pm}
+    rm -rf CPAN/Encode/Detect{,.pm}
+    rm -rf CPAN/HTML/Parser{,.pm}
+    rm -rf CPAN/Image{,.pm}
+    rm -rf CPAN/IO/AIO{,.pm}
+    rm -rf CPAN/IO/Interface{,.pm}
+    rm -rf CPAN/JSON/XS{,.pm}
+    rm -rf CPAN/MP3/Cut/Gapless{,.pm}
+    rm -rf CPAN/Sub/Name{,.pm}
+    rm -rf CPAN/XML/Parser{,.pm}
+    rm -rf CPAN/YAML/XS{,.pm}
 
     ${lib.optionalString (!enableUnfreeFirmware) ''
       # remove unfree firmware

From d6f7f2c2714841cdd0c7ef0b90fed19ad10c8cb7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 21:28:41 +0000
Subject: [PATCH 097/235] savepagenow: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/sa/savepagenow/package.nix b/pkgs/by-name/sa/savepagenow/package.nix
index b2687794190b..3d6c5f7f9ef2 100644
--- a/pkgs/by-name/sa/savepagenow/package.nix
+++ b/pkgs/by-name/sa/savepagenow/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "savepagenow";
-  version = "1.3.0";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pastpages";
     repo = "savepagenow";
     tag = version;
-    sha256 = "sha256-omQ28GqgBKC8W51c0qb6Tg06obXskyfF+2dg/13ah1M=";
+    sha256 = "sha256-ztM1g71g8SN1LTyFF7sxaLhC3+nVsC9fJwfYPjkUsdE=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From cfc1ff230f4522ae5d7e45f8d5d1df4cf26fd1ef Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 24 Jan 2026 22:46:31 +0100
Subject: [PATCH 098/235] proton-ge-bin: GE-Proton10-28 -> GE-Proton10-29

---
 pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index 85e659856088..9b177adc74ad 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton10-28";
+  version = "GE-Proton10-29";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-6NvSGX8445la6WU6z9UaaKJm30eg094cuTyhHVDjbOo=";
+    hash = "sha256-ATtKLEKA+r557FVnBoW/iYrRR4Ki9G8rjlV4+2rki0I=";
   };
 
   dontUnpack = true;

From cf37ecf7dcfb0a27bdde669160c06dc0c3c1b679 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 24 Jan 2026 12:43:27 -0600
Subject: [PATCH 099/235] yaziPlugins: update on 2026-01-24
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- compress: 0-unstable-2026-01-10 → 25.12.29-unstable-2026-01-24
  Compare: https://github.com/KKV9/compress.yazi/compare/e6007f7c3f364cdb7146f5b6b282790948fb0bd6...cb6e8ec0141915dc319ccd6b904dcd2f03502576
- diff: 25.2.7-unstable-2025-12-31 → 26.1.22-unstable-2026-01-24
  Compare: https://github.com/yazi-rs/plugins/compare/398796d88fee7bf9c99c4dc29089b865d4f47722...6c71385af67c71cb3d62359e94077f2e940b15df
- lsar: 25.5.31-unstable-2025-12-31 → 26.1.22-unstable-2026-01-24
  Compare: https://github.com/yazi-rs/plugins/compare/398796d88fee7bf9c99c4dc29089b865d4f47722...6c71385af67c71cb3d62359e94077f2e940b15df
- mediainfo: 25.5.31-unstable-2026-01-07 → 25.5.31-unstable-2026-01-24
  Compare: https://github.com/boydaihungst/mediainfo.yazi/compare/7cd6b042aba45367701e00819705bd0bac2c963c...ae2a1f18feb55ea9148032ce247109f2303ddbfd
- piper: 25.9.15-unstable-2026-01-12 → 26.1.22-unstable-2026-01-24
  Compare: https://github.com/yazi-rs/plugins/compare/c179ea49753b3a784935986d36b077a6df24bdb3...6c71385af67c71cb3d62359e94077f2e940b15df
- recycle-bin: 0-unstable-2026-01-04 → 0-unstable-2026-01-17
  Compare: https://github.com/uhs-robert/recycle-bin.yazi/compare/69d7d4ce9e102b9249166c8ea783cfd24bdf7bb4...fa687116c46a784e664ef96619b32abf51f29b06
- vcs-files: 25.12.29-unstable-2026-01-06 → 26.1.22-unstable-2026-01-24
  Compare: https://github.com/yazi-rs/plugins/compare/4e5590280db0de5f130bf377e9c32a202110f575...6c71385af67c71cb3d62359e94077f2e940b15df

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/ya/yazi/plugins/compress/default.nix    | 6 +++---
 pkgs/by-name/ya/yazi/plugins/diff/default.nix        | 6 +++---
 pkgs/by-name/ya/yazi/plugins/lsar/default.nix        | 6 +++---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix   | 6 +++---
 pkgs/by-name/ya/yazi/plugins/piper/default.nix       | 6 +++---
 pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix | 6 +++---
 pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix   | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/compress/default.nix b/pkgs/by-name/ya/yazi/plugins/compress/default.nix
index 042efadbf6d8..dc56ed1048aa 100644
--- a/pkgs/by-name/ya/yazi/plugins/compress/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/compress/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "compress.yazi";
-  version = "0-unstable-2026-01-10";
+  version = "25.12.29-unstable-2026-01-24";
 
   src = fetchFromGitHub {
     owner = "KKV9";
     repo = "compress.yazi";
-    rev = "e6007f7c3f364cdb7146f5b6b282790948fb0bd6";
-    hash = "sha256-m5FfN2gnTHsbwP2aYaE+K6kNGfAC7HBVtCyy6HzNRrE=";
+    rev = "cb6e8ec0141915dc319ccd6b904dcd2f03502576";
+    hash = "sha256-D/EpcRDIc3toeyjHqi+vGw0v9B22HVvKJua5EVEAc0U=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/diff/default.nix b/pkgs/by-name/ya/yazi/plugins/diff/default.nix
index f6fb9c4d802d..91cad01652c3 100644
--- a/pkgs/by-name/ya/yazi/plugins/diff/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/diff/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "diff.yazi";
-  version = "25.2.7-unstable-2025-12-31";
+  version = "26.1.22-unstable-2026-01-24";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "398796d88fee7bf9c99c4dc29089b865d4f47722";
-    hash = "sha256-LOQ/0LYVrXsqQjeBeERKQ2M8BwN8xo3yej1mxNHphOU=";
+    rev = "6c71385af67c71cb3d62359e94077f2e940b15df";
+    hash = "sha256-+akz8E6Fmk6KwmeZOePEm/KqfbDaKeL4wiUgtm12SAE=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix
index 9ca9da29b88c..7587f0db6d45 100644
--- a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "lsar.yazi";
-  version = "25.5.31-unstable-2025-12-31";
+  version = "26.1.22-unstable-2026-01-24";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "398796d88fee7bf9c99c4dc29089b865d4f47722";
-    hash = "sha256-LOQ/0LYVrXsqQjeBeERKQ2M8BwN8xo3yej1mxNHphOU=";
+    rev = "6c71385af67c71cb3d62359e94077f2e940b15df";
+    hash = "sha256-+akz8E6Fmk6KwmeZOePEm/KqfbDaKeL4wiUgtm12SAE=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index 6b85010096d4..b44310426a03 100644
--- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mediainfo.yazi";
-  version = "25.5.31-unstable-2026-01-07";
+  version = "25.5.31-unstable-2026-01-24";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "7cd6b042aba45367701e00819705bd0bac2c963c";
-    hash = "sha256-Ehg8PFiOLy4iKgsOjj8KiNGTdj3VwkdmNP3lvdBi9aY=";
+    rev = "ae2a1f18feb55ea9148032ce247109f2303ddbfd";
+    hash = "sha256-QH1vvPjPYGbf47kSgxV97pxZrdSFcqAEyXtQbJhusLg=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/piper/default.nix b/pkgs/by-name/ya/yazi/plugins/piper/default.nix
index e02678dea0a9..b5f35832915a 100644
--- a/pkgs/by-name/ya/yazi/plugins/piper/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/piper/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "piper.yazi";
-  version = "25.9.15-unstable-2026-01-12";
+  version = "26.1.22-unstable-2026-01-24";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "c179ea49753b3a784935986d36b077a6df24bdb3";
-    hash = "sha256-0VKoUusTmKVxW8fJkYf0lm17bMjvkN1/tmx7+pNJdWI=";
+    rev = "6c71385af67c71cb3d62359e94077f2e940b15df";
+    hash = "sha256-+akz8E6Fmk6KwmeZOePEm/KqfbDaKeL4wiUgtm12SAE=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
index 5bf02985a679..261185b749b6 100644
--- a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "recycle-bin.yazi";
-  version = "0-unstable-2026-01-04";
+  version = "0-unstable-2026-01-17";
 
   src = fetchFromGitHub {
     owner = "uhs-robert";
     repo = "recycle-bin.yazi";
-    rev = "69d7d4ce9e102b9249166c8ea783cfd24bdf7bb4";
-    hash = "sha256-oGmgqe8ZUJM3cxIPw019PwcNaQjLYquFpD1awabPrPc=";
+    rev = "fa687116c46a784e664ef96619b32abf51f29b06";
+    hash = "sha256-lpxTGWA15szM5VJ+qvV2+GTg7HXiZaZfyWyjeNMsTSM=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
index 423b962aef67..406368906de2 100644
--- a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "vcs-files.yazi";
-  version = "25.12.29-unstable-2026-01-06";
+  version = "26.1.22-unstable-2026-01-24";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "4e5590280db0de5f130bf377e9c32a202110f575";
-    hash = "sha256-/yGS8R1YsYqqX4JTlIJeg+NfFSxGUHvSdKQZGk6KiBU=";
+    rev = "6c71385af67c71cb3d62359e94077f2e940b15df";
+    hash = "sha256-+akz8E6Fmk6KwmeZOePEm/KqfbDaKeL4wiUgtm12SAE=";
   };
 
   meta = {

From ab152e868657029a7c42408dff34c5f17829acd5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 24 Jan 2026 23:55:48 +0100
Subject: [PATCH 100/235] reactguard: init at 0.9.9

Vulnerability detection tool for CVE-2025-55182 (React2Shell

https://github.com/theori-io/reactguard
---
 pkgs/by-name/re/reactguard/package.nix | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/re/reactguard/package.nix

diff --git a/pkgs/by-name/re/reactguard/package.nix b/pkgs/by-name/re/reactguard/package.nix
new file mode 100644
index 000000000000..f9f3a4733989
--- /dev/null
+++ b/pkgs/by-name/re/reactguard/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication (finalAttrs: {
+  pname = "reactguard";
+  version = "0.9.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "theori-io";
+    repo = "reactguard";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ysXdqMny6c1ATTpjI4Ev4T1yjs2jNu4mf7azO/IsAKI=";
+  };
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    httpx
+    typing-extensions
+  ];
+
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+    pytest-cov-stub
+    pytest-xdist
+  ];
+
+  pythonImportsCheck = [ "reactguard" ];
+
+  meta = {
+    description = "Vulnerability detection tool for CVE-2025-55182 (React2Shell";
+    homepage = "https://github.com/theori-io/reactguard";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "reactguard";
+  };
+})

From 5222670cf926e85efc27de6f0c365d675314a777 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 23:11:35 +0000
Subject: [PATCH 101/235] python3Packages.llama-index-embeddings-gemini: 0.4.1
 -> 0.4.2

---
 .../python-modules/llama-index-embeddings-gemini/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
index faa2484bb9ae..b4ddcd36a874 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-gemini";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_embeddings_gemini";
     inherit version;
-    hash = "sha256-XkFXYdaRr1i0Ez5GLkxIGIJZcR/hCS2mB2t5jWRUUs0=";
+    hash = "sha256-GY983cmRtwir+2q0qyJW5iFmK+96ed5lu6pKHcUm/4g=";
   };
 
   pythonRelaxDeps = [ "google-generativeai" ];

From 18eedde6c2ba57605450583a64cf7a15b1b17df6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 23:18:45 +0000
Subject: [PATCH 102/235] snac2: 2.88 -> 2.89

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

diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix
index ed4e4871322d..a8a1fca0fdb4 100644
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snac2";
-  version = "2.88";
+  version = "2.89";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
     repo = "snac2";
     tag = finalAttrs.version;
-    hash = "sha256-3IqPIIfU4MKXMMpOFYgI0RN+DZE+oTgLGOYIKwfKCsI=";
+    hash = "sha256-MnDvEnwdrqrWm2qSTieaE4aB1GbrMtpps+rX/ff7EDQ=";
   };
 
   buildInputs = [

From 284fb4528332fc1354c735982191c190b759684d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 23:38:33 +0000
Subject: [PATCH 103/235] wasmtime: 40.0.2 -> 41.0.0

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

diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix
index 51cb918c4da9..38ddcbfd515a 100644
--- a/pkgs/by-name/wa/wasmtime/package.nix
+++ b/pkgs/by-name/wa/wasmtime/package.nix
@@ -13,20 +13,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasmtime";
-  version = "40.0.2";
+  version = "41.0.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasmtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4y9WpCdyuF/Tp2k/1d5rZxwYunWNdeibEsFgHcBC52Q=";
+    hash = "sha256-/NQ1nmF5u/mNhS5orvohUWjSrp6YYtzJqpJV2iwn63Q=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-aTPgnuBvOIqg1+Sa2ZLdMTLujm8dKGK5xpZ3qHpr3f8=";
+  cargoHash = "sha256-OViDhQVAs11PzuS4OGL0dzn+K9+yqHwTzXynxl95y88=";
   cargoBuildFlags = [
     "--package"
     "wasmtime-cli"

From 0902e92e43f022c24066a69dd73d76793b6a90c2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 24 Jan 2026 23:53:24 +0000
Subject: [PATCH 104/235] python3Packages.mdformat: 0.7.22 -> 1.0.0

Diff: https://github.com/executablebooks/mdformat/compare/0.7.22...1.0.0

Changelog: https://github.com/executablebooks/mdformat/blob/1.0.0/docs/users/changelog.md
---
 .../python-modules/mdformat/default.nix       | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix
index e498e4c5c727..d818cf5f9a59 100644
--- a/pkgs/development/python-modules/mdformat/default.nix
+++ b/pkgs/development/python-modules/mdformat/default.nix
@@ -1,16 +1,17 @@
 {
   lib,
   buildPythonPackage,
+  pythonOlder,
   fetchFromGitHub,
+  setuptools,
   markdown-it-py,
   pytestCheckHook,
-  pythonOlder,
-  setuptools,
+  versionCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mdformat";
-  version = "0.7.22";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -18,15 +19,18 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "mdformat";
-    tag = version;
-    hash = "sha256-WvbGCqfzh7KlNXIGJq09goiyLzVgU7c1+qmsLrIW38k=";
+    tag = finalAttrs.version;
+    hash = "sha256-fo4xO4Y89qPAggEjwuf6dnTyu1JzhZVdJyUqGNpti7g=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [ markdown-it-py ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+  ];
 
   pythonImportsCheck = [ "mdformat" ];
 
@@ -37,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "CommonMark compliant Markdown formatter";
     homepage = "https://mdformat.rtfd.io/";
-    changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md";
+    changelog = "https://github.com/executablebooks/mdformat/blob/${finalAttrs.src.tag}/docs/users/changelog.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab
@@ -45,4 +49,4 @@ buildPythonPackage rec {
     ];
     mainProgram = "mdformat";
   };
-}
+})

From fb969ce6a5dc0568b9be64d02d2a7b5d53ec3a49 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 17 Jan 2026 22:08:06 -0800
Subject: [PATCH 105/235] rocmPackages: 7.0.2 -> 7.1.1

---
 .../rocm-modules/amdsmi/default.nix           | 13 +-----
 .../rocm-modules/aqlprofile/default.nix       |  6 +--
 pkgs/development/rocm-modules/clr/default.nix | 20 +++-------
 .../rocm-modules/composable_kernel/base.nix   |  4 +-
 .../development/rocm-modules/half/default.nix |  2 +-
 .../rocm-modules/hip-common/default.nix       |  4 +-
 .../rocm-modules/hipblas-common/default.nix   |  4 +-
 .../rocm-modules/hipblas/default.nix          |  4 +-
 .../rocm-modules/hipblaslt/default.nix        |  2 +-
 .../rocm-modules/hipcub/default.nix           |  4 +-
 .../rocm-modules/hipfft/default.nix           |  4 +-
 .../rocm-modules/hipfort/default.nix          |  4 +-
 .../rocm-modules/hipify/default.nix           |  4 +-
 .../rocm-modules/hiprand/default.nix          |  4 +-
 .../rocm-modules/hipsolver/default.nix        |  4 +-
 .../rocm-modules/hipsparse/default.nix        |  4 +-
 .../development/rocm-modules/llvm/default.nix |  4 +-
 .../rocm-modules/migraphx/default.nix         | 11 ++---
 .../migraphx/msgpack-6-compat.patch           | 29 --------------
 .../rocm-modules/miopen/default.nix           |  4 +-
 .../rocm-modules/mivisionx/default.nix        |  4 +-
 .../development/rocm-modules/rccl/default.nix |  6 ++-
 pkgs/development/rocm-modules/rdc/default.nix |  4 +-
 .../rocm-modules/rocalution/default.nix       |  4 +-
 .../rocm-modules/rocblas/default.nix          |  7 ++--
 .../rocm-modules/rocdbgapi/default.nix        | 14 +++----
 .../rocm-modules/rocfft/default.nix           |  4 +-
 .../rocm-modules/rocgdb/default.nix           |  4 +-
 .../rocm-modules/rocm-cmake/default.nix       |  4 +-
 .../rocm-modules/rocm-core/default.nix        |  4 +-
 .../rocm-modules/rocm-docs-core/default.nix   |  4 +-
 .../rocm-modules/rocm-runtime/default.nix     | 20 +++-------
 .../rocm-modules/rocm-smi/default.nix         |  4 +-
 .../rocm-modules/rocminfo/default.nix         |  4 +-
 .../rocm-modules/rocmlir/default.nix          | 40 ++++++++++++-------
 .../rocm-modules/rocprim/default.nix          |  4 +-
 .../rocprofiler-register/default.nix          |  4 +-
 .../rocm-modules/rocprofiler/default.nix      |  4 +-
 .../rocm-modules/rocr-debug-agent/default.nix |  4 +-
 .../rocm-modules/rocrand/default.nix          |  4 +-
 .../rocm-modules/rocsolver/default.nix        |  4 +-
 .../rocm-modules/rocsparse/default.nix        |  4 +-
 .../rocm-modules/rocthrust/default.nix        |  4 +-
 .../rocm-modules/roctracer/default.nix        |  4 +-
 .../rocm-modules/rocwmma/default.nix          |  4 +-
 pkgs/development/rocm-modules/rpp/default.nix |  7 +++-
 .../rocm-modules/tensile/default.nix          |  4 +-
 47 files changed, 134 insertions(+), 179 deletions(-)
 delete mode 100644 pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch

diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix
index eb33b7608604..57b095812d26 100644
--- a/pkgs/development/rocm-modules/amdsmi/default.nix
+++ b/pkgs/development/rocm-modules/amdsmi/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   rocmUpdateScript,
   cmake,
   pkg-config,
@@ -21,12 +20,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amdsmi";
-  version = "7.0.2";
+  version = "7.1.1";
   src = fetchFromGitHub {
     owner = "rocm";
     repo = "amdsmi";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-1xQD68mrG1g9Bpw5/vxn+XxDM5HuAyEHyALyBixqR1s=";
+    hash = "sha256-BGe3+8YFwu41ZVAF+VtN5Cn9pfzGxmCg/Rpq8qWOEoM=";
   };
 
   postPatch = ''
@@ -42,14 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     cp ./include/amd_smi/impl/amd_hsmp.h ./esmi_ib_library/include/asm/amd_hsmp.h
   '';
 
-  patches = [
-    (fetchpatch {
-      name = "fix-build-with-gcc15.patch";
-      url = "https://github.com/ROCm/amdsmi/commit/902667db3cafe72e2009287cb96b160854ab9d81.patch";
-      hash = "sha256-MoOY5q6tQ7Q+bgm/600Etz+cxRk4L2ujkarnBjnfANw=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/development/rocm-modules/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix
index 97fa65abfd56..8c5105348489 100644
--- a/pkgs/development/rocm-modules/aqlprofile/default.nix
+++ b/pkgs/development/rocm-modules/aqlprofile/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation {
   pname = "aqlprofile";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "aqlprofile";
-    tag = "rocm-7.0.2";
-    hash = "sha256-A17SAkEUf3yAGwvZUWSdL7Tn5YAXB0YlD3T1DLTjDSg=";
+    tag = "rocm-7.1.1";
+    hash = "sha256-MAZUHo52gb0aZSFnKugMlXxcDkmMwhy1AFF1RDRgRVk=";
   };
 
   env.CXXFLAGS = "-DROCP_LD_AQLPROFILE=1";
diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix
index 79070cb3ffba..b1f77059e41c 100644
--- a/pkgs/development/rocm-modules/clr/default.nix
+++ b/pkgs/development/rocm-modules/clr/default.nix
@@ -70,7 +70,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clr";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "clr";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-zajb/iTtF/ECRScdcQ85HPgq8DdIGqSinJoVyyi89bw=";
+    hash = "sha256-ofsq1uqMixtum5C6cp/UgTDpgGPfj+rAd6PoDx5iLLw=";
   };
 
   nativeBuildInputs = [
@@ -147,14 +147,10 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./cmake-find-x11-libgl.patch
     (fetchpatch {
-      # [PATCH] improve rocclr isa compatibility check
-      sha256 = "sha256-/QpB3Wqdhcq6lzyO/zOWzwQC0oYpesCICxnVx5CqbWg=";
-      url = "https://github.com/GZGavinZhao/clr/commit/733ee38ef8ad5c84926970981821f446dfcb00af.patch";
-    })
-    (fetchpatch {
-      # [PATCH] improve hipamd isa compatibility check
-      sha256 = "sha256-FvZInw8PqB68ePxAGu45cWT/whD1xmprIA5wZb5OLcE=";
-      url = "https://github.com/GZGavinZhao/clr/commit/1f0b54ee9b0de08f4dc8cd38b6728928b180048a.patch";
+      # [PATCH] rocclr: Extend HIP ISA compatibility checks
+      sha256 = "sha256-InUSIFI1MgkfocBEoZjO2BCgXNyfF10ehh9jkTtAPXs=";
+      url = "https://github.com/GZGavinZhao/rocm-systems/commit/937dcfdd316b589509c061809186fe5451d22431.patch";
+      relative = "projects/clr";
     })
   ];
 
@@ -174,10 +170,6 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace opencl/khronos/icd/loader/icd_platform.h \
       --replace-fail '#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";' \
                      '#define ICD_VENDOR_PATH "/run/opengl-driver/etc/OpenCL/vendors/";'
-
-    # new unbundler has better error messages, defaulting it on
-    substituteInPlace rocclr/utils/flags.hpp \
-      --replace-fail "HIP_ALWAYS_USE_NEW_COMGR_UNBUNDLING_ACTION, false" "HIP_ALWAYS_USE_NEW_COMGR_UNBUNDLING_ACTION, true"
   '';
 
   postInstall = ''
diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix
index 5c51c4208d40..b3071460b6d6 100644
--- a/pkgs/development/rocm-modules/composable_kernel/base.nix
+++ b/pkgs/development/rocm-modules/composable_kernel/base.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   pname = "composable_kernel_base";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "composable_kernel";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-Wql7PD3kg85AFXn7UaTKxhURyDPfVe/OUbR+udrqDc8=";
+    hash = "sha256-exdkyTIK03dzlCXHm3j8ehEb9NxLOxPX9QyfMsiCgSs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/half/default.nix b/pkgs/development/rocm-modules/half/default.nix
index 54a2bdc7054e..a7f73bde23fd 100644
--- a/pkgs/development/rocm-modules/half/default.nix
+++ b/pkgs/development/rocm-modules/half/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "half";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
diff --git a/pkgs/development/rocm-modules/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix
index 365ffc146c82..750d539c6906 100644
--- a/pkgs/development/rocm-modules/hip-common/default.nix
+++ b/pkgs/development/rocm-modules/hip-common/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hip-common";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "HIP";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-9VQrCed5EKVXu41Qrnf2m2jXveWt5Y/SlSxlUmjZS0M=";
+    hash = "sha256-aI41HdyzyE5HtCbzFmTQYGMiFyQELM/MTVOAbQsg8So=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/development/rocm-modules/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix
index adf9c331de39..8343f3c256fb 100644
--- a/pkgs/development/rocm-modules/hipblas-common/default.nix
+++ b/pkgs/development/rocm-modules/hipblas-common/default.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipblas-common";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "hipBLAS-common";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-NXSMVtfjei4vIjU9y4o3Px/fplq7C7ziY1R8YqnY2LQ=";
+    hash = "sha256-sswqYIv3c5ArT6dQ3MRru7ZZVA0VxoKW/a0pYTBpjgE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix
index 6f1682110652..63998f5f2368 100644
--- a/pkgs/development/rocm-modules/hipblas/default.nix
+++ b/pkgs/development/rocm-modules/hipblas/default.nix
@@ -24,7 +24,7 @@
 # Can also use cuBLAS
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipblas";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "hipBLAS";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-SoszZBbk8sM3yjgahs1UrPCsEbGmTYTpdOw+Ah/z8H8=";
+    hash = "sha256-2wDnYZapJ4fU/JZpy6qOf5+DYuatWmCw/hA8WO5x2T0=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix
index f19734394f0e..f6e18d27056d 100644
--- a/pkgs/development/rocm-modules/hipblaslt/default.nix
+++ b/pkgs/development/rocm-modules/hipblaslt/default.nix
@@ -70,7 +70,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipblaslt${clr.gpuArchSuffix}";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix
index d0a7f7815bf4..eb7d8a7dbb35 100644
--- a/pkgs/development/rocm-modules/hipcub/default.nix
+++ b/pkgs/development/rocm-modules/hipcub/default.nix
@@ -17,7 +17,7 @@
 # CUB can also be used as a backend instead of rocPRIM.
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipcub";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "hipCUB";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-Vx9h/DTZo7RfQrflVwXOCKiA7rt6dQQw/P/bllgtq8w=";
+    hash = "sha256-3/499pX7hFKJwbhSEH3/bMhNdyabK36jLv8s5TC2fuw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix
index 0439197337cd..a5dcee6f3bd8 100644
--- a/pkgs/development/rocm-modules/hipfft/default.nix
+++ b/pkgs/development/rocm-modules/hipfft/default.nix
@@ -21,7 +21,7 @@
 # Can also use cuFFT
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipfft";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "hipFFT";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-cozwHUlqACq0IM3YToc/xFB694DJ3rPiEPUCTo0xuHY=";
+    hash = "sha256-6FyI9s6H/lHFhm8aUqB9+vvJ0CRIVWCFLNoJprvsI6o=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/rocm-modules/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix
index c13345965c2f..401ecbee4953 100644
--- a/pkgs/development/rocm-modules/hipfort/default.nix
+++ b/pkgs/development/rocm-modules/hipfort/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipfort";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "hipfort";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-s/VOaU5IKZYH0Vhtjl/UZTrnpLsJ7zWFTvAJY2x3AcA=";
+    hash = "sha256-IVLhp8rYtKhkt8K8Mc0qyrp670oKoK0QeclnJjO36pY=";
   };
 
   patches = [
diff --git a/pkgs/development/rocm-modules/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix
index 22fd712c2983..ea0bd5ebf806 100644
--- a/pkgs/development/rocm-modules/hipify/default.nix
+++ b/pkgs/development/rocm-modules/hipify/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipify";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "HIPIFY";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-xcWUYfZvbTHs4BvDiXAOLONfLiCq9uEGOHSK/hOWg7c=";
+    hash = "sha256-NbFFHAAvMGpvIryhEbktN5w03Cpay9lEqelqkUT9dpQ=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix
index 8854b4dc4827..18d00f097728 100644
--- a/pkgs/development/rocm-modules/hiprand/default.nix
+++ b/pkgs/development/rocm-modules/hiprand/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hiprand";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "hipRAND";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-yOLdFQ4/OGGfX75A/ElY1xD+4nkcqT8tZx2bQZgXTx4=";
+    hash = "sha256-yypKwJ5p2aSAqapEHre9eOjjaFAI8Q1dDYWhwfrrdhg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix
index 48f1149d60f6..b4cc56a6abec 100644
--- a/pkgs/development/rocm-modules/hipsolver/default.nix
+++ b/pkgs/development/rocm-modules/hipsolver/default.nix
@@ -21,7 +21,7 @@
 # Can also use cuSOLVER
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipsolver";
-  version = "7.0.2";
+  version = "7.1.0";
 
   outputs = [
     "out"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "hipSOLVER";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-IZAVdu+VpSrJ/EZXymOzvrGnRLBpxUgVeaj1U+ux02M=";
+    hash = "sha256-n0+Xy92mBhI2vjB7pFHGt2UgPIHo9rO2ZxGxkz30Otw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix
index 033250e16725..12034a4dea02 100644
--- a/pkgs/development/rocm-modules/hipsparse/default.nix
+++ b/pkgs/development/rocm-modules/hipsparse/default.nix
@@ -19,7 +19,7 @@
 # This can also use cuSPARSE as a backend instead of rocSPARSE
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipsparse";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "hipSPARSE";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-hfC+QsOfDNKIZROgTZZsGbAG0yghc27PyVwCDr8MEJ8=";
+    hash = "sha256-zaMAsLfUYkMUiA2vnGiK0//+vZwugqt5T6xJU4FBrRo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/llvm/default.nix b/pkgs/development/rocm-modules/llvm/default.nix
index fd4ca82c838c..548d928f2179 100644
--- a/pkgs/development/rocm-modules/llvm/default.nix
+++ b/pkgs/development/rocm-modules/llvm/default.nix
@@ -33,7 +33,7 @@
 }:
 
 let
-  version = "7.0.2";
+  version = "7.1.1";
   # major version of this should be the clang version ROCm forked from
   rocmLlvmVersion = "20.0.0-rocm";
   # llvmPackages_base version should match rocmLlvmVersion
@@ -115,7 +115,7 @@ let
     owner = "ROCm";
     repo = "llvm-project";
     rev = "rocm-${version}";
-    hash = "sha256-gJlDFbCRsiwHgRzmwm36C3WvGfWwgPrtBNUHYmZHTB8=";
+    hash = "sha256-CfknIRVeR1bCKh1xzXKl3ehVp0kWT0uGrI9C1HTSKVo=";
   };
   llvmMajorVersion = lib.versions.major rocmLlvmVersion;
   # An llvmPackages (pkgs/development/compilers/llvm/) built from ROCm LLVM's source tree
diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix
index 32eeb4a84227..f2bde73b4d38 100644
--- a/pkgs/development/rocm-modules/migraphx/default.nix
+++ b/pkgs/development/rocm-modules/migraphx/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   rocmUpdateScript,
   pkg-config,
   cmake,
@@ -59,7 +58,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "migraphx";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -75,13 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "AMDMIGraphX";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-P3jiq6i7jpfpL9/S7mc1CiNRwAt8fzy3waHKhyuYIXI=";
+    hash = "sha256-s6w4bF7koK4wnf6leVKBzwIB4X2ROHa3EgX6XuJIAew=";
   };
 
-  patches = [
-    ./msgpack-6-compat.patch
-  ];
-
   nativeBuildInputs = [
     pkg-config
     cmake
@@ -147,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${lib.getInclude abseil-cpp}/include -I${hipblas-common}/include"
+    export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${lib.getInclude abseil-cpp}/include -I${hipblas-common}/include -I${lib.getInclude protobuf}/include"
     patchShebangs tools
 
     # `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]`
diff --git a/pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch b/pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch
deleted file mode 100644
index 5c4890a02ce2..000000000000
--- a/pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1dba2c8d..7795ba78 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -358,13 +358,19 @@ target_link_libraries(migraphx PRIVATE nlohmann_json::nlohmann_json)
- find_package(SQLite3 REQUIRED)
- target_link_libraries(migraphx PRIVATE SQLite::SQLite3)
- 
--find_package(msgpackc-cxx QUIET)
--if(NOT msgpackc-cxx_FOUND)
--    find_package(msgpack REQUIRED)
-+# See: https://github.com/msgpack/msgpack-c/wiki/Q%26A#how-to-support-both-msgpack-c-c-version-5x-and-6x-
-+# Prefer 6.x (msgpack-cxx)
-+find_package(msgpack-cxx)
-+if(msgpack-cxx_FOUND)
-+    message(STATUS "Found msgpack-cxx (>=6.x)")
-+else()
-+    find_package(msgpackc-cxx REQUIRED NAMES msgpackc-cxx msgpack)
-+    message(STATUS "Found msgpackc-cxx (<=5.x)")
-+    add_library(msgpack-cxx ALIAS msgpackc-cxx)
- endif()
--target_link_libraries(migraphx PRIVATE msgpackc-cxx)
-+target_link_libraries(migraphx PRIVATE msgpack-cxx)
- # Make this available to the tests
--target_link_libraries(migraphx INTERFACE $<BUILD_INTERFACE:msgpackc-cxx>)
-+target_link_libraries(migraphx INTERFACE $<BUILD_INTERFACE:msgpack-cxx>)
- 
- add_library(migraphx_all_targets INTERFACE)
- 
diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix
index 512a24a85685..13dbfa9d4dfc 100644
--- a/pkgs/development/rocm-modules/miopen/default.nix
+++ b/pkgs/development/rocm-modules/miopen/default.nix
@@ -43,7 +43,7 @@
 let
   # FIXME: cmake files need patched to include this properly
   cFlags = "-Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include";
-  version = "7.0.2";
+  version = "7.1.1";
 
   # Targets outside this list will get
   # error: use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD'
@@ -69,7 +69,7 @@ let
     owner = "ROCm";
     repo = "MIOpen";
     rev = "rocm-${version}";
-    hash = "sha256-PJj2LzU5naAku+FOnMl+Ymad2beYYSS81/K/CR+l2UA=";
+    hash = "sha256-g0AEpuUiwKCu/doiRh9mW34W04m4ynHoarSyl6tR/aE=";
     fetchLFS = true;
     fetchSubmodules = true;
     # WORKAROUND: .lfsconfig is incorrectly set to exclude everything upstream
diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix
index 40107372e408..baa1bbf68afd 100644
--- a/pkgs/development/rocm-modules/mivisionx/default.nix
+++ b/pkgs/development/rocm-modules/mivisionx/default.nix
@@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: {
         "cpu"
     );
 
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "MIVisionX";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-SO0rE86UmX9f574ALdnnBDFceKGKTvJDQ8Lf7iSlJtA=";
+    hash = "sha256-aC6GUPK6ZSOAx+PHHB4gLPNAG5U/kapqX7YWilusDw8=";
   };
 
   patches = [
diff --git a/pkgs/development/rocm-modules/rccl/default.nix b/pkgs/development/rocm-modules/rccl/default.nix
index 757cffedc610..b8fe44a4ee6e 100644
--- a/pkgs/development/rocm-modules/rccl/default.nix
+++ b/pkgs/development/rocm-modules/rccl/default.nix
@@ -40,7 +40,7 @@ in
 # infiniband ib_peer_mem support isn't in the mainline kernel but is carried by some distros
 stdenv.mkDerivation (finalAttrs: {
   pname = "rccl${clr.gpuArchSuffix}";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -58,9 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rccl";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-ByKz6TNdGVbh65ZH5PtgUbAj4qNVmOBmZ9SrOjkTbWU=";
+    hash = "sha256-3u7D3Gre1n+4Lf+cK+RMfCUM9c46pXZjdhGOrwIKM0w=";
   };
 
+  requiredSystemFeatures = [ "big-parallel" ]; # Very resource intensive LTO
+
   nativeBuildInputs = [
     cmake
     rocm-cmake
diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix
index 8d25a239f168..aaa0104c94d3 100644
--- a/pkgs/development/rocm-modules/rdc/default.nix
+++ b/pkgs/development/rocm-modules/rdc/default.nix
@@ -49,7 +49,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rdc";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rdc";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-ztInmK3oCbvnLe7XQ55/hUHRyhuZ2M2XVTG1NcVHtGs=";
+    hash = "sha256-oJS0fBeISpgjZkaMfFl/Yq7mPOsdaZDqiRjSPv7kT1Q=";
   };
 
   patches = [
diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix
index e40b0598a856..f044ce89ac4c 100644
--- a/pkgs/development/rocm-modules/rocalution/default.nix
+++ b/pkgs/development/rocm-modules/rocalution/default.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocalution";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rocALUTION";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-/Tcb11/63MWnUTyigDrL2slwqL8C553hG5OKRYZan7s=";
+    hash = "sha256-UkXbcbhaTulCqW1FZHwTyUZLFSnj7WmLYqlPqu5m6YM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix
index 309858960511..293cd0f966ee 100644
--- a/pkgs/development/rocm-modules/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/rocblas/default.nix
@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocblas${clr.gpuArchSuffix}";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocBLAS";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-528jAdhWtZbbw76dfUgpMr5px0T7q4Oj76jp0z0lh3A=";
+    hash = "sha256-obKypbYmnSeOtOr7g0pxOz02YfzZ0bGugTtznkeHz14=";
   };
 
   outputs = [ "out" ] ++ lib.optional buildBenchmarks "benchmark" ++ lib.optional buildTests "test";
@@ -92,7 +92,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.CXXFLAGS = "-fopenmp -I${lib.getDev boost}/include -I${hipblas-common}/include -I${roctracer}/include";
   # Fails to link tests with undefined symbol: cblas_*
-  env.LDFLAGS = lib.optionalString (buildTests || buildBenchmarks) "-Wl,--as-needed -lcblas";
+  env.LDFLAGS =
+    "-Wl,--as-needed -lzstd" + lib.optionalString (buildTests || buildBenchmarks) " -lcblas";
   env.TENSILE_ROCM_ASSEMBLER_PATH = "${stdenv.cc}/bin/clang++";
 
   cmakeFlags = [
diff --git a/pkgs/development/rocm-modules/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix
index 7103a988c146..b856c57ebb71 100644
--- a/pkgs/development/rocm-modules/rocdbgapi/default.nix
+++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix
@@ -47,7 +47,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocdbgapi";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -56,11 +56,13 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
+  buildFlags = lib.optionals buildDocs [ "doc" ];
+
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "ROCdbgapi";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-adzHfTd4O59YKqkPL1oZnM8qiuGjlWefbl50MI2Z7co=";
+    hash = "sha256-RwYZJPwGhNtSSvmSgy0AsNTc98cav0/u9jH5f93sB9M=";
   };
 
   nativeBuildInputs = [
@@ -89,12 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
   ];
 
-  # Unfortunately, it seems like we have to call make on this manually
-  postBuild = lib.optionalString buildDocs ''
-    make -j$NIX_BUILD_CORES doc
-  '';
-
   postInstall = lib.optionalString buildDocs ''
+    mkdir -p $doc/share/doc/amd-dbgapi/
     mv $out/share/html/amd-dbgapi $doc/share/doc/amd-dbgapi/html
     rmdir $out/share/html
   '';
@@ -106,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Debugger support for control of execution and inspection state";
+    description = "Debugger support for control of execution and inspection state of AMD's GPU architectures";
     homepage = "https://github.com/ROCm/ROCdbgapi";
     license = with lib.licenses; [ mit ];
     teams = [ lib.teams.rocm ];
diff --git a/pkgs/development/rocm-modules/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix
index c132b7952656..426faa1a9410 100644
--- a/pkgs/development/rocm-modules/rocfft/default.nix
+++ b/pkgs/development/rocm-modules/rocfft/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocfft${clr.gpuArchSuffix}";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocFFT";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-VVRZSmMma/sjSj2obRrwP118v/FasS30ZU0nFsEp9rw=";
+    hash = "sha256-1Ho3b5NmnzfLhDnvH6FECigs6OgpbJrxw4EnqKyaHA0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocgdb/default.nix b/pkgs/development/rocm-modules/rocgdb/default.nix
index 3cc5a4a410a5..debc2d12966f 100644
--- a/pkgs/development/rocm-modules/rocgdb/default.nix
+++ b/pkgs/development/rocm-modules/rocgdb/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocgdb";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "ROCgdb";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-IYdhYYJGTXBIftTEpvi+lvdhtYgdFWSpdNbtTBh0l9s=";
+    hash = "sha256-LDVGO++voqwVMM6RcRtgbXTUvFLTyg/TFdSZanv5Xdc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocm-cmake/default.nix b/pkgs/development/rocm-modules/rocm-cmake/default.nix
index a30a34c74b03..311a848863a0 100644
--- a/pkgs/development/rocm-modules/rocm-cmake/default.nix
+++ b/pkgs/development/rocm-modules/rocm-cmake/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-cmake";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-cmake";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-Gu+w+2dXKXcJtdmpODByxQaZbYMkoAeX9/0tOcGy5Es=";
+    hash = "sha256-im6UO0crO0Jc27zkTsdvJYPHit8IGlw/vDPGrmP1XqY=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/rocm-modules/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix
index 242c9bfa7d92..0902dc58ae60 100644
--- a/pkgs/development/rocm-modules/rocm-core/default.nix
+++ b/pkgs/development/rocm-modules/rocm-core/default.nix
@@ -17,13 +17,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-core";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-core";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-TKHNtY3XoLznOi1aVHdxFk3bedtLKkrFy0NVm0ad6ZY=";
+    hash = "sha256-3WQPR7v7LRoo4ioCXzkUEqnJdXA3uxSgoZZQvEG5Gqg=";
   };
 
   patches = [
diff --git a/pkgs/development/rocm-modules/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/rocm-docs-core/default.nix
index b50cea3fe088..8d5e41f32ed3 100644
--- a/pkgs/development/rocm-modules/rocm-docs-core/default.nix
+++ b/pkgs/development/rocm-modules/rocm-docs-core/default.nix
@@ -24,14 +24,14 @@
 # FIXME: Move to rocmPackages_common
 buildPythonPackage rec {
   pname = "rocm-docs-core";
-  version = "1.23.0";
+  version = "1.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-docs-core";
     rev = "v${version}";
-    hash = "sha256-5Qh83eJ9vju/uUb9gGA4B5Bh1WZCygIRbSnaEZzIdbw=";
+    hash = "sha256-N9wqu83fPQGgOSDdb4yXmfxfDxkevk6QA31vLl5sYHo=";
   };
 
   buildInputs = [ setuptools ];
diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix
index 98b2bded9d9e..73d83211b15b 100644
--- a/pkgs/development/rocm-modules/rocm-runtime/default.nix
+++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-runtime";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "ROCR-Runtime";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-oz2UCR4XEhNm1uDlCeDnDJrmysWKA6GKxlEuFu21es0=";
+    hash = "sha256-gqe1trGc/Cu1XFA4aYjOzFurUgebLbdTHEJi4iw2+kk=";
   };
 
   cmakeBuildType = "RelWithDebInfo";
@@ -54,20 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     (fetchpatch {
-      # rocr: Extend HIP ISA compatibility check
+      # [PATCH] rocr: Extend HIP ISA compatibility check
       sha256 = "sha256-8r2Lb5lBfFaZC3knCxfXGcnkzNv6JxOKyJn2rD5gus4=";
-      url = "https://github.com/GZGavinZhao/ROCR-Runtime/commit/7c63e7185d8fcf08537a278908946145f6231121.patch";
-    })
-    # Patches for UB at runtime https://github.com/ROCm/ROCR-Runtime/issues/272
-    (fetchpatch {
-      # [PATCH] queues: fix UB due to 1 << 31
-      url = "https://github.com/ROCm/ROCR-Runtime/commit/9b8a0f5dbee1903fa990a7d8accc1c5fbc549636.patch";
-      hash = "sha256-KlZWjfngH8yKly08iwC+Bzpvp/4dkaTpRIKdFYwRI+U=";
-    })
-    (fetchpatch {
-      # [PATCH] topology: fix UB due to 1 << 31
-      url = "https://github.com/ROCm/ROCR-Runtime/commit/d1d00bfee386d263e13c2b64fb6ffd1156deda7c.patch";
-      hash = "sha256-u70WEZaphQ7qTfgQPFATwdKWtHytu7CFH7Pzv1rOM8w=";
+      url = "https://github.com/GZGavinZhao/rocm-systems/commit/c13cd118fcc8e0bc9ae8de62897542dca7352b71.patch";
+      relative = "projects/rocr-runtime";
     })
     (fetchpatch {
       # [PATCH] kfd_ioctl: fix UB due to 1 << 31
diff --git a/pkgs/development/rocm-modules/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix
index f10d5da21474..838d6c81977e 100644
--- a/pkgs/development/rocm-modules/rocm-smi/default.nix
+++ b/pkgs/development/rocm-modules/rocm-smi/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-smi";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm_smi_lib";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-LzWKWiHmMDGO2ejvcT0BBg22HbYD9q0fxK/bq6JvcnQ=";
+    hash = "sha256-/3to1+45n+D8snwrFVhApSMWp/rIXmTFK+BiA0mcKZo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocminfo/default.nix b/pkgs/development/rocm-modules/rocminfo/default.nix
index 620c63cb1ec6..0e9b2301b4ab 100644
--- a/pkgs/development/rocm-modules/rocminfo/default.nix
+++ b/pkgs/development/rocm-modules/rocminfo/default.nix
@@ -12,14 +12,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "7.0.2";
+  version = "7.1.1";
   pname = "rocminfo";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocminfo";
     rev = "rocm-${finalAttrs.version}";
-    sha256 = "sha256-wE1/golRQm5uggXRQ1BucxV3laypSOUCvjTFx5N2yTE=";
+    sha256 = "sha256-SuW34m2ep69+dj1rb0vqfQcK83FBtjlMLqSMCUZltU4=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/rocm-modules/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix
index 5ed107d458db..47b5ae1ff3d2 100644
--- a/pkgs/development/rocm-modules/rocmlir/default.nix
+++ b/pkgs/development/rocm-modules/rocmlir/default.nix
@@ -8,6 +8,9 @@
   clr,
   libxml2,
   libedit,
+  rocm-comgr,
+  rocm-device-libs,
+  rocm-runtime,
   zstd,
   zlib,
   ncurses,
@@ -39,7 +42,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocmlir${suffix}";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -52,10 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rocMLIR";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-0+vZ/Lkh1fC9oKyy83YjIX4xuMJEWErd8UpZZuaaXdI=";
+    hash = "sha256-A9vUvsEZrZlNEW4cscF66L48rJQ1zJYmIzwXQ2QzJ3s=";
   };
 
   nativeBuildInputs = [
+    clr
     cmake
     rocm-cmake
     python3Packages.python
@@ -65,6 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxml2
     libedit
+    rocm-comgr
+    rocm-runtime
+    rocm-device-libs
   ];
 
   propagatedBuildInputs = [
@@ -74,23 +81,28 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DLLVM_USE_LINKER=lld"
-    "-DLLVM_ENABLE_ZSTD=FORCE_ON"
-    "-DLLVM_ENABLE_ZLIB=FORCE_ON"
-    "-DLLVM_ENABLE_LIBCXX=ON"
-    "-DLLVM_ENABLE_TERMINFO=ON"
-    "-DROCM_PATH=${clr}"
+    (lib.cmakeFeature "LLVM_TARGETS_TO_BUILD" "AMDGPU${
+      lib.optionalString (!buildRockCompiler) ";${llvmNativeTarget}"
+    }")
+    (lib.cmakeFeature "LLVM_USE_LINKER" "lld")
+    (lib.cmakeFeature "LLVM_ENABLE_ZSTD" "FORCE_ON")
+    (lib.cmakeFeature "LLVM_ENABLE_ZLIB" "FORCE_ON")
+    (lib.cmakeBool "LLVM_ENABLE_LIBCXX" true)
+    (lib.cmakeBool "LLVM_ENABLE_TERMINFO" true)
+    (lib.cmakeFeature "ROCM_PATH" "${clr}")
     # Manually define CMAKE_INSTALL_<DIR>
     # See: https://github.com/NixOS/nixpkgs/pull/197838
-    "-DCMAKE_INSTALL_BINDIR=bin"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+    (lib.cmakeBool "MLIR_ENABLE_ROCM_RUNNER" (!buildRockCompiler))
     (lib.cmakeBool "BUILD_FAT_LIBROCKCOMPILER" buildRockCompiler)
   ]
+  ++ lib.optionals buildRockCompiler [
+    (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
+  ]
   ++ lib.optionals (!buildRockCompiler) [
-    "-DROCM_TEST_CHIPSET=gfx000"
+    (lib.cmakeFeature "ROCM_TEST_CHIPSET" "gfx900")
   ];
 
   postPatch = ''
diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix
index f1769f266292..47dedf2e23c0 100644
--- a/pkgs/development/rocm-modules/rocprim/default.nix
+++ b/pkgs/development/rocm-modules/rocprim/default.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocprim";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rocPRIM";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-uOlrN/FvEBBCHsPeJOWs9NNqVwrcxVExfs5wp03PH0U=";
+    hash = "sha256-/O6aEF23IaUSVzEDRqIlpYpxNCSTa/CwVDgXOhvTrQc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
index 5e23901f4c09..821a4d9de569 100644
--- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix
+++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocprofiler-register";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocprofiler-register";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-hK7k4tg7/5rYCSTFKsFRsRYfVevkCARcDyxlexrXbts=";
+    hash = "sha256-XlBz5rDMvnPxyCiqpEpIUWzbHJ1BbMzeCJTrP5kKf+w=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/rocm-modules/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix
index a8aeefc12886..9fa4f70b1138 100644
--- a/pkgs/development/rocm-modules/rocprofiler/default.nix
+++ b/pkgs/development/rocm-modules/rocprofiler/default.nix
@@ -44,13 +44,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocprofiler";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocprofiler";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-p2VwMm9Ltx/SFDIFk42nY9Too0Rp/IrqfuH8cQnhoGA=";
+    hash = "sha256-V+E+6D/mBW/NVdHSBVUVMG5Z/QOF73vfZ5rryW2VBtI=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix
index aebee50302ba..f829f9e5a090 100644
--- a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix
+++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocr-debug-agent";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocr_debug_agent";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-twoihis1OrCQ4K3rjDgjSErq+qktqz2xwkLLxBJIJ90=";
+    hash = "sha256-zW92HyK4nGcDaJxmBaHeURAivs6dU059WxaywL6dAk4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix
index 8d952d3e10b8..b4ac228ef5f0 100644
--- a/pkgs/development/rocm-modules/rocrand/default.nix
+++ b/pkgs/development/rocm-modules/rocrand/default.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocrand${clr.gpuArchSuffix}";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rocRAND";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-O7YCQBtFSa0xiHbbAXX2FyE6uRywEaMaJyX85875Yd0=";
+    hash = "sha256-QhHxpjr3SqeSSMS4QmnDq8zIxEeUtrgwb9JG84jfJgY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix
index cbad72ab2328..4653c009739b 100644
--- a/pkgs/development/rocm-modules/rocsolver/default.nix
+++ b/pkgs/development/rocm-modules/rocsolver/default.nix
@@ -36,7 +36,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocsolver${clr.gpuArchSuffix}";
-  version = "7.0.2";
+  version = "7.1.0";
 
   outputs = [
     "out"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rocSOLVER";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-/JFGqNA4weVgFuVtszYAxq65/+oZjiKC8zSxwvp964M=";
+    hash = "sha256-U5RrV90UZiIUgLYleLJ6rFHWRFMQNyh3zezRusj7T0M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix
index df695fb09d6c..c6bfded26eb0 100644
--- a/pkgs/development/rocm-modules/rocsparse/default.nix
+++ b/pkgs/development/rocm-modules/rocsparse/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocsparse${clr.gpuArchSuffix}";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rocSPARSE";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-0KFzrVGScCQDbOdlX016ymZ4lgCimd9XK4auK9V5p3k=";
+    hash = "sha256-ZNeFslIQZlFCNqWHmrpcxDuOvVu1cjiEd8b6ZNXcZzo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix
index 940bedc8fa83..23e669d35629 100644
--- a/pkgs/development/rocm-modules/rocthrust/default.nix
+++ b/pkgs/development/rocm-modules/rocthrust/default.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocthrust";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rocThrust";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-tbGEZ8NXu7euPN8CaRYOjcmTmYq1SUP7LNKOjO0RICE=";
+    hash = "sha256-Gncy0wvN8M4JSmnjbxaED+M9rLo4A/7LCCq/6temiZU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix
index fd71442c4c58..cfd1045e3ab8 100644
--- a/pkgs/development/rocm-modules/roctracer/default.nix
+++ b/pkgs/development/rocm-modules/roctracer/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "roctracer";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "roctracer";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-8DMwaMtzdBuAAV5KhQfqLfTtSyvPiwZxc1lAAoeXGus=";
+    hash = "sha256-LCtdPnE+rJU/ccI1PTFDMPNXxgl1GrRgc5z7LjOw3zA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix
index 6b3800c83b12..1cfafeb027ad 100644
--- a/pkgs/development/rocm-modules/rocwmma/default.nix
+++ b/pkgs/development/rocm-modules/rocwmma/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocwmma";
-  version = "7.0.2";
+  version = "7.1.1";
 
   outputs = [
     "out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm";
     repo = "rocWMMA";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-xCLoYvbKiAgAxDCbEopNxYBs3V3EJBmO3NpONiveXvE=";
+    hash = "sha256-6hvdq3J8UhldcyNqXxi9UEF+P0RgG8o5YdIZLzvpgXw=";
   };
 
   patches = lib.optionals (buildTests || buildBenchmarks) [
diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix
index bfa3849a3987..9c815a034d11 100644
--- a/pkgs/development/rocm-modules/rpp/default.nix
+++ b/pkgs/development/rocm-modules/rpp/default.nix
@@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: {
         "cpu"
     );
 
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rpp";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-oysmF9TS1tm37x9DNoZ2KqHKP1wJDoFY+IuL1WkIz0o=";
+    hash = "sha256-ZlJRV57ybPsczvoWwd5vr2n7EKje0vj2GJYsvVY+qas=";
   };
 
   nativeBuildInputs = [
@@ -56,6 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     "-DROCM_PATH=${clr}"
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
   ]
   ++ lib.optionals (gpuTargets != [ ]) [
     "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix
index b4d150b357f3..306174ddf1d4 100644
--- a/pkgs/development/rocm-modules/tensile/default.nix
+++ b/pkgs/development/rocm-modules/tensile/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "tensile";
-  version = "7.0.2";
+  version = "7.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "Tensile";
     rev = "rocm-${version}";
-    hash = "sha256-1G6qp/VBJL67QW9t2VB5KK5lwn+PbY0hqHq8DzyK2fg=";
+    hash = "sha256-uYLlbtXrc8m8/RpMbP7WaS7VYGIUm2LHYzv00DZAzvE=";
   };
 
   # TODO: It should be possible to run asm caps test ONCE for all supported arches

From b17c41cc49a6cdf0364c48d55e2d69dc309b0c41 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 19 Jan 2026 10:59:36 -0800
Subject: [PATCH 106/235] rocmPackages.clr: enable gfx1150 (Ryzen AI series
 APU) by default

---
 pkgs/development/rocm-modules/clr/default.nix       | 2 +-
 pkgs/development/rocm-modules/default.nix           | 1 +
 pkgs/development/rocm-modules/hipblaslt/default.nix | 2 +-
 pkgs/development/rocm-modules/rocsolver/default.nix | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix
index b1f77059e41c..41bc146a0300 100644
--- a/pkgs/development/rocm-modules/clr/default.nix
+++ b/pkgs/development/rocm-modules/clr/default.nix
@@ -237,7 +237,7 @@ stdenv.mkDerivation (finalAttrs: {
       "1100"
       "1101"
       "1102"
-      # 7.x "1150"
+      "1150" # Strix Point
       "1151" # Strix Halo
       # "12-generic"
       "1200" # RX 9060
diff --git a/pkgs/development/rocm-modules/default.nix b/pkgs/development/rocm-modules/default.nix
index cf9e9815eb83..bfc84389b260 100644
--- a/pkgs/development/rocm-modules/default.nix
+++ b/pkgs/development/rocm-modules/default.nix
@@ -333,6 +333,7 @@ outer
     "gfx1100"
     "gfx1101"
     "gfx1102"
+    "gfx1150"
     "gfx1151"
   ];
   gfx12 = scopeForArches [
diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix
index f6e18d27056d..e139079eb95e 100644
--- a/pkgs/development/rocm-modules/hipblaslt/default.nix
+++ b/pkgs/development/rocm-modules/hipblaslt/default.nix
@@ -43,7 +43,7 @@ let
       "gfx950"
       "gfx1100"
       "gfx1101"
-      # 7.x "gfx1150"
+      "gfx1150"
       "gfx1151"
       "gfx1200"
       "gfx1201"
diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix
index 4653c009739b..bf19c63e8dfe 100644
--- a/pkgs/development/rocm-modules/rocsolver/default.nix
+++ b/pkgs/development/rocm-modules/rocsolver/default.nix
@@ -27,6 +27,7 @@
       "gfx1100"
       "gfx1101"
       "gfx1102"
+      "gfx1150"
       "gfx1151"
       "gfx1200"
       "gfx1201"

From 6713c5e487e948febd0057fd401f5b87c46af7da Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 20 Jan 2026 13:05:00 -0800
Subject: [PATCH 107/235] rocmPackages.rocm-runtime: apply fix for segfault
 when queue allocation fails

Found by @06kellyjac, possibly triggered by bug in linux-6.18.4

https://lore.kernel.org/linux-iommu/870872aa-28e9-412a-bac6-8020bf560e4f@amd.com/t/

Resolving this *will not fix the underlying issue*, but does transmute a
segfault into an actual error result.

ROCm error: out of memory
  current device: 0, in function stream at /build/source/ggml/src/ggml-hip/../ggml-cuda/common.cuh:1345
  hipStreamCreateWithFlags(&streams[device][stream], 0x01)
---
 .../rocm-modules/rocm-runtime/default.nix     |  3 +
 .../rocm-runtime/queue-failure.patch          | 71 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 pkgs/development/rocm-modules/rocm-runtime/queue-failure.patch

diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix
index 73d83211b15b..5e82f2550cb7 100644
--- a/pkgs/development/rocm-modules/rocm-runtime/default.nix
+++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix
@@ -53,6 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
+    # Vendored upstream PR for fix for segfault when queue allocation fails
+    # https://github.com/ROCm/rocm-systems/pull/2850
+    ./queue-failure.patch
     (fetchpatch {
       # [PATCH] rocr: Extend HIP ISA compatibility check
       sha256 = "sha256-8r2Lb5lBfFaZC3knCxfXGcnkzNv6JxOKyJn2rD5gus4=";
diff --git a/pkgs/development/rocm-modules/rocm-runtime/queue-failure.patch b/pkgs/development/rocm-modules/rocm-runtime/queue-failure.patch
new file mode 100644
index 000000000000..f9087144bc22
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocm-runtime/queue-failure.patch
@@ -0,0 +1,71 @@
+From b7717446c85d08b2d7c0c60ba3ac0eff11ee6120 Mon Sep 17 00:00:00 2001
+From: Luna Nova <git@lunnova.dev>
+Date: Tue, 20 Jan 2026 12:55:45 -0800
+Subject: [PATCH 1/2] rocm-runtime: fix crash in QueueCreate due to trying to
+ free non allocated scratch
+
+if (scratch.main_queue_base != nullptr) before calling ReleaseQueueMainScratch
+because ReleaseQueueMainScratch is only valid if main_queue_base is set
+and the scope guard can fire for an error allocating the queue.
+---
+ .../runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp        | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
+index 01b01fe869..83db40dacc 100644
+--- a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
++++ b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
+@@ -1792,7 +1792,9 @@ hsa_status_t GpuAgent::QueueCreate(size_t size, hsa_queue_type32_t queue_type, u
+   scratch.main_queue_base = nullptr;
+   scratch.main_queue_process_offset = 0;
+ 
+-  MAKE_NAMED_SCOPE_GUARD(scratchGuard, [&]() { ReleaseQueueMainScratch(scratch); });
++  MAKE_NAMED_SCOPE_GUARD(scratchGuard, [&]() {
++    if (scratch.main_queue_base != nullptr) ReleaseQueueMainScratch(scratch);
++  });
+ 
+   if (scratch.main_size != 0) {
+     AcquireQueueMainScratch(scratch);
+-- 
+2.52.0
+
+
+From 9c1746cd76a703e4d2321dc2ffe85fc61bfd2f21 Mon Sep 17 00:00:00 2001
+From: Luna Nova <git@lunnova.dev>
+Date: Tue, 20 Jan 2026 13:00:32 -0800
+Subject: [PATCH 2/2] rocm-runtime: log for errors in QueueCreate
+
+---
+ .../runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp   | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
+index 83db40dacc..ae68732eb5 100644
+--- a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
++++ b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
+@@ -1799,6 +1799,9 @@ hsa_status_t GpuAgent::QueueCreate(size_t size, hsa_queue_type32_t queue_type, u
+   if (scratch.main_size != 0) {
+     AcquireQueueMainScratch(scratch);
+     if (scratch.main_queue_base == nullptr) {
++      LogPrint(HSA_AMD_LOG_FLAG_INFO,
++               "Failed to allocate scratch memory for queue, size=%zu, node=%u",
++               scratch.main_size, node_id());
+       return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
+     }
+   }
+@@ -1827,7 +1830,11 @@ hsa_status_t GpuAgent::QueueCreate(size_t size, hsa_queue_type32_t queue_type, u
+             node_id()));
+   }
+ 
+-  if (!shared_queue) return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
++  if (!shared_queue) {
++    LogPrint(HSA_AMD_LOG_FLAG_INFO,
++             "Failed to allocate shared queue descriptor memory, node=%u", node_id());
++    return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
++  }
+ 
+   auto aql_queue = new AqlQueue(shared_queue, this, size, node_id(), scratch, event_callback, data,
+                                 flags);
+-- 
+2.52.0
+

From 3ab6791fe58ec4686036f3864455cf268257011a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 00:13:23 +0000
Subject: [PATCH 108/235] fzf-make: 0.65.0 -> 0.67.0

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

diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix
index 9bce264bc85b..789c44dbac92 100644
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fzf-make";
-  version = "0.65.0";
+  version = "0.67.0";
 
   src = fetchFromGitHub {
     owner = "kyu08";
     repo = "fzf-make";
     tag = "v${version}";
-    hash = "sha256-KL2dRyfwwa365hEMeVixAP9DFx3QObJVeesj95tOUmo=";
+    hash = "sha256-ciUixT+ELBL90rPe1wUyp41ZL2a6YhEDY+n66cOB1xk=";
   };
 
-  cargoHash = "sha256-QaR0Se8ecNKj7OcngwEOrK63VT200D+/Xm3RaIiLdec=";
+  cargoHash = "sha256-pVkoxMYcPUjzpN3nbyECtLS8wXo78P1ybOdl3P05Zkc=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From 12c0d4c888d928cff3fb601c507c86df192901d0 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 24 Jan 2026 16:16:44 -0800
Subject: [PATCH 109/235] rocmPackages.amdsmi: fix error: redefinition of
 'struct drm_color_ctm_3x4'

---
 .../rocm-modules/amdsmi/default.nix           |  6 ++++
 .../amdsmi/drm-struct-redefinition-fix.patch  | 35 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/rocm-modules/amdsmi/drm-struct-redefinition-fix.patch

diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix
index 57b095812d26..af24c68b8fd2 100644
--- a/pkgs/development/rocm-modules/amdsmi/default.nix
+++ b/pkgs/development/rocm-modules/amdsmi/default.nix
@@ -41,6 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
     cp ./include/amd_smi/impl/amd_hsmp.h ./esmi_ib_library/include/asm/amd_hsmp.h
   '';
 
+  patches = [
+    # Fix error: redefinition of 'struct drm_color_ctm_3x4'
+    # https://github.com/ROCm/amdsmi/pull/165
+    ./drm-struct-redefinition-fix.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/development/rocm-modules/amdsmi/drm-struct-redefinition-fix.patch b/pkgs/development/rocm-modules/amdsmi/drm-struct-redefinition-fix.patch
new file mode 100644
index 000000000000..caf23edcef57
--- /dev/null
+++ b/pkgs/development/rocm-modules/amdsmi/drm-struct-redefinition-fix.patch
@@ -0,0 +1,35 @@
+From b8b4a6bcfe35ba9539a120cfd16573123ddd9241 Mon Sep 17 00:00:00 2001
+From: "Sv. Lockal" <lockalsash@gmail.com>
+Date: Mon, 15 Dec 2025 03:46:35 +0800
+Subject: [PATCH] Fix compilation with libdrm-2.4.130
+
+Fix error: redefinition of 'struct drm_color_ctm_3x4'.
+
+drm_color_ctm_3x4 structure is now defined in https://github.com/torvalds/linux/commit/e5719e7f19009d4fbedf685fc22eec9cd8de154f#diff-4c51fb416ec7cc69566cd7b795ee57eb070aa1006ad65d6962081f039ffb2718
+
+As this structure is unused and not a part of amdsmi public interface,
+it is safe to remove it.
+---
+ include/amd_smi/impl/amdgpu_drm.h | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/include/amd_smi/impl/amdgpu_drm.h b/include/amd_smi/impl/amdgpu_drm.h
+index b56a5ac4b..0e483d13b 100644
+--- a/include/amd_smi/impl/amdgpu_drm.h
++++ b/include/amd_smi/impl/amdgpu_drm.h
+@@ -1625,15 +1625,6 @@ struct drm_amdgpu_info_uq_metadata {
+ #define AMDGPU_FAMILY_GC_11_5_0			150 /* GC 11.5.0 */
+ #define AMDGPU_FAMILY_GC_12_0_0			152 /* GC 12.0.0 */
+ 
+-/* FIXME wrong namespace! */
+-struct drm_color_ctm_3x4 {
+-	/*
+-	 * Conversion matrix with 3x4 dimensions in S31.32 sign-magnitude
+-	 * (not two's complement!) format.
+-	 */
+-	__u64 matrix[12];
+-};
+-
+ #if defined(__cplusplus)
+ }
+ #endif

From 5c98be4c599aa1ce407d2817d744ed5f6bcee9b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 00:22:59 +0000
Subject: [PATCH 110/235] sof-tools: 2.14 -> 2.14.2

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

diff --git a/pkgs/by-name/so/sof-tools/package.nix b/pkgs/by-name/so/sof-tools/package.nix
index 0e62ccd5e348..ae6dcf31ef29 100644
--- a/pkgs/by-name/so/sof-tools/package.nix
+++ b/pkgs/by-name/so/sof-tools/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sof-tools";
-  version = "2.14";
+  version = "2.14.2";
 
   src = fetchFromGitHub {
     owner = "thesofproject";
     repo = "sof";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y3byJmoANVeilJpO82aljBZas/6u6VqfynYl0csW1as=";
+    hash = "sha256-1LLpmcwz0NYhJ9eCeuQWCwjROPptS6MWq+LkkN4Bsek=";
   };
 
   postPatch = ''

From 7ac032101e58da2f56c018c10d0033799f6cd885 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Jan 2026 00:27:44 +0000
Subject: [PATCH 111/235] python3Packages.mdformat-simple-breaks: 0.0.1 ->
 0.1.0

Diff: https://github.com/csala/mdformat-simple-breaks/compare/v0.0.1...v0.1.0
---
 .../mdformat-simple-breaks/default.nix        | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
index da2b68c1eab7..043d2ac18d3d 100644
--- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
+++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
@@ -4,30 +4,40 @@
   fetchFromGitHub,
   flit-core,
   mdformat,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mdformat-simple-breaks";
-  version = "0.0.1";
+  version = "0.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "csala";
     repo = "mdformat-simple-breaks";
-    tag = "v${version}";
-    hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-w0qPxIlCFMvs7p2Lya/ATkQN9wVt8ipsePZgonN/qpc=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [
+    flit-core
+  ];
 
-  propagatedBuildInputs = [ mdformat ];
+  dependencies = [
+    mdformat
+  ];
 
   pythonImportsCheck = [ "mdformat_simple_breaks" ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
   meta = {
     description = "Mdformat plugin to render thematic breaks using three dashes";
+    changelog = "https://github.com/csala/mdformat-simple-breaks/releases/tag/${finalAttrs.src.tag}";
     homepage = "https://github.com/csala/mdformat-simple-breaks";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aldoborrero ];
   };
-}
+})

From e41dd7e6697ec489412bb9ca435fdc7239371453 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Jan 2026 00:37:52 +0000
Subject: [PATCH 112/235] python3Packages.mdformat-frontmatter: 2.0.8 -> 2.0.10

Diff: https://github.com/butler54/mdformat-frontmatter/compare/v2.0.8...v2.0.10

Changelog: https://github.com/butler54/mdformat-frontmatter/blob/v2.0.10/CHANGELOG.md
---
 .../mdformat-frontmatter/default.nix          | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix
index 56d6ff7d04bb..8cb60804f62a 100644
--- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix
+++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix
@@ -2,27 +2,34 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   flit-core,
+
+  # dependencies
   mdformat,
   mdit-py-plugins,
   ruamel-yaml,
+
+  # tests
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mdformat-frontmatter";
-  version = "2.0.8";
+  version = "2.0.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "butler54";
     repo = "mdformat-frontmatter";
-    tag = "v${version}";
-    hash = "sha256-2heQw8LL/ILY36oItBeQq33qjVBGT51qGG4CcCEDutA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-snW9L9vnRHjNchhWZ5sIrn1r4piEYJeKQwib/4rarOo=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     mdformat
     mdit-py-plugins
     ruamel-yaml
@@ -30,14 +37,18 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mdformat_frontmatter" ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
   meta = {
     description = "Mdformat plugin to ensure frontmatter is respected";
     homepage = "https://github.com/butler54/mdformat-frontmatter";
-    changelog = "https://github.com/butler54/mdformat-frontmatter/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/butler54/mdformat-frontmatter/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       aldoborrero
       polarmutex
     ];
   };
-}
+})

From f505ade997469b80c87e4a593673c1044fd78ff6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 00:43:25 +0000
Subject: [PATCH 113/235] python3Packages.meshtastic: 2.7.6 -> 2.7.7

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 5a918b72b27e..4c82178aab11 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "meshtastic";
-  version = "2.7.6";
+  version = "2.7.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "python";
     tag = finalAttrs.version;
-    hash = "sha256-5MvIv9/v5feqbLN60PFps0xr+k+AOczVsLwnlCJJDZI=";
+    hash = "sha256-dpO5mYdEagJ/dDiKV7vJMRdQAZN0GY7/Sf6/kkHRpCM=";
   };
 
   pythonRelaxDeps = [

From ca4023409b79fbbe376cb38a6fb4068eaf42f9a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 00:47:50 +0000
Subject: [PATCH 114/235] python3Packages.hcloud: 2.15.0 -> 2.16.0

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

diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index b8865de91dbd..3ee62ac9dcff 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "hcloud";
-  version = "2.15.0";
+  version = "2.16.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-/Y5mjersmXo/6t5e3Te+BZpT5MvBT7AGCXZnUC737U0=";
+    hash = "sha256-6xrLMRW8CzVrRQrSMlaHO1gxGzV6SWJaj+DLq6LbUJs=";
   };
 
   build-system = [ setuptools ];

From 4e9c0c4f3f4b9abca947dbe7aee1b1e6be9261e6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Jan 2026 00:41:16 +0000
Subject: [PATCH 115/235] python3Packages.mdformat-gfm: 0.3.6 -> 1.0.0

Diff: https://github.com/hukkin/mdformat-gfm/compare/0.3.6...1.0.0
---
 .../python-modules/mdformat-gfm/default.nix   | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/mdformat-gfm/default.nix b/pkgs/development/python-modules/mdformat-gfm/default.nix
index 440915bbd91d..1e5afc0290f4 100644
--- a/pkgs/development/python-modules/mdformat-gfm/default.nix
+++ b/pkgs/development/python-modules/mdformat-gfm/default.nix
@@ -2,53 +2,55 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  linkify-it-py,
+
+  # build-system
+  flit-core,
+
+  # dependencies
   markdown-it-py,
   mdformat,
-  mdformat-tables,
   mdit-py-plugins,
-  poetry-core,
+  wcwidth,
+
+  # tests
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mdformat-gfm";
-  version = "0.3.6";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = "mdformat-gfm";
-    tag = version;
-    hash = "sha256-c1jJwyTL8IgQnIAJFoPSuJ8VEYgnQ4slZyV0bHlUHLQ=";
+    tag = finalAttrs.version;
+    hash = "sha256-Vijt5P3KRL4jkU8AI2lAsJkvFne/l3utUkjHUs8PQHI=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [
+    flit-core
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     markdown-it-py
     mdformat
-    mdformat-tables
     mdit-py-plugins
-    linkify-it-py
+    wcwidth
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    "test_default_style__api"
-    "test_default_style__cli"
-  ];
-
   pythonImportsCheck = [ "mdformat_gfm" ];
 
   meta = {
     description = "Mdformat plugin for GitHub Flavored Markdown compatibility";
     homepage = "https://github.com/hukkin/mdformat-gfm";
+    changelog = "https://github.com/hukkin/mdformat-gfm/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       aldoborrero
       polarmutex
     ];
   };
-}
+})

From d8998d0b70e9545602f5226f68c6e99a8f078515 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sat, 24 Jan 2026 17:00:16 -0800
Subject: [PATCH 116/235] antigravity: 1.15.6 -> 1.15.8

---
 pkgs/by-name/an/antigravity/information.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json
index 14b4a35ac914..9ca34b9e4abd 100644
--- a/pkgs/by-name/an/antigravity/information.json
+++ b/pkgs/by-name/an/antigravity/information.json
@@ -1,22 +1,22 @@
 {
-  "version": "1.15.6",
+  "version": "1.15.8",
   "vscodeVersion": "1.104.0",
   "sources": {
     "x86_64-linux": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/linux-x64/Antigravity.tar.gz",
-      "sha256": "e399b13e4b6d8ec5b57a746478a87b0f7652f8a69024febd4c25ec847a4c8ea6"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/linux-x64/Antigravity.tar.gz",
+      "sha256": "44afc76e06599b5eed8eab68db3d2c553c77ea6b9cc7652250e3d1a58bbb1498"
     },
     "aarch64-linux": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/linux-arm/Antigravity.tar.gz",
-      "sha256": "645247bc7c6c637b07610884350588e888eabd22e32a2786695606bebbb97900"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/linux-arm/Antigravity.tar.gz",
+      "sha256": "a39cb7fb78eaceb939e82cf8024fc7e16694a61b32d2af61ba414fe4284e41cd"
     },
     "x86_64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/darwin-x64/Antigravity.zip",
-      "sha256": "d99b852cf831c4a1d3207a9cbef0b2cb92a68fdbb84f121d908d694617f0a8a4"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/darwin-x64/Antigravity.zip",
+      "sha256": "2554e90087f83e92655650a66d51f47c5577fade58627d5ec8b4221e5ed62ed8"
     },
     "aarch64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/darwin-arm/Antigravity.zip",
-      "sha256": "85d62d8efc97777d77c176809025235d9138a7f3d1b3d6003526499b8e48ec3c"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/darwin-arm/Antigravity.zip",
+      "sha256": "cc3199592ff91325e395ba9fff1a0cd9f3c709bec52ec36d30f27101d6231239"
     }
   }
 }

From ca0b62810c98d65f4739cade1f2f20bd972fd061 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Jan 2026 00:59:41 +0000
Subject: [PATCH 117/235] python3Packages.mdformat-front-matters: init at 2.0.0

---
 .../mdformat-front-matters/default.nix        | 62 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/python-modules/mdformat-front-matters/default.nix

diff --git a/pkgs/development/python-modules/mdformat-front-matters/default.nix b/pkgs/development/python-modules/mdformat-front-matters/default.nix
new file mode 100644
index 000000000000..14752c8dae57
--- /dev/null
+++ b/pkgs/development/python-modules/mdformat-front-matters/default.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  uv-build,
+
+  # dependencies
+  mdformat,
+  mdit-py-plugins,
+  ruamel-yaml,
+  toml,
+
+  # tests
+  pytestCheckHook,
+  typing-extensions,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "mdformat-front-matters";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "kyleking";
+    repo = "mdformat-front-matters";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nfthUgOmKI57d+xLMmzveYPugzvvwkIzA//+CgvJGRw=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.10" "uv_build"
+  '';
+
+  build-system = [
+    uv-build
+  ];
+
+  dependencies = [
+    mdformat
+    mdit-py-plugins
+    ruamel-yaml
+    toml
+  ];
+
+  pythonImportsCheck = [ "mdformat_front_matters" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    typing-extensions
+  ];
+
+  meta = {
+    description = "mdformat plugin to format YAML, TOML, or JSON front matter";
+    homepage = "https://github.com/kyleking/mdformat-front-matters";
+    changelog = "https://github.com/KyleKing/mdformat-front-matters/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0f172b404a1..25bc51721838 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9461,6 +9461,8 @@ self: super: with self; {
 
   mdformat-footnote = callPackage ../development/python-modules/mdformat-footnote { };
 
+  mdformat-front-matters = callPackage ../development/python-modules/mdformat-front-matters { };
+
   mdformat-frontmatter = callPackage ../development/python-modules/mdformat-frontmatter { };
 
   mdformat-gfm = callPackage ../development/python-modules/mdformat-gfm { };

From fdccb06c986cc32f4c552b66245d0519015b3eb2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Jan 2026 00:51:52 +0000
Subject: [PATCH 118/235] python3Packages.mdformat-mkdocs: 4.4.2 -> 5.1.3

Diff: https://github.com/KyleKing/mdformat-mkdocs/compare/v4.4.2...v5.1.3

Changelog: https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v5.1.3
---
 .../mdformat-mkdocs/default.nix               | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix
index c824dd32655e..cd0aa4e37545 100644
--- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix
+++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix
@@ -2,13 +2,15 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  flit-core,
+
+  # build-system
+  uv-build,
+
   mdformat-beautysh,
   mdformat-footnote,
-  mdformat-frontmatter,
+  mdformat-front-matters,
   mdformat-gfm,
   mdformat-simple-breaks,
-  mdformat-tables,
   mdformat,
   mdit-py-plugins,
   more-itertools,
@@ -16,19 +18,26 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mdformat-mkdocs";
-  version = "4.4.2";
+  version = "5.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "KyleKing";
     repo = "mdformat-mkdocs";
-    tag = "v${version}";
-    hash = "sha256-u3IHqllknX6ilReXRVyZoDfqid8Ioe+zvC3wPh04HXo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-PklT9LlaIQFG194zhHQhzR8kVe084Q+1Bo9180eOMd0=";
   };
 
-  build-system = [ flit-core ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.10" "uv_build"
+  '';
+
+  build-system = [
+    uv-build
+  ];
 
   dependencies = [
     mdformat
@@ -42,10 +51,9 @@ buildPythonPackage rec {
       mdformat-beautysh
       # mdformat-config
       mdformat-footnote
-      mdformat-frontmatter
+      mdformat-front-matters
       # mdformat-ruff
       mdformat-simple-breaks
-      mdformat-tables
       # mdformat-web
       # mdformat-wikilink
     ];
@@ -66,8 +74,8 @@ buildPythonPackage rec {
   meta = {
     description = "Mdformat plugin for MkDocs";
     homepage = "https://github.com/KyleKing/mdformat-mkdocs";
-    changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/${src.tag}";
+    changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aldoborrero ];
   };
-}
+})

From 0f308bb8364c6ce94936ccbb5a5ecc32b5d16c01 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Jan 2026 01:06:04 +0000
Subject: [PATCH 119/235] python3Packages.mdformat-myst: 0.2.0 -> 0.3.0

Diff:
https://github.com/executablebooks/mdformat-myst/compare/v0.2.0...0.3.0

Changelog:
https://github.com/executablebooks/mdformat-myst/releases/tag/v0.3.0/CHANGELOG.md
---
 .../python-modules/mdformat-myst/default.nix  | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/mdformat-myst/default.nix b/pkgs/development/python-modules/mdformat-myst/default.nix
index 01a5a327accb..5d6465b29b9a 100644
--- a/pkgs/development/python-modules/mdformat-myst/default.nix
+++ b/pkgs/development/python-modules/mdformat-myst/default.nix
@@ -2,26 +2,32 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   flit-core,
+
+  # dependencies
   mdformat,
   mdformat-footnote,
-  mdformat-frontmatter,
-  mdformat-tables,
+  mdformat-front-matters,
+  mdformat-gfm,
   mdit-py-plugins,
   ruamel-yaml,
+
+  # tests
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mdformat-myst";
-  version = "0.2.1";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "mdformat-myst";
-    tag = "v${version}";
-    hash = "sha256-Ty9QOsOTCNfhdLVuLfD0x63OFfHhODr14i/dhN+Sqnc=";
+    tag = finalAttrs.version;
+    hash = "sha256-y0zN47eK0UqTHx6ft/OrczAjdHdmPKIByCnz1c1JURQ=";
   };
 
   build-system = [ flit-core ];
@@ -29,8 +35,8 @@ buildPythonPackage rec {
   dependencies = [
     mdformat
     mdformat-footnote
-    mdformat-frontmatter
-    mdformat-tables
+    mdformat-front-matters
+    mdformat-gfm
     mdit-py-plugins
     ruamel-yaml
   ];
@@ -42,8 +48,8 @@ buildPythonPackage rec {
   meta = {
     description = "Mdformat plugin for MyST compatibility";
     homepage = "https://github.com/executablebooks/mdformat-myst";
-    changelog = "https://github.com/executablebooks/mdformat-myst/releases/tag/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/executablebooks/mdformat-myst/releases/tag/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mattkang ];
   };
-}
+})

From a012064c2d6d206c984c827e6cc260c307f42085 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 01:12:56 +0000
Subject: [PATCH 120/235] cdncheck: 1.2.19 -> 1.2.20

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

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 433d1e8a039e..db4573a7f551 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cdncheck";
-  version = "1.2.19";
+  version = "1.2.20";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gb+M/y1MADwCR9gz1+mSXbvE3sSV8FKTDSz+Y9U2gfU=";
+    hash = "sha256-M+WlXFTw6DMV197aJh7UUIDsRiGeobXR5biEjRtASKE=";
   };
 
-  vendorHash = "sha256-Tc8qrML7u5qE0zVe7JCL1BM0KbhJSwnjhnd2gX5YUaA=";
+  vendorHash = "sha256-sVCmEMT6Y/9EPCbiUlstAw8FS4y+afeYeWNhT8aBXSE=";
 
   subPackages = [ "cmd/cdncheck/" ];
 

From 33be3797be50d7e009074a0894d6a5703afbf752 Mon Sep 17 00:00:00 2001
From: thattemperature <2719023332@qq.com>
Date: Thu, 22 Jan 2026 22:48:19 +0800
Subject: [PATCH 121/235] emacsPackages.consult: fix consult-flymake issue

---
 .../editors/emacs/elisp-packages/elpa-common-overrides.nix     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
index 1fc3f359f07e..818646630cc5 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
@@ -76,6 +76,9 @@ in
 
   cl-print = null; # builtin
 
+  # https://github.com/NixOS/nixpkgs/issues/483425
+  consult = addPackageRequires super.consult [ self.flymake ];
+
   # missing optional dependencies https://codeberg.org/rahguzar/consult-hoogle/issues/4
   consult-hoogle = addPackageRequiresIfOlder super.consult-hoogle [ self.consult ] "0.2.2";
 

From 86c9e1693f3c62763edce32bd445c847cc2a057b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Jan 2026 00:45:39 +0000
Subject: [PATCH 122/235] python3Packages.mdformat-tables: drop

---
 .../mdformat-tables/default.nix               | 49 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 pkgs/development/python-modules/mdformat-tables/default.nix

diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix
deleted file mode 100644
index 99ca4ca99ad5..000000000000
--- a/pkgs/development/python-modules/mdformat-tables/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build dependencies
-  flit-core,
-
-  # dependencies
-  mdformat,
-  wcwidth,
-
-  # tests
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "mdformat-tables";
-  version = "1.0.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "executablebooks";
-    repo = "mdformat-tables";
-    tag = "v${version}";
-    hash = "sha256-7MbpGBGprhGrQ9P31HUU2h0bjyHWap6DETVN/dCDA1w=";
-  };
-
-  build-system = [ flit-core ];
-
-  dependencies = [
-    mdformat
-    wcwidth
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pythonImportsCheck = [ "mdformat_tables" ];
-
-  meta = {
-    description = "Mdformat plugin for rendering tables";
-    homepage = "https://github.com/executablebooks/mdformat-tables";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      aldoborrero
-      polarmutex
-    ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 76cc374d42c7..f858cb4d6982 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -267,6 +267,7 @@ mapAliases {
   Markups = throw "'Markups' has been renamed to/replaced by 'markups'"; # Converted to throw 2025-10-29
   mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
   matlink-gpapi = throw "'matlink-gpapi' has been removed as it was broken and unmaintained"; # Added 2025-11-09
+  mdformat-tables = "'mdformat-tables' has been archived and replaced by 'mdformat-gfm"; # added 2025-01-25
   MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29
   MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29
   memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25bc51721838..da84d3a7976f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9477,8 +9477,6 @@ self: super: with self; {
 
   mdformat-simple-breaks = callPackage ../development/python-modules/mdformat-simple-breaks { };
 
-  mdformat-tables = callPackage ../development/python-modules/mdformat-tables { };
-
   mdformat-toc = callPackage ../development/python-modules/mdformat-toc { };
 
   mdformat-wikilink = callPackage ../development/python-modules/mdformat-wikilink { };

From 7d1437b3e78274faf41abaf290ac186d72f1a25d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Jan 2026 01:17:15 +0000
Subject: [PATCH 123/235] python3Packages.mdformat-nix-alejandra: relax
 mdformat dep

---
 .../mdformat-nix-alejandra/default.nix             | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix b/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix
index 6eac79a7dc9e..df9f773e3af7 100644
--- a/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix
+++ b/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix
@@ -8,7 +8,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mdformat-nix-alejandra";
   version = "0.1.0";
   pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aldoborrero";
     repo = "mdformat-nix-alejandra";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-jUXApGsxCA+pRm4m4ZiHWlxmVkqCPx3A46oQdtyKz5g=";
   };
 
@@ -25,9 +25,12 @@ buildPythonPackage rec {
       --replace-fail '"alejandra"' '"${lib.getExe alejandra}"'
   '';
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ mdformat ];
+  pythonRelaxDeps = [
+    "mdformat"
+  ];
+  dependencies = [ mdformat ];
 
   pythonImportsCheck = [ "mdformat_nix_alejandra" ];
 
@@ -35,8 +38,9 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mdformat plugin format Nix code blocks with alejandra";
+    changelog = "https://github.com/aldoborrero/mdformat-nix-alejandra/releases/tag/${finalAttrs.src.tag}";
     homepage = "https://github.com/aldoborrero/mdformat-nix-alejandra";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aldoborrero ];
   };
-}
+})

From 34271feb6e5d4fc0ccbaf6eb3019ead58d7e2715 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 01:21:14 +0000
Subject: [PATCH 124/235] tcping-rs: 1.2.21 -> 1.2.24

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

diff --git a/pkgs/by-name/tc/tcping-rs/package.nix b/pkgs/by-name/tc/tcping-rs/package.nix
index dadc075793b6..786f9e55e450 100644
--- a/pkgs/by-name/tc/tcping-rs/package.nix
+++ b/pkgs/by-name/tc/tcping-rs/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "tcping-rs";
-  version = "1.2.21";
+  version = "1.2.24";
 
   src = fetchFromGitHub {
     owner = "lvillis";
     repo = "tcping-rs";
     tag = version;
-    hash = "sha256-n8eYxq3zFj1337lC7OJ32p9AaMU4HJDWVk0Bkw/STJ0=";
+    hash = "sha256-gsTZls5guqtDk8x+3q4nFYGwhr+TAV5iE9kiZgbmzCI=";
   };
 
-  cargoHash = "sha256-l1VzdBuwNANT9rUEEPuESfOp7/f3tghJrX/SEY9fSeA=";
+  cargoHash = "sha256-m/juo6+SPFAxQ7E2JgTkv47kxn4LhwfI4UGSDzHAXMc=";
 
   checkFlags = [
     # This test requires external network access

From 11f8f21dcf27d4226cb23517f1835f6ff9c9bf23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 01:28:19 +0000
Subject: [PATCH 125/235] vacuum-tube: 1.5.4 -> 1.5.5

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

diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix
index 5965f2decbf9..9b56990d5e68 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vacuum-tube";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "shy1132";
     repo = "VacuumTube";
     tag = "v${version}";
-    hash = "sha256-b5OnDoMejnupeK4sWoXQo7vpFFD/y1p4vxMZTMMO25g=";
+    hash = "sha256-rFR82BO5rXv+4ePx5FqXOWec7ncM5Ml0dwixtLXQFts=";
   };
 
-  npmDepsHash = "sha256-NBsLgcYFHnj+hVELTKMreLsrJAu3S+RuhBcOTeIhQew=";
+  npmDepsHash = "sha256-u5cfKgKP+n7V8gk2NRWNJz/P7hxURnPFQ7yjLE+fAlE=";
   makeCacheWritable = true;
 
   env = {

From 68ee51e68bea191130853bcbef937bff4398e52f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 01:46:19 +0000
Subject: [PATCH 126/235] minigalaxy: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix
index 51791c74717d..61a041684c5a 100644
--- a/pkgs/by-name/mi/minigalaxy/package.nix
+++ b/pkgs/by-name/mi/minigalaxy/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "minigalaxy";
-  version = "1.4.0";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sharkwouter";
     repo = "minigalaxy";
     tag = version;
-    hash = "sha256-ZHTjppdLxKDURceonbH7dJz+krBhu3lr2P7QPVDxRZw=";
+    hash = "sha256-YZhgVeWdVaNiTj7hvYuHbaVtoKN6EFoOANWdkrlj4dU=";
   };
 
   patches = [

From 7c571e3b45a77c4ea434480231beb47d67c0a5a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 01:58:27 +0000
Subject: [PATCH 127/235] gonic: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/by-name/go/gonic/package.nix b/pkgs/by-name/go/gonic/package.nix
index d0dddb9cf4a1..11b4564f920b 100644
--- a/pkgs/by-name/go/gonic/package.nix
+++ b/pkgs/by-name/go/gonic/package.nix
@@ -20,15 +20,15 @@
 
 buildGoModule rec {
   pname = "gonic";
-  version = "0.19.0";
+  version = "0.20.0";
   src = fetchFromGitHub {
     owner = "sentriz";
     repo = "gonic";
     rev = "v${version}";
-    sha256 = "sha256-la3xBECo4zZfkp5BlXuUzFEUGtxMl8ZAQdwgjFXIuSM=";
+    sha256 = "sha256-llNKCxVrsDmi5a33NoAPEyJu+728gFQcAItPk2IBdwo=";
   };
 
-  vendorHash = "sha256-HrYS7c0MtiOYRyiSg7eLbiSIUkHeRikJ0Rwf4EoZIsQ=";
+  vendorHash = "sha256-uVZ0Q1nrE7DLurW4fldsr3yyz80J6ONiPjLXHXHDGlg=";
 
   # TODO(Profpatsch): write a test for transcoding support,
   # since it is prone to break

From 785a34ec0133db0a1f4330012917af06ef3cfbad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 02:46:56 +0000
Subject: [PATCH 128/235] volanta: 1.15.0 -> 1.15.2

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

diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix
index 1977daa247e7..99a7d2e49be8 100644
--- a/pkgs/by-name/vo/volanta/package.nix
+++ b/pkgs/by-name/vo/volanta/package.nix
@@ -9,11 +9,11 @@
 }:
 let
   pname = "volanta";
-  version = "1.15.0";
-  build = "1240645b";
+  version = "1.15.2";
+  build = "32c42adb";
   src = fetchurl {
     url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage";
-    hash = "sha256-6QF9o5BFeGZBjpusFMYrWlnYhAdItfxg+gS0Xf2q7io=";
+    hash = "sha256-2f6/zl+N3sZ6en50T8lo2EDMGi/sBk2SHKKBxm/oGQw=";
   };
   appImageContents = appimageTools.extract { inherit pname version src; };
 in

From f1009d36a38ec017d649a2df5546f1cabd6b3038 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 02:52:27 +0000
Subject: [PATCH 129/235] libretro.ppsspp: 0-unstable-2026-01-18 ->
 0-unstable-2026-01-24

---
 pkgs/applications/emulators/libretro/cores/ppsspp.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index c0b389a35945..a931219f2e33 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2026-01-18";
+  version = "0-unstable-2026-01-24";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "3c3de9ce6b93dc718ad7487ee249dea560a791ed";
-    hash = "sha256-ZzOrK0ccYew91bZLMp5B4r5wC/4e6N5SaDled0fskcI=";
+    rev = "bab01f1b162ed76dde584b9a1f9f327fecbf5cb5";
+    hash = "sha256-SXI6EmvpQ80nkzxswBrvCZTVi8qW6R5097D4aZTSie4=";
     fetchSubmodules = true;
   };
 

From 9ae6841a9e2ba052a28df263e4aada5e62e9bdd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 03:21:19 +0000
Subject: [PATCH 130/235] ttl: 0.13.0 -> 0.13.4

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

diff --git a/pkgs/by-name/tt/ttl/package.nix b/pkgs/by-name/tt/ttl/package.nix
index 9b3d1c22c956..07d65d5c9277 100644
--- a/pkgs/by-name/tt/ttl/package.nix
+++ b/pkgs/by-name/tt/ttl/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ttl";
-  version = "0.13.0";
+  version = "0.13.4";
 
   src = fetchFromGitHub {
     owner = "lance0";
     repo = "ttl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cHiAIWUewdUwV9PO1He2V/+FML8XSVJOlyp+J+tdB24=";
+    hash = "sha256-r1rmyQI4EnLpCYpcz3cNO5XI6uLaBVYTGC8+ttyzUu8=";
   };
 
-  cargoHash = "sha256-6TehH3p9ikt1lx7p2Y2jM/21gASk8Taqoe/2bBfFs94=";
+  cargoHash = "sha256-fcfgj26cgM7q3byxfVJ2GKRXg4oNd6tj5plEylfJXjQ=";
 
   nativeBuildInputs = [
     installShellFiles

From de5f74ed4e1922a253a0acb9837f06bcb85af769 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 04:01:43 +0000
Subject: [PATCH 131/235] qsv: 11.0.2 -> 14.0.0

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

diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index a1b75c8e6295..d3f816729ae0 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -15,7 +15,7 @@
   withUi ? true,
   buildFeatures ?
     # enable all features except self_update by default
-    # https://github.com/dathere/qsv/blob/11.0.2/Cargo.toml#L370
+    # https://github.com/dathere/qsv/blob/14.0.0/Cargo.toml#L370
     [
       "apply"
       "feature_capable"
@@ -33,7 +33,7 @@
 
 let
   pname = "qsv";
-  version = "11.0.2";
+  version = "14.0.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version buildFeatures;
@@ -42,10 +42,10 @@ rustPlatform.buildRustPackage {
     owner = "dathere";
     repo = "qsv";
     rev = version;
-    hash = "sha256-EuNDwzO4tVjJUz8mXI0fDczoPLD89zmbSyfFI8ZrgwU=";
+    hash = "sha256-Y/rCNG74R9EZMp+vLdGr+62HRM5Y4LpXq2C9S7gZ3fM=";
   };
 
-  cargoHash = "sha256-l8hkDr3CtpyXWDTS8oje6W0iu5O28j4rLIXprxTEwHc=";
+  cargoHash = "sha256-5Q3Eim6Yk0a+0Pq0JHHQw/X9Zl4TNml2OjoCRwjd5Lw=";
 
   buildInputs = [
     file

From 4132b64aa1ed345125b928abd5ad2261dcc5402d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 04:21:32 +0000
Subject: [PATCH 132/235] python3Packages.pycollada: 0.9.2 -> 0.9.3

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

diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
index 0ba716114fa6..52e5aa1890ec 100644
--- a/pkgs/development/python-modules/pycollada/default.nix
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pycollada";
-  version = "0.9.2";
+  version = "0.9.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fKEiZ74KK5PkldYDbmsnQCOpRX3tZBlU6wxHDv4VPW4=";
+    hash = "sha256-w01tzw/i66WJb3HJbTehwP4aYfCEQPoM/Ow9woldMwI=";
   };
 
   build-system = [

From 4c054636751fa79c36d506dc3240ad384b27881e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 04:33:09 +0000
Subject: [PATCH 133/235] python3Packages.togrill-bluetooth: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/togrill-bluetooth/default.nix b/pkgs/development/python-modules/togrill-bluetooth/default.nix
index abf75f3bb427..7b1ba9314c9b 100644
--- a/pkgs/development/python-modules/togrill-bluetooth/default.nix
+++ b/pkgs/development/python-modules/togrill-bluetooth/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "togrill-bluetooth";
-  version = "0.8.0";
+  version = "0.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elupus";
     repo = "togrill-bluetooth";
     tag = version;
-    hash = "sha256-aBuWy8tG722yLzUS62yGdXcETGuH+dX9XVi/qMwEiVg=";
+    hash = "sha256-UZul5JEGv0zRcnUsEH2dkIiFt7jNYAc+9RvmDJMxkk0=";
   };
 
   build-system = [

From ac6e45707f379ca39f22b28dc1bd1c4e7bb62bcc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 04:36:41 +0000
Subject: [PATCH 134/235] nixbit: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix
index 816a77745722..f948bb66b077 100644
--- a/pkgs/by-name/ni/nixbit/package.nix
+++ b/pkgs/by-name/ni/nixbit/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nixbit";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "pbek";
     repo = "nixbit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VBstZEs1ptLWjqiat5vLdrduUDTBj2Lm9CwpMt1puyM=";
+    hash = "sha256-fKDNoDrJvbRl81N3fAvUugorsL6HspOSgopxBATcBBo=";
   };
 
   nativeBuildInputs = [

From 9516e7266e934edfb31184f14ad1d7973c12cada Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 05:05:35 +0000
Subject: [PATCH 135/235] python3Packages.iometer: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/development/python-modules/iometer/default.nix b/pkgs/development/python-modules/iometer/default.nix
index beba41d64809..a8572074f6f1 100644
--- a/pkgs/development/python-modules/iometer/default.nix
+++ b/pkgs/development/python-modules/iometer/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "iometer";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iometer-gmbh";
     repo = "iometer.py";
     tag = "v${version}";
-    hash = "sha256-rr+t8VPiPX9/r7mHo9DjLRjoZ7x/4IadhmDtIi2T0C4=";
+    hash = "sha256-FO9IwBXGIBh522JaaATjxo93zbGwnB+Y9dy7724d1Rw=";
   };
 
   build-system = [ poetry-core ];

From 8e217026315213a74cf9723cf40efd5fe55e2ac2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 05:22:43 +0000
Subject: [PATCH 136/235] terraform-providers.digitalocean_digitalocean: 2.73.0
 -> 2.74.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index dcadcab4e118..d3b2e75c0f10 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -310,11 +310,11 @@
     "vendorHash": null
   },
   "digitalocean_digitalocean": {
-    "hash": "sha256-SmpbPDlJxsXT63d4KnUSzbPLSG5c2mPy6SCA8TCpxe4=",
+    "hash": "sha256-inPOojpjliZpEN3Bk67mPdmq0XDCFHFpwthwuJjyIZg=",
     "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
     "owner": "digitalocean",
     "repo": "terraform-provider-digitalocean",
-    "rev": "v2.73.0",
+    "rev": "v2.74.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 5b2315665b67405bb9d255d5c6ba04549dea2eb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 06:07:50 +0000
Subject: [PATCH 137/235] pixi: 0.62.2 -> 0.63.2

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

diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index 91754cf30999..fe6c9206ebbf 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.62.2";
+  version = "0.63.2";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HNXfcZuj+yLWatwdSOP0WDkX4y9pcVwrNjsaZdD3ZNo=";
+    hash = "sha256-XI7NyZhqPAgQlagCsW0GulQaHxRfgI0X/wOM19phnSA=";
   };
 
-  cargoHash = "sha256-wmr1dOqV8IAhqmG4SjeCra+CEpajwZJWUlTNYVVgHVo=";
+  cargoHash = "sha256-Tx3XHz7/t27WB2N2QqlLzpfilRD2+dwNvC54NF0kwz8=";
 
   nativeBuildInputs = [
     pkg-config

From 7e6ce40f37cae2c7b3eb7b1e27a1aef782004288 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 06:40:02 +0000
Subject: [PATCH 138/235] cargo-tally: 1.0.71 -> 1.0.72

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

diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix
index 1bcaa50ff95a..051194a2553c 100644
--- a/pkgs/by-name/ca/cargo-tally/package.nix
+++ b/pkgs/by-name/ca/cargo-tally/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tally";
-  version = "1.0.71";
+  version = "1.0.72";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-jJj4aXhGMU5L7Yya65wi022M6lE/nHiyjozptSJcMGg=";
+    hash = "sha256-YkjRCP6VAp2Az0iM5HIG984ScJ3b3iKm34j4YuIs0kQ=";
   };
 
-  cargoHash = "sha256-GC4rYaNwTLfbSAojnhZb0vi6FmNiXL6YJ5TEVtQom6M=";
+  cargoHash = "sha256-SAO1VqlYzySIiBV3j6PCo7gknekmULpG/Two/8R0pv4=";
 
   meta = {
     description = "Graph the number of crates that depend on your crate over time";

From 8bb27ea86914c604c056cf0d0588df45ce469025 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 06:47:28 +0000
Subject: [PATCH 139/235] terraform-providers.mongodb_mongodbatlas: 2.4.0 ->
 2.5.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 dcadcab4e118..fecf26c62459 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -923,13 +923,13 @@
     "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
   },
   "mongodb_mongodbatlas": {
-    "hash": "sha256-yVkhW1cYH+1biC1kUI6MdAK00QpiCyG/sGbOOxTEmm8=",
+    "hash": "sha256-PACDH+CIEzUC/LYmppXin93vi0xp+1fMev2xn9iroRo=",
     "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
     "owner": "mongodb",
     "repo": "terraform-provider-mongodbatlas",
-    "rev": "v2.4.0",
+    "rev": "v2.5.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-5xHm81ribxzdgSkMPAY7JEnlwf7wN/QGD8UyxUx2FOQ="
+    "vendorHash": "sha256-3LMym5LFcrtEPA1exhrqbn3lqur7Vh8RP9wOwWChuKc="
   },
   "namecheap_namecheap": {
     "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",

From 17b2e79eb76e8960b672ae27e88bf2dabb228571 Mon Sep 17 00:00:00 2001
From: Saad Nadeem <saad29nadeem@gmail.com>
Date: Sun, 25 Jan 2026 01:51:49 -0500
Subject: [PATCH 140/235] vimPlugins.fff-nvim: add maintainer bridgesense

---
 .../editors/vim/plugins/non-generated/fff-nvim/default.nix       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index ffd20d30cdb3..6b8e22f77db6 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -69,6 +69,7 @@ vimUtils.buildVimPlugin {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       GaetanLepage
+      bridgesense
     ];
   };
 }

From cea13a8a0664f6813c87ee1b4da438d1031e2f41 Mon Sep 17 00:00:00 2001
From: Saad Nadeem <saad29nadeem@gmail.com>
Date: Sun, 25 Jan 2026 01:53:13 -0500
Subject: [PATCH 141/235] vimPlugins.fff-nvim: e3f788f-unstable-2025-12-13 ->
 6b01f95-unstable-2026-01-24

---
 .../plugins/non-generated/fff-nvim/default.nix    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index 6b8e22f77db6..a05e2e6fa284 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -10,18 +10,18 @@
   vimUtils,
 }:
 let
-  version = "e3f788f-unstable-2025-12-13";
+  version = "6b01f95-unstable-2026-01-24";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff.nvim";
-    rev = "e3f788f87b014f61e39cd916edc766d10e563d73";
-    hash = "sha256-NSTo5zs9DvGDVUp6PJNHCQsSNPgdkJCTYvlA/IP12h4=";
+    rev = "6b01f95ca6305511ef28175c42b250925376f181";
+    hash = "sha256-vI1oOVzpTpYZ0ea6w0e2wyKa0TsyLFFauOZkhYbXLYM=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-kNTJC+0KBQKt0nMY2HAUWnr55x8nTd5oRGeDuam8X30=";
+    cargoHash = "sha256-jch2snZVoDqPkbeuF++yc/3ikoWal29bTKZjkyDgVjU=";
 
     nativeBuildInputs = [
       pkg-config
@@ -49,10 +49,15 @@ vimUtils.buildVimPlugin {
   postPatch = ''
     substituteInPlace lua/fff/download.lua \
       --replace-fail \
-        "return plugin_dir .. '/../target'" \
+        "return plugin_dir .. '/../target/release'" \
         "return '${fff-nvim-lib}/lib'"
   '';
 
+  nvimSkipModule = [
+    # Skip single file dev config for testing fff.nvim locally
+    "empty_config"
+  ];
+
   passthru = {
     updateScript = nix-update-script {
       extraArgs = [ "--version=branch" ];

From f1d5fe8cedc1781a107159fc9a546919f5a44b79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 07:41:06 +0000
Subject: [PATCH 142/235] python3Packages.gwcs: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix
index f586f4826bd4..c7d61fb17e49 100644
--- a/pkgs/development/python-modules/gwcs/default.nix
+++ b/pkgs/development/python-modules/gwcs/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "gwcs";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spacetelescope";
     repo = "gwcs";
     tag = version;
-    hash = "sha256-aiC+uJ5S2HggBsou4vbjxxNtilRVC4eklRgML/lLK+4=";
+    hash = "sha256-0iUnapBn8yDCx1tqHD10Ljid15yBuqlICyFuva2LNPk=";
   };
 
   build-system = [

From 58642d81be4682c5bb70119341ed688ef8d56525 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 08:28:07 +0000
Subject: [PATCH 143/235] zipline: 4.4.0 -> 4.4.1

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

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 0bed24621f7d..eb732bbfbb33 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -36,13 +36,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H3WzCe1AgnYYI5oskWPi4k1NdpyXCFMmeulPJtwvuIo=";
+    hash = "sha256-9+r3padIhpmLNfiL68eut7e+VemhsqhvRcJhyOdA7+k=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm';
     fetcherVersion = 2;
-    hash = "sha256-JphaLunhwPdeKxlHdpMNGAl8um7wsOkNCCWYxQhLuBM=";
+    hash = "sha256-cYoZNalVDI1rLEYFLhJZ9pAZQCvieZL+Rj5VK7Q2/vk=";
   };
 
   buildInputs = [

From 2b29d84766a957c48262145544c312baa1f26583 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jan 2026 10:01:25 +0100
Subject: [PATCH 144/235] python313Packages.iamdata: 0.1.202601241 ->
 0.1.202601251

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202601241...v0.1.202601251

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202601251
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 00943ac47256..3aeecc1748e0 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202601241";
+  version = "0.1.202601251";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LItzSttudJs1VmcXabxD38omsuK8+RsFMDYCPmm/+Ok=";
+    hash = "sha256-X0hS2sAvFCEpCKCDEXUzlYPSz0/E6n7H66ytIP+EgrI=";
   };
 
   __darwinAllowLocalNetworking = true;

From d4629db800a9885d14ef7a34190bb6b7aea35f71 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 25 Jan 2026 17:01:28 +0800
Subject: [PATCH 145/235] mate.pluma: 1.28.0 -> 1.28.1

https://github.com/mate-desktop/pluma/compare/v1.28.0...v1.28.1
---
 pkgs/desktops/mate/pluma/default.nix | 34 +++++++++++++++-------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index 336a284d1072..337096fb279a 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -1,48 +1,52 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
+  autoconf-archive,
+  autoreconfHook,
   pkg-config,
   gettext,
   perl,
   itstool,
   isocodes,
   enchant,
+  gtk-doc,
   libxml2,
+  mate-common,
   python3,
   gtksourceview4,
   libpeas,
   mate-desktop,
   wrapGAppsHook3,
+  yelp-tools,
   gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pluma";
-  version = "1.28.0";
+  version = "1.28.1";
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/pluma-${finalAttrs.version}.tar.xz";
-    sha256 = "qorflYk0UJOlDjCyft5KeKJCHRcnwn9GX8h8Q1llodQ=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "pluma";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-+3zY3A7JRc7utYMNiQBnsy0lZr1PuDSOtdP+iigNRDQ=";
   };
 
-  patches = [
-    # Switch to girepository-2.0
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/pluma/raw/55b770fa4d899bd92aa5ce94f3be7e2e3523a096/f/libpeas1_pygobject352.patch";
-      hash = "sha256-uNGz6LEnJU4HxU1yzcm2mmrGM6QyuRSwc3w7XDYCNaQ=";
-    })
-  ];
-
   nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
     gettext
     isocodes
     itstool
+    gtk-doc
+    mate-common # mate-common.m4 macros
     perl
     pkg-config
     python3.pkgs.wrapPython
     wrapGAppsHook3
+    yelp-tools
   ];
 
   buildInputs = [
@@ -58,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   pythonPath = with python3.pkgs; [
     pycairo
-    six
   ];
 
   postFixup = ''
@@ -67,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru.updateScript = gitUpdater {
-    url = "https://git.mate-desktop.org/pluma";
     odd-unstable = true;
     rev-prefix = "v";
   };

From 10ee9af99ec1ef7cbefe0472fab8f973607279c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 09:03:51 +0000
Subject: [PATCH 146/235] wireguard-vanity-keygen: 0.1.2 -> 0.1.3

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

diff --git a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
index fd8567b9af43..7c2ab9dafb65 100644
--- a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
+++ b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "wireguard-vanity-keygen";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "axllent";
     repo = "wireguard-vanity-keygen";
     rev = version;
-    hash = "sha256-IF5z0qkVOzcwVQNfem18DTn6KbEjjPspGfneG1ekGJI=";
+    hash = "sha256-TpfSowOS1dNKIcoTV1hTnMzEbAax8uwYoan3SIJ03Lc=";
   };
 
-  vendorHash = "sha256-dYpkAdOjiXm1REGsUUTRb8de6okdZ9GpKppBnb6oo9g=";
+  vendorHash = "sha256-eh7zTM88qgXKqmhf1WyWsKve+YneQAUji2mDMEHUCIA=";
 
   ldflags = [
     "-s"

From ab6d11f0ae451a4b652f2b51f89a01cd6e350525 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 09:04:26 +0000
Subject: [PATCH 147/235] woodpecker-plugin-git: 2.8.0 -> 2.8.1

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

diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
index 662368ee4938..6b41383621ee 100644
--- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
+++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "woodpecker-plugin-git";
-  version = "2.8.0";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "woodpecker-ci";
     repo = "plugin-git";
     tag = version;
-    hash = "sha256-fUGTO60ZgMt8t/O4Cb3trSMmTFhKBxG8sjft+hrmUjQ=";
+    hash = "sha256-MhtqRWmZCjtb2QOwlbnlZUPHDNunjgWlhHCtM9pvYMM=";
   };
 
-  vendorHash = "sha256-FbtktDU6Rl3lu3U2vu20M+hz1HdLMu1krUcqXX3HfeA=";
+  vendorHash = "sha256-hOktS+CQQ6TaHt96DaAcZXhqJGGleD/RdjdUfgv7oxw=";
 
   env.CGO_ENABLED = "0";
 

From 3d578e8848eacff460b6ad40e1e69761206a1670 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jan 2026 10:06:11 +0100
Subject: [PATCH 148/235] python313Packages.gwcs: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix
index c7d61fb17e49..53038f7dc4e2 100644
--- a/pkgs/development/python-modules/gwcs/default.nix
+++ b/pkgs/development/python-modules/gwcs/default.nix
@@ -14,7 +14,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gwcs";
   version = "1.0.1";
   pyproject = true;
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spacetelescope";
     repo = "gwcs";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-0iUnapBn8yDCx1tqHD10Ljid15yBuqlICyFuva2LNPk=";
   };
 
@@ -50,8 +50,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module to manage the Generalized World Coordinate System";
     homepage = "https://github.com/spacetelescope/gwcs";
-    changelog = "https://github.com/spacetelescope/gwcs/blob/${src.tag}/CHANGES.rst";
+    changelog = "https://github.com/spacetelescope/gwcs/blob/${finalAttrs.src.tag}/CHANGES.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 572fa3603800b4633e839a56f855502ecfb0b2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alja=C5=BE=20M=2E=20Er=C5=BEen?= <aljaz@erzen.si>
Date: Sun, 25 Jan 2026 10:08:42 +0100
Subject: [PATCH 149/235] zensical: 0.0.18 -> 0.0.19

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

diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix
index ea1fc9ff8099..31a7fd43f368 100644
--- a/pkgs/by-name/ze/zensical/package.nix
+++ b/pkgs/by-name/ze/zensical/package.nix
@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "zensical";
-  version = "0.0.18";
+  version = "0.0.19";
   pyproject = true;
 
   # We fetch from PyPi, because GitHub repo does not contain all sources.
@@ -16,12 +16,12 @@ python3Packages.buildPythonApplication rec {
   # We could combine sources, but then nix-update won't work.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-H7ERAygza6RFliocZhV74Wmhz+fRxO3//7GEw/iE3wc=";
+    hash = "sha256-xCQQ+j9nOOIiOGN8dMugCID1nbRuPpOU9UToh8cu5LY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-r8X8td94+0wd4/riE+YCBBIe417xh0IK4vvPwPuRsGg=";
+    hash = "sha256-r0ToUJPCrZFwqjbHCsnGS7WHdEcmOqpoBQvqWbnUuPU=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From cf039b1136c05b379d6f6adee01c1656d030f7ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 09:24:34 +0000
Subject: [PATCH 150/235] terraform-providers.exoscale_exoscale: 0.67.1 ->
 0.67.2

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index dcadcab4e118..2b3b389998a9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -382,11 +382,11 @@
     "vendorHash": "sha256-M5cX70GwfdEJ22V8CwoaNEdEWb1CX7wsBgvj3GvjE0Q="
   },
   "exoscale_exoscale": {
-    "hash": "sha256-8FIZO+iRqYa7y5Li8GoGnFT069vx4q4KczCgEB4SKuk=",
+    "hash": "sha256-V7mG584wyr99myizr/jx9AadkAnBCZvUvAKF0sX/CIA=",
     "homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
     "owner": "exoscale",
     "repo": "terraform-provider-exoscale",
-    "rev": "v0.67.1",
+    "rev": "v0.67.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 68ff3be880725a94653558ab64436eb4b6e87a6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 09:44:04 +0000
Subject: [PATCH 151/235] terraform-providers.grafana_grafana: 4.23.0 -> 4.25.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 dcadcab4e118..b488ba390b04 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -472,13 +472,13 @@
     "vendorHash": "sha256-mzDFyk2oImRXt72kFV5Ln++ScgoecpJEJtzUKjvCaws="
   },
   "grafana_grafana": {
-    "hash": "sha256-gfS+sJREaObaXSgfVK7oUAgm05EqSRhiLauGP6V9Vhw=",
+    "hash": "sha256-EO18AHTtuchRpHxcXa5shmCpoLR91Ows8doBUTjollI=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v4.23.0",
+    "rev": "v4.25.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-sP86GbNZUmltn5a7AREyw54Fa3eFNwW/lMIFZIEj/Bo="
+    "vendorHash": "sha256-5+nBYEAdiyNYsZsWvghciCYixQB3ojRlpSiSdjNWDHY="
   },
   "gridscale_gridscale": {
     "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=",

From 5829878640f2918caf04eceec5ad97a00d51bc3c Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Sun, 25 Jan 2026 15:15:23 +0530
Subject: [PATCH 152/235] librepods: init at 0.1.0-unstable-2025-12-07

---
 pkgs/by-name/li/librepods/package.nix | 46 +++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/li/librepods/package.nix

diff --git a/pkgs/by-name/li/librepods/package.nix b/pkgs/by-name/li/librepods/package.nix
new file mode 100644
index 000000000000..796991baf99a
--- /dev/null
+++ b/pkgs/by-name/li/librepods/package.nix
@@ -0,0 +1,46 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  libpulseaudio,
+  openssl,
+  qt6,
+  cmake,
+  pkg-config,
+  lib,
+}:
+
+stdenv.mkDerivation {
+  pname = "librepods";
+  version = "0.1.0-unstable-2025-12-07";
+
+  src = fetchFromGitHub {
+    owner = "kavishdevar";
+    repo = "librepods";
+    rev = "0e1f784737122913c21b429810d059aadfb4479e";
+    hash = "sha256-nXEMIyQWEDMjyKGPAleqqSttznNmrdSHKT4Kr2tLHBY=";
+  };
+
+  sourceRoot = "source/linux";
+
+  buildInputs = [
+    libpulseaudio
+    openssl
+    qt6.qtbase
+    qt6.qtconnectivity
+    qt6.qtquick3d
+    qt6.qttools
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6.wrapQtAppsHook
+  ];
+
+  meta = {
+    homepage = "https://github.com/kavishdevar/librepods";
+    description = "AirPods liberated from Apple's ecosystem";
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.thefossguy ];
+  };
+}

From 0c42eba605c1153eb6178b048c3b9350dd7bb9e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 09:49:35 +0000
Subject: [PATCH 153/235] python3Packages.agentic-threat-hunting-framework:
 0.4.0 -> 0.5.2

---
 .../agentic-threat-hunting-framework/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix b/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix
index cbce1c8e2635..98670ba707d8 100644
--- a/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix
+++ b/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "agentic-threat-hunting-framework";
-  version = "0.4.0";
+  version = "0.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Nebulock-Inc";
     repo = "agentic-threat-hunting-framework";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WU58wQGlUgbOqcIE7EKtABNvTKtvTiRO9iJLW4gXDlI=";
+    hash = "sha256-0IlDOS9qWl0F9h3xWDioK/GhZ3HanAQMdAkH6mvvQCQ=";
   };
 
   build-system = [ setuptools ];

From 60915ee928b0285ab2cb2bf3edab88498eff8cc6 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 25 Jan 2026 09:51:05 +0000
Subject: [PATCH 154/235] mutt: 2.2.16 -> 2.3.0

Changes: http://www.mutt.org/relnotes/2.3/
---
 pkgs/by-name/mu/mutt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mutt/package.nix b/pkgs/by-name/mu/mutt/package.nix
index fb2fc651ab50..d1c5887c17d3 100644
--- a/pkgs/by-name/mu/mutt/package.nix
+++ b/pkgs/by-name/mu/mutt/package.nix
@@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport;
 
 stdenv.mkDerivation rec {
   pname = "mutt";
-  version = "2.2.16";
+  version = "2.3.0";
   outputs = [
     "out"
     "doc"
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    hash = "sha256-HTEJp0OtiyXu+XEJsr20Zdt4N9Co0hHNOIvhtvqsPzI=";
+    hash = "sha256-XV68QIQ/cVbV7eMOUAFnmKxzNkZ/etNH5xZRBRbMITA=";
   };
 
   patches = [

From 1e1367c2822e7554c5f123fe7254bbd3faa2c560 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 25 Jan 2026 11:19:41 +0100
Subject: [PATCH 155/235] python3Packages.pygame-ce: skip failing tests

---
 .../python-modules/pygame-ce/default.nix      |  4 +-
 .../pygame-ce/skip-failing-tests.patch        | 43 +++++++++++++++++++
 .../pygame-ce/skip-rle-tests.patch            | 12 ------
 3 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/pygame-ce/skip-failing-tests.patch
 delete mode 100644 pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch

diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index c41cbf96780f..6b02afb75f38 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -60,8 +60,8 @@ buildPythonPackage rec {
       );
     })
 
-    # Can be removed after the SDL 3.4.0 bump.
-    ./skip-rle-tests.patch
+    # https://github.com/pygame-community/pygame-ce/pull/3680#issuecomment-3796052119
+    ./skip-failing-tests.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pygame-ce/skip-failing-tests.patch b/pkgs/development/python-modules/pygame-ce/skip-failing-tests.patch
new file mode 100644
index 000000000000..d85b591ab13a
--- /dev/null
+++ b/pkgs/development/python-modules/pygame-ce/skip-failing-tests.patch
@@ -0,0 +1,43 @@
+diff --git a/test/draw_test.py b/test/draw_test.py
+index ed99f0ce9..0484ef53d 100644
+--- a/test/draw_test.py
++++ b/test/draw_test.py
+@@ -7496,6 +7496,10 @@ class DrawModuleTest(unittest.TestCase):
+             with self.assertRaises(TypeError):
+                 draw.polygon(surf, col, points, 0)
+ 
++    @unittest.skipIf(
++        True,
++        "https://github.com/pygame-community/pygame-ce/pull/3680#issuecomment-3796052119",
++    )
+     def test_aafunctions_depth_segfault(self):
+         """Ensure future commits don't break the segfault fixed by pull request
+         https://github.com/pygame-community/pygame-ce/pull/3008
+diff --git a/test/surface_test.py b/test/surface_test.py
+index c2c91f4f5..35b9e1aaf 100644
+--- a/test/surface_test.py
++++ b/test/surface_test.py
+@@ -286,6 +286,7 @@ class SurfaceTypeTest(unittest.TestCase):
+         for pt in test_utils.rect_outer_bounds(fill_rect):
+             self.assertNotEqual(s1.get_at(pt), color)
+ 
++    @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/575")
+     def test_fill_rle(self):
+         """Test RLEACCEL flag with fill()"""
+         color = (250, 25, 25, 255)
+diff --git a/test/window_test.py b/test/window_test.py
+index b8dd1f005..5b7939908 100644
+--- a/test/window_test.py
++++ b/test/window_test.py
+@@ -113,10 +113,7 @@ class WindowTypeTest(unittest.TestCase):
+         self.win.always_on_top = False
+         self.assertFalse(self.win.always_on_top)
+ 
+-    @unittest.skipIf(
+-        SDL < (2, 0, 18),
+-        "requires SDL 2.0.18+",
+-    )
++    @unittest.skipIf(True, "https://github.com/pygame-community/pygame-ce/pull/3680")
+     def test_mouse_rect(self):
+         self.win.mouse_rect = None
+         self.assertIsNone(self.win.mouse_rect)
diff --git a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch
deleted file mode 100644
index 6b488f0c880a..000000000000
--- a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/surface_test.py b/test/surface_test.py
-index c2c91f4f5..58d916de8 100644
---- a/test/surface_test.py
-+++ b/test/surface_test.py
-@@ -435,6 +436,7 @@ class SurfaceTypeTest(unittest.TestCase):
-         finally:
-             pygame.display.quit()
- 
-+    @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/issues/14424")
-     def test_set_alpha__set_colorkey_rle(self):
-         pygame.display.init()
-         try:

From 79c4ac482101dedc071a6bc153eadcd0ab0482e0 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 25 Jan 2026 11:19:41 +0100
Subject: [PATCH 156/235] python3Packages.pygame-original: skip failing tests

---
 .../pygame-original/default.nix               |  3 +--
 .../pygame-original/skip-failing-tests.patch  | 24 +++++++++++++++++++
 .../pygame-original/skip-rle-tests.patch      | 20 ----------------
 3 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/pygame-original/skip-failing-tests.patch
 delete mode 100644 pkgs/development/python-modules/pygame-original/skip-rle-tests.patch

diff --git a/pkgs/development/python-modules/pygame-original/default.nix b/pkgs/development/python-modules/pygame-original/default.nix
index 58e869518086..bce0db96b739 100644
--- a/pkgs/development/python-modules/pygame-original/default.nix
+++ b/pkgs/development/python-modules/pygame-original/default.nix
@@ -64,8 +64,7 @@ buildPythonPackage rec {
     # mixer queue test returns busy queue when it shouldn't
     ./skip-mixer-test.patch
 
-    # Can be removed with the next SDL3 bump.
-    ./skip-rle-tests.patch
+    ./skip-failing-tests.patch
 
     # https://github.com/pygame/pygame/pull/4497
     ./0001-Use-SDL_HasSurfaceRLE-when-available.patch
diff --git a/pkgs/development/python-modules/pygame-original/skip-failing-tests.patch b/pkgs/development/python-modules/pygame-original/skip-failing-tests.patch
new file mode 100644
index 000000000000..0d1e42257ec9
--- /dev/null
+++ b/pkgs/development/python-modules/pygame-original/skip-failing-tests.patch
@@ -0,0 +1,24 @@
+diff --git a/test/pixelarray_test.py b/test/pixelarray_test.py
+index 7b1cf420..67b93d3d 100644
+--- a/test/pixelarray_test.py
++++ b/test/pixelarray_test.py
+@@ -990,6 +990,7 @@ class PixelArrayTypeTest(unittest.TestCase, TestMixin):
+         self.assertEqual(w2, w)
+         self.assertEqual(h2, h_slice)
+ 
++    @unittest.skipIf(True, "")
+     def test_make_surface__subclassed_surface(self):
+         """Ensure make_surface can handle subclassed surfaces."""
+         expected_size = (3, 5)
+diff --git a/test/surface_test.py b/test/surface_test.py
+index b1147d27..8e1209ff 100644
+--- a/test/surface_test.py
++++ b/test/surface_test.py
+@@ -239,6 +239,7 @@ class SurfaceTypeTest(unittest.TestCase):
+         for pt in test_utils.rect_outer_bounds(fill_rect):
+             self.assertNotEqual(s1.get_at(pt), color)
+ 
++    @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/575")
+     def test_fill_rle(self):
+         """Test RLEACCEL flag with fill()"""
+         color = (250, 25, 25, 255)
diff --git a/pkgs/development/python-modules/pygame-original/skip-rle-tests.patch b/pkgs/development/python-modules/pygame-original/skip-rle-tests.patch
deleted file mode 100644
index 5f9c6be928d4..000000000000
--- a/pkgs/development/python-modules/pygame-original/skip-rle-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/test/surface_test.py b/test/surface_test.py
-index b1147d27..c7ba2928 100644
---- a/test/surface_test.py
-+++ b/test/surface_test.py
-@@ -346,6 +346,7 @@ class SurfaceTypeTest(unittest.TestCase):
-         finally:
-             pygame.display.quit()
- 
-+    @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/pull/14429")
-     def test_solarwolf_rle_usage_2(self):
-         """Test for RLE status after setting alpha"""
- 
-@@ -377,6 +378,7 @@ class SurfaceTypeTest(unittest.TestCase):
-         finally:
-             pygame.display.quit()
- 
-+    @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/issues/14424")
-     def test_set_alpha__set_colorkey_rle(self):
-         pygame.display.init()
-         try:

From bce1254b01c7522f5f0ad4a182639595a48f34fd Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 25 Jan 2026 11:19:41 +0100
Subject: [PATCH 157/235] python3Packages.pygame-original: disable on Python >=
 3.14

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/development/python-modules/pygame-original/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pygame-original/default.nix b/pkgs/development/python-modules/pygame-original/default.nix
index bce0db96b739..8cff86b55344 100644
--- a/pkgs/development/python-modules/pygame-original/default.nix
+++ b/pkgs/development/python-modules/pygame-original/default.nix
@@ -32,6 +32,9 @@ buildPythonPackage rec {
   version = "2.6.1";
   pyproject = true;
 
+  # https://github.com/NixOS/nixpkgs/pull/475917
+  disabled = pythonAtLeast "3.14";
+
   src = fetchFromGitHub {
     owner = "pygame";
     repo = "pygame";

From 0cb5655ba26433b3f8fd0f981e5f03be224fa5b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 10:47:15 +0000
Subject: [PATCH 158/235] codebook: 0.3.28 -> 0.3.29

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

diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index 8604d826bf12..ae3b0fcd747a 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.3.28";
+  version = "0.3.29";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iYQy0uupRoNkBwlvykicGcRIpZftrpDOQaKzFoG+JgI=";
+    hash = "sha256-jGI0a2rb0ljDorqq+g9PbFO4UfCUrtgX47tVNq3AHhs=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-jW2HQxoTZ+1x2j+fVHm1K1TU9TB9wGuEm7D9Fn2Xnac=";
+  cargoHash = "sha256-2ZPB5sGFhewiJX70IMVygbyPUV1AYe6pcjmTIK0gvhc=";
 
   CARGO_PROFILE_RELEASE_LTO = "fat";
   CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";

From 5fbcba2ccdf1f1b19238b6989eb3fd2db45512df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 11:42:42 +0000
Subject: [PATCH 159/235] remnote: 1.22.58 -> 1.22.67

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 1c9c4f777c39..bcbf1bef3d91 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.22.58";
+  version = "1.22.67";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-xGA3ASWRuM+RloOHcaNregTClf+XUtP7jrTiQRem71s=";
+    hash = "sha256-HKY8ockflFnws8UoREFjaBQUPaVPxlH2fWFcaGTdwhI=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From c35866e386d172a828e45bc524f6082a252d6859 Mon Sep 17 00:00:00 2001
From: Chuang Zhu <git@chuang.cz>
Date: Sun, 25 Jan 2026 19:43:40 +0800
Subject: [PATCH 160/235] ejabberd: fix rebar-deps.nix, add missing nixfmt to
 updateScript

---
 pkgs/by-name/ej/ejabberd/rebar-deps.nix | 15 +++++++++++++--
 pkgs/by-name/ej/ejabberd/update.sh      |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
index 3d16f909dff9..34856128bf02 100644
--- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix
+++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
@@ -128,7 +128,7 @@ let
       src = fetchHex {
         pkg = "p1_pgsql";
         version = "1.1.38";
-        sha256 = "";
+        sha256 = "sha256-Bs9kQwCBeOujh7ou6STTYgBBuuTaGyyWloAoSgXMdZ4=";
       };
       beamDeps = [ xmpp ];
     };
@@ -148,7 +148,7 @@ let
       src = fetchHex {
         pkg = "p1_mysql";
         version = "1.0.27";
-        sha256 = "";
+        sha256 = "sha256-BmBR8kACenZzJUfmnZagl05w3BTe2UU77yYyIYQe2ps=";
       };
       beamDeps = [ ];
     };
@@ -262,6 +262,17 @@ let
         stun
       ];
     };
+    erlydtl = builder {
+      name = "erlydtl";
+      version = "git";
+      src = fetchFromGitHub {
+        owner = "erlydtl";
+        repo = "erlydtl";
+        rev = "aae414692b6052e96d890e03bbeeeca0f4dc01c2";
+        sha256 = "00p194jgmvzqza7xr7fdm2n091ymkyy66aj4gc82n0kzdlh03vbm";
+      };
+      beamDeps = [ ];
+    };
     eredis = builder {
       name = "eredis";
       version = "1.7.1";
diff --git a/pkgs/by-name/ej/ejabberd/update.sh b/pkgs/by-name/ej/ejabberd/update.sh
index 0db339651212..3727293d77b9 100755
--- a/pkgs/by-name/ej/ejabberd/update.sh
+++ b/pkgs/by-name/ej/ejabberd/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" erlang autoconf automake
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" erlang autoconf automake nixfmt
 #shellcheck shell=bash
 
 set -eu -o pipefail

From 68c04108e290bfe34bde2238dee27a5991f50114 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 24 Jan 2026 21:52:02 +0100
Subject: [PATCH 161/235] haskellPackages.cabal2nix-unstable: 2025-11-20 ->
 2026-01-25

Makes haskellPackages stop referencing pkgs.xorg. See also
<https://github.com/NixOS/nixpkgs/issues/479553>.
---
 .../cabal2nix-unstable/cabal2nix.nix          |   6 +-
 .../distribution-nixpkgs.nix                  |   6 +-
 .../cabal2nix-unstable/hackage-db.nix         |   6 +-
 .../cabal2nix-unstable/language-nix.nix       |   6 +-
 .../haskell-modules/hackage-packages.nix      | 364 +++++++++---------
 5 files changed, 194 insertions(+), 194 deletions(-)

diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
index ebd8fa92ce90..afa2ab7a079a 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
@@ -35,10 +35,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "2.20.1-unstable-2025-11-20";
+  version = "2.21.0-unstable-2026-01-25";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
-    sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
+    url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
+    sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
   };
   postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
   isLibrary = true;
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
index 81a23733d424..8a5382ee2ac3 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
@@ -18,10 +18,10 @@
 }:
 mkDerivation {
   pname = "distribution-nixpkgs";
-  version = "1.7.1.1-unstable-2025-11-20";
+  version = "1.7.1.1-unstable-2026-01-25";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
-    sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
+    url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
+    sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
   };
   postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
   enableSeparateDataOutput = true;
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
index 3554407b8faa..c0363bea2617 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
@@ -17,10 +17,10 @@
 }:
 mkDerivation {
   pname = "hackage-db";
-  version = "2.1.3-unstable-2025-11-20";
+  version = "2.1.3-unstable-2026-01-25";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
-    sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
+    url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
+    sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
   };
   postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
   isLibrary = true;
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
index 503860f9737c..53130dcbc60d 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
@@ -14,10 +14,10 @@
 }:
 mkDerivation {
   pname = "language-nix";
-  version = "2.3.0-unstable-2025-11-20";
+  version = "2.3.0-unstable-2026-01-25";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
-    sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
+    url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
+    sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
   };
   postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
   libraryHaskellDepends = [
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9fb971bfd2ce..5c600ac41bae 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -14091,7 +14091,7 @@ self: {
       directory,
       filepath,
       JuicyPixels,
-      libX11,
+      libx11,
       mwc-random,
       primitive,
       random,
@@ -14113,12 +14113,12 @@ self: {
         random
         vector
       ];
-      executableSystemDepends = [ libX11 ];
+      executableSystemDepends = [ libx11 ];
       description = "Generates colorful wallpapers";
       license = lib.licenses.mit;
       mainProgram = "FractalArt";
     }
-  ) { inherit (pkgs.xorg) libX11; };
+  ) { inherit (pkgs) libx11; };
 
   Fractaler = callPackage (
     {
@@ -14737,9 +14737,9 @@ self: {
           mkDerivation,
           base,
           libGL,
-          libX11,
-          libXext,
-          libXfixes,
+          libx11,
+          libxext,
+          libxfixes,
           OpenGL,
         }:
         mkDerivation {
@@ -14754,9 +14754,9 @@ self: {
           ];
           librarySystemDepends = [
             libGL
-            libX11
-            libXext
-            libXfixes
+            libx11
+            libxext
+            libxfixes
           ];
           description = "A Haskell binding for GLFW";
           license = lib.licenses.bsd3;
@@ -14766,9 +14766,9 @@ self: {
       )
       {
         inherit (pkgs) libGL;
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXext;
-        inherit (pkgs.xorg) libXfixes;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxext;
+        inherit (pkgs) libxfixes;
       };
 
   GLFW-OGL =
@@ -14777,8 +14777,8 @@ self: {
         {
           mkDerivation,
           base,
-          libX11,
-          libXrandr,
+          libx11,
+          libxrandr,
           mtl,
           OGL,
         }:
@@ -14793,8 +14793,8 @@ self: {
             OGL
           ];
           librarySystemDepends = [
-            libX11
-            libXrandr
+            libx11
+            libxrandr
           ];
           description = "A binding for GLFW (OGL)";
           license = lib.licenses.bsd3;
@@ -14802,8 +14802,8 @@ self: {
         }
       )
       {
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXrandr;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxrandr;
       };
 
   GLFW-b = callPackage (
@@ -14908,7 +14908,7 @@ self: {
           mkDerivation,
           base,
           libGL,
-          libX11,
+          libx11,
         }:
         mkDerivation {
           pname = "GLHUI";
@@ -14917,7 +14917,7 @@ self: {
           libraryHaskellDepends = [ base ];
           librarySystemDepends = [
             libGL
-            libX11
+            libx11
           ];
           description = "Open OpenGL context windows in X11 with libX11";
           license = lib.licenses.bsd3;
@@ -14926,7 +14926,7 @@ self: {
       )
       {
         inherit (pkgs) libGL;
-        inherit (pkgs.xorg) libX11;
+        inherit (pkgs) libx11;
       };
 
   GLM = callPackage (
@@ -18474,7 +18474,7 @@ self: {
           bytestring,
           hg3dsdl2050,
           HGamer3D-Data,
-          libX11,
+          libx11,
           SDL2,
           utf8-string,
         }:
@@ -18490,7 +18490,7 @@ self: {
           ];
           librarySystemDepends = [
             hg3dsdl2050
-            libX11
+            libx11
             SDL2
           ];
           description = "SDL2 Binding for HGamer3D";
@@ -18501,7 +18501,7 @@ self: {
       {
         inherit (pkgs) SDL2;
         hg3dsdl2050 = null;
-        inherit (pkgs.xorg) libX11;
+        inherit (pkgs) libx11;
       };
 
   HGamer3D-SFML-Binding =
@@ -47788,12 +47788,12 @@ self: {
           mkDerivation,
           base,
           data-default-class,
-          libX11,
-          libXext,
-          libXinerama,
-          libXrandr,
-          libXrender,
-          libXScrnSaver,
+          libx11,
+          libxext,
+          libxinerama,
+          libxrandr,
+          libxrender,
+          libxscrnsaver,
         }:
         mkDerivation {
           pname = "X11";
@@ -47806,12 +47806,12 @@ self: {
             data-default-class
           ];
           librarySystemDepends = [
-            libX11
-            libXext
-            libXinerama
-            libXrandr
-            libXrender
-            libXScrnSaver
+            libx11
+            libxext
+            libxinerama
+            libxrandr
+            libxrender
+            libxscrnsaver
           ];
           description = "A binding to the X11 graphics library";
           license = lib.licenses.bsd3;
@@ -47819,19 +47819,19 @@ self: {
         }
       )
       {
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXScrnSaver;
-        inherit (pkgs.xorg) libXext;
-        inherit (pkgs.xorg) libXinerama;
-        inherit (pkgs.xorg) libXrandr;
-        inherit (pkgs.xorg) libXrender;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxext;
+        inherit (pkgs) libxinerama;
+        inherit (pkgs) libxrandr;
+        inherit (pkgs) libxrender;
+        inherit (pkgs) libxscrnsaver;
       };
 
   X11-extras = callPackage (
     {
       mkDerivation,
       base,
-      libX11,
+      libx11,
       X11,
     }:
     mkDerivation {
@@ -47844,13 +47844,13 @@ self: {
         base
         X11
       ];
-      librarySystemDepends = [ libX11 ];
+      librarySystemDepends = [ libx11 ];
       description = "Missing bindings to the X11 graphics library";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
-  ) { inherit (pkgs.xorg) libX11; };
+  ) { inherit (pkgs) libx11; };
 
   X11-rm = callPackage (
     {
@@ -47923,7 +47923,7 @@ self: {
     {
       mkDerivation,
       base,
-      libXft,
+      libxft,
       utf8-string,
       X11,
     }:
@@ -47936,12 +47936,12 @@ self: {
         utf8-string
         X11
       ];
-      libraryPkgconfigDepends = [ libXft ];
+      libraryPkgconfigDepends = [ libxft ];
       description = "Bindings to the Xft and some Xrender parts";
       license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.slotThe ];
     }
-  ) { inherit (pkgs.xorg) libXft; };
+  ) { inherit (pkgs) libxft; };
 
   X11-xshape = callPackage (
     {
@@ -48001,7 +48001,7 @@ self: {
       license = lib.licenses.bsd3;
       platforms = lib.platforms.windows;
     }
-  ) { inherit (pkgs.xorg) xinput; };
+  ) { inherit (pkgs) xinput; };
 
   XML = callPackage (
     {
@@ -48212,18 +48212,18 @@ self: {
     {
       mkDerivation,
       base,
-      libXau,
+      libxau,
     }:
     mkDerivation {
       pname = "Xauth";
       version = "0.1";
       sha256 = "1mvflp6y1nz9961gngbwk0b7wr8sx3p6296jfvvb6ln1kvm2scxs";
       libraryHaskellDepends = [ base ];
-      libraryPkgconfigDepends = [ libXau ];
+      libraryPkgconfigDepends = [ libxau ];
       description = "A binding to the X11 authentication library";
       license = lib.licenses.bsd3;
     }
-  ) { inherit (pkgs.xorg) libXau; };
+  ) { inherit (pkgs) libxau; };
 
   Xec = callPackage (
     {
@@ -105264,14 +105264,14 @@ self: {
           bindings-DSL,
           HUnit,
           libGL,
-          libX11,
-          libXcursor,
-          libXext,
-          libXfixes,
-          libXi,
-          libXinerama,
-          libXrandr,
-          libXxf86vm,
+          libx11,
+          libxcursor,
+          libxext,
+          libxfixes,
+          libxi,
+          libxinerama,
+          libxrandr,
+          libxxf86vm,
           test-framework,
           test-framework-hunit,
         }:
@@ -105285,14 +105285,14 @@ self: {
           ];
           librarySystemDepends = [
             libGL
-            libX11
-            libXcursor
-            libXext
-            libXfixes
-            libXi
-            libXinerama
-            libXrandr
-            libXxf86vm
+            libx11
+            libxcursor
+            libxext
+            libxfixes
+            libxi
+            libxinerama
+            libxrandr
+            libxxf86vm
           ];
           testHaskellDepends = [
             base
@@ -105306,14 +105306,14 @@ self: {
       )
       {
         inherit (pkgs) libGL;
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXcursor;
-        inherit (pkgs.xorg) libXext;
-        inherit (pkgs.xorg) libXfixes;
-        inherit (pkgs.xorg) libXi;
-        inherit (pkgs.xorg) libXinerama;
-        inherit (pkgs.xorg) libXrandr;
-        inherit (pkgs.xorg) libXxf86vm;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxcursor;
+        inherit (pkgs) libxext;
+        inherit (pkgs) libxfixes;
+        inherit (pkgs) libxi;
+        inherit (pkgs) libxinerama;
+        inherit (pkgs) libxrandr;
+        inherit (pkgs) libxxf86vm;
       };
 
   bindings-K8055 = callPackage (
@@ -112798,8 +112798,8 @@ self: {
           filepath,
           finite-typelits,
           hspec,
-          libX11,
-          libXrandr,
+          libx11,
+          libxrandr,
           lifted-base,
           monad-control,
           mtl,
@@ -112838,8 +112838,8 @@ self: {
             X11
           ];
           librarySystemDepends = [
-            libX11
-            libXrandr
+            libx11
+            libxrandr
           ];
           executableHaskellDepends = [ base ];
           testHaskellDepends = [
@@ -112857,8 +112857,8 @@ self: {
         }
       )
       {
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXrandr;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxrandr;
       };
 
   bludigon =
@@ -112874,8 +112874,8 @@ self: {
           filepath,
           finite-typelits,
           hspec,
-          libX11,
-          libXrandr,
+          libx11,
+          libxrandr,
           lifted-base,
           monad-control,
           mtl,
@@ -112914,8 +112914,8 @@ self: {
             X11
           ];
           librarySystemDepends = [
-            libX11
-            libXrandr
+            libx11
+            libxrandr
           ];
           executableHaskellDepends = [ base ];
           testHaskellDepends = [
@@ -112935,8 +112935,8 @@ self: {
         }
       )
       {
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXrandr;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxrandr;
       };
 
   bluefin = callPackage (
@@ -229157,7 +229157,7 @@ self: {
       mkDerivation,
       base,
       base-prelude,
-      libXtst,
+      libxtst,
       split,
       X11,
     }:
@@ -229171,13 +229171,13 @@ self: {
         split
         X11
       ];
-      librarySystemDepends = [ libXtst ];
+      librarySystemDepends = [ libxtst ];
       description = "A crossplatform library to simulate keyboard input";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
-  ) { inherit (pkgs.xorg) libXtst; };
+  ) { inherit (pkgs) libxtst; };
 
   fakedata = callPackage (
     {
@@ -249257,8 +249257,8 @@ self: {
           bytestring,
           containers,
           directory,
-          libX11,
-          libXext,
+          libx11,
+          libxext,
           old-time,
           parallel,
           process,
@@ -249284,8 +249284,8 @@ self: {
             unix
           ];
           librarySystemDepends = [
-            libX11
-            libXext
+            libx11
+            libxext
           ];
           executableHaskellDepends = [
             array
@@ -249301,8 +249301,8 @@ self: {
         }
       )
       {
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXext;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxext;
       };
 
   fugue = callPackage (
@@ -270088,7 +270088,7 @@ self: {
       haskell-gi,
       haskell-gi-base,
       haskell-gi-overloading,
-      libX11,
+      libx11,
       text,
       transformers,
     }:
@@ -270111,11 +270111,11 @@ self: {
         text
         transformers
       ];
-      libraryPkgconfigDepends = [ libX11 ];
+      libraryPkgconfigDepends = [ libx11 ];
       description = "xlib bindings";
       license = lib.licenses.lgpl21Only;
     }
-  ) { inherit (pkgs.xorg) libX11; };
+  ) { inherit (pkgs) libx11; };
 
   giak = callPackage (
     {
@@ -286017,9 +286017,9 @@ self: {
           directory,
           exceptions,
           hashable,
-          libX11,
-          libXau,
-          libXScrnSaver,
+          libx11,
+          libxau,
+          libxscrnsaver,
           microlens,
           microlens-mtl,
           protolude,
@@ -286058,9 +286058,9 @@ self: {
             X11
           ];
           executablePkgconfigDepends = [
-            libX11
-            libXau
-            libXScrnSaver
+            libx11
+            libxau
+            libxscrnsaver
             xcb
             xdmcp
           ];
@@ -286070,9 +286070,9 @@ self: {
         }
       )
       {
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXScrnSaver;
-        inherit (pkgs.xorg) libXau;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxau;
+        inherit (pkgs) libxscrnsaver;
         xcb = null;
         xdmcp = null;
       };
@@ -289142,7 +289142,7 @@ self: {
       base,
       glib,
       gtk3,
-      libX11,
+      libx11,
     }:
     mkDerivation {
       pname = "gtk-traymanager";
@@ -289153,11 +289153,11 @@ self: {
         glib
         gtk3
       ];
-      libraryPkgconfigDepends = [ libX11 ];
+      libraryPkgconfigDepends = [ libx11 ];
       description = "A wrapper around the eggtraymanager library for Linux system trays";
       license = lib.licenses.lgpl21Only;
     }
-  ) { inherit (pkgs.xorg) libX11; };
+  ) { inherit (pkgs) libx11; };
 
   gtk2hs-buildtools = callPackage (
     {
@@ -289572,10 +289572,10 @@ self: {
           gtk2hs-buildtools,
           gtkglext,
           libGLU,
-          libICE,
-          libSM,
-          libXmu,
-          libXt,
+          libice,
+          libsm,
+          libxmu,
+          libxt,
           pango,
         }:
         mkDerivation {
@@ -289597,10 +289597,10 @@ self: {
           librarySystemDepends = [
             gtk2
             libGLU
-            libICE
-            libSM
-            libXmu
-            libXt
+            libice
+            libsm
+            libxmu
+            libxt
           ];
           libraryPkgconfigDepends = [ gtkglext ];
           libraryToolDepends = [ gtk2hs-buildtools ];
@@ -289614,10 +289614,10 @@ self: {
         inherit (pkgs) gtk2;
         inherit (pkgs.gnome2) gtkglext;
         inherit (pkgs) libGLU;
-        inherit (pkgs.xorg) libICE;
-        inherit (pkgs.xorg) libSM;
-        inherit (pkgs.xorg) libXmu;
-        inherit (pkgs.xorg) libXt;
+        inherit (pkgs) libice;
+        inherit (pkgs) libsm;
+        inherit (pkgs) libxmu;
+        inherit (pkgs) libxt;
       };
 
   gtkimageview = callPackage (
@@ -290394,12 +290394,12 @@ self: {
           containers,
           lens,
           libGL,
-          libX11,
-          libXcursor,
-          libXext,
-          libXi,
-          libXinerama,
-          libXrandr,
+          libx11,
+          libxcursor,
+          libxext,
+          libxi,
+          libxinerama,
+          libxrandr,
           linear,
           template-haskell,
           text,
@@ -290425,12 +290425,12 @@ self: {
           librarySystemDepends = [
             c
             libGL
-            libX11
-            libXcursor
-            libXext
-            libXi
-            libXinerama
-            libXrandr
+            libx11
+            libxcursor
+            libxext
+            libxi
+            libxinerama
+            libxrandr
           ];
           description = "Raylib bindings for Haskell";
           license = lib.licensesSpdx."Apache-2.0";
@@ -290440,12 +290440,12 @@ self: {
       {
         c = null;
         inherit (pkgs) libGL;
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXcursor;
-        inherit (pkgs.xorg) libXext;
-        inherit (pkgs.xorg) libXi;
-        inherit (pkgs.xorg) libXinerama;
-        inherit (pkgs.xorg) libXrandr;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxcursor;
+        inherit (pkgs) libxext;
+        inherit (pkgs) libxi;
+        inherit (pkgs) libxinerama;
+        inherit (pkgs) libxrandr;
       };
 
   h-reversi = callPackage (
@@ -342135,8 +342135,8 @@ self: {
           hoodle-types,
           http-types,
           lens,
-          libX11,
-          libXi,
+          libx11,
+          libxi,
           monad-loops,
           mtl,
           network-uri,
@@ -342214,8 +342214,8 @@ self: {
             xournal-parser
           ];
           librarySystemDepends = [
-            libX11
-            libXi
+            libx11
+            libxi
           ];
           description = "Core library for hoodle";
           license = lib.licenses.bsd3;
@@ -342223,8 +342223,8 @@ self: {
         }
       )
       {
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXi;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxi;
       };
 
   hoodle-extra = callPackage (
@@ -475538,7 +475538,7 @@ self: {
           inline-c,
           libGL,
           libGLU,
-          libX11,
+          libx11,
           QuickCheck,
           text,
           vector,
@@ -475562,7 +475562,7 @@ self: {
             glew
             libGL
             libGLU
-            libX11
+            libx11
           ];
           libraryPkgconfigDepends = [
             freetype
@@ -475587,7 +475587,7 @@ self: {
         inherit (pkgs) glew;
         inherit (pkgs) libGL;
         inherit (pkgs) libGLU;
-        inherit (pkgs.xorg) libX11;
+        inherit (pkgs) libx11;
       };
 
   nanovg-simple = callPackage (
@@ -491837,8 +491837,8 @@ self: {
           base,
           either,
           libGL,
-          libX11,
-          libXinerama,
+          libx11,
+          libxinerama,
           monads-tf,
           ovr,
           systemd,
@@ -491858,8 +491858,8 @@ self: {
           ];
           librarySystemDepends = [
             libGL
-            libX11
-            libXinerama
+            libx11
+            libxinerama
             ovr
             systemd
           ];
@@ -491871,8 +491871,8 @@ self: {
       )
       {
         inherit (pkgs) libGL;
-        inherit (pkgs.xorg) libX11;
-        inherit (pkgs.xorg) libXinerama;
+        inherit (pkgs) libx11;
+        inherit (pkgs) libxinerama;
         ovr = null;
         inherit (pkgs) systemd;
       };
@@ -528022,7 +528022,7 @@ self: {
       mkDerivation,
       base,
       base-unicode-symbols,
-      libXinerama,
+      libxinerama,
       X11,
     }:
     mkDerivation {
@@ -528036,12 +528036,12 @@ self: {
         base-unicode-symbols
         X11
       ];
-      executableSystemDepends = [ libXinerama ];
+      executableSystemDepends = [ libxinerama ];
       description = "A utility for X11 that moves the mouse cursor using the keyboard";
       license = lib.licenses.gpl3Only;
       mainProgram = "place-cursor-at";
     }
-  ) { inherit (pkgs.xorg) libXinerama; };
+  ) { inherit (pkgs) libxinerama; };
 
   placeholder = callPackage (
     {
@@ -620388,7 +620388,7 @@ self: {
           base,
           bytestring,
           containers,
-          libXft,
+          libxft,
           mtl,
           parsec,
           permute,
@@ -620431,7 +620431,7 @@ self: {
             X11-xshape
           ];
           libraryPkgconfigDepends = [
-            libXft
+            libxft
             xext
           ];
           executableHaskellDepends = [
@@ -620455,7 +620455,7 @@ self: {
             X11-xshape
           ];
           executablePkgconfigDepends = [
-            libXft
+            libxft
             xext
           ];
           description = "A programming language for simple GUIs";
@@ -620466,7 +620466,7 @@ self: {
         }
       )
       {
-        inherit (pkgs.xorg) libXft;
+        inherit (pkgs) libxft;
         xext = null;
       };
 
@@ -742896,7 +742896,7 @@ self: {
           directory,
           filepath,
           libGL,
-          libX11,
+          libx11,
           process,
           split,
           wxdirect,
@@ -742924,7 +742924,7 @@ self: {
           ];
           librarySystemDepends = [
             libGL
-            libX11
+            libx11
           ];
           libraryPkgconfigDepends = [ wxGTK ];
           doHaddock = false;
@@ -742937,7 +742937,7 @@ self: {
       )
       {
         inherit (pkgs) libGL;
-        inherit (pkgs.xorg) libX11;
+        inherit (pkgs) libx11;
         inherit (pkgs) wxGTK;
       };
 
@@ -743274,7 +743274,7 @@ self: {
       base,
       c2hs,
       containers,
-      libXi,
+      libxi,
       mtl,
       X11,
     }:
@@ -743288,12 +743288,12 @@ self: {
         mtl
         X11
       ];
-      librarySystemDepends = [ libXi ];
+      librarySystemDepends = [ libxi ];
       libraryToolDepends = [ c2hs ];
       description = "Haskell FFI bindings for X11 XInput library (-lXi)";
       license = lib.licenses.bsd3;
     }
-  ) { inherit (pkgs.xorg) libXi; };
+  ) { inherit (pkgs) libxi; };
 
   x509 = callPackage (
     {
@@ -747236,9 +747236,9 @@ self: {
           http-types,
           iwlib,
           libmpd,
-          libXpm,
-          libXrandr,
-          libXrender,
+          libxpm,
+          libxrandr,
+          libxrender,
           mtl,
           old-locale,
           pango,
@@ -747320,9 +747320,9 @@ self: {
             X11-xft
           ];
           librarySystemDepends = [
-            libXpm
-            libXrandr
-            libXrender
+            libxpm
+            libxrandr
+            libxrender
             wirelesstools
           ];
           executableHaskellDepends = [
@@ -747371,9 +747371,9 @@ self: {
         }
       )
       {
-        inherit (pkgs.xorg) libXpm;
-        inherit (pkgs.xorg) libXrandr;
-        inherit (pkgs.xorg) libXrender;
+        inherit (pkgs) libxpm;
+        inherit (pkgs) libxrandr;
+        inherit (pkgs) libxrender;
         inherit (pkgs) wirelesstools;
       };
 
@@ -748835,7 +748835,7 @@ self: {
     {
       mkDerivation,
       base,
-      libXtst,
+      libxtst,
       X11,
     }:
     mkDerivation {
@@ -748846,11 +748846,11 @@ self: {
         base
         X11
       ];
-      librarySystemDepends = [ libXtst ];
+      librarySystemDepends = [ libxtst ];
       description = "Thin FFI bindings to X11 XTest library";
       license = lib.licenses.bsd3;
     }
-  ) { inherit (pkgs.xorg) libXtst; };
+  ) { inherit (pkgs) libxtst; };
 
   xturtle = callPackage (
     {

From b56ba90686020c3ebcb046fb9257b257aafad2dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 12:02:41 +0000
Subject: [PATCH 162/235] python3Packages.aiontfy: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/aiontfy/default.nix b/pkgs/development/python-modules/aiontfy/default.nix
index c011ea208276..8483e6fc4126 100644
--- a/pkgs/development/python-modules/aiontfy/default.nix
+++ b/pkgs/development/python-modules/aiontfy/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "aiontfy";
-  version = "0.6.1";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tr4nt0r";
     repo = "aiontfy";
     tag = "v${version}";
-    hash = "sha256-43sl9jCJErROEOIllUFizG6IIBpFWCQTRyJP+0u1z+M=";
+    hash = "sha256-tQjS9GXCiDOL3O8l1NotTk6LNvDgCa+tz0re96myu2w=";
   };
 
   build-system = [

From 5911842bb8d0edd996549b342bf9694e9b7dbd12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 12:14:39 +0000
Subject: [PATCH 163/235] picom-pijulius: 8.2-unstable-2025-12-09 ->
 8.2-unstable-2026-01-24

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

diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix
index 75a9f2af763e..fcda0235f81b 100644
--- a/pkgs/by-name/pi/picom-pijulius/package.nix
+++ b/pkgs/by-name/pi/picom-pijulius/package.nix
@@ -8,13 +8,13 @@
 
 picom.overrideAttrs (previousAttrs: {
   pname = "picom-pijulius";
-  version = "8.2-unstable-2025-12-09";
+  version = "8.2-unstable-2026-01-24";
 
   src = fetchFromGitHub {
     owner = "pijulius";
     repo = "picom";
-    rev = "ccf24dce28ebf9e8ff805c0105b97f29bc2e66ac";
-    hash = "sha256-hZhqGzYjJfhnPHDc4B4xE73JtdmwsYThMu3TW0Zs24o=";
+    rev = "cb09df27efb4cd78417926f02338e93805067730";
+    hash = "sha256-/8865rKifoRk73YVul6IaDYmF2q1oFD9TCXDAIEEy5Q=";
   };
 
   dontVersionCheck = true;

From 31463dbd9448e89cab951008ea7de7779db3dde0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 13:03:23 +0000
Subject: [PATCH 164/235] lua-language-server: 3.17.0 -> 3.17.1

---
 pkgs/by-name/lu/lua-language-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix
index c50079c6e8a4..108e7e649c53 100644
--- a/pkgs/by-name/lu/lua-language-server/package.nix
+++ b/pkgs/by-name/lu/lua-language-server/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lua-language-server";
-  version = "3.17.0";
+  version = "3.17.1";
 
   src = fetchFromGitHub {
     owner = "luals";
     repo = "lua-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-jeO01VvukzpVPP/ob/p/br51uy6eVdAFqRTIo/DttR0=";
+    hash = "sha256-NfxBiXiGF4+meXTwp6We9+bmHW7Z9ZcxvRXAGwWAULo=";
     fetchSubmodules = true;
   };
 

From f5c6425046899bebc52de78f7033451c765f393d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 25 Jan 2026 13:24:21 +0000
Subject: [PATCH 165/235] cccc: mark for removal (`gcc-15` build failure)

Fails to build on `master` as https://hydra.nixos.org/build/319888132.

As upstream did not update since 2006 let's mark
it broken for removal.
---
 pkgs/by-name/cc/cccc/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cc/cccc/package.nix b/pkgs/by-name/cc/cccc/package.nix
index 437a93ea8e5b..e33094ab57d1 100644
--- a/pkgs/by-name/cc/cccc/package.nix
+++ b/pkgs/by-name/cc/cccc/package.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = [ ];
     # The last successful Darwin Hydra build was in 2023
-    broken = stdenv.hostPlatform.isDarwin;
+    # On linux fails to build on gcc-15, needs porting to c23, but
+    # the upstream code did not update since 2006.
+    broken = true;
   };
 }

From 70ef3448b1348761bd3458ac0f58ad7d37be3b69 Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Sun, 25 Jan 2026 14:18:07 +0100
Subject: [PATCH 166/235] imwheel: fixing build

---
 pkgs/by-name/im/imwheel/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/im/imwheel/package.nix b/pkgs/by-name/im/imwheel/package.nix
index 55fffc8aa8eb..2fd756c0f52d 100644
--- a/pkgs/by-name/im/imwheel/package.nix
+++ b/pkgs/by-name/im/imwheel/package.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     libXtst
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   makeFlags = [
     "sysconfdir=/etc"
     "ETCDIR=/etc"

From 3e0b8a1bf30625d0aac3c93381c6e13ef5c38d95 Mon Sep 17 00:00:00 2001
From: Stefan Nuernberger <kabelfrickler@gmail.com>
Date: Sat, 24 Jan 2026 13:10:54 +0100
Subject: [PATCH 167/235] en-croissant: 0.11.1 -> 0.12.2

Co-authored-by: Michael Leuchtenburg <michael@slashhome.org>
---
 .../en-croissant-update-tauri-utils.patch     | 166 ++++++++++++++++++
 pkgs/by-name/en/en-croissant/package.nix      |  74 +++++---
 2 files changed, 214 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/by-name/en/en-croissant/en-croissant-update-tauri-utils.patch

diff --git a/pkgs/by-name/en/en-croissant/en-croissant-update-tauri-utils.patch b/pkgs/by-name/en/en-croissant/en-croissant-update-tauri-utils.patch
new file mode 100644
index 000000000000..d4e8f40e5602
--- /dev/null
+++ b/pkgs/by-name/en/en-croissant/en-croissant-update-tauri-utils.patch
@@ -0,0 +1,166 @@
+diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
+index f4bc16e..cae6562 100644
+--- a/src-tauri/Cargo.lock
++++ b/src-tauri/Cargo.lock
+@@ -545,6 +545,17 @@ dependencies = [
+  "brotli-decompressor",
+ ]
+ 
++[[package]]
++name = "brotli"
++version = "7.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
++dependencies = [
++ "alloc-no-stdlib",
++ "alloc-stdlib",
++ "brotli-decompressor",
++]
++
+ [[package]]
+ name = "brotli-decompressor"
+ version = "4.0.1"
+@@ -690,16 +701,16 @@ dependencies = [
+ 
+ [[package]]
+ name = "cargo_metadata"
+-version = "0.18.1"
++version = "0.19.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
++checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
+ dependencies = [
+  "camino",
+  "cargo-platform",
+  "semver",
+  "serde",
+  "serde_json",
+- "thiserror 1.0.63",
++ "thiserror 2.0.17",
+ ]
+ 
+ [[package]]
+@@ -2661,7 +2672,19 @@ version = "2.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
+ dependencies = [
+- "jsonptr",
++ "jsonptr 0.4.7",
++ "serde",
++ "serde_json",
++ "thiserror 1.0.63",
++]
++
++[[package]]
++name = "json-patch"
++version = "3.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
++dependencies = [
++ "jsonptr 0.6.3",
+  "serde",
+  "serde_json",
+  "thiserror 1.0.63",
+@@ -2678,6 +2701,16 @@ dependencies = [
+  "serde_json",
+ ]
+ 
++[[package]]
++name = "jsonptr"
++version = "0.6.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"
++dependencies = [
++ "serde",
++ "serde_json",
++]
++
+ [[package]]
+ name = "keyboard-types"
+ version = "0.7.0"
+@@ -4614,13 +4647,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_json"
+-version = "1.0.114"
++version = "1.0.149"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
++checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+ dependencies = [
+  "itoa 1.0.10",
+- "ryu",
++ "memchr",
+  "serde",
++ "serde_core",
++ "zmij",
+ ]
+ 
+ [[package]]
+@@ -5237,7 +5272,7 @@ dependencies = [
+  "dirs",
+  "glob",
+  "heck 0.5.0",
+- "json-patch",
++ "json-patch 2.0.0",
+  "schemars",
+  "semver",
+  "serde",
+@@ -5255,9 +5290,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e"
+ dependencies = [
+  "base64 0.22.1",
+- "brotli",
++ "brotli 6.0.0",
+  "ico",
+- "json-patch",
++ "json-patch 2.0.0",
+  "plist",
+  "png",
+  "proc-macro2",
+@@ -5573,18 +5608,19 @@ dependencies = [
+ 
+ [[package]]
+ name = "tauri-utils"
+-version = "2.0.1"
++version = "2.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045"
++checksum = "96fb10e7cc97456b2d5b9c03e335b5de5da982039a303a20d10006885e4523a0"
+ dependencies = [
+- "brotli",
++ "brotli 7.0.0",
+  "cargo_metadata",
+  "ctor",
+  "dunce",
+  "glob",
+  "html5ever",
++ "http 1.1.0",
+  "infer",
+- "json-patch",
++ "json-patch 3.0.1",
+  "kuchikiki",
+  "log",
+  "memchr",
+@@ -5599,7 +5635,7 @@ dependencies = [
+  "serde_json",
+  "serde_with",
+  "swift-rs",
+- "thiserror 1.0.63",
++ "thiserror 2.0.17",
+  "toml 0.8.2",
+  "url",
+  "urlpattern",
+@@ -7031,6 +7067,12 @@ dependencies = [
+  "zstd",
+ ]
+ 
++[[package]]
++name = "zmij"
++version = "1.0.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
++
+ [[package]]
+ name = "zopfli"
+ version = "0.8.1"
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index 422bd7901bb3..38f2cc31b26e 100644
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@@ -3,54 +3,73 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-
-  pnpm_9,
   fetchPnpmDeps,
-  pnpmConfigHook,
+
   nodejs,
-  cargo-tauri_1,
+  pnpm_10,
+  pnpmConfigHook,
+  cargo-tauri,
+  jq,
+  moreutils,
   pkg-config,
   wrapGAppsHook3,
   makeBinaryWrapper,
 
   openssl,
-  libsoup_2_4,
-  # webkitgtk_4_0,
+  webkitgtk_4_1,
   gst_all_1,
+
+  nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+
+let
+  pnpm = pnpm_10;
+in
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "en-croissant";
-  version = "0.11.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "franciscoBSalgueiro";
     repo = "en-croissant";
-    tag = "v${version}";
-    hash = "sha256-EiGML3oFCJR4TZkd+FekUrJwCYe/nGdWD9mAtKKtITQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Ef6O8C1PPjCmF5lashpBQXWwjsEEKCl5R98QMOFDIBM=";
   };
 
   pnpmDeps = fetchPnpmDeps {
-    inherit
+    inherit (finalAttrs)
       pname
       version
       src
       ;
-    pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI=";
+    inherit pnpm;
+    fetcherVersion = 2;
+    hash = "sha256-p2j886NRBw/8c2UJ94o6w7YtKnOfm7hU9SgEUrzAwco=";
   };
 
+  cargoPatches = [
+    # Bump the tauri-utils package to at least 2.1.0, to fix resource path resolution on NixOS.
+    ./en-croissant-update-tauri-utils.patch
+  ];
+
+  postPatch = ''
+    jq '.plugins.updater.endpoints = [ ] | .bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
+  '';
+
   cargoRoot = "src-tauri";
 
-  cargoHash = "sha256-6cBGOdJ7jz+mOl2EEXxoLNeX9meW+ybQxAxnnHAplIc=";
+  cargoHash = "sha256-cTb6nKHlazyOu3cpwAAp20j3QmrDxC507ZRpYT5fgQs=";
 
-  buildAndTestSubdir = cargoRoot;
+  buildAndTestSubdir = finalAttrs.cargoRoot;
 
   nativeBuildInputs = [
-    pnpmConfigHook
-    pnpm_9
     nodejs
-    cargo-tauri_1.hook
+    pnpm
+    pnpmConfigHook
+
+    cargo-tauri.hook
+    jq
+    moreutils
     pkg-config
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
@@ -58,12 +77,12 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     openssl
-    libsoup_2_4
-    # webkitgtk_4_0
+    webkitgtk_4_1
+
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
   ];
 
   doCheck = false; # many scoring tests fail
@@ -72,14 +91,17 @@ rustPlatform.buildRustPackage rec {
     makeWrapper "$out"/Applications/en-croissant.app/Contents/MacOS/en-croissant $out/bin/en-croissant
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
-    # webkitgtk_4_0 was removed
-    broken = true;
     description = "Ultimate Chess Toolkit";
     homepage = "https://github.com/franciscoBSalgueiro/en-croissant/";
     license = lib.licenses.gpl3Only;
     mainProgram = "en-croissant";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      snu
+    ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-}
+})

From 1a3fdad8309e19af6f5b7c8d03cabbc2fcad604a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 13:55:59 +0000
Subject: [PATCH 168/235] amp-cli: 0.0.1768760544-gf06f5a ->
 0.0.1769346334-gc7e300

---
 pkgs/by-name/am/amp-cli/package-lock.json | 8 ++++----
 pkgs/by-name/am/amp-cli/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json
index fbef1fd7a31c..8020e6b2ce00 100644
--- a/pkgs/by-name/am/amp-cli/package-lock.json
+++ b/pkgs/by-name/am/amp-cli/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@sourcegraph/amp": "^0.0.1768760544-gf06f5a"
+        "@sourcegraph/amp": "^0.0.1769346334-gc7e300"
       }
     },
     "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
       }
     },
     "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1768760544-gf06f5a",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1768760544-gf06f5a.tgz",
-      "integrity": "sha512-ECw/n1n3aKERHW8qo5KaFgKgLDj4zJElFsyHnAS10BRv3ON0T6BPbboMvqvtYq1NEeX00QGpBDO2u0Q1+k3oGQ==",
+      "version": "0.0.1769346334-gc7e300",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1769346334-gc7e300.tgz",
+      "integrity": "sha512-inYgc+ARJbXEXrDMQsG2kwQI9/tRHD/TPubNGv6XnQSd0MxCq9hr4KxiSryFnw5qIASWYn85RdSy6LM9dRFa7Q==",
       "license": "Amp Commercial License",
       "dependencies": {
         "@napi-rs/keyring": "1.1.9"
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index a774b7822597..a47187cf16c8 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -9,11 +9,11 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "amp-cli";
-  version = "0.0.1768760544-gf06f5a";
+  version = "0.0.1769346334-gc7e300";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-URgYg3SZXeHrw+xXiXC1BDe0/ZUFRu9mDmqtTIA9ObU=";
+    hash = "sha256-Y0ySMlYP/mvD+ydkGhqt03zYkFj6BmZpe2zLnAV5rDk=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x bin/amp-wrapper.js
   '';
 
-  npmDepsHash = "sha256-7r522RT+38rjv1YqjhR9XIhWYoxVHmRUKeYfToCbsHA=";
+  npmDepsHash = "sha256-2e0kJJqmIB3kAaSzATSaNojLvsCIq5MwTGK0y0OxfO4=";
 
   propagatedBuildInputs = [
     ripgrep

From c86a0144544f466a8f6fcd71c56a5dd79de4d796 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 14:04:17 +0000
Subject: [PATCH 169/235] python3Packages.pylacus: 1.21.0 -> 1.21.2

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

diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix
index dc5150d4d3ad..f50a9cf36b02 100644
--- a/pkgs/development/python-modules/pylacus/default.nix
+++ b/pkgs/development/python-modules/pylacus/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pylacus";
-  version = "1.21.0";
+  version = "1.21.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "PyLacus";
     tag = "v${version}";
-    hash = "sha256-YTHFA25c9EnXlOKmJd2sdrdYZ+5tAopvpWRfW8IpDpU=";
+    hash = "sha256-EqsQGcZjmP0dGOLuv2AFMsmUlL4ERDpBM1ivsNVNmCU=";
   };
 
   build-system = [ poetry-core ];

From bd69ab7156ca09b763617299f9f83d6a1ce979a2 Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Tue, 16 Dec 2025 17:35:52 +0800
Subject: [PATCH 170/235] gephgui-wry: init at 5.4.1

Co-authored-by: penalty1083 <penalty1083@outlook.com>
Co-authored-by: gepbird <gutyina.gergo.2@gmail.com>
---
 pkgs/by-name/ge/gephgui-wry/package.nix | 144 ++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 pkgs/by-name/ge/gephgui-wry/package.nix

diff --git a/pkgs/by-name/ge/gephgui-wry/package.nix b/pkgs/by-name/ge/gephgui-wry/package.nix
new file mode 100644
index 000000000000..a47135d0c307
--- /dev/null
+++ b/pkgs/by-name/ge/gephgui-wry/package.nix
@@ -0,0 +1,144 @@
+{
+  lib,
+  rustPlatform,
+  webkitgtk_4_1,
+  pkg-config,
+  buildNpmPackage,
+  makeDesktopItem,
+  fetchFromGitHub,
+  nix-update-script,
+  perl,
+  stdenv,
+  glib,
+  copyDesktopItems,
+  wrapGAppsHook4,
+  nodejs_22,
+}:
+let
+  pac-cmd = stdenv.mkDerivation {
+    pname = "pac-cmd";
+    version = "0-unstable-2020-01-07";
+
+    src = fetchFromGitHub {
+      owner = "getlantern";
+      repo = "pac-cmd";
+      rev = "495bad48b8601385daa8205ec4db504166dff18b";
+      hash = "sha256-T4g0FR20sOxJ20H4LTmhrA2EsRe8JYXj6MB2ImkbPsY=";
+    };
+
+    postPatch = ''
+      rm binaries/*/pac
+      substituteInPlace Makefile --replace-fail 'uname -p' 'uname -m'
+    '';
+
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ glib ];
+    installPhase = ''
+      runHook preInstall
+
+      install -Dm755 -t $out/bin binaries/*/pac
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "Change proxy auto-config settings of operation system";
+      homepage = "https://github.com/getlantern/pac-cmd";
+      license = lib.licenses.asl20;
+      mainProgram = "pac";
+      platforms = lib.platforms.all;
+    };
+  };
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gephgui-wry";
+  version = "5.4.1";
+
+  src = fetchFromGitHub {
+    owner = "geph-official";
+    repo = "gephgui-pkg";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nlWFiEFraI4sUBTs/ZxiHpaeYHert78oPiyFc6LKV30=";
+    fetchSubmodules = true;
+  };
+
+  gephgui = buildNpmPackage {
+    pname = "gephgui";
+    inherit (finalAttrs) version src;
+
+    sourceRoot = "${finalAttrs.src.name}/gephgui-wry/gephgui";
+    npmDepsHash = "sha256-dGzmdvzKp/JHCgDf3NJb0oolgW4Y/spagzpeVpMF28w=";
+
+    # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
+    nodejs = nodejs_22;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp -aR dist/* $out/
+
+      runHook postInstall
+    '';
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/gephgui-wry";
+  cargoHash = "sha256-7EJvcnltKlq94jahnMpvzdFJ8P12HjUGC6AOXirpcg4=";
+
+  nativeBuildInputs = [
+    pkg-config
+    perl
+    copyDesktopItems
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [ webkitgtk_4_1 ];
+
+  preBuild = ''
+    cp -r ${finalAttrs.gephgui}/ gephgui/dist/
+  '';
+
+  postInstall = ''
+    install -m 444 -D gephgui/public/gephlogo.png $out/share/icons/hicolor/512x512/apps/geph.png
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --suffix PATH : ${lib.makeBinPath [ pac-cmd ]}
+    )
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Geph";
+      desktopName = "Geph";
+      icon = "geph";
+      exec = "gephgui-wry";
+      categories = [ "Network" ];
+      comment = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
+      startupWMClass = "geph";
+    })
+  ];
+
+  passthru = {
+    inherit pac-cmd;
+    inherit (finalAttrs) gephgui;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage=gephgui"
+      ];
+    };
+  };
+
+  meta = {
+    description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
+    homepage = "https://github.com/geph-official/gephgui-wry";
+    mainProgram = "gephgui-wry";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
+      penalty1083
+      MCSeekeri
+    ];
+  };
+})

From 7deac0d58318351153b19349570747f5786f7a45 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jan 2026 15:17:18 +0100
Subject: [PATCH 171/235] python313Packages.llama-index-embeddings-gemini:
 migrate to finalAttrs

---
 .../llama-index-embeddings-gemini/default.nix               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
index b4ddcd36a874..339b5c559b71 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
@@ -7,14 +7,14 @@
   hatchling,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "llama-index-embeddings-gemini";
   version = "0.4.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_embeddings_gemini";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-GY983cmRtwir+2q0qyJW5iFmK+96ed5lu6pKHcUm/4g=";
   };
 
@@ -38,4 +38,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From d5df9c589ebf2f60c91debfd3ad70bbca7c97939 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 14:18:22 +0000
Subject: [PATCH 172/235] python3Packages.pydevccu: 0.1.20 -> 0.1.21

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

diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix
index 73bf92fd7646..ebcab7466389 100644
--- a/pkgs/development/python-modules/pydevccu/default.nix
+++ b/pkgs/development/python-modules/pydevccu/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pydevccu";
-  version = "0.1.20";
+  version = "0.1.21";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "SukramJ";
     repo = "pydevccu";
     tag = version;
-    hash = "sha256-DqXekG5WyXuEwn4lmsTBzRxlGBHGWFXOh3Mg/u9O7X8=";
+    hash = "sha256-RroFOnGOU7JDpe2mv44jKhyduT4jg8ySYtdhhPrSfvw=";
   };
 
   postPatch = ''

From 4f035a06869aacb969fec23658421f39a3ee40dd Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Sun, 25 Jan 2026 14:23:05 +0000
Subject: [PATCH 173/235] catppuccinifier-cli: 9.0.0 -> 9.1.0

Diff: https://github.com/lighttigerXIV/catppuccinifier/compare/9.0.0...9.1.0
---
 pkgs/by-name/ca/catppuccinifier-cli/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccinifier-cli/package.nix b/pkgs/by-name/ca/catppuccinifier-cli/package.nix
index 6f5fe96ce128..8ba45625dfd8 100644
--- a/pkgs/by-name/ca/catppuccinifier-cli/package.nix
+++ b/pkgs/by-name/ca/catppuccinifier-cli/package.nix
@@ -2,23 +2,26 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "catppuccinifier-cli";
-  version = "9.0.0";
+  version = "9.1.0";
 
   src = fetchFromGitHub {
     owner = "lighttigerXIV";
     repo = "catppuccinifier";
     tag = finalAttrs.version;
-    hash = "sha256-YlHb8gueKyXB2JJeRJmo8oFLOeYcmthup4n4BkEHNTA=";
+    hash = "sha256-e8sLYp+0YhC/vAn4vag9UUaw3VYDRERGnLD1RuW1TXE=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/catppuccinifier-cli";
 
   cargoHash = "sha256-mIzRK4rqD8ON8LqkG3QhOseZLM5+Rr1Rhj1uuu+KRMI=";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Apply catppuccin flavors to your wallpapers";
     homepage = "https://github.com/lighttigerXIV/catppuccinifier";

From 2146fe93e442926bc19a7504b9d0e93bdef910c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 14:28:20 +0000
Subject: [PATCH 174/235] server-box: 1.0.1291 -> 1.0.1297

---
 pkgs/by-name/se/server-box/package.nix       |  4 ++--
 pkgs/by-name/se/server-box/pubspec.lock.json | 24 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix
index a123b962ab6b..b63b2cd2975f 100644
--- a/pkgs/by-name/se/server-box/package.nix
+++ b/pkgs/by-name/se/server-box/package.nix
@@ -13,13 +13,13 @@
 }:
 
 let
-  version = "1.0.1291";
+  version = "1.0.1297";
 
   src = fetchFromGitHub {
     owner = "lollipopkit";
     repo = "flutter_server_box";
     tag = "v${version}";
-    hash = "sha256-5SEw0hNeZg2a4SaqFnkKASeEVXpLWVjQVNT2NlaJz9c=";
+    hash = "sha256-5E+tvI/YIos5pyO7OfIfzunyiuhgDY9561sV+85hvtg=";
   };
 in
 flutter338.buildFlutterApplication {
diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json
index 5b0dce994028..26c28b4e7035 100644
--- a/pkgs/by-name/se/server-box/pubspec.lock.json
+++ b/pkgs/by-name/se/server-box/pubspec.lock.json
@@ -254,11 +254,11 @@
       "dependency": "transitive",
       "description": {
         "name": "camera_web",
-        "sha256": "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f",
+        "sha256": "57f49a635c8bf249d07fb95eb693d7e4dda6796dedb3777f9127fb54847beba7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.5"
+      "version": "0.3.5+3"
     },
     "characters": {
       "dependency": "transitive",
@@ -547,11 +547,11 @@
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+        "sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.1.5"
     },
     "file": {
       "dependency": "transitive",
@@ -904,21 +904,21 @@
       "dependency": "transitive",
       "description": {
         "name": "hive_ce",
-        "sha256": "81d39a03c4c0ba5938260a8c3547d2e71af59defecea21793d57fc3551f0d230",
+        "sha256": "29f8791bf13fa6cf7435a58f1f82a7c9706973c867affa77c34d91e105762664",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.15.1"
+      "version": "2.17.0"
     },
     "hive_ce_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "hive_ce_flutter",
-        "sha256": "26d656c9e8974f0732f1d09020e2d7b08ba841b8961a02dbfb6caf01474b0e9a",
+        "sha256": "2677e95a333ff15af43ccd06af7eb7abbf1a4f154ea071997f3de4346cae913a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.3.4"
     },
     "hive_ce_generator": {
       "dependency": "direct dev",
@@ -1034,11 +1034,11 @@
       "dependency": "transitive",
       "description": {
         "name": "isolate_channel",
-        "sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d",
+        "sha256": "68191008e3a219bc87cc8cddbcd1e29810bd9f3a0fdc2108b574ccbd9aafda08",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.2+1"
+      "version": "0.3.0"
     },
     "isolate_contactor": {
       "dependency": "transitive",
@@ -2182,11 +2182,11 @@
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.4"
+      "version": "1.2.1"
     },
     "web": {
       "dependency": "transitive",

From 4dd2b5b153b564eb997cebb5b91d82be2f11a1cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jan 2026 15:29:53 +0100
Subject: [PATCH 175/235] python313Packages.pylacus: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix
index f50a9cf36b02..9c71ee4cece1 100644
--- a/pkgs/development/python-modules/pylacus/default.nix
+++ b/pkgs/development/python-modules/pylacus/default.nix
@@ -6,7 +6,7 @@
   requests,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pylacus";
   version = "1.21.2";
   pyproject = true;
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "PyLacus";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-EqsQGcZjmP0dGOLuv2AFMsmUlL4ERDpBM1ivsNVNmCU=";
   };
 
@@ -30,8 +30,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module to enqueue and query a remote Lacus instance";
     homepage = "https://github.com/ail-project/PyLacus";
-    changelog = "https://github.com/ail-project/PyLacus/releases/tag/${src.tag}";
+    changelog = "https://github.com/ail-project/PyLacus/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 85c1b7090228ee0f4b98f5cf20603c2ee4a9451a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jan 2026 15:41:59 +0100
Subject: [PATCH 176/235] python313Packages.meross-iot: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index fefa39ae3025..6e6ce757e04f 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -9,7 +9,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "meross-iot";
   version = "0.4.10.4";
   pyproject = true;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "albertogeniola";
     repo = "MerossIot";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-9y8/q218hD7BZIbjJvzwmc9bEzWZI+OrA8ERW36ya3w=";
   };
 
@@ -39,8 +39,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to interact with Meross devices";
     homepage = "https://github.com/albertogeniola/MerossIot";
-    changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${version}";
+    changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 6464c7c1e8b3ab9f83d894094c481b5aa54612f9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jan 2026 15:43:46 +0100
Subject: [PATCH 177/235] python313Packages.pydevccu: migrate to  finalAttrs

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

diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix
index ebcab7466389..5d3c56fabcc3 100644
--- a/pkgs/development/python-modules/pydevccu/default.nix
+++ b/pkgs/development/python-modules/pydevccu/default.nix
@@ -7,7 +7,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pydevccu";
   version = "0.1.21";
   pyproject = true;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "pydevccu";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-RroFOnGOU7JDpe2mv44jKhyduT4jg8ySYtdhhPrSfvw=";
   };
 
@@ -40,8 +40,8 @@ buildPythonPackage rec {
   meta = {
     description = "HomeMatic CCU XML-RPC Server with fake devices";
     homepage = "https://github.com/SukramJ/pydevccu";
-    changelog = "https://github.com/SukramJ/pydevccu/releases/tag/${src.tag}";
+    changelog = "https://github.com/SukramJ/pydevccu/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 143951127898fc9dd6ca968a28de4801c6ace1d5 Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Sun, 25 Jan 2026 14:11:24 +0100
Subject: [PATCH 178/235] luaPackages.tree-sitter-orgmode: fix build with
 strictDeps

There is a patch in staging enabling strictDeps for lua packages.
I noticed tree-sitter-orgmode failed to patch on recent master with
strictDeps so this is a preemptive fix.
---
 maintainers/scripts/luarocks-packages.csv  | 2 +-
 pkgs/development/lua-modules/overrides.nix | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 24fd936a66ac..877e97fd2aed 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -158,7 +158,7 @@ tl,,,,,,mephistophiles
 toml-edit,,,,,5.1,mrcjkb
 tree-sitter-http,,,,0.0.33-1,,
 tree-sitter-norg,,,,,5.1,mrcjkb
-tree-sitter-orgmode,,,,,,
+tree-sitter-orgmode,,,,,5.1,
 vstruct,,,,,,
 vusted,,,,,,
 xml2lua,,,,,,teto
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index ffb76d6fffbc..3c3c5ef0677c 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -1173,9 +1173,12 @@ in
       ++ [
         lua.pkgs.luarocks-build-treesitter-parser-cpp
       ];
+
+    meta.broken = lua.luaversion != "5.1";
   });
 
   tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (old: {
+    strictDeps = true; # can be removed after february 2026
     propagatedBuildInputs =
       let
         # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs,
@@ -1185,11 +1188,14 @@ in
       old.propagatedBuildInputs
       ++ [
         lua.pkgs.luarocks-build-treesitter-parser
-        tree-sitter
       ];
     nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
       writableTmpDirAsHomeHook
+      tree-sitter
     ];
+
+    # should be fixed upstream
+    meta.broken = lua.luaversion != "5.1";
   });
 
   vstruct = prev.vstruct.overrideAttrs (_: {

From 5eca146ae35bd20407adc7debfcbecf437d7c3ef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jan 2026 16:04:06 +0100
Subject: [PATCH 179/235] tcping-rs: add changelog to meta

Add changelog URL to tcping-rs package metadata
---
 pkgs/by-name/tc/tcping-rs/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/tc/tcping-rs/package.nix b/pkgs/by-name/tc/tcping-rs/package.nix
index 786f9e55e450..89084aae1ef0 100644
--- a/pkgs/by-name/tc/tcping-rs/package.nix
+++ b/pkgs/by-name/tc/tcping-rs/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   nix-update-script,
 }:
+
 rustPlatform.buildRustPackage rec {
   pname = "tcping-rs";
   version = "1.2.24";
@@ -27,6 +28,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "TCP Ping (tcping) Utility for Port Reachability";
     homepage = "https://github.com/lvillis/tcping-rs";
+    changelog = "https://github.com/lvillis/tcping-rs/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     mainProgram = "tcping";
     maintainers = with lib.maintainers; [ heitorPB ];

From f8c15a6f0f80277d8ac1d364ad1d8b456f6e3dc6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jan 2026 16:06:54 +0100
Subject: [PATCH 180/235] tcping-rs: migrate to finalAttrs

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

diff --git a/pkgs/by-name/tc/tcping-rs/package.nix b/pkgs/by-name/tc/tcping-rs/package.nix
index 89084aae1ef0..715ec913de2d 100644
--- a/pkgs/by-name/tc/tcping-rs/package.nix
+++ b/pkgs/by-name/tc/tcping-rs/package.nix
@@ -5,14 +5,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tcping-rs";
   version = "1.2.24";
 
   src = fetchFromGitHub {
     owner = "lvillis";
     repo = "tcping-rs";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-gsTZls5guqtDk8x+3q4nFYGwhr+TAV5iE9kiZgbmzCI=";
   };
 
@@ -28,9 +28,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "TCP Ping (tcping) Utility for Port Reachability";
     homepage = "https://github.com/lvillis/tcping-rs";
-    changelog = "https://github.com/lvillis/tcping-rs/releases/tag/${src.tag}";
+    changelog = "https://github.com/lvillis/tcping-rs/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     mainProgram = "tcping";
     maintainers = with lib.maintainers; [ heitorPB ];
   };
-}
+})

From c104e79d20c74450dfc1a25554663d08dedcc862 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jan 2026 15:52:05 +0100
Subject: [PATCH 181/235] newt: migrate to finalAttrs

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

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index 01da2d2a7e0c..f3350ba8e357 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -6,14 +6,14 @@
   nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "newt";
   version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "newt";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-Ya+OVSChGmiZ8JTAfl/im8fOhLCC+r6JKSlH+CnSwP8=";
   };
 
@@ -24,7 +24,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X=main.newtVersion=${version}"
+    "-X=main.newtVersion=${finalAttrs.version}"
   ];
 
   doInstallCheck = true;
@@ -36,7 +36,7 @@ buildGoModule rec {
   meta = {
     description = "Tunneling client for Pangolin";
     homepage = "https://github.com/fosrl/newt";
-    changelog = "https://github.com/fosrl/newt/releases/tag/${src.tag}";
+    changelog = "https://github.com/fosrl/newt/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       fab
@@ -45,4 +45,4 @@ buildGoModule rec {
     ];
     mainProgram = "newt";
   };
-}
+})

From 45461e4b6bab193f8417dc6ed94ef9c058a56e19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 15:12:07 +0000
Subject: [PATCH 182/235] 
 terraform-providers.opentelekomcloud_opentelekomcloud: 1.36.56 -> 1.36.57

---
 .../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 cb0ad04cfb86..6d95afec3e5b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1031,13 +1031,13 @@
     "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
   },
   "opentelekomcloud_opentelekomcloud": {
-    "hash": "sha256-68JyLHSHyse7znn7egPLMz4DeyHaWAGfa0TLCHQJd4k=",
+    "hash": "sha256-Pco5/kiFOyqwjktDFgHgCtq/kVKshzZyp9cjT+mJYJs=",
     "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
     "owner": "opentelekomcloud",
     "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.56",
+    "rev": "v1.36.57",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ESu1guITtquRqdGI3KdMhOf24gjtii45i5TkVrqJ18U="
+    "vendorHash": "sha256-v7t3W7v38xw7M8r9rdx+9cTUT6FFY4x5ujkVYD7qThw="
   },
   "opsgenie_opsgenie": {
     "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",

From 6b22df9c5cbb23fcde7a03999e1e14ae8e0bcc02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 25 Jan 2026 02:01:58 +0100
Subject: [PATCH 183/235] nixos/tests/rqbit: convert to runTest

---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/rqbit.nix     | 52 +++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ed08e308eed0..da285ba3e7d0 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1389,7 +1389,7 @@ in
   rosenpass = runTest ./rosenpass.nix;
   roundcube = runTest ./roundcube.nix;
   routinator = handleTest ./routinator.nix { };
-  rqbit = handleTest ./rqbit.nix { };
+  rqbit = runTest ./rqbit.nix;
   rshim = handleTest ./rshim.nix { };
   rspamd = handleTest ./rspamd.nix { };
   rspamd-trainer = runTest ./rspamd-trainer.nix;
diff --git a/nixos/tests/rqbit.nix b/nixos/tests/rqbit.nix
index dcef770839b6..15dcea4fb97e 100644
--- a/nixos/tests/rqbit.nix
+++ b/nixos/tests/rqbit.nix
@@ -1,30 +1,28 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  let
-    port = 3030;
-  in
-  {
-    name = "rqbit";
-    meta = {
-      maintainers = with pkgs.lib.maintainers; [ CodedNil ];
+{ pkgs, ... }:
+let
+  port = 3030;
+in
+{
+  name = "rqbit";
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [ CodedNil ];
+  };
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.rqbit = {
+        httpPort = port;
+        enable = true;
+        openFirewall = true;
+      };
     };
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.rqbit = {
-          httpPort = port;
-          enable = true;
-          openFirewall = true;
-        };
-      };
+  testScript = /* python */ ''
+    machine.start()
+    machine.wait_for_unit("rqbit.service")
+    machine.wait_for_open_port(${toString port})
 
-    testScript = /* python */ ''
-      machine.start()
-      machine.wait_for_unit("rqbit.service")
-      machine.wait_for_open_port(${toString port})
-
-      machine.succeed("curl --fail http://localhost:${toString port}")
-    '';
-  }
-)
+    machine.succeed("curl --fail http://localhost:${toString port}")
+  '';
+}

From 5899374fd566f54beec98dae8645598db04b5da6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 20 Oct 2025 17:54:00 +0200
Subject: [PATCH 184/235] saunafs: remove unnecessary override

Compatible with fmt 12, which is the default.

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 pkgs/top-level/all-packages.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 344288d86e77..4d21561f8242 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3627,13 +3627,6 @@ with pkgs;
 
   sasview = callPackage ../applications/science/misc/sasview { };
 
-  saunafs = callPackage ../by-name/sa/saunafs/package.nix {
-    fmt = fmt_11;
-    spdlog = spdlog.override {
-      fmt = fmt_11;
-    };
-  };
-
   segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };
 
   semgrep = python3.pkgs.toPythonApplication python3.pkgs.semgrep;

From 682ede8ddf523f0ef03c593b1602a2325b68b39d Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:49:05 +0200
Subject: [PATCH 185/235] zeroad-unwrapped: remove top-level override

---
 pkgs/by-name/ze/zeroad-unwrapped/package.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix              |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
index 3a16aaf5c3b6..88b8637d90e9 100644
--- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix
+++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
@@ -4,7 +4,7 @@
   perl,
   fetchurl,
   python3,
-  fmt,
+  fmt_9,
   libidn,
   pkg-config,
   spidermonkey_115,
@@ -34,7 +34,7 @@
   cxxtest,
   freetype,
   withEditor ? true,
-  wxGTK,
+  wxGTK32,
 }:
 
 # You can find more instructions on how to build 0ad here:
@@ -80,19 +80,19 @@ stdenv.mkDerivation rec {
     gloox
     nvidia-texture-tools
     libsodium
-    fmt
+    fmt_9
     freetype
     premake5
     cxxtest
   ]
-  ++ lib.optional withEditor wxGTK;
+  ++ lib.optional withEditor wxGTK32;
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-I${xorgproto}/include"
     "-I${libX11.dev}/include"
     "-I${libXcursor.dev}/include"
     "-I${SDL2}/include/SDL2"
-    "-I${fmt.dev}/include"
+    "-I${fmt_9.dev}/include"
     "-I${nvidia-texture-tools.dev}/include"
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 344288d86e77..eee777b4bcfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12473,11 +12473,6 @@ with pkgs;
     yquake2-all-games
     ;
 
-  zeroad-unwrapped = callPackage ../by-name/ze/zeroad-unwrapped/package.nix {
-    wxGTK = wxGTK32;
-    fmt = fmt_9;
-  };
-
   ### DESKTOP ENVIRONMENTS
 
   arcan-wrapped = arcan.wrapper.override { };

From daf8a66db35fac123d289bee3dabcab36845ae0c Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:47:30 +0200
Subject: [PATCH 186/235] xfe: remove top-level override

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

diff --git a/pkgs/by-name/xf/xfe/package.nix b/pkgs/by-name/xf/xfe/package.nix
index e45aedbbc6f0..3bfa2f758773 100644
--- a/pkgs/by-name/xf/xfe/package.nix
+++ b/pkgs/by-name/xf/xfe/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  fox,
+  fox_1_6,
   fontconfig,
   freetype,
   pkg-config,
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     intltool
   ];
   buildInputs = [
-    fox
+    fox_1_6
     gettext
     xcbutil
     gcc
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eee777b4bcfe..ddc9b6383461 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1366,10 +1366,6 @@ with pkgs;
     inherit lib udisks python3;
   };
 
-  xfe = callPackage ../by-name/xf/xfe/package.nix {
-    fox = fox_1_6;
-  };
-
   johnny-reborn-engine = callPackage ../applications/misc/johnny-reborn { };
 
   johnny-reborn = callPackage ../applications/misc/johnny-reborn/with-data.nix { };

From 462f79ef84b21aa72beb442de27d6c12f241543e Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:46:58 +0200
Subject: [PATCH 187/235] wio: remove top-level override

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

diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix
index 241655dad9e0..2e8889e36e16 100644
--- a/pkgs/by-name/wi/wio/package.nix
+++ b/pkgs/by-name/wi/wio/package.nix
@@ -16,7 +16,7 @@
   unstableGitUpdater,
   wayland,
   wayland-protocols,
-  wlroots,
+  wlroots_0_19,
   xwayland,
 }:
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     udev
     wayland
     wayland-protocols
-    wlroots
+    wlroots_0_19
     xwayland
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddc9b6383461..6d3f060c6cbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3923,10 +3923,6 @@ with pkgs;
 
   web-eid-app = qt6Packages.callPackage ../tools/security/web-eid-app { };
 
-  wio = callPackage ../by-name/wi/wio/package.nix {
-    wlroots = wlroots_0_19;
-  };
-
   wyrd = callPackage ../tools/misc/wyrd {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };

From dd3c1e22ef09d1bd8dd91a2ba42fe3dceda03576 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:46:16 +0200
Subject: [PATCH 188/235] waybox: remove top-level override

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

diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix
index 2cd19e53f2e5..96d0c94a3961 100644
--- a/pkgs/by-name/wa/waybox/package.nix
+++ b/pkgs/by-name/wa/waybox/package.nix
@@ -17,7 +17,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  wlroots,
+  wlroots_0_17,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     udev
     wayland
     wayland-protocols
-    wlroots
+    wlroots_0_17
   ];
 
   strictDeps = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d3f060c6cbf..fb972539325c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10641,10 +10641,6 @@ with pkgs;
 
   i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
 
-  waybox = callPackage ../by-name/wa/waybox/package.nix {
-    wlroots = wlroots_0_17;
-  };
-
   workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
 
   wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };

From 18bae66952ce12b1469ab5e915c8989d283d3873 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:44:37 +0200
Subject: [PATCH 189/235] vcsh: remove top-level override

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

diff --git a/pkgs/by-name/vc/vcsh/package.nix b/pkgs/by-name/vc/vcsh/package.nix
index 50d657e0235e..a0a31822353b 100644
--- a/pkgs/by-name/vc/vcsh/package.nix
+++ b/pkgs/by-name/vc/vcsh/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   autoconf,
-  automake,
+  automake116x,
   makeWrapper,
   pkg-config,
   unzip,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     autoconf
-    automake
+    automake116x
     makeWrapper
     pkg-config
     unzip
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb972539325c..23bb93c1d767 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5711,10 +5711,6 @@ with pkgs;
 
   or1k-newlib = callPackage ../development/misc/or1k/newlib.nix { };
 
-  vcsh = callPackage ../by-name/vc/vcsh/package.nix {
-    automake = automake116x;
-  };
-
   ### DEVELOPMENT / TOOLS
 
   inherit (callPackage ../development/tools/alloy { })

From 727778bf681a13dceb4ec7ad5810e6794f443963 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:43:40 +0200
Subject: [PATCH 190/235] tomb: remove top-level override

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

diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix
index 1ebfad7df23d..d495097d34a4 100644
--- a/pkgs/by-name/to/tomb/package.nix
+++ b/pkgs/by-name/to/tomb/package.nix
@@ -15,7 +15,7 @@
   lsof,
   makeBinaryWrapper,
   nix-update-script,
-  pinentry,
+  pinentry-curses,
   stdenvNoCC,
   util-linuxMinimal,
   versionCheckHook,
@@ -36,7 +36,7 @@ let
     gnupg
     libargon2
     lsof
-    pinentry
+    pinentry-curses
     util-linuxMinimal
   ];
 
@@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ makeBinaryWrapper ];
 
   buildInputs = [
-    pinentry
+    pinentry-curses
     zsh
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23bb93c1d767..85a509f1e381 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13476,10 +13476,6 @@ with pkgs;
     discord-development
     ;
 
-  tomb = callPackage ../by-name/to/tomb/package.nix {
-    pinentry = pinentry-curses;
-  };
-
   tora = libsForQt5.callPackage ../development/tools/tora { };
 
   nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };

From 3395fa4713e55b3750ecf266f5c7de0ca48b37f5 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:42:05 +0200
Subject: [PATCH 191/235] the-powder-toy: remove top-level override

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

diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix
index 2a7120027f35..9a3db9630c98 100644
--- a/pkgs/by-name/th/the-powder-toy/package.nix
+++ b/pkgs/by-name/th/the-powder-toy/package.nix
@@ -8,7 +8,7 @@
   lib,
   libpng,
   libX11,
-  lua,
+  lua5_2,
   luajit,
   meson,
   ninja,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     jsoncpp
     libpng
     libX11
-    lua
+    lua5_2
     luajit
     SDL2
     zlib
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85a509f1e381..42d029f54807 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12395,10 +12395,6 @@ with pkgs;
 
   protonup-ng = with python3Packages; toPythonApplication protonup-ng;
 
-  the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix {
-    lua = lua5_2;
-  };
-
   teeworlds-server = teeworlds.override { buildClient = false; };
 
   tengine = callPackage ../servers/http/tengine {

From 94fc0097e99eb6e42e055c42bbf65747a0b5b2c5 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:40:52 +0200
Subject: [PATCH 192/235] sway-unwrapped: remove top-level override

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

diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix
index e829c7b6b92f..630ac7193c03 100644
--- a/pkgs/by-name/sw/sway-unwrapped/package.nix
+++ b/pkgs/by-name/sw/sway-unwrapped/package.nix
@@ -20,7 +20,7 @@
   libinput,
   gdk-pixbuf,
   librsvg,
-  wlroots,
+  wlroots_0_19,
   wayland-protocols,
   libdrm,
   nixosTests,
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
     wayland-protocols
     libdrm
-    (wlroots.override { inherit (finalAttrs) enableXWayland; })
+    (wlroots_0_19.override { inherit (finalAttrs) enableXWayland; })
   ]
   ++ lib.optionals finalAttrs.enableXWayland [
     xorg.xcbutilwm
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42d029f54807..77e1c8288216 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1744,10 +1744,6 @@ with pkgs;
 
   intel-oneapi = callPackage ../development/libraries/intel-oneapi { };
 
-  sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
-    wlroots = wlroots_0_19;
-  };
-
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
 
   cplex = callPackage ../applications/science/math/cplex (config.cplex or { });

From b0c8fb3344d627619d93215494c9356ec12ed95a Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:05:57 +0200
Subject: [PATCH 193/235] guile-xcb: remove top-level override

---
 pkgs/by-name/gu/guile-xcb/package.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix       |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/gu/guile-xcb/package.nix b/pkgs/by-name/gu/guile-xcb/package.nix
index 567c3e07a0ed..26f83441f1b9 100644
--- a/pkgs/by-name/gu/guile-xcb/package.nix
+++ b/pkgs/by-name/gu/guile-xcb/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  guile,
+  guile_2_2,
   pkg-config,
   texinfo,
 }:
@@ -24,13 +24,13 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    guile
+    guile_2_2
     texinfo
   ];
 
   configureFlags = [
-    "--with-guile-site-dir=$(out)/${guile.siteDir}"
-    "--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}"
+    "--with-guile-site-dir=$(out)/${guile_2_2.siteDir}"
+    "--with-guile-site-ccache-dir=$(out)/${guile_2_2.siteCcacheDir}"
   ];
 
   makeFlags = [
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
     description = "XCB bindings for Guile";
     license = lib.licenses.gpl3Plus;
     maintainers = [ ];
-    platforms = guile.meta.platforms;
+    platforms = guile_2_2.meta.platforms;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 344288d86e77..6eef8f5f270f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5702,10 +5702,6 @@ with pkgs;
 
   guile = guile_3_0;
 
-  guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix {
-    guile = guile_2_2;
-  };
-
   msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { };
 
   msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };

From 87d01b7465e17d9dfeaf73702e45fcfad0364bf9 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:18:01 +0200
Subject: [PATCH 194/235] libkazv: remove top-level override

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

diff --git a/pkgs/by-name/li/libkazv/package.nix b/pkgs/by-name/li/libkazv/package.nix
index 1740c15f8cef..e17533314b4c 100644
--- a/pkgs/by-name/li/libkazv/package.nix
+++ b/pkgs/by-name/li/libkazv/package.nix
@@ -8,7 +8,7 @@
   cryptopp,
   immer,
   lager,
-  libcpr,
+  libcpr_1_10_5,
   libhttpserver,
   libmicrohttpd,
   nlohmann_json,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     cryptopp
     immer
     lager
-    libcpr
+    libcpr_1_10_5
     libhttpserver
     libmicrohttpd
     olm
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6eef8f5f270f..dc00292b73ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13595,10 +13595,6 @@ with pkgs;
     fltk = fltk_1_3;
   };
 
-  libkazv = callPackage ../by-name/li/libkazv/package.nix {
-    libcpr = libcpr_1_10_5;
-  };
-
   libpostalWithData = callPackage ../by-name/li/libpostal/package.nix {
     withData = true;
   };

From 55488b815a40b5adf62c4b03653999a2817c3c1b Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:23:36 +0200
Subject: [PATCH 195/235] nsxiv: remove top-level override

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

diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix
index 739b1cdb59d4..5c7f46292a33 100644
--- a/pkgs/by-name/ns/nsxiv/package.nix
+++ b/pkgs/by-name/ns/nsxiv/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitea,
   giflib,
-  imlib2,
+  imlib2Full,
   libXft,
   libexif,
   libwebp,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     giflib
-    imlib2
+    imlib2Full
     libXft
     libexif
     libwebp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc00292b73ec..edd0c8e5fe8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11456,10 +11456,6 @@ with pkgs;
     imlib2 = imlib2Full;
   };
 
-  nsxiv = callPackage ../by-name/ns/nsxiv/package.nix {
-    imlib2 = imlib2Full;
-  };
-
   dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };

From 58f82bd0e57b8f2e815720ee61a8dd17fb60efe6 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:26:07 +0200
Subject: [PATCH 196/235] pekwm: remove top-level override

---
 pkgs/by-name/pe/pekwm/package.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix   |  6 ------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/pe/pekwm/package.nix b/pkgs/by-name/pe/pekwm/package.nix
index d6aea6bd8b9b..b8dbf284a0b5 100644
--- a/pkgs/by-name/pe/pekwm/package.nix
+++ b/pkgs/by-name/pe/pekwm/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  awk,
+  gawk,
   cmake,
-  grep,
+  gnugrep,
   libXext,
   libXft,
   libXinerama,
@@ -14,7 +14,7 @@
   libpng,
   pkg-config,
   runtimeShell,
-  sed,
+  gnused,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   cmakeFlags = [
-    "-DAWK=${lib.getBin awk}/bin/awk"
-    "-DGREP=${lib.getBin grep}/bin/grep"
-    "-DSED=${lib.getBin sed}/bin/sed"
+    "-DAWK=${lib.getBin gawk}/bin/awk"
+    "-DGREP=${lib.getBin gnugrep}/bin/grep"
+    "-DSED=${lib.getBin gnused}/bin/sed"
     "-DSH=${runtimeShell}"
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edd0c8e5fe8b..faf1b9d828da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11212,12 +11212,6 @@ with pkgs;
 
   parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
 
-  pekwm = callPackage ../by-name/pe/pekwm/package.nix {
-    awk = gawk;
-    grep = gnugrep;
-    sed = gnused;
-  };
-
   pdfpc = callPackage ../applications/misc/pdfpc {
     inherit (gst_all_1)
       gstreamer

From e4fe1974396d84df6c70ed8ae265e64ac6f20c42 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:29:57 +0200
Subject: [PATCH 197/235] renpy: remove top-level override

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

diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix
index 22e835c7b1c9..69003c992bed 100644
--- a/pkgs/by-name/re/renpy/package.nix
+++ b/pkgs/by-name/re/renpy/package.nix
@@ -12,7 +12,7 @@
   libpng,
   makeWrapper,
   pkg-config,
-  python3,
+  python312,
   SDL2,
   stdenv,
   versionCheckHook,
@@ -21,7 +21,7 @@
 }:
 
 let
-  python = python3;
+  python = python312;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renpy";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index faf1b9d828da..09abfc5f7dbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2024,8 +2024,6 @@ with pkgs;
 
   psrecord = python3Packages.callPackage ../tools/misc/psrecord { };
 
-  renpy = callPackage ../by-name/re/renpy/package.nix { python3 = python312; };
-
   remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
 
   ropgadget = with python3Packages; toPythonApplication ropgadget;

From 0b71248027031895874a0b8c623977b9269426fa Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:31:15 +0200
Subject: [PATCH 198/235] ricochet-refresh: remove top-level override

---
 pkgs/by-name/ri/ricochet-refresh/package.nix | 7 ++++---
 pkgs/top-level/all-packages.nix              | 4 ----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix
index 8c36c14fbb06..83e05cccc2df 100644
--- a/pkgs/by-name/ri/ricochet-refresh/package.nix
+++ b/pkgs/by-name/ri/ricochet-refresh/package.nix
@@ -4,7 +4,8 @@
   fetchFromGitHub,
   qt5,
   openssl,
-  protobuf,
+  # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178
+  protobuf_21,
   pkg-config,
   cmake,
 }:
@@ -35,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
     ])
     ++ [
       openssl
-      protobuf
+      protobuf_21
     ];
 
   nativeBuildInputs = [
     pkg-config
-    protobuf
+    protobuf_21
     cmake
     qt5.wrapQtAppsHook
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09abfc5f7dbe..9cfb0c2a119b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9899,10 +9899,6 @@ with pkgs;
 
   polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { };
 
-  ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix {
-    protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178
-  };
-
   scheherazade-new = scheherazade.override {
     version = "4.400";
   };

From fbdf49f0973e92e231bdf26ef021cf7d2efab809 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:37:16 +0200
Subject: [PATCH 199/235] shadps4: remove top-level override

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

diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 70ce23705a25..87b323bf5a9a 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gcc14Stdenv,
   fetchFromGitHub,
 
   nixosTests,
@@ -54,7 +54,8 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+# relies on std::sinf & co, which was broken in GCC until GCC 14: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79700
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "shadps4";
   version = "0.13.0";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cfb0c2a119b..25fa1f6b9e6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1315,11 +1315,6 @@ with pkgs;
     withWayland = true;
   };
 
-  shadps4 = callPackage ../by-name/sh/shadps4/package.nix {
-    # relies on std::sinf & co, which was broken in GCC until GCC 14: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79700
-    stdenv = gcc14Stdenv;
-  };
-
   winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };
 
   zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };

From 8aa4d13f1029854877feb3575ba92defa896035e Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:39:48 +0200
Subject: [PATCH 200/235] sile: remove top-level override

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

diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix
index 493a14a14fde..cc8254927814 100644
--- a/pkgs/by-name/si/sile/package.nix
+++ b/pkgs/by-name/si/sile/package.nix
@@ -13,7 +13,7 @@
   luarocks,
 
   # buildInputs
-  lua,
+  luajit,
   harfbuzz,
   icu,
   fontconfig,
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     # build time we would fail to build since we only provide it at test time.
     "PDFINFO=false"
   ]
-  ++ lib.optionals (!lua.pkgs.isLuaJIT) [
+  ++ lib.optionals (!luajit.pkgs.isLuaJIT) [
     "--without-luajit"
   ];
 
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Use this passthru variable to add packages to your lua environment. Use
     # something like this in your development environment:
     #
-    # myLuaEnv = lua.withPackages (
+    # myLuaEnv = luajit.withPackages (
     #  ps: lib.attrVals (sile.passthru.luaPackages ++ [
     #    "lua-cjson"
     #    "lua-resty-http"
@@ -142,13 +142,13 @@ stdenv.mkDerivation (finalAttrs: {
       "ldoc"
       # NOTE: Add lua packages here, to change the luaEnv also read by `flake.nix`
     ]
-    ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [
+    ++ lib.optionals (lib.versionOlder luajit.luaversion "5.2") [
       "bit32"
     ]
-    ++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [
+    ++ lib.optionals (lib.versionOlder luajit.luaversion "5.3") [
       "compat53"
     ];
-    luaEnv = lua.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps);
+    luaEnv = luajit.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps);
 
     # Copied from Makefile.am
     tests.test = lib.optionalAttrs (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25fa1f6b9e6e..2a7465385691 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -780,10 +780,6 @@ with pkgs;
     propagatedBuildInputs = [ dieHook ];
   } ../build-support/setup-hooks/shorten-perl-shebang.sh;
 
-  sile = callPackage ../by-name/si/sile/package.nix {
-    lua = luajit;
-  };
-
   singularity-tools = callPackage ../build-support/singularity-tools { };
 
   srcOnly = callPackage ../build-support/src-only { };

From c97df140fe4981f9203a20700c7497e00f42493f Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 25 Jan 2026 12:33:12 -0500
Subject: [PATCH 201/235] google-chrome: remove JohnRTitor as co-maintainer

Per request in https://github.com/NixOS/nixpkgs/pull/483541#issuecomment-3796760529.
---
 pkgs/by-name/go/google-chrome/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index b11bf84e58ab..3eb22dcaa055 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -315,7 +315,6 @@ let
     homepage = "https://www.google.com/chrome/browser/";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [
-      johnrtitor
       mdaniels5757
     ];
     platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];

From a5f8e948b1d28dade979075398edd126c05e487f Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 23 Jan 2026 20:59:48 -0500
Subject: [PATCH 202/235] freeipmi: enable for darwin

---
 pkgs/by-name/fr/freeipmi/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/freeipmi/package.nix b/pkgs/by-name/fr/freeipmi/package.nix
index 122aa61f986c..817cd64e49d8 100644
--- a/pkgs/by-name/fr/freeipmi/package.nix
+++ b/pkgs/by-name/fr/freeipmi/package.nix
@@ -3,6 +3,7 @@
   fetchurl,
   lib,
   stdenv,
+  argp-standalone,
   libgcrypt,
   readline,
   libgpg-error,
@@ -17,12 +18,22 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-W872u562gOSbSjYjV5kwrOeJn1OSWyBF/p+RrWkEER0=";
   };
 
+  postPatch = lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace man/Makefile.in \
+      --replace-fail \
+        '$(CPP_FOR_BUILD) -nostdinc -w -C -P -I. -I$(top_srcdir)/man $@.pre $@' \
+        '$(CPP_FOR_BUILD) -nostdinc -w -C -P -I. -I$(top_srcdir)/man -o $@ $@.pre'
+  '';
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   buildInputs = [
     libgcrypt
     readline
     libgpg-error
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    argp-standalone
   ];
 
   configureFlags = [
@@ -63,6 +74,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
 
     maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
+    platforms = lib.platforms.gnu ++ lib.platforms.unix;
   };
 }

From e279d4affc67c2eeb7eb3036586a71ee042f4a84 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 23 Jan 2026 21:01:35 -0500
Subject: [PATCH 203/235] nut: enable for darwin

---
 pkgs/by-name/nu/nut/package.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/nu/nut/package.nix b/pkgs/by-name/nu/nut/package.nix
index f9f7441c6331..471c1d3911d9 100644
--- a/pkgs/by-name/nu/nut/package.nix
+++ b/pkgs/by-name/nu/nut/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     (replaceVars ./hardcode-paths.patch {
       avahi = "${avahi}/lib";
       freeipmi = "${freeipmi}/lib";
-      libgpiod = "${libgpiod_1}/lib";
+      libgpiod = if stdenv.hostPlatform.isLinux then "${libgpiod_1}/lib" else "/homeless-shelter";
       libusb = "${libusb1}/lib";
       neon = "${neon}/lib";
       libmodbus = "${modbus}/lib";
@@ -76,18 +76,20 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    neon
-    libusb1
-    openssl
-    udev
     avahi
     freeipmi
-    libgpiod_1
-    libtool
-    i2c-tools
-    net-snmp
     gd
+    libtool
+    libusb1
     modbus
+    neon
+    net-snmp
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    i2c-tools
+    libgpiod_1
+    udev
   ];
 
   nativeBuildInputs = [
@@ -129,7 +131,7 @@ stdenv.mkDerivation rec {
     "sbin"
   ];
 
-  postInstall = ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace $out/lib/systemd/system-shutdown/nutshutdown \
       --replace /bin/sed "${gnused}/bin/sed" \
       --replace /bin/sleep "${coreutils}/bin/sleep" \
@@ -155,7 +157,7 @@ stdenv.mkDerivation rec {
       It uses a layered approach to connect all of the parts.
     '';
     homepage = "https://networkupstools.org/";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.pierron ];
     license = with lib.licenses; [
       gpl1Plus

From 61d55f4308f3ec34e6c6b602d923110951d53177 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 17 Dec 2025 07:02:15 -0500
Subject: [PATCH 204/235] electron*: meld electron-bin*.meta.platforms into
 .meta.platforms

It should let Hydra and other infra know that this package - and
its children like podman-desktop that inherit `platforms` from electron
package - support darwin.

Thanks to @fugidev for the original idea.
---
 pkgs/top-level/all-packages.nix | 63 ++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d21561f8242..c30107afd03a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5785,27 +5785,48 @@ with pkgs;
     electron-chromedriver_40
     ;
 
-  electron_36 = electron_36-bin;
-  electron_37 =
-    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_37 then
-      electron-source.electron_37
-    else
-      electron_37-bin;
-  electron_38 =
-    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_38 then
-      electron-source.electron_38
-    else
-      electron_38-bin;
-  electron_39 =
-    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_39 then
-      electron-source.electron_39
-    else
-      electron_39-bin;
-  electron_40 =
-    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_40 then
-      electron-source.electron_40
-    else
-      electron_40-bin;
+  inherit
+    (
+      let
+        # On Linux, we use source electron package. On Darwin, we use binary. Hydra
+        # and other infra uses Linux package .meta.platforms to determine supported
+        # platforms. It means that Hydra won't cache podman-desktop and other
+        # electron-based apps on Darwin. This helper will force Linux package .meta
+        # to list darwin.
+        getElectronPkg =
+          { src, bin }:
+          (if lib.meta.availableOn stdenv.hostPlatform src then src else bin).overrideAttrs (old: {
+            meta = old.meta // {
+              platforms = lib.lists.unique (src.meta.platforms ++ bin.meta.platforms);
+            };
+          });
+      in
+      {
+        electron_36 = electron_36-bin;
+        electron_37 = getElectronPkg {
+          src = electron-source.electron_37;
+          bin = electron_37-bin;
+        };
+        electron_38 = getElectronPkg {
+          src = electron-source.electron_38;
+          bin = electron_38-bin;
+        };
+        electron_39 = getElectronPkg {
+          src = electron-source.electron_39;
+          bin = electron_39-bin;
+        };
+        electron_40 = getElectronPkg {
+          src = electron-source.electron_40;
+          bin = electron_40-bin;
+        };
+      }
+    )
+    electron_36
+    electron_37
+    electron_38
+    electron_39
+    electron_40
+    ;
   electron = electron_38;
   electron-bin = electron_38-bin;
   electron-chromedriver = electron-chromedriver_38;

From 10e6cebac2d92cc7403b8650a25a50e195d48e58 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 17 Dec 2025 07:33:59 -0500
Subject: [PATCH 205/235] joplin-desktop: rely on electron.meta.platforms to
 include darwin

---
 pkgs/by-name/jo/joplin-desktop/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix
index 33d9a9b8f3cd..db69e0a94270 100644
--- a/pkgs/by-name/jo/joplin-desktop/package.nix
+++ b/pkgs/by-name/jo/joplin-desktop/package.nix
@@ -248,6 +248,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       fugi
     ];
-    platforms = electron.meta.platforms ++ lib.platforms.darwin;
+    inherit (electron.meta) platforms;
   };
 })

From af15cb490464c6e13da16af180a0575191e7d37e Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 17 Dec 2025 07:34:12 -0500
Subject: [PATCH 206/235] element-desktop: rely on electron.meta.platforms to
 include darwin

---
 pkgs/by-name/el/element-desktop/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index cd992a4489b1..5cd9ff13ecae 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -174,7 +174,7 @@ stdenv.mkDerivation (
       changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md";
       license = lib.licenses.agpl3Plus;
       teams = [ lib.teams.matrix ];
-      platforms = electron.meta.platforms ++ lib.platforms.darwin;
+      inherit (electron.meta) platforms;
       mainProgram = "element-desktop";
     };
   }

From 228a994a1d87eb1fc61cf95bad8e5362b84f39a4 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 25 Jan 2026 18:53:50 +0100
Subject: [PATCH 207/235] zmk-studio: fix build on darwin

---
 pkgs/by-name/zm/zmk-studio/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/zm/zmk-studio/package.nix b/pkgs/by-name/zm/zmk-studio/package.nix
index a9d65a64e7b1..26c58acc189e 100644
--- a/pkgs/by-name/zm/zmk-studio/package.nix
+++ b/pkgs/by-name/zm/zmk-studio/package.nix
@@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    makeWrapper "$out/Application/ZMK Studio.app/Contents/MacOS/zmk-studio" "$out/bin/zmk-studio"
+    makeWrapper "$out/Applications/ZMK Studio.app/Contents/MacOS/zmk-studio" "$out/bin/zmk-studio"
   '';
 
   meta = {

From a2e247703853e37cd2983935dc0c7981982eb27b Mon Sep 17 00:00:00 2001
From: Mohamed Hisham Abdelzaher <mohamed.hisham.abdelzaher@gmail.com>
Date: Sun, 25 Jan 2026 19:54:25 +0200
Subject: [PATCH 208/235] cagent: init at 1.19.0

---
 pkgs/by-name/ca/cagent/package.nix | 54 ++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/ca/cagent/package.nix

diff --git a/pkgs/by-name/ca/cagent/package.nix b/pkgs/by-name/ca/cagent/package.nix
new file mode 100644
index 000000000000..bc04212f31fa
--- /dev/null
+++ b/pkgs/by-name/ca/cagent/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "cagent";
+  version = "1.19.0";
+
+  src = fetchFromGitHub {
+    owner = "docker";
+    repo = "cagent";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-J7IRlSsjXRDvbUKwnV2rrWnEmvqciJw3mN8NerQBtl4=";
+  };
+
+  vendorHash = "sha256-q7mP9JWJEdDbUO/3MHsJwiySNvN2SbhnhEbJArnCW3M=";
+
+  # Disable tests: Networked model providers and writable cache directories are required.
+  doCheck = false;
+
+  # Skip install checks on macOS: The build sandbox is missing the `/etc/protocols` file, which is required for validation.
+  doInstallCheck = !stdenv.hostPlatform.isDarwin;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X"
+    "github.com/docker/cagent/pkg/version.Version=${finalAttrs.version}"
+    "-X"
+    "github.com/docker/cagent/pkg/version.Commit=${finalAttrs.src.tag}"
+  ];
+
+  meta = {
+    description = "Agent Builder and Runtime by Docker Engineering";
+    longDescription = ''
+      A powerful, easy-to-use, customizable multi-agent runtime that
+      orchestrates AI agents with specialized capabilities and tools,
+      and the interactions between agents.
+    '';
+    homepage = "https://github.com/docker/cagent";
+    changelog = "https://github.com/docker/cagent/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://github.com/docker/cagent/releases";
+    license = lib.licenses.asl20;
+    mainProgram = "cagent";
+    maintainers = with lib.maintainers; [ MH0386 ];
+  };
+})

From 615b488eb1d9f4c927b497df2eaceb18feee0b09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 17:55:20 +0000
Subject: [PATCH 209/235] kitty-themes: 0-unstable-2026-01-10 ->
 0-unstable-2026-01-25

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

diff --git a/pkgs/by-name/ki/kitty-themes/package.nix b/pkgs/by-name/ki/kitty-themes/package.nix
index 88a2695f0ee2..a45a776ccdba 100644
--- a/pkgs/by-name/ki/kitty-themes/package.nix
+++ b/pkgs/by-name/ki/kitty-themes/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "kitty-themes";
-  version = "0-unstable-2026-01-10";
+  version = "0-unstable-2026-01-25";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty-themes";
-    rev = "0da136b4d31ab1c0dc49306bbf2ba8b819dafed8";
-    hash = "sha256-jefF6MzFbKDz6Grsdh5fyi/hrZI72mNkp5iUvelIhDs=";
+    rev = "58a07a8ca50f72f95f6858153a21717416cf3389";
+    hash = "sha256-UIFIe68eb+Xihx+rdeQdp4Nku49m0Ft6G7R0KjRfY8g=";
   };
 
   dontConfigure = true;

From 729d7d3ae0e6849be598c1e24153e955377912e9 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 25 Jan 2026 14:02:39 -0500
Subject: [PATCH 210/235] workflows/periodic-merge: fix comment syntax

---
 .github/workflows/periodic-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 543ad15bd338..ac79898cb14b 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -65,5 +65,5 @@ jobs:
         with:
           issue-number: 105153
           body: |
-            Periodic merge from `${{ inputs.from }}` into `[${{ inputs.into }}](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }})` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
+            Periodic merge from `${{ inputs.from }}` into [`${{ inputs.into }}`](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }}) has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
           token: ${{ steps.app-token.outputs.token }}

From 3de83a0d73b5526a7195115d5212beda81a889c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 19:30:29 +0000
Subject: [PATCH 211/235] piliplus: 1.1.5.3 -> 1.1.5.5

---
 pkgs/by-name/pi/piliplus/git-hashes.json   |   2 +-
 pkgs/by-name/pi/piliplus/package.nix       |   2 +-
 pkgs/by-name/pi/piliplus/pubspec.lock.json | 102 ++++++++++++++-------
 pkgs/by-name/pi/piliplus/src-info.json     |   8 +-
 4 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/pi/piliplus/git-hashes.json b/pkgs/by-name/pi/piliplus/git-hashes.json
index 5e92f2bad83f..c0265b610035 100644
--- a/pkgs/by-name/pi/piliplus/git-hashes.json
+++ b/pkgs/by-name/pi/piliplus/git-hashes.json
@@ -1,7 +1,7 @@
 {
   "auto_orientation": "sha256-0QOEW8+0PpBIELmzilZ8+z7ozNRxKgI0BzuBS8c1Fng=",
   "canvas_danmaku": "sha256-C3No/hLtf/TpPJHXXfPqHjUKI1vck++UWqvkAX9EzYM=",
-  "chat_bottom_container": "sha256-um9KwZUDxWBhFsGHfv00TjPzxDHmp43TLRF0GwuV1xs=",
+  "chat_bottom_container": "sha256-+R1MiDMO4onCMXiJ7MJtJVAwyEJcikTyONwp+HibqA0=",
   "extended_nested_scroll_view": "sha256-Vjv5zp5c0Xob1H8/U0+lUueLqOKo7qwusOCchdt3Z7M=",
   "file_picker": "sha256-yOZwX6GrA+91WtpXuVf7eM5gdI6mxmdxkSe+dgnHvj4=",
   "floating": "sha256-0Xd9dsXJCQ/r/8Nb16oM+M8Jdw+r4QzGmU++HpqF/v0=",
diff --git a/pkgs/by-name/pi/piliplus/package.nix b/pkgs/by-name/pi/piliplus/package.nix
index 8192467b7ed1..1a0011185865 100644
--- a/pkgs/by-name/pi/piliplus/package.nix
+++ b/pkgs/by-name/pi/piliplus/package.nix
@@ -13,7 +13,7 @@
 let
   srcInfo = lib.importJSON ./src-info.json;
   description = "Third-party Bilibili client developed in Flutter";
-  version = "1.1.5.3";
+  version = "1.1.5.5";
 in
 flutter338.buildFlutterApplication {
   pname = "piliplus";
diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json
index 8a3f8ad065db..d1c1aef331ca 100644
--- a/pkgs/by-name/pi/piliplus/pubspec.lock.json
+++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e",
+        "sha256": "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "92.0.0"
+      "version": "93.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e",
+        "sha256": "de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.0"
+      "version": "10.0.1"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -205,11 +205,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413",
+        "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.3"
+      "version": "4.0.4"
     },
     "build_config": {
       "dependency": "transitive",
@@ -235,11 +235,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057",
+        "sha256": "b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.4"
+      "version": "2.10.5"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -255,11 +255,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139",
+        "sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.1"
+      "version": "8.12.3"
     },
     "cached_network_image": {
       "dependency": "direct main",
@@ -327,7 +327,7 @@
       "description": {
         "path": "packages/chat_bottom_container",
         "ref": "main",
-        "resolved-ref": "acccababf698ef1712031c383ea4b7ff54ae630c",
+        "resolved-ref": "dba2bf10db4a6f89564d9be63ce17b18f0f7e3e5",
         "url": "https://github.com/bggRGjQaUbCoE/flutter_chat_packages.git"
       },
       "source": "git",
@@ -363,6 +363,16 @@
       "source": "hosted",
       "version": "1.1.2"
     },
+    "code_assets": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_assets",
+        "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
     "code_builder": {
       "dependency": "transitive",
       "description": {
@@ -467,11 +477,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
+        "sha256": "8a0aa2b9bae196552b71575efc94580e447546c26c7120577bb6f81fbd33b52e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.4"
     },
     "dbus": {
       "dependency": "transitive",
@@ -628,11 +638,11 @@
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+        "sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.1.5"
     },
     "file": {
       "dependency": "transitive",
@@ -1052,6 +1062,16 @@
       "source": "hosted",
       "version": "1.1.0"
     },
+    "hooks": {
+      "dependency": "transitive",
+      "description": {
+        "name": "hooks",
+        "sha256": "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
     "html": {
       "dependency": "direct main",
       "description": {
@@ -1156,11 +1176,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "5e9bf126c37c117cf8094215373c6d561117a3cfb50ebc5add1a61dc6e224677",
+        "sha256": "297e42bd236c4ac4b091d4277292159b3280545e030cae2be3d503f9ecf7e6a1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.13+10"
+      "version": "0.8.13+12"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
@@ -1509,6 +1529,16 @@
       "source": "hosted",
       "version": "2.0.0"
     },
+    "native_toolchain_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "native_toolchain_c",
+        "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.17.4"
+    },
     "nm": {
       "dependency": "transitive",
       "description": {
@@ -1519,6 +1549,16 @@
       "source": "hosted",
       "version": "0.5.0"
     },
+    "objective_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "objective_c",
+        "sha256": "7fd0c4d8ac8980011753b9bdaed2bf15111365924cdeeeaeb596214ea2b03537",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "9.2.4"
+    },
     "octo_image": {
       "dependency": "transitive",
       "description": {
@@ -1603,11 +1643,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4",
+        "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.1"
+      "version": "2.6.0"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1803,11 +1843,11 @@
       "dependency": "transitive",
       "description": {
         "name": "safe_local_storage",
-        "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236",
+        "sha256": "608354d4cdfdabb29428bdb330c4e54dbc31aab238b09ba59fe73660580553cc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.0.2"
     },
     "saver_gallery": {
       "dependency": "direct main",
@@ -1903,11 +1943,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sentry",
-        "sha256": "9b2fe138df1a104f6e41d8ebf2b1e4fe39d4370d2200eb4eea29913d38b8b33b",
+        "sha256": "fa14b2177d2cd4489ec78817ec4e52affe1be9f595718de970a5e4ed2bccc530",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.9.1"
+      "version": "9.10.0"
     },
     "share_plus": {
       "dependency": "direct main",
@@ -2290,11 +2330,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
+        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -2340,11 +2380,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
+        "sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.19"
+      "version": "1.1.20"
     },
     "vector_math": {
       "dependency": "direct main",
@@ -2400,11 +2440,11 @@
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.2.1"
     },
     "waterfall_flow": {
       "dependency": "direct main",
@@ -2520,7 +2560,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.10.0 <4.0.0",
-    "flutter": "3.38.4"
+    "dart": ">=3.10.3 <4.0.0",
+    "flutter": "3.38.6"
   }
 }
diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json
index 8e7eea65a217..ebd876e82819 100644
--- a/pkgs/by-name/pi/piliplus/src-info.json
+++ b/pkgs/by-name/pi/piliplus/src-info.json
@@ -1,6 +1,6 @@
 {
-  "rev": "de85e82bfa49b5220f1ede5aff315dc92ec61ad4",
-  "revCount": 4526,
-  "commitDate": 1767759159,
-  "hash": "sha256-SSGLkBB0PH42GvXeVKdbURmo94TsGcR4ZtMFSD3OmEc="
+  "rev": "038f03a4e7b08db8f55fe6c2a629397ac32d7749",
+  "revCount": 4573,
+  "commitDate": 1769325693,
+  "hash": "sha256-fLCQ8TguCIe6qjN5XjvQIiCHg91Ry1uoqgO5DmjNqY4="
 }

From 5ef081f9db86ab1558e0a09dd71d56f3e3bad5eb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 25 Jan 2026 20:41:24 +0100
Subject: [PATCH 212/235] curv: mark broken on aarch64

https://hydra.nixos.org/job/nixos/unstable/nixpkgs.curv.aarch64-linux
---
 pkgs/by-name/cu/curv/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix
index 63f7b5152933..1993682eb0ac 100644
--- a/pkgs/by-name/cu/curv/package.nix
+++ b/pkgs/by-name/cu/curv/package.nix
@@ -97,7 +97,8 @@ stdenv.mkDerivation {
     homepage = "https://codeberg.org/doug-moen/curv";
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
-    broken = stdenv.hostPlatform.isDarwin;
+    # aarch64 fails installCheckPhase: https://hydra.nixos.org/build/319705783
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
     maintainers = with lib.maintainers; [ pbsds ];
     mainProgram = "curv";
   };

From 9e9c44b5acf0266a57748b4217eb2f42ffbfa80d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 25 Jan 2026 14:48:46 -0500
Subject: [PATCH 213/235] Revert "smpq: pin stormlib to version 9.22"

This reverts commit 616be9785f91100fa43ebb2daa8ef23a01dcfb41.
---
 pkgs/top-level/all-packages.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 344288d86e77..63f6b73dc296 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3654,18 +3654,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_12;
   };
 
-  smpq = callPackage ../by-name/sm/smpq/package.nix {
-    stormlib = stormlib.overrideAttrs (old: {
-      version = "9.22";
-      src = fetchFromGitHub {
-        owner = "ladislav-zezula";
-        repo = "StormLib";
-        rev = "v9.22";
-        hash = "sha256-jFUfxLzuRHAvFE+q19i6HfGcL6GX4vKL1g7l7LOhjeU=";
-      };
-    });
-  };
-
   snapcast = callPackage ../applications/audio/snapcast {
     pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux;
   };

From b42efdd3cdb30fd4dea9ad5f6d2df80245a8d968 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 19:50:17 +0000
Subject: [PATCH 214/235] beam26Packages.ex_doc: 0.39.3 -> 0.40.0

---
 pkgs/development/beam-modules/ex_doc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index 0c7ed7bb9daa..939335e9593d 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -14,12 +14,12 @@
 
 let
   pname = "ex_doc";
-  version = "0.39.3";
+  version = "0.40.0";
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-LLy4gemj3oiMbZKc9ZUWY3g2fyY1Rvxjtzx/sbAp8JE=";
+    hash = "sha256-jz/9zIylMe7opCLt9wQ4GhR7bvAenWU8MOEACIvLKzk=";
   };
 in
 mixRelease {
@@ -37,7 +37,7 @@ mixRelease {
   mixFodDeps = fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version elixir;
-    hash = "sha256-TknrENa0Nb1Eobd4oTBl6TilPVEsw9+XjPdF3Ntq+DI=";
+    hash = "sha256-pMIm0lVMqkuiprp0XeVB+x4VTh+hQR3t8dk5OBmnIqA=";
   };
 
   passthru = {

From e8cb4ce5e07d1b3145ed9b6ddcb68327653684ee Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 26 Dec 2025 23:37:51 +0200
Subject: [PATCH 215/235] various: remove unused argument overrides

Overriding the argument with the same default value as in package.nix is
pointless.

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 pkgs/top-level/all-packages.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55dc09810337..d7e2a7caeb2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2406,7 +2406,6 @@ with pkgs;
 
   tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };
 
-  tracy = callPackage ../by-name/tr/tracy/package.nix { withWayland = stdenv.hostPlatform.isLinux; };
   tracy-glfw = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; };
   tracy-wayland = callPackage ../by-name/tr/tracy/package.nix { withWayland = true; };
 
@@ -5240,7 +5239,6 @@ with pkgs;
   };
 
   dbqn = callPackage ../by-name/db/dbqn/package.nix {
-    buildNativeImage = false;
     jdk = jre;
     stdenv = stdenvNoCC;
   };
@@ -12226,12 +12224,6 @@ with pkgs;
 
   factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { };
 
-  freeciv = callPackage ../by-name/fr/freeciv/package.nix {
-    sdl2Client = false;
-    gtkClient = true;
-    qtClient = false;
-  };
-
   freeciv_sdl2 = freeciv.override {
     sdl2Client = true;
     gtkClient = false;

From 5703b0c8f8ade1871b0487594a25cb148f8dd91a Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 26 Dec 2025 23:37:51 +0200
Subject: [PATCH 216/235] gamescope: change a default and remove some
 all-packages.nix arguments

Overriding the argument with the same default value as in package.nix
is pointless.

And having the real value be different than what package.nix
implies is confusing.
---
 pkgs/by-name/ga/gamescope/package.nix | 2 +-
 pkgs/top-level/all-packages.nix       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 682b71e2b338..2453a491ad79 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -37,7 +37,7 @@
   makeBinaryWrapper,
   nix-update-script,
   enableExecutable ? true,
-  enableWsi ? true,
+  enableWsi ? false,
 }:
 let
   frogShaders = fetchFromGitHub {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55dc09810337..7ffbbb9ccf7f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1001,9 +1001,6 @@ with pkgs;
   };
 
   gamescope = callPackage ../by-name/ga/gamescope/package.nix {
-    enableExecutable = true;
-    enableWsi = false;
-
     wlroots = wlroots_0_17;
   };
 

From d2975a9cc0e356f6e76a710ee30f70c400de2b6c Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:05:05 +0200
Subject: [PATCH 217/235] gamescope: remove top-level override

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

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 2453a491ad79..7224f1591a3d 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -29,7 +29,7 @@
   glslang,
   hwdata,
   stb,
-  wlroots,
+  wlroots_0_17,
   libdecor,
   lcms,
   lib,
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ]
   ++ lib.optionals enableExecutable (
-    wlroots.buildInputs
+    wlroots_0_17.buildInputs
     ++ [
       # gamescope uses a custom wlroots branch
       xorg.libXcomposite
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ffbbb9ccf7f..e343386853f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1000,15 +1000,9 @@ with pkgs;
     libgamemode32 = pkgsi686Linux.gamemode.lib;
   };
 
-  gamescope = callPackage ../by-name/ga/gamescope/package.nix {
-    wlroots = wlroots_0_17;
-  };
-
   gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = false;
     enableWsi = true;
-
-    wlroots = wlroots_0_17;
   };
 
   font-v = with python3Packages; toPythonApplication font-v;

From 2b8237cc597a654af9f94fbb4990f895a4e4d641 Mon Sep 17 00:00:00 2001
From: Angelo Delefortrie <angelo.delefortrie@gmail.com>
Date: Sun, 25 Jan 2026 21:28:16 +0100
Subject: [PATCH 218/235] rauthy: 0.34.0 -> 0.34.1

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

diff --git a/pkgs/by-name/ra/rauthy/package.nix b/pkgs/by-name/ra/rauthy/package.nix
index 94d1928bb9cd..7e29ddf106df 100644
--- a/pkgs/by-name/ra/rauthy/package.nix
+++ b/pkgs/by-name/ra/rauthy/package.nix
@@ -13,19 +13,19 @@
   lld,
 }:
 let
-  version = "0.34.0";
+  version = "0.34.1";
   pname = "rauthy";
 
   src = fetchFromGitHub {
     owner = "sebadob";
     repo = "rauthy";
     tag = "v${version}";
-    hash = "sha256-ZYugnemiZpa8gmXCRgZc/9att/vUribC1+vpS7vhgl8=";
+    hash = "sha256-6Ddf8ukwEecxBp9hMbWS4odxrRGB/uIXWdTbIU3MAUM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src pname version;
-    hash = "sha256-ixl4mlQJw8Gr7Rrnm8B2Iz8xI7IAne8OR9Dri0k3kqY=";
+    hash = "sha256-fXe4bQRLscUk7fdAQGwzwBVJIRs8+puWfTeAjby1MmE=";
   };
 
   # Wasm modules are needed to build the frontend and are part of the main Rust repo.

From 0363fb9c786bbc4c59e33b3d64c5d253651f551f Mon Sep 17 00:00:00 2001
From: aoli-al <aoli.al@hotmail.com>
Date: Fri, 2 Jan 2026 13:19:57 -0500
Subject: [PATCH 219/235] jetbrains.jdk-no-jcef-17: drop

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 .../compilers/jetbrains-jdk/17.nix            | 186 ------------------
 pkgs/top-level/all-packages.nix               |   6 +-
 2 files changed, 3 insertions(+), 189 deletions(-)
 delete mode 100644 pkgs/development/compilers/jetbrains-jdk/17.nix

diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix
deleted file mode 100644
index f95d35e8eb43..000000000000
--- a/pkgs/development/compilers/jetbrains-jdk/17.nix
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  jetbrains,
-  openjdk17,
-  openjdk17-bootstrap,
-  git,
-  autoconf,
-  unzip,
-  rsync,
-  debugBuild ? false,
-  withJcef ? true,
-
-  libXdamage,
-  libXxf86vm,
-  libXrandr,
-  libXi,
-  libXcursor,
-  libXrender,
-  libX11,
-  libXext,
-  libxcb,
-  nss,
-  nspr,
-  libdrm,
-  libgbm,
-  wayland,
-  udev,
-  fontconfig,
-}:
-
-assert debugBuild -> withJcef;
-
-let
-  arch =
-    {
-      "aarch64-linux" = "aarch64";
-      "x86_64-linux" = "x64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-  cpu = stdenv.hostPlatform.parsed.cpu.name;
-in
-openjdk17.overrideAttrs (oldAttrs: rec {
-  pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
-  javaVersion = "17.0.15";
-  build = "1381";
-  # To get the new tag:
-  # git clone https://github.com/jetbrains/jetbrainsruntime
-  # cd jetbrainsruntime
-  # git tag --points-at [revision]
-  # Look for the line that starts with jbr-
-  openjdkTag = "jbr-17.0.15+6";
-  version = "${javaVersion}-b${build}";
-
-  src = fetchFromGitHub {
-    owner = "JetBrains";
-    repo = "JetBrainsRuntime";
-    rev = "jb${version}";
-    hash = "sha256-Ckv2SNugHK75Af+ZzI91+QodOHIa5TMcjVQYsO45mQo=";
-  };
-
-  env = (oldAttrs.env or { }) // {
-    BOOT_JDK = openjdk17-bootstrap.home;
-    # run `git log -1 --pretty=%ct` in jdk repo for new value on update
-    SOURCE_DATE_EPOCH = 1745907200;
-  };
-
-  patches = [ ];
-
-  dontConfigure = true;
-
-  buildPhase = ''
-    runHook preBuild
-
-    ${lib.optionalString withJcef "cp -r ${jetbrains.jcef} jcef_linux_${arch}"}
-
-    sed \
-        -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \
-        -e "s/SOURCE_DATE_EPOCH=.*//" \
-        -e "s/export SOURCE_DATE_EPOCH//" \
-        -i jb/project/tools/common/scripts/common.sh
-    substituteInPlace jb/project/tools/linux/scripts/mkimages_${arch}.sh --replace-fail "STATIC_CONF_ARGS" "STATIC_CONF_ARGS ''${configureFlags[*]}"
-    sed \
-        -e "s/create_image_bundle \"jb/#/" \
-        -e "s/echo Creating /exit 0 #/" \
-        -i jb/project/tools/linux/scripts/mkimages_${arch}.sh
-
-    patchShebangs .
-    ./jb/project/tools/linux/scripts/mkimages_${arch}.sh -w ${build} ${
-      if debugBuild then "fd" else (if withJcef then "jcef" else "nomod")
-    }
-
-    runHook postBuild
-  '';
-
-  installPhase =
-    let
-      buildType = if debugBuild then "fastdebug" else "release";
-      debugSuffix = if debugBuild then "-fastdebug" else "";
-      jcefSuffix = if debugBuild || !withJcef then "" else "_jcef";
-      jbrsdkDir = "jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build}";
-    in
-    ''
-      runHook preInstall
-
-      mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir}
-      rm -rf build/linux-${cpu}-server-${buildType}/images/jdk
-      mv build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} build/linux-${cpu}-server-${buildType}/images/jdk
-    ''
-    + oldAttrs.installPhase
-    + "runHook postInstall";
-
-  postInstall = lib.optionalString withJcef ''
-    chmod +x $out/lib/openjdk/lib/chrome-sandbox
-  '';
-
-  dontStrip = debugBuild;
-
-  postFixup = ''
-    # Build the set of output library directories to rpath against
-    LIBDIRS="${
-      lib.makeLibraryPath [
-        libXdamage
-        libXxf86vm
-        libXrandr
-        libXi
-        libXcursor
-        libXrender
-        libX11
-        libXext
-        libxcb
-        nss
-        nspr
-        libdrm
-        libgbm
-        wayland
-        udev
-        fontconfig
-      ]
-    }"
-    for output in ${lib.concatStringsSep " " oldAttrs.outputs}; do
-      if [ "$output" = debug ]; then continue; fi
-      LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
-    done
-    # Add the local library paths to remove dependencies on the bootstrap
-    for output in ${lib.concatStringsSep " " oldAttrs.outputs}; do
-      if [ "$output" = debug ]; then continue; fi
-      OUTPUTDIR=$(eval echo \$$output)
-      BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-      echo "$BINLIBS" | while read i; do
-        patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-      done
-    done
-  '';
-
-  nativeBuildInputs = [
-    git
-    autoconf
-    unzip
-    rsync
-  ]
-  ++ oldAttrs.nativeBuildInputs;
-
-  meta = {
-    description = "OpenJDK fork which better supports Jetbrains's products";
-    longDescription = ''
-      JetBrains Runtime is a runtime environment for running IntelliJ Platform
-      based products on Windows, Mac OS X, and Linux. JetBrains Runtime is
-      based on OpenJDK project with some modifications. These modifications
-      include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI
-      support, ligatures, some fixes for native crashes not presented in
-      official build, and other small enhancements.
-      JetBrains Runtime is not a certified build of OpenJDK. Please, use at
-      your own risk.
-    '';
-    homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
-    inherit (openjdk17.meta) license platforms mainProgram;
-
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-
-  passthru = oldAttrs.passthru // {
-    home = "${jetbrains.jdk}/lib/openjdk";
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1d1a5cc8623..2e945fca174d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10483,9 +10483,6 @@ with pkgs;
         jdk = jdk21;
         withJcef = false;
       };
-      jdk-no-jcef-17 = callPackage ../development/compilers/jetbrains-jdk/17.nix {
-        withJcef = false;
-      };
       jdk = callPackage ../development/compilers/jetbrains-jdk {
         jdk = jdk21;
       };
@@ -10493,6 +10490,9 @@ with pkgs;
         jdk = jdk21;
       };
     }
+    // lib.optionalAttrs config.allowAliases {
+      jdk-no-jcef-17 = throw "'jdk-no-jcef-17' has been removed because it is unused in nixpkgs."; # Added 2026-01-24
+    }
   );
 
   librespot = callPackage ../applications/audio/librespot {

From e39a870f7099a1a6b0169e514dd79aaa9a557afd Mon Sep 17 00:00:00 2001
From: Saad Nadeem <saad29nadeem@gmail.com>
Date: Sun, 25 Jan 2026 16:03:23 -0500
Subject: [PATCH 220/235] maintainers: bridgesense -> saadndm

---
 maintainers/maintainer-list.nix                      | 12 ++++++------
 .../vim/plugins/non-generated/fff-nvim/default.nix   |  2 +-
 pkgs/by-name/im/impala/package.nix                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9d5e2e3db0cc..6d98657730b8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3931,12 +3931,6 @@
     githubId = 15181236;
     keys = [ { fingerprint = "AE1E 3B80 7727 C974 B972  AB3C C324 01C3 BF52 1179"; } ];
   };
-  bridgesense = {
-    name = "Saad Nadeem";
-    email = "saad29nadeem@gmail.com";
-    github = "BridgeSenseDev";
-    githubId = 88615188;
-  };
   britter = {
     name = "Benedikt Ritter";
     email = "beneritter@gmail.com";
@@ -23269,6 +23263,12 @@
     github = "s1341";
     githubId = 5682183;
   };
+  saadndm = {
+    name = "Saad Nadeem";
+    email = "saad29nadeem@gmail.com";
+    github = "saadndm";
+    githubId = 88615188;
+  };
   sagikazarmark = {
     name = "Mark Sagi-Kazar";
     email = "mark.sagikazar@gmail.com";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index a05e2e6fa284..bdce756a7ae0 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -74,7 +74,7 @@ vimUtils.buildVimPlugin {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       GaetanLepage
-      bridgesense
+      saadndm
     ];
   };
 }
diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix
index f0a18fc5299c..68796e26cc18 100644
--- a/pkgs/by-name/im/impala/package.nix
+++ b/pkgs/by-name/im/impala/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       nydragon
-      bridgesense
+      saadndm
     ];
     mainProgram = "impala";
   };

From 6df4aaa8b075033cbad1781ebf371cf64acc5e18 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 26 Dec 2025 23:50:51 +0200
Subject: [PATCH 221/235] dillo: remove top level override

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

diff --git a/pkgs/by-name/di/dillo/package.nix b/pkgs/by-name/di/dillo/package.nix
index 53b234f354ca..e27b1d54e3a6 100644
--- a/pkgs/by-name/di/dillo/package.nix
+++ b/pkgs/by-name/di/dillo/package.nix
@@ -2,7 +2,7 @@
   lib,
   autoreconfHook,
   fetchFromGitHub,
-  fltk,
+  fltk_1_3,
   libjpeg,
   libpng,
   libwebp,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    fltk
+    fltk_1_3
     which
   ];
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libwebp
     ssl
-    fltk
+    fltk_1_3
   ];
 
   outputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36badce13194..d14ff23b43a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13514,10 +13514,6 @@ with pkgs;
 
   yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { });
 
-  dillo = callPackage ../by-name/di/dillo/package.nix {
-    fltk = fltk_1_3;
-  };
-
   libpostalWithData = callPackage ../by-name/li/libpostal/package.nix {
     withData = true;
   };

From c156640f8816aa3f4ce6a4791cb60392a04b7098 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 26 Dec 2025 23:51:39 +0200
Subject: [PATCH 222/235] djv: remove top-level override

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

diff --git a/pkgs/by-name/dj/djv/package.nix b/pkgs/by-name/dj/djv/package.nix
index 2a861f28d7c8..e7f2da7adcc9 100644
--- a/pkgs/by-name/dj/djv/package.nix
+++ b/pkgs/by-name/dj/djv/package.nix
@@ -19,7 +19,7 @@
   nativefiledialog-extended,
   nlohmann_json,
   opencolorio,
-  openexr,
+  openexr_2,
   openssl,
   opentimelineio,
   plutovg,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     nativefiledialog-extended
     nlohmann_json
     opencolorio
-    openexr
+    openexr_2
     openssl
     opentimelineio
     plutovg
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d14ff23b43a1..e3863b54437a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10112,8 +10112,6 @@ with pkgs;
 
   inherit (callPackage ../development/tools/devpod { }) devpod devpod-desktop;
 
-  djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
-
   djview4 = djview;
 
   dmenu-rs-enable-plugins = dmenu-rs.override { enablePlugins = true; };

From d346c4ef8df3ea939ec123a056ec403971d17d33 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 26 Dec 2025 23:52:37 +0200
Subject: [PATCH 223/235] dwl: remove top-level override

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

diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix
index f5e52b90cbf2..ae12368f19e1 100644
--- a/pkgs/by-name/dw/dwl/package.nix
+++ b/pkgs/by-name/dw/dwl/package.nix
@@ -14,7 +14,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  wlroots,
+  wlroots_0_18,
   writeText,
   xcbutilwm,
   xwayland,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     pixman
     wayland
     wayland-protocols
-    wlroots
+    wlroots_0_18
   ]
   ++ lib.optionals enableXWayland [
     libX11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3863b54437a..82f81beedc87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10144,10 +10144,6 @@ with pkgs;
 
   droopy = python3Packages.callPackage ../applications/networking/droopy { };
 
-  dwl = callPackage ../by-name/dw/dwl/package.nix {
-    wlroots = wlroots_0_18;
-  };
-
   evilwm = callPackage ../applications/window-managers/evilwm {
     patches = config.evilwm.patches or [ ];
   };

From d739b1766acf93670a460159fff2752f3df2be82 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 26 Dec 2025 23:53:23 +0200
Subject: [PATCH 224/235] eff: remove top-level override

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

diff --git a/pkgs/by-name/ef/eff/package.nix b/pkgs/by-name/ef/eff/package.nix
index 88e4fa3e418a..a199255cc3b5 100644
--- a/pkgs/by-name/ef/eff/package.nix
+++ b/pkgs/by-name/ef/eff/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
   fetchFromGitHub,
-  ocamlPackages,
+  ocaml-ng,
 }:
 
 let
-  inherit (ocamlPackages) buildDunePackage js_of_ocaml menhir;
+  inherit (ocaml-ng.ocamlPackages_5_2) buildDunePackage js_of_ocaml menhir;
 in
 
 buildDunePackage rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82f81beedc87..9010c50c7b71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -351,8 +351,6 @@ with pkgs;
     catch2 = catch2_3;
   };
 
-  eff = callPackage ../by-name/ef/eff/package.nix { ocamlPackages = ocaml-ng.ocamlPackages_5_2; };
-
   enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { };
 
   inherit (gridlock) nyarr;

From 5589e9dfab76d84e592d6b2fe53e708c84a63267 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 26 Dec 2025 23:54:11 +0200
Subject: [PATCH 225/235] eudev: remove top-level override

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

diff --git a/pkgs/by-name/eu/eudev/package.nix b/pkgs/by-name/eu/eudev/package.nix
index 60c4f73ea8b6..c28c7a9676fa 100644
--- a/pkgs/by-name/eu/eudev/package.nix
+++ b/pkgs/by-name/eu/eudev/package.nix
@@ -6,7 +6,7 @@
   gperf,
   kmod,
   pkg-config,
-  util-linux,
+  util-linuxMinimal,
   testers,
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     kmod
-    util-linux
+    util-linuxMinimal
   ];
 
   configureFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9010c50c7b71..70ccf79c0a4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9680,10 +9680,6 @@ with pkgs;
     ubootWandboard
     ;
 
-  eudev = callPackage ../by-name/eu/eudev/package.nix {
-    util-linux = util-linuxMinimal;
-  };
-
   usbrelay = callPackage ../os-specific/linux/usbrelay { };
   usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };
 

From 65c67c3fc23af151ecb7207a91fbf60d1848ebec Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 26 Dec 2025 23:55:11 +0200
Subject: [PATCH 226/235] firezone-server: remove top-level override

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

diff --git a/pkgs/by-name/fi/firezone-server/package.nix b/pkgs/by-name/fi/firezone-server/package.nix
index f2d302a66f61..5b1014691275 100644
--- a/pkgs/by-name/fi/firezone-server/package.nix
+++ b/pkgs/by-name/fi/firezone-server/package.nix
@@ -2,7 +2,7 @@
   lib,
   nixosTests,
   fetchFromGitHub,
-  beamPackages,
+  beam27Packages,
   gitMinimal,
   pnpm_9,
   fetchPnpmDeps,
@@ -13,7 +13,7 @@
 
   mixReleaseName ? "domain", # "domain" "web" or "api"
 }:
-beamPackages.mixRelease rec {
+beam27Packages.mixRelease rec {
   pname = "firezone-server-${mixReleaseName}";
   version = "0-unstable-2025-08-31";
 
@@ -69,7 +69,7 @@ beamPackages.mixRelease rec {
 
   inherit mixReleaseName;
 
-  mixFodDeps = beamPackages.fetchMixDeps {
+  mixFodDeps = beam27Packages.fetchMixDeps {
     pname = "mix-deps-${pname}-${version}";
     inherit src version;
     hash = "sha256-h3l7HK9dxNmkHWfJyCOCXmCvFOK+mZtmszhRv0zxqoo=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70ccf79c0a4a..cd2c7d907ec4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2478,10 +2478,6 @@ with pkgs;
 
   fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { };
 
-  firezone-server = callPackage ../by-name/fi/firezone-server/package.nix {
-    beamPackages = beam27Packages;
-  };
-
   flannel = callPackage ../tools/networking/flannel { };
   cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix { };
 

From f44cfd1f47ebf14ad0fafc8759d816a642905368 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:01:34 +0200
Subject: [PATCH 227/235] g-wrap: remove top-level override

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

diff --git a/pkgs/by-name/g-/g-wrap/package.nix b/pkgs/by-name/g-/g-wrap/package.nix
index f31445c28561..2c410bd7c602 100644
--- a/pkgs/by-name/g-/g-wrap/package.nix
+++ b/pkgs/by-name/g-/g-wrap/package.nix
@@ -2,7 +2,7 @@
   fetchurl,
   lib,
   stdenv,
-  guile,
+  guile_2_2,
   guile-lib,
   libffi,
   pkg-config,
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   # Note: Glib support is optional, but it's quite useful (e.g., it's used by
   # Guile-GNOME).
   buildInputs = [
-    guile
+    guile_2_2
     glib
     guile-lib
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd2c7d907ec4..4a1bdcee0f0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6102,9 +6102,6 @@ with pkgs;
   griffe = with python3Packages; toPythonApplication griffe;
 
   gwrap = g-wrap;
-  g-wrap = callPackage ../by-name/g-/g-wrap/package.nix {
-    guile = guile_2_2;
-  };
 
   hadolint =
     # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013

From b19e26917ad387e9a099d72bf6f6ef53cb0199d1 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:04:04 +0200
Subject: [PATCH 228/235] gwrap: remove alias

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 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 5a0a032508a3..117509bec4f1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -816,6 +816,7 @@ mapAliases {
   guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27
   guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25
   gutenprintBin = gutenprint-bin; # Added 2025-08-21
+  gwrap = warnAlias "The 'gwrap' alias has been removed. The correct name of the package is 'g-wrap'" g-wrap; # Added 2026-01-25
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
   hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # Added 2025-09-26
   harmony-music = throw "harmony-music 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 4a1bdcee0f0a..b48374fd69e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6101,8 +6101,6 @@ with pkgs;
 
   griffe = with python3Packages; toPythonApplication griffe;
 
-  gwrap = g-wrap;
-
   hadolint =
     # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
     (

From 79b2a77cbd6f97a958853d57a3f3777e2cc1b790 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Jan 2026 02:34:14 +0000
Subject: [PATCH 229/235] python3Packages.pytorch-tokenizers: 1.0.1 -> 1.1.0

---
 .../python-modules/pytorch-tokenizers/default.nix    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch-tokenizers/default.nix b/pkgs/development/python-modules/pytorch-tokenizers/default.nix
index 10f2835577f5..d1b0774d525a 100644
--- a/pkgs/development/python-modules/pytorch-tokenizers/default.nix
+++ b/pkgs/development/python-modules/pytorch-tokenizers/default.nix
@@ -20,7 +20,7 @@
 }:
 
 let
-  # https://github.com/meta-pytorch/tokenizers/blob/v1.0.1/CMakeLists.txt#L174-L175
+  # https://github.com/meta-pytorch/tokenizers/blob/v<VERSION>/CMakeLists.txt#L174-L175
   pybind11-src = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11";
@@ -28,17 +28,17 @@ let
     hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU=";
   };
 in
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pytorch-tokenizers";
-  version = "1.0.1";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "meta-pytorch";
     repo = "tokenizers";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-1BGazimbauNBN/VfLiuhk21VEhbP07GEpPc+GAfKTQY=";
+    hash = "sha256-la1PH8KT6iWYjvwBNYcQu5KwRS1/6H7SX5Vu6bpD+vg=";
   };
 
   patches = [
@@ -93,4 +93,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})

From 702119d8d508147bd7659070da05bb3e6a9968c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 21:40:03 +0000
Subject: [PATCH 230/235] python3Packages.pyezvizapi: 1.0.4.4 -> 1.0.4.5

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

diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix
index 87642de5b210..d09289013d3c 100644
--- a/pkgs/development/python-modules/pyezvizapi/default.nix
+++ b/pkgs/development/python-modules/pyezvizapi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyezvizapi";
-  version = "1.0.4.4";
+  version = "1.0.4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RenierM26";
     repo = "pyEzvizApi";
     tag = version;
-    hash = "sha256-ReGGyB7qxiBK5zNQJP2oCzTF3IeQDu1ljM5IF7vZcXk=";
+    hash = "sha256-mzEZQmdhS/vJTFMgDSLaLqKos0ui2pFkcSToy5B8yrw=";
   };
 
   build-system = [ setuptools ];

From c617bd0cd5c23fca6593b8cefa84c10ae77946a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 21:59:55 +0000
Subject: [PATCH 231/235] nom: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index 4fc5cdddd8d7..943440d62055 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "nom";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "guyfedwards";
     repo = "nom";
     tag = "v${version}";
-    hash = "sha256-u+DS79ByO1XL0hGnK8PbeMIO6aU+wkhYaLWspXvEgwQ=";
+    hash = "sha256-4TZLMSqp6ZoDcRAnpABztBQ85sVkPWVsJtd9zOWtCTQ=";
   };
 
   vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";

From dfb0b8256ccfccd8282959bb916b7bba005fe74e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jan 2026 22:09:48 +0000
Subject: [PATCH 232/235] flashmq: 1.24.0 -> 1.25.0

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

diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix
index d89164cde733..eb0eff1239e4 100644
--- a/pkgs/by-name/fl/flashmq/package.nix
+++ b/pkgs/by-name/fl/flashmq/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flashmq";
-  version = "1.24.0";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "halfgaar";
     repo = "FlashMQ";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aDIUTJVDo00qyAsNuXDptHehngwHm9AkPGgwiRRND/E=";
+    hash = "sha256-+74nTluVpEfbK1pfWnJR5uv51HPkNbwzXUkHb5NeWn8=";
   };
 
   nativeBuildInputs = [

From 516c699fdb6e4e05d5744d2805d54f4ad6883713 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sun, 25 Jan 2026 23:12:42 +0100
Subject: [PATCH 233/235] phpPackages.grumphp: 2.17.0 -> 2.18.0

---
 pkgs/development/php-packages/grumphp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix
index 622996584858..9413e46f1f1b 100644
--- a/pkgs/development/php-packages/grumphp/default.nix
+++ b/pkgs/development/php-packages/grumphp/default.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "grumphp";
-  version = "2.17.0";
+  version = "2.18.0";
 
   src = fetchFromGitHub {
     owner = "phpro";
     repo = "grumphp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g2V2clNI0+KzKAPStq1vJZ3gHpBV1EbduWBmzRnuzv8=";
+    hash = "sha256-JNpgIba+Y3qURegZFNeBKwigynSVzSfaAxM2RwcILMc=";
   };
 
-  vendorHash = "sha256-lgXDxfBTCtGlrDzi+leeE8J8VIsaKpwyB1CUTUvdpMg=";
+  vendorHash = "sha256-Abi+NIXqD8HVTI1OVimeYmzybKXGGNA+l2MHUkx7CpQ=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 71aa97971acf451599ed56f0107eca5547934201 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sun, 25 Jan 2026 23:25:48 +0100
Subject: [PATCH 234/235] phpPackages.phing: 3.1.0 -> 3.1.1

---
 pkgs/development/php-packages/phing/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix
index ea2f2337ea47..f35900674f5f 100644
--- a/pkgs/development/php-packages/phing/default.nix
+++ b/pkgs/development/php-packages/phing/default.nix
@@ -8,16 +8,16 @@
 (php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject2
   (finalAttrs: {
     pname = "phing";
-    version = "3.1.0";
+    version = "3.1.1";
 
     # Upstream no longer provides the composer.lock in their release artifact
     src = fetchgit {
       url = "https://github.com/phingofficial/phing";
       tag = finalAttrs.version;
-      hash = "sha256-gY6ocmkd7eJIMaBrewfxYL7gTr+1qNHTkuAp+w9ApUU=";
+      hash = "sha256-2v16ojUDIECLfwWy8/Rbp1A6LlAXnjr4/dJLh6oog8w=";
     };
 
-    vendorHash = "sha256-yfGfMAQGlXnCoww4rtynknL7qDjcQFEM8p8FbsIqJZU=";
+    vendorHash = "sha256-dBk4/Mz2jh7Bq9VfdfvnWqSufbeAeVdC85zAnXVFQNA=";
 
     nativeInstallCheckInputs = [
       versionCheckHook

From 71c9b3ff5d46b798f6001e3bdb378cecb7d7fc76 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sun, 25 Jan 2026 23:45:44 +0100
Subject: [PATCH 235/235] phpPackages.castor: 0.27.0 -> 1.1.0

---
 pkgs/development/php-packages/castor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix
index a17d6d8ae923..a78d09c341e6 100644
--- a/pkgs/development/php-packages/castor/default.nix
+++ b/pkgs/development/php-packages/castor/default.nix
@@ -9,16 +9,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "castor";
-  version = "0.27.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "jolicode";
     repo = "castor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ot4akuKhNtEXukiDSy69q75phx6EvkJsL0XHAN+el+M=";
+    hash = "sha256-HgFFy/qEN7fPCFqDJe1SLMpDWB04YPI6OPYaURqjyKQ=";
   };
 
-  vendorHash = "sha256-fLx4uLS9708IFKnBus3R7nt6V/BCsZZflYEhwzUkXzc=";
+  vendorHash = "sha256-RBN99M5YFee8FZURn4lVuscrCmajMNn+10KgwqgPk8k=";
 
   nativeBuildInputs = [ installShellFiles ];