From d7499910842a5cf097b4d868ddffe9c0ea5656f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Dec 2025 00:38:54 +0000
Subject: [PATCH 001/167] pythia: 8.315 -> 8.316

---
 pkgs/development/libraries/physics/pythia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
index 36a9d866d4f1..c71c0165160b 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pythia";
-  version = "8.315";
+  version = "8.316";
 
   src = fetchurl {
     url = "https://pythia.org/download/pythia83/pythia${
       builtins.replaceStrings [ "." ] [ "" ] version
     }.tgz";
-    sha256 = "sha256-Sy/nNB4z6QtyJv3Koqe/kyeYezNU6EwE8f2SVoY2kK4=";
+    sha256 = "sha256-HZkwGq/WiWtXQ17dc4UOU/No8AIaZHsSzyVYTXcxNIk=";
   };
 
   nativeBuildInputs = [ rsync ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];

From 07898187007997134bac73e75fcf07fb6b5b5c3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 31 Dec 2025 10:48:45 +0000
Subject: [PATCH 002/167] simplescreenrecorder: 0.4.4-unstable-2025-06-14 ->
 0.4.4-unstable-2025-12-28

---
 pkgs/applications/video/simplescreenrecorder/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 0577ef00d9df..c50603dc3355 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation {
   pname = "simplescreenrecorder";
-  version = "0.4.4-unstable-2025-06-14";
+  version = "0.4.4-unstable-2025-12-28";
 
   src = fetchFromGitHub {
     owner = "MaartenBaert";
     repo = "ssr";
-    rev = "232eac75c56821b4baf025b7dfd7ce737e73f420";
-    hash = "sha256-0PLAHfVIFSv196dcQ83CCvYoKkJFcKKnKB8vISoprCk=";
+    rev = "d790385b49de937976165d6feb39414c75ad6a3d";
+    hash = "sha256-QfFK43iwtwZvTRbxNXiphcsxhn/ofllGX993XppiRBw=";
   };
 
   cmakeFlags = [

From e2236b4d154de715e607d115fc59a514608aa3a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 31 Dec 2025 12:31:24 +0000
Subject: [PATCH 003/167] chsrc: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix
index f43c48e79fed..827c81503267 100644
--- a/pkgs/by-name/ch/chsrc/package.nix
+++ b/pkgs/by-name/ch/chsrc/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chsrc";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "RubyMetric";
     repo = "chsrc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AgyaaKPCyqivCMd6VrV1Fiu6D/bvgW/faztVByjghiQ=";
+    hash = "sha256-DPX6CeFaN9dMRz8NzJs/7v9Orgh6+MV2xmOLdtDqEtI=";
   };
 
   nativeBuildInputs = [ texinfo ];

From c00149d10160344027c9c75425323f04270710b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jan 2026 23:10:08 +0000
Subject: [PATCH 004/167] dput-ng: 1.43 -> 1.44

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

diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix
index d6f42da04d48..7caf42e88a6a 100644
--- a/pkgs/by-name/dp/dput-ng/package.nix
+++ b/pkgs/by-name/dp/dput-ng/package.nix
@@ -5,7 +5,7 @@
   nix-update-script,
 }:
 let
-  version = "1.43";
+  version = "1.44";
 in
 python3.pkgs.buildPythonApplication {
   pname = "dput-ng";
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication {
     owner = "debian";
     repo = "dput-ng";
     tag = "debian/${version}";
-    hash = "sha256-zrH4h4C4y3oTiOXsidFv/rIJNzCdV2lqzNEg0SOkX4w=";
+    hash = "sha256-3MdxyTRnoK5SUJzY5DTzfOiurcbtxujhiNpMABNLxgY=";
   };
 
   postPatch = ''

From 93dc53d1294f2147e6f9f7a2ca4aef5cb6a6e88c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Jan 2026 06:11:29 +0000
Subject: [PATCH 005/167] gf: 0-unstable-2025-12-25 -> 0-unstable-2025-12-31

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

diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix
index 78f7413b4148..620bc0e4d4ca 100644
--- a/pkgs/by-name/gf/gf/package.nix
+++ b/pkgs/by-name/gf/gf/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation {
   pname = "gf";
-  version = "0-unstable-2025-12-25";
+  version = "0-unstable-2025-12-31";
 
   src = fetchFromGitHub {
     repo = "gf";
     owner = "nakst";
-    rev = "a8c0fb67756c043d63832c008e3ad12132b121cb";
-    hash = "sha256-OJE51lVkHWAgo7u/SX46s3pzQBeMW3zViiXJnB86bpo=";
+    rev = "9a5dbcc90dc9ca9580f6ce2854cd67e2e507b0c1";
+    hash = "sha256-+1ERc7mQCwaov+NdL1cdIZeDtHr4wkuLHaSdR8w5u40=";
   };
 
   nativeBuildInputs = [

From e541ef7d950abfdb3f4ceb8185af307f5e598b32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 00:47:48 +0000
Subject: [PATCH 006/167] featherpad: 1.6.2 -> 1.6.3

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

diff --git a/pkgs/by-name/fe/featherpad/package.nix b/pkgs/by-name/fe/featherpad/package.nix
index 08b23e25ee54..58b30ae6fde4 100644
--- a/pkgs/by-name/fe/featherpad/package.nix
+++ b/pkgs/by-name/fe/featherpad/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "featherpad";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "FeatherPad";
     tag = "V${finalAttrs.version}";
-    hash = "sha256-G47ltOiyNEk/NrFWoXpft/rCJ18t0FTZrc5ReEJL6TU=";
+    hash = "sha256-h/Opw4PmIEZdIx+gXoXriA0h1YxyImiZJFFPr1KUo/A=";
   };
 
   nativeBuildInputs = [

From afb5c80b95be01cfe4516bb6f50fd398d9a2fcbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 00:27:45 +0000
Subject: [PATCH 007/167] bazarr: 1.5.3 -> 1.5.4

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

diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix
index 4d152125e41e..4af06fa098f1 100644
--- a/pkgs/by-name/ba/bazarr/package.nix
+++ b/pkgs/by-name/ba/bazarr/package.nix
@@ -17,11 +17,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "bazarr";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchzip {
     url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
-    hash = "sha256-2JzsGnGgrkD5G0ZmrphkPZTnak3gdkHloXRKA+p9Y/0=";
+    hash = "sha256-NHfEhatHs03DdiyMwpZdJwi55NBHoaPXMmhkq+D1bqE=";
     stripRoot = false;
   };
 

From 3a40d71b773c4f19a3d248ef492bf3294542632b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 00:30:12 +0000
Subject: [PATCH 008/167] tarlz: 0.28.1 -> 0.29

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

diff --git a/pkgs/by-name/ta/tarlz/package.nix b/pkgs/by-name/ta/tarlz/package.nix
index 6aa7e151360d..7a57e5ad6226 100644
--- a/pkgs/by-name/ta/tarlz/package.nix
+++ b/pkgs/by-name/ta/tarlz/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tarlz";
-  version = "0.28.1";
+  version = "0.29";
   outputs = [
     "out"
     "man"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://savannah/lzip/tarlz/tarlz-${finalAttrs.version}.tar.lz";
-    sha256 = "sha256-qzySt/fxDJU5vHvmkfumSK8h1MieVdgexm12H43Ytak=";
+    sha256 = "sha256-fhJ/HhsbYspuNBf94y864EgbpYhvVqhVOiFbGdgcbBk=";
   };
 
   enableParallelBuilding = true;

From 29dff3f11a8e006d16d0bd471b69ff64bfbc6c78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 10:07:43 +0000
Subject: [PATCH 009/167] lbreakouthd: 1.2 -> 1.2.1

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

diff --git a/pkgs/by-name/lb/lbreakouthd/package.nix b/pkgs/by-name/lb/lbreakouthd/package.nix
index 501f0d3fa149..22a21f2d817e 100644
--- a/pkgs/by-name/lb/lbreakouthd/package.nix
+++ b/pkgs/by-name/lb/lbreakouthd/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lbreakouthd";
-  version = "1.2";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ZEy/b2ZWAZvDNbAu/FnpsPo8WsvSGADbdaSXU/gpdBk=";
+    hash = "sha256-c/TZVeOT+w1ML0R5jThVZ8/amvyMYkWsSE6vSrRFjvM=";
   };
 
   # On macOS with a case-insensitive filesystem, "sdl.h" shadows <SDL.h>

From 1cfc666dae0c205179b42acffcbc202527bc7d40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 23:47:31 +0000
Subject: [PATCH 010/167] freeplane: 1.12.14 -> 1.12.16

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

diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix
index 2d91ae81ebf1..134495debe72 100644
--- a/pkgs/by-name/fr/freeplane/package.nix
+++ b/pkgs/by-name/fr/freeplane/package.nix
@@ -12,7 +12,7 @@
 
 let
   pname = "freeplane";
-  version = "1.12.14";
+  version = "1.12.16";
 
   jdk = jdk17;
   gradle = gradle_9;
@@ -21,7 +21,7 @@ let
     owner = "freeplane";
     repo = "freeplane";
     rev = "release-${version}";
-    hash = "sha256-hoQFtxJ5FghvSKSOzcf1Yt8H948Ij/r+MKifvnkUjvA=";
+    hash = "sha256-I7vp67UXoiBDxmIOlgCWk6sKOZSWHHI7A2Sdu6cl488=";
   };
 
 in

From cea58b73e4e1c03d201c7342b84ad01f3ab8f120 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 09:44:29 +0000
Subject: [PATCH 011/167] squawk: 2.34.0 -> 2.37.0

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

diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix
index dfce63c666fb..559abfc9af7a 100644
--- a/pkgs/by-name/sq/squawk/package.nix
+++ b/pkgs/by-name/sq/squawk/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "squawk";
-  version = "2.34.0";
+  version = "2.37.0";
 
   src = fetchFromGitHub {
     owner = "sbdchd";
     repo = "squawk";
     tag = "v${version}";
-    hash = "sha256-SdCtZ+A4MuHhTrL5v65uDb47FeIBaGweHRXhD9crx2k=";
+    hash = "sha256-+7cIymENIjF2fVD+qAblY4+dkENYiaTnDhCc/VuuAIk=";
   };
 
-  cargoHash = "sha256-r12pNc7C4mNYzIaE/99jrWBQ/YPqR30k90TFx1hBGR4=";
+  cargoHash = "sha256-2CJkwkC8/BgaYi994WoLtsykdTH5ZAyH0CpbvDTZ1GA=";
 
   nativeBuildInputs = [
     pkg-config

From 3a0500fb08ccfd6dcfa51d002279219829fb57bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 Jan 2026 05:02:13 +0000
Subject: [PATCH 012/167] mpd-discord-rpc: 1.9.0 -> 1.11.0

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

diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
index dade0e9059a7..d8d39043bb7b 100644
--- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix
+++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mpd-discord-rpc";
-  version = "1.9.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "mpd-discord-rpc";
     rev = "v${version}";
-    hash = "sha256-Aqxh6dVZI59FGFtuyC5KcuaEr2OZL/A4UHSpnthR0Uk=";
+    hash = "sha256-vP6d5HxlfLSIobWm7h34ttHjzpx+UZKE6Iyj9QfTRl0=";
   };
 
-  cargoHash = "sha256-L4hQ1NAzddiPv6DxY8mcMQ6GlRdhIr+LeY9TtFbx3Mw=";
+  cargoHash = "sha256-Pw/Y3STSzOtgWYu1OnmdV2Ybxl1WuIwqfGKbmRruR7w=";
 
   nativeBuildInputs = [
     pkg-config

From 5d6df0628aaf3a5d95b2c4a76daf8de74b3dcd65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 Jan 2026 13:13:45 +0000
Subject: [PATCH 013/167] sbt-with-scala-native: 1.12.0 -> 1.12.1

---
 pkgs/development/tools/build-managers/sbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 32169198b91e..8fa5fbc30eeb 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sbt";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchurl {
     url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
-    hash = "sha256-5K3j9L2+HnRFvprPAssbNXS+tGA2LhcofiRrfq+buVI=";
+    hash = "sha256-7wQT39wXegcZ75scsYQemdQa8pyYd89gHx5naVFCw+k=";
   };
 
   postPatch = ''

From dec92d4a08c991873f0607e654c8641d1c0fcc04 Mon Sep 17 00:00:00 2001
From: William Fish <william.michael.fish@gmail.com>
Date: Tue, 27 Jan 2026 16:53:09 +0000
Subject: [PATCH 014/167] maintainers: add willfish

---
 maintainers/maintainer-list.nix     | 5 +++++
 pkgs/by-name/va/variety/package.nix | 1 +
 2 files changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 35856528656f..f12146861833 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28297,6 +28297,11 @@
     githubId = 5185341;
     name = "Will Cohen";
   };
+  willfish = {
+    github = "willfish";
+    githubId = 8156884;
+    name = "William Fish";
+  };
   willibutz = {
     email = "willibutz@posteo.de";
     github = "WilliButz";
diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix
index d90041e44381..2b67481ff302 100644
--- a/pkgs/by-name/va/variety/package.nix
+++ b/pkgs/by-name/va/variety/package.nix
@@ -110,6 +110,7 @@ python3Packages.buildPythonApplication rec {
     maintainers = with lib.maintainers; [
       p3psi
       zfnmxt
+      willfish
     ];
   };
 }

From 62ae2975872467a8551cb41e591e8a9f9260ab77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 Jan 2026 10:04:49 +0000
Subject: [PATCH 015/167] apacheHttpdPackages.mod_python: 3.5.0.5 -> 3.5.0.7

---
 pkgs/servers/http/apache-modules/mod_python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index 87b328df0517..94ac67648bb9 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mod_python";
-  version = "3.5.0.5";
+  version = "3.5.0.7";
 
   src = fetchFromGitHub {
     owner = "grisha";
     repo = "mod_python";
     tag = finalAttrs.version;
-    hash = "sha256-7nH0AwSaXoWvGMDgctx+HykC0Q87pU/nNSUammEj/wQ=";
+    hash = "sha256-8LbkwbY5vsRQhbqkXytBxM+MVMtnwRa61nrKHbI4Vtg=";
   };
 
   patches = [ ./install.patch ];

From c4a7d4219092e939b7e77f82eccdfcad092ee1f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 Jan 2026 11:52:47 +0000
Subject: [PATCH 016/167] novelwriter: 2.8 -> 2.8.2

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

diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix
index 73f14d7f407f..ebd01cd8c0c5 100644
--- a/pkgs/by-name/no/novelwriter/package.nix
+++ b/pkgs/by-name/no/novelwriter/package.nix
@@ -7,7 +7,7 @@
   nix-update-script,
 }:
 let
-  version = "2.8";
+  version = "2.8.2";
 in
 python3.pkgs.buildPythonApplication {
   pname = "novelwriter";
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication {
     owner = "vkbo";
     repo = "novelWriter";
     tag = "v${version}";
-    hash = "sha256-6OIDsmPVbpU90bbj4O2CO5YXNtz0bCrG2ygruxsl9Ec=";
+    hash = "sha256-VCl0dHnMlmkyGFeLPACi2ZC66ebrDraw+JABNomWP4k=";
   };
 
   nativeBuildInputs = [ qt6.wrapQtAppsHook ];

From 1d64d785ba31b6efe253e97aff09d9e4f40e20aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 19:35:15 +0000
Subject: [PATCH 017/167] gpac-unstable: 2.4.0-unstable-2025-12-23 ->
 2.4.0-unstable-2026-01-30

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

diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index e4ea8996db4d..1d81bea2e4cf 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -64,12 +64,12 @@ let
     };
   };
   unstable = {
-    version = "2.4.0-unstable-2025-12-23";
+    version = "2.4.0-unstable-2026-01-30";
     src = fetchFromGitHub {
       owner = "gpac";
       repo = "gpac";
-      rev = "035540740e7a9901cd5f5b08ff5df4f31ac28ec2";
-      hash = "sha256-CAP6NYSU+ctjl9BMD22rybNcWVm3eAVDAiZKfp8/xDc=";
+      rev = "2166130136223373dad2ef3fb72e4cbd129cb468";
+      hash = "sha256-Iw4UAKjFnV+NiG77VOfHUHPle5+YAIavtGmtrD3Uebw=";
     };
     updateScript = unstableGitUpdater {
       tagFormat = "v*";

From a5a2b6e0b365659be6b1cc1a12ab0dee0650843a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Feb 2026 18:19:56 +0000
Subject: [PATCH 018/167] freerdp: 3.21.0 -> 3.22.0

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

diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index fe99c6c507e1..5e28584f2659 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -70,13 +70,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freerdp";
-  version = "3.21.0";
+  version = "3.22.0";
 
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
     rev = finalAttrs.version;
-    hash = "sha256-oIws2HO2usOCtVDe6OTIdIDHYgb9tBIEctvCW6/Woxc=";
+    hash = "sha256-cJFY0v2zvbaKVINOKVZGvLozwgD7kf2ffVU9EGYBMGQ=";
   };
 
   postPatch = ''

From 6268a322ce96f6cca7d37975a6a9044b7842465b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Dec 2025 18:46:14 +0000
Subject: [PATCH 019/167] transmission-remote-gtk: 1.6.0 -> 1.7.0

---
 pkgs/by-name/tr/transmission-remote-gtk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/transmission-remote-gtk/package.nix b/pkgs/by-name/tr/transmission-remote-gtk/package.nix
index ef2398ba1f07..fb8800e13b1d 100644
--- a/pkgs/by-name/tr/transmission-remote-gtk/package.nix
+++ b/pkgs/by-name/tr/transmission-remote-gtk/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "transmission-remote-gtk";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "transmission-remote-gtk";
     repo = "transmission-remote-gtk";
     tag = finalAttrs.version;
-    hash = "sha256-/syZI/5LhuYLvXrNknnpbGHEH0z5iHeye2YRNJFWZJ0=";
+    hash = "sha256-I8Y5oB7sF5q1j8ITaYmQWa/ZdBORxbMSLI5O0vWUoKY=";
   };
 
   nativeBuildInputs = [

From cb5e881411b3e6171003ae81cdc10cd8279c97ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 13:32:55 +0000
Subject: [PATCH 020/167] memtier-benchmark: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix
index 8228b7027ed2..8885b658c50f 100644
--- a/pkgs/by-name/me/memtier-benchmark/package.nix
+++ b/pkgs/by-name/me/memtier-benchmark/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "memtier-benchmark";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "redislabs";
     repo = "memtier_benchmark";
     tag = finalAttrs.version;
-    sha256 = "sha256-FzuURsGob9ZQC0C18wKLhamCyARirtvGLq5lF64JOX8=";
+    hash = "sha256-2lJE3+/LMVe+/p2bybUN9YxxSH7uaSFPwBpIuIfMcG8=";
   };
 
   patchPhase = ''

From 45bcec933f2d21d4ded43a1abb590a9dc2d6f8ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 00:36:10 +0000
Subject: [PATCH 021/167] adriconf: 2.7.2 -> 2.7.3

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

diff --git a/pkgs/by-name/ad/adriconf/package.nix b/pkgs/by-name/ad/adriconf/package.nix
index f9940a6fc4db..08eb000bd892 100644
--- a/pkgs/by-name/ad/adriconf/package.nix
+++ b/pkgs/by-name/ad/adriconf/package.nix
@@ -18,14 +18,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "adriconf";
-  version = "2.7.2";
+  version = "2.7.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "adriconf";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-0XTsYeS4tNAnGhuJ81fmjHhFS6fVq1lirui5b+ojxTQ=";
+    hash = "sha256-MRZYAinBL4fzj/Nhhn22sJgupVMpoeeyOYYWTr+fK+E=";
   };
 
   # fix build with c23

From 0f98bbdb962b42b3b641723fe09e2dab63ba3994 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 12:39:23 +0000
Subject: [PATCH 022/167] ddrescue: 1.29.1 -> 1.30

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

diff --git a/pkgs/by-name/dd/ddrescue/package.nix b/pkgs/by-name/dd/ddrescue/package.nix
index 406466805d20..710b1bb6c386 100644
--- a/pkgs/by-name/dd/ddrescue/package.nix
+++ b/pkgs/by-name/dd/ddrescue/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ddrescue";
-  version = "1.29.1";
+  version = "1.30";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/ddrescue-${finalAttrs.version}.tar.lz";
-    sha256 = "sha256-3dfUXfAmgHg1ouxqucNl3y7xno3hpQ/+aIbNOR4E3XU=";
+    hash = "sha256-ImRiLTCdbIehz8GRSCkriFmmiOm8AtRwL1zU8oh0VUI=";
   };
 
   nativeBuildInputs = [ lzip ];

From a401d24534a6fe5226cbe0855f2299bf57a24783 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 00:42:14 +0000
Subject: [PATCH 023/167] fabric-installer: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/by-name/fa/fabric-installer/package.nix b/pkgs/by-name/fa/fabric-installer/package.nix
index 1b7a7741fc10..702e4b7f75ed 100644
--- a/pkgs/by-name/fa/fabric-installer/package.nix
+++ b/pkgs/by-name/fa/fabric-installer/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fabric-installer";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${finalAttrs.version}/fabric-installer-${finalAttrs.version}.jar";
-    sha256 = "sha256-wgxAfVyksRmq6XhH6y+7HTTJKWm2R/u7HeL9NsoAc44=";
+    hash = "sha256-JIemndb52cJgUmWnFC13wmq2LtxiDmvPgQ1YHS7jG3k=";
   };
 
   dontUnpack = true;

From 1eab56cfea3c89e3d81f23cca09b18775de3c28c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jan 2026 05:55:32 +0000
Subject: [PATCH 024/167] kirc: 1.0.7 -> 1.2.2

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

diff --git a/pkgs/by-name/ki/kirc/package.nix b/pkgs/by-name/ki/kirc/package.nix
index b5830bc07871..802b2c9f071e 100644
--- a/pkgs/by-name/ki/kirc/package.nix
+++ b/pkgs/by-name/ki/kirc/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kirc";
-  version = "1.0.7";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "mcpcpc";
     repo = "kirc";
-    rev = finalAttrs.version;
-    hash = "sha256-ModcUryLJTbf19ZKZDQ05Wqqac5vBsCN7SaT0/TD4Ro=";
+    tag = finalAttrs.version;
+    hash = "sha256-0A2Es8/EAOMgxRNxT0P53E5QYeuYHv/p93UUeQxM5gc=";
   };
 
   dontConfigure = true;

From cf02c5eff97e862033c0b4b5b80e380f37c10c18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 19:07:04 +0000
Subject: [PATCH 025/167] restream: 1.3.1 -> 1.4.0

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

diff --git a/pkgs/by-name/re/restream/package.nix b/pkgs/by-name/re/restream/package.nix
index 1a01f58222e5..b611dca3defa 100644
--- a/pkgs/by-name/re/restream/package.nix
+++ b/pkgs/by-name/re/restream/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "restream";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "rien";
     repo = "restream";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-AXHKOfdIM3LsHF6u3M/lMhhcuPZADoEal7de3zlx7L4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rJYdmBQrDH/oURXVO8WWTxgvibcpNC8yxno6pZPl6No=";
   };
 
   dontConfigure = true;

From 52ceff703265f55991550344683b7e6bfdb48225 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 09:50:40 +0000
Subject: [PATCH 026/167] narsil: 1.4.0-112-gaa252eb26 -> 1.4.0-116-gab32c9f80

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

diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix
index 2db9b0f9ce13..8e23a5b84fde 100644
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "narsil";
-  version = "1.4.0-112-gaa252eb26";
+  version = "1.4.0-116-gab32c9f80";
 
   src = fetchFromGitHub {
     owner = "NickMcConnell";
     repo = "NarSil";
     tag = finalAttrs.version;
-    hash = "sha256-FqWoyq6FFCknT29Zkrkozi0+2JkrhJ2fKXVSbh5ZWXo=";
+    hash = "sha256-Nw8NZyFQzTwcJhKB86LC0mqjLOmivSm7o9BSRsvQVP4=";
   };
 
   passthru.updateScript = nix-update-script { };

From a8acebcc2602b53a4b7206ff4e547a3f73da462d Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 3 Feb 2026 21:58:09 +0100
Subject: [PATCH 027/167] flutter: set pname

---
 pkgs/development/compilers/flutter/sdk-symlink.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/flutter/sdk-symlink.nix b/pkgs/development/compilers/flutter/sdk-symlink.nix
index d71bd5d09428..d8ddd9bd0c2e 100644
--- a/pkgs/development/compilers/flutter/sdk-symlink.nix
+++ b/pkgs/development/compilers/flutter/sdk-symlink.nix
@@ -6,6 +6,7 @@ flutter:
 
 let
   self = symlinkJoin {
+    inherit (flutter) pname;
     name = "${flutter.name}-sdk-links";
     paths = [
       flutter

From 93eba3d97b5b4d9a6b192a6cb746d831259a09f1 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 3 Feb 2026 23:01:49 +0100
Subject: [PATCH 028/167] mathematica: add pname

---
 pkgs/by-name/ma/mathematica/generic.nix |  4 ++--
 pkgs/by-name/ma/mathematica/package.nix | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix
index 3c38de14a67f..bfcbc0ca8343 100644
--- a/pkgs/by-name/ma/mathematica/generic.nix
+++ b/pkgs/by-name/ma/mathematica/generic.nix
@@ -10,7 +10,7 @@
   # arguments from default.nix
   lang,
   meta,
-  name,
+  pname,
   src,
   version,
   # dependencies
@@ -89,7 +89,7 @@ in
 stdenv.mkDerivation {
   inherit
     meta
-    name
+    pname
     src
     version
     ;
diff --git a/pkgs/by-name/ma/mathematica/package.nix b/pkgs/by-name/ma/mathematica/package.nix
index e0bdd7b0f1ce..62ce806a98b0 100644
--- a/pkgs/by-name/ma/mathematica/package.nix
+++ b/pkgs/by-name/ma/mathematica/package.nix
@@ -62,14 +62,13 @@ in
 
 callPackage ./generic.nix {
   inherit cudaSupport cudaPackages;
-  inherit (found-version) version lang;
+  inherit (found-version) lang;
   src = if source == null then found-version.src else source;
-  name = (
-    "mathematica"
+  pname = "mathematica";
+  version =
+    found-version.version
     + lib.optionalString cudaSupport "-cuda"
-    + "-${found-version.version}"
-    + lib.optionalString (lang != "en") "-${lang}"
-  );
+    + lib.optionalString (lang != "en") "-${lang}";
   meta = {
     description = "Wolfram Mathematica computational software system";
     homepage = "https://www.wolfram.com/mathematica/";

From 85f22ce55fe3f366ba0e06165de9509098bab305 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 4 Feb 2026 00:26:26 +0100
Subject: [PATCH 029/167] rkboot: set pname and version

---
 pkgs/by-name/rk/rkboot/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rk/rkboot/package.nix b/pkgs/by-name/rk/rkboot/package.nix
index b52b0bc14b68..3863cfab2f3b 100644
--- a/pkgs/by-name/rk/rkboot/package.nix
+++ b/pkgs/by-name/rk/rkboot/package.nix
@@ -6,9 +6,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "rkboot";
-
-  src = rkbin.src;
+  pname = "rkboot";
+  inherit (rkbin) src version;
 
   postPatch = ''
     substituteInPlace RKBOOT/*.ini --replace 'PATH=' 'PATH=rkboot/'

From 5fc971e616a890b163808841a74c72ef6db8a9ba Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 4 Feb 2026 16:51:19 +0100
Subject: [PATCH 030/167] vhs: replace `rev` with `tag`

---
 pkgs/by-name/vh/vhs/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix
index b7108579d106..fb6e4b3587d8 100644
--- a/pkgs/by-name/vh/vhs/package.nix
+++ b/pkgs/by-name/vh/vhs/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "vhs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZnE5G8kfj7qScsT+bZg90ze4scpUxeC6xF8dAhdUUCo=";
   };
 

From e24922cbe99377f93b8bb114b36fd903287e7a8b Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 4 Feb 2026 16:51:44 +0100
Subject: [PATCH 031/167] vhs: replace `makeWrapper` with `makeBinaryWrapper`

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

diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix
index fb6e4b3587d8..ec2bc8bce860 100644
--- a/pkgs/by-name/vh/vhs/package.nix
+++ b/pkgs/by-name/vh/vhs/package.nix
@@ -7,7 +7,7 @@
   ffmpeg,
   ttyd,
   chromium,
-  makeWrapper,
+  makeBinaryWrapper,
 }:
 
 buildGoModule rec {
@@ -25,7 +25,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [
     installShellFiles
-    makeWrapper
+    makeBinaryWrapper
   ];
 
   ldflags = [

From d33d3428c86a6e14c0ab2c06bfc157bd30cd1d04 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 4 Feb 2026 17:00:07 +0100
Subject: [PATCH 032/167] vhs: use `finalAttrs` pattern

---
 pkgs/by-name/vh/vhs/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix
index ec2bc8bce860..649d2e3d989e 100644
--- a/pkgs/by-name/vh/vhs/package.nix
+++ b/pkgs/by-name/vh/vhs/package.nix
@@ -10,14 +10,14 @@
   makeBinaryWrapper,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "vhs";
   version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "vhs";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ZnE5G8kfj7qScsT+bZg90ze4scpUxeC6xF8dAhdUUCo=";
   };
 
@@ -31,17 +31,17 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X=main.Version=${version}"
+    "-X=main.Version=${finalAttrs.version}"
   ];
 
   postInstall = ''
     wrapProgram $out/bin/vhs --prefix PATH : ${
       lib.makeBinPath (
-        lib.optionals stdenv.hostPlatform.isLinux [ chromium ]
-        ++ [
+        [
           ffmpeg
           ttyd
         ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux [ chromium ]
       )
     }
   ''
@@ -58,8 +58,8 @@ buildGoModule rec {
     description = "Tool for generating terminal GIFs with code";
     mainProgram = "vhs";
     homepage = "https://github.com/charmbracelet/vhs";
-    changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}";
+    changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From 8eefb3ab1032790c6b6b4cdfaa095cc9f1f9ec12 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 4 Feb 2026 10:08:42 -0600
Subject: [PATCH 033/167] vimPlugins: remove old deprecations

Dropping deprecations that are multiple releases old. User's have had
plenty of warning.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/deprecated.json       | 58 +------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index 5677af1a1084..6f053e1ca96b 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -1,8 +1,4 @@
 {
-    "TrueZen-nvim": {
-        "date": "2022-07-27",
-        "new": "true-zen-nvim"
-    },
     "codeium-nvim": {
         "date": "2025-04-09",
         "new": "windsurf-nvim"
@@ -23,10 +19,6 @@
         "date": "2024-11-19",
         "new": "cmp-tabnine"
     },
-    "compe-tmux": {
-        "date": "2021-12-07",
-        "new": "cmp-tmux"
-    },
     "compe-zsh": {
         "date": "2024-11-19",
         "new": "cmp-zsh"
@@ -39,88 +31,40 @@
         "date": "2024-05-12",
         "new": "vim-gina"
     },
-    "gist-vim": {
-        "date": "2020-03-27",
-        "new": "vim-gist"
-    },
-    "lspsaga-nvim-original": {
-        "date": "2023-08-08",
-        "new": "lspsaga-nvim"
-    },
     "lua-async-await": {
         "date": "2025-01-09",
         "new": "lua-async"
     },
-    "lua-dev-nvim": {
-        "date": "2022-10-14",
-        "new": "neodev-nvim"
-    },
     "magma-nvim-goose": {
         "date": "2024-10-28",
         "new": "magma-nvim"
     },
-    "nvchad-extensions": {
-        "date": "2023-08-19",
-        "new": "nvchad-ui"
-    },
     "nvim-base16": {
         "date": "2024-02-15",
         "new": "base16-nvim"
     },
-    "nvim-bufferline-lua": {
-        "date": "2021-08-22",
-        "new": "bufferline-nvim"
-    },
     "nvim-compe": {
         "date": "2024-11-19",
         "new": "nvim-cmp"
     },
-    "nvim-lsp": {
-        "date": "2020-08-31",
-        "new": "nvim-lspconfig"
-    },
-    "nvim-toggleterm-lua": {
-        "date": "2021-08-22",
-        "new": "toggleterm-nvim"
-    },
-    "orgmode-nvim": {
-        "date": "2021-11-28",
-        "new": "orgmode"
-    },
     "render-markdown": {
         "date": "2024-09-16",
         "new": "render-markdown-nvim"
     },
-    "sql-nvim": {
-        "date": "2021-09-03",
-        "new": "sqlite-lua"
-    },
     "suda-vim": {
         "date": "2024-05-12",
         "new": "vim-suda"
     },
     "taskwarrior": {
         "date": "2024-08-13",
-        "new": "taskwarrior3 or taskwarrior2"
+        "new": "taskwarrior2"
     },
     "vim-fsharp": {
         "date": "2024-03-16",
         "new": "zarchive-vim-fsharp"
     },
-    "vim-jade": {
-        "date": "2020-03-27",
-        "new": "vim-pug"
-    },
     "vscode-diff-nvim": {
         "date": "2026-01-10",
         "new": "codediff-nvim"
-    },
-    "vundle": {
-        "date": "2020-03-27",
-        "new": "Vundle-vim"
-    },
-    "youcompleteme": {
-        "date": "2020-03-27",
-        "new": "YouCompleteMe"
     }
 }

From 46c608ea6434fef3e312e57b72bcd86be7aba5d5 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 4 Feb 2026 10:51:21 -0600
Subject: [PATCH 034/167] vimPlugins: deprecations warn

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/aliases.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 66dd58185a5e..6dd117aad018 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -29,7 +29,10 @@ let
     ) aliases;
 
   deprecations = lib.mapAttrs (
-    old: info: throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}."
+    old: info:
+    lib.warnOnInstantiate "'vimPlugins.${old}' was renamed to 'vimPlugins.${info.new}' on ${info.date}. Please update to 'vimPlugins.${info.new}'." (
+      builtins.getAttr info.new prev
+    )
   ) (lib.importJSON ./deprecated.json);
 
 in

From 579d745f35066d7db7e2064275b2296e2e7f9360 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 4 Feb 2026 10:08:15 -0600
Subject: [PATCH 035/167] vimPlugins: warn on aliases, move to deprecated

I want to be able to remove old ones eventually, can't do so without a
proper warning first.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/aliases.nix           | 114 +----
 .../editors/vim/plugins/deprecated.json       | 432 ++++++++++++++++++
 2 files changed, 434 insertions(+), 112 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 6dd117aad018..42081f02d181 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -40,141 +40,31 @@ mapAliases (
   with prev;
   {
     # keep-sorted start case=no
-    "sourcemap.vim" = sourcemap-vim;
-    airline = vim-airline;
-    alternative = a-vim; # backwards compat, added 2014-10-21
-    bats = bats-vim;
     blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17
-    BufOnly = BufOnly-vim;
-    calendar = calendar-vim;
-    caw = caw-vim;
-    chad = chadtree;
     coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
     coc-sumneko-lua = throw "coc-sumneko-lua was removed, as it is unmaintained and broken. You should switch to lua_ls"; # added 2026-02-04
     coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01
-    coffee-script = vim-coffee-script;
-    coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18
-    colors-solarized = vim-colors-solarized;
-    colorsamplerpack = Colour-Sampler-Pack;
-    Colour_Sampler_Pack = Colour-Sampler-Pack;
-    command_T = command-t; # backwards compat, added 2014-10-18
-    commentary = vim-commentary;
-    committia = committia-vim;
     completion-treesitter = throw "completion-treesitter has been archived since 2024-01"; # Added 2025-12-18
-    concealedyank = concealedyank-vim;
-    context-filetype = context_filetype-vim;
-    Cosco = cosco-vim;
-    CSApprox = csapprox;
-    css_color_5056 = vim-css-color;
-    csv = csv-vim;
-    ctrlp = ctrlp-vim;
-    cute-python = vim-cute-python;
-    denite = denite-nvim;
-    easy-align = vim-easy-align;
-    easygit = vim-easygit;
-    easymotion = vim-easymotion;
-    echodoc = echodoc-vim;
-    eighties = vim-eighties;
-    ethersync = lib.warnOnInstantiate "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
-    extradite = vim-extradite;
     feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
     floating-nvim = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26
     fruzzy = throw "vimPlugins.fruzzy did not update since 2019-10-28 and uses EOL version of Nim"; # Added 2025-11-12
-    fugitive = vim-fugitive;
-    fzfWrapper = fzf-wrapper;
-    ghc-mod-vim = ghcmod-vim;
-    ghcmod = ghcmod-vim;
-    Gist = vim-gist;
-    gitgutter = vim-gitgutter;
     gleam-vim = throw "gleam.vim has been removed: its code was merged into vim."; # Added 2025-06-10
-    goyo = goyo-vim;
-    gundo = gundo-vim;
-    Gundo = gundo-vim; # backwards compat, added 2015-10-03
-    haskellconceal = vim-haskellconceal;
-    haskellConceal = vim-haskellconceal; # backwards compat, added 2014-10-18
-    haskellConcealPlus = vim-haskellConcealPlus;
-    hier = vim-hier;
-    hlint-refactor = hlint-refactor-vim;
-    Hoogle = vim-hoogle;
-    hoogle = vim-hoogle;
-    indent-blankline-nvim-lua = indent-blankline-nvim; # backwards compat, added 2021-07-05
-    ipython = vim-ipython;
-    latex-live-preview = vim-latex-live-preview;
-    maktaba = vim-maktaba;
     minsnip-nvim = throw "the upstream repository got deleted"; # added 2025-08-30
-    multiple-cursors = vim-multiple-cursors;
-    necoGhc = neco-ghc; # backwards compat, added 2014-10-18
-    neocomplete = neocomplete-vim;
-    neoinclude = neoinclude-vim;
-    neomru = neomru-vim;
-    neosnippet = neosnippet-vim;
     neuron-nvim = throw "neuron.nvim has been removed: archived repository 2023-02-19"; # Added 2025-09-10
     nvim-gps = throw "nvim-gps has been archived since 2022. Use nvim-navic instead."; # Added 2025-12-18
     nvim-ts-rainbow = throw "nvim-ts-rainbow has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
     nvim-ts-rainbow2 = throw "nvim-ts-rainbow2 has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
-    open-browser = open-browser-vim;
-    pathogen = vim-pathogen;
     peskcolor-vim = throw "peskcolor-vim has been removed: abandoned by upstream"; # Added 2024-08-23
     playground = throw "playground has been archived"; # Added 2025-12-18
-    polyglot = vim-polyglot;
-    prettyprint = vim-prettyprint;
-    pure-lua = lib.warnOnInstantiate "Please replace 'pure-lua' with 'moonlight-nvim' as this name was an error" moonlight-nvim; # Added 2025-11-17
-    quickrun = vim-quickrun;
-    rainbow_parentheses = rainbow_parentheses-vim;
-    repeat = vim-repeat;
-    rhubarb = vim-rhubarb;
-    riv = riv-vim;
-    rust-tools-nvim = lib.warnOnInstantiate "rust-tools-nvim is abandoned by upstream; you should use rustaceanvim" rust-tools-nvim;
-    sensible = vim-sensible;
-    signature = vim-signature;
-    sleuth = vim-sleuth;
-    snipmate = vim-snipmate;
-    Solarized = vim-colors-solarized;
-    solarized = vim-colors-solarized;
-    solidity = vim-solidity;
-    sourcemap = sourcemap-vim;
+    pure-lua = lib.warnOnInstantiate "Please replace 'vimPlugins.pure-lua' with 'vimPlugins.moonlight-nvim' as this name was an error" moonlight-nvim; # Added 2025-11-17
+    rust-tools-nvim = lib.warnOnInstantiate "'vimPlugins.rust-tools-nvim' is abandoned by upstream; you should use 'vimPlugins.rustaceanvim'" rust-tools-nvim;
     Spacegray-vim = throw "Spacegray-vim has been removed: abandoned by upstream"; # Added 2025-03-24
     SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
     spacevim = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27
     sparkup = throw "the upstream repository got deleted"; # added 2025-08-06
-    ssr = ssr-nvim; # Added 2025-08-31
-    stylish-haskell = vim-stylish-haskell;
-    stylishHaskell = vim-stylish-haskell; # backwards compat, added 2014-10-18
-    suda-vim = vim-suda; # backwards compat, added 2024-05-16
-    Supertab = supertab;
-    surround = vim-surround;
-    Syntastic = syntastic;
     syntax-tree-surfer = throw "syntax-tree-surfer has been archived"; # Added 2025-12-18
-    SyntaxRange = vim-SyntaxRange;
-    table-mode = vim-table-mode;
-    tabpagebuffer = tabpagebuffer-vim;
-    tabpagecd = vim-tabpagecd;
-    Tabular = tabular;
-    Tagbar = tagbar;
-    taglist = taglist-vim;
-    The_NERD_Commenter = nerdcommenter;
-    The_NERD_tree = nerdtree;
-    thumbnail = thumbnail-vim;
-    tlib = tlib_vim;
-    tmux-navigator = vim-tmux-navigator;
-    tmuxNavigator = vim-tmux-navigator; # backwards compat, added 2014-10-18
     todo-nvim = throw "todo-nvim has been removed: abandoned by upstream"; # Added 2023-08-23
-    tslime = tslime-vim;
-    UltiSnips = ultisnips;
-    unite = unite-vim;
-    vim-addon-vim2nix = vim2nix;
     vim-sourcetrail = throw "vim-sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14
-    vimproc = vimproc-vim;
-    vimshell = vimshell-vim;
-    vinegar = vim-vinegar;
-    vscode-diff-nvim = codediff-nvim; # Added 2026-01-12
-    watchdogs = vim-watchdogs;
-    WebAPI = webapi-vim;
-    wombat256 = wombat256-vim; # backwards compat, added 2015-7-8
-    xterm-color-table = xterm-color-table-vim;
-    Yankring = YankRing-vim;
-    yankring = YankRing-vim;
-    zeavim = zeavim-vim;
     # keep-sorted end
   }
   // deprecations
diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index 6f053e1ca96b..85a81ee8814e 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -7,6 +7,34 @@
         "date": "2025-04-09",
         "new": "windsurf-vim"
     },
+    "coffee-script": {
+        "date": "2026-02-04",
+        "new": "vim-coffee-script"
+    },
+    "coffeeScript": {
+        "date": "2026-02-04",
+        "new": "vim-coffee-script"
+    },
+    "colors-solarized": {
+        "date": "2026-02-04",
+        "new": "vim-colors-solarized"
+    },
+    "colorsamplerpack": {
+        "date": "2026-02-04",
+        "new": "Colour-Sampler-Pack"
+    },
+    "command_T": {
+        "date": "2026-02-04",
+        "new": "command-t"
+    },
+    "commentary": {
+        "date": "2026-02-04",
+        "new": "vim-commentary"
+    },
+    "committia": {
+        "date": "2026-02-04",
+        "new": "committia-vim"
+    },
     "compe-conjure": {
         "date": "2024-11-19",
         "new": "cmp-conjure"
@@ -23,14 +51,134 @@
         "date": "2024-11-19",
         "new": "cmp-zsh"
     },
+    "concealedyank": {
+        "date": "2026-02-04",
+        "new": "concealedyank-vim"
+    },
+    "context-filetype": {
+        "date": "2026-02-04",
+        "new": "context_filetype-vim"
+    },
+    "css_color_5056": {
+        "date": "2026-02-04",
+        "new": "vim-css-color"
+    },
+    "csv": {
+        "date": "2026-02-04",
+        "new": "csv-vim"
+    },
+    "ctrlp": {
+        "date": "2026-02-04",
+        "new": "ctrlp-vim"
+    },
+    "cute-python": {
+        "date": "2026-02-04",
+        "new": "vim-cute-python"
+    },
+    "denite": {
+        "date": "2026-02-04",
+        "new": "denite-nvim"
+    },
+    "easy-align": {
+        "date": "2026-02-04",
+        "new": "vim-easy-align"
+    },
+    "easygit": {
+        "date": "2026-02-04",
+        "new": "vim-easygit"
+    },
+    "easymotion": {
+        "date": "2026-02-04",
+        "new": "vim-easymotion"
+    },
+    "echodoc": {
+        "date": "2026-02-04",
+        "new": "echodoc-vim"
+    },
+    "eighties": {
+        "date": "2026-02-04",
+        "new": "vim-eighties"
+    },
+    "ethersync": {
+        "date": "2025-10-31",
+        "new": "teamtype"
+    },
+    "extradite": {
+        "date": "2026-02-04",
+        "new": "vim-extradite"
+    },
     "fern-vim": {
         "date": "2024-05-12",
         "new": "vim-fern"
     },
+    "fugitive": {
+        "date": "2026-02-04",
+        "new": "vim-fugitive"
+    },
+    "fzfWrapper": {
+        "date": "2026-02-04",
+        "new": "fzf-wrapper"
+    },
+    "ghc-mod-vim": {
+        "date": "2026-02-04",
+        "new": "ghcmod-vim"
+    },
+    "ghcmod": {
+        "date": "2026-02-04",
+        "new": "ghcmod-vim"
+    },
     "gina-vim": {
         "date": "2024-05-12",
         "new": "vim-gina"
     },
+    "gitgutter": {
+        "date": "2026-02-04",
+        "new": "vim-gitgutter"
+    },
+    "goyo": {
+        "date": "2026-02-04",
+        "new": "goyo-vim"
+    },
+    "gundo": {
+        "date": "2026-02-04",
+        "new": "gundo-vim"
+    },
+    "haskellConceal": {
+        "date": "2026-02-04",
+        "new": "vim-haskellconceal"
+    },
+    "haskellConcealPlus": {
+        "date": "2026-02-04",
+        "new": "vim-haskellConcealPlus"
+    },
+    "haskellconceal": {
+        "date": "2026-02-04",
+        "new": "vim-haskellconceal"
+    },
+    "hier": {
+        "date": "2026-02-04",
+        "new": "vim-hier"
+    },
+    "hlint-refactor": {
+        "date": "2026-02-04",
+        "new": "hlint-refactor-vim"
+    },
+    "hoogle": {
+        "date": "2026-02-04",
+        "new": "vim-hoogle"
+    },
+    "indent-blankline-nvim-lua": {
+        "date": "2026-02-04",
+        "new": "indent-blankline-nvim"
+    },
+    "ipython": {
+        "date": "2026-02-04",
+        "new": "vim-ipython"
+    },
+    "latex-live-preview": {
+        "date": "2026-02-04",
+        "new": "vim-latex-live-preview"
+    },
     "lua-async-await": {
         "date": "2025-01-09",
         "new": "lua-async"
@@ -51,14 +199,118 @@
         "date": "2024-09-16",
         "new": "render-markdown-nvim"
     },
+    "repeat": {
+        "date": "2026-02-04",
+        "new": "vim-repeat"
+    },
+    "rhubarb": {
+        "date": "2026-02-04",
+        "new": "vim-rhubarb"
+    },
+    "riv": {
+        "date": "2026-02-04",
+        "new": "riv-vim"
+    },
+    "sensible": {
+        "date": "2026-02-04",
+        "new": "vim-sensible"
+    },
+    "signature": {
+        "date": "2026-02-04",
+        "new": "vim-signature"
+    },
+    "sleuth": {
+        "date": "2026-02-04",
+        "new": "vim-sleuth"
+    },
+    "snipmate": {
+        "date": "2026-02-04",
+        "new": "vim-snipmate"
+    },
+    "solarized": {
+        "date": "2026-02-04",
+        "new": "vim-colors-solarized"
+    },
+    "solidity": {
+        "date": "2026-02-04",
+        "new": "vim-solidity"
+    },
+    "sourcemap": {
+        "date": "2026-02-04",
+        "new": "sourcemap-vim"
+    },
+    "sourcemap.vim": {
+        "date": "2026-02-04",
+        "new": "sourcemap-vim"
+    },
+    "ssr": {
+        "date": "2026-02-04",
+        "new": "ssr-nvim"
+    },
+    "stylish-haskell": {
+        "date": "2026-02-04",
+        "new": "vim-stylish-haskell"
+    },
+    "stylishHaskell": {
+        "date": "2026-02-04",
+        "new": "vim-stylish-haskell"
+    },
     "suda-vim": {
         "date": "2024-05-12",
         "new": "vim-suda"
     },
+    "surround": {
+        "date": "2026-02-04",
+        "new": "vim-surround"
+    },
+    "table-mode": {
+        "date": "2026-02-04",
+        "new": "vim-table-mode"
+    },
+    "tabpagebuffer": {
+        "date": "2026-02-04",
+        "new": "tabpagebuffer-vim"
+    },
+    "tabpagecd": {
+        "date": "2026-02-04",
+        "new": "vim-tabpagecd"
+    },
+    "taglist": {
+        "date": "2026-02-04",
+        "new": "taglist-vim"
+    },
     "taskwarrior": {
         "date": "2024-08-13",
         "new": "taskwarrior2"
     },
+    "thumbnail": {
+        "date": "2026-02-04",
+        "new": "thumbnail-vim"
+    },
+    "tlib": {
+        "date": "2026-02-04",
+        "new": "tlib_vim"
+    },
+    "tmux-navigator": {
+        "date": "2026-02-04",
+        "new": "vim-tmux-navigator"
+    },
+    "tmuxNavigator": {
+        "date": "2026-02-04",
+        "new": "vim-tmux-navigator"
+    },
+    "tslime": {
+        "date": "2026-02-04",
+        "new": "tslime-vim"
+    },
+    "unite": {
+        "date": "2026-02-04",
+        "new": "unite-vim"
+    },
+    "vim-addon-vim2nix": {
+        "date": "2026-02-04",
+        "new": "vim2nix"
+    },
     "vim-fsharp": {
         "date": "2024-03-16",
         "new": "zarchive-vim-fsharp"
@@ -66,5 +318,185 @@
     "vscode-diff-nvim": {
         "date": "2026-01-10",
         "new": "codediff-nvim"
+    },
+    "BufOnly": {
+        "date": "2026-02-04",
+        "new": "BufOnly-vim"
+    },
+    "CSApprox": {
+        "date": "2026-02-04",
+        "new": "csapprox"
+    },
+    "Colour_Sampler_Pack": {
+        "date": "2026-02-04",
+        "new": "Colour-Sampler-Pack"
+    },
+    "Cosco": {
+        "date": "2026-02-04",
+        "new": "cosco-vim"
+    },
+    "Gist": {
+        "date": "2026-02-04",
+        "new": "vim-gist"
+    },
+    "Gundo": {
+        "date": "2026-02-04",
+        "new": "gundo-vim"
+    },
+    "Hoogle": {
+        "date": "2026-02-04",
+        "new": "vim-hoogle"
+    },
+    "Solarized": {
+        "date": "2026-02-04",
+        "new": "vim-colors-solarized"
+    },
+    "Supertab": {
+        "date": "2026-02-04",
+        "new": "supertab"
+    },
+    "Syntastic": {
+        "date": "2026-02-04",
+        "new": "syntastic"
+    },
+    "SyntaxRange": {
+        "date": "2026-02-04",
+        "new": "vim-SyntaxRange"
+    },
+    "Tabular": {
+        "date": "2026-02-04",
+        "new": "tabular"
+    },
+    "Tagbar": {
+        "date": "2026-02-04",
+        "new": "tagbar"
+    },
+    "The_NERD_Commenter": {
+        "date": "2026-02-04",
+        "new": "nerdcommenter"
+    },
+    "The_NERD_tree": {
+        "date": "2026-02-04",
+        "new": "nerdtree"
+    },
+    "UltiSnips": {
+        "date": "2026-02-04",
+        "new": "ultisnips"
+    },
+    "WebAPI": {
+        "date": "2026-02-04",
+        "new": "webapi-vim"
+    },
+    "Yankring": {
+        "date": "2026-02-04",
+        "new": "YankRing-vim"
+    },
+    "airline": {
+        "date": "2026-02-04",
+        "new": "vim-airline"
+    },
+    "alternative": {
+        "date": "2026-02-04",
+        "new": "a-vim"
+    },
+    "bats": {
+        "date": "2026-02-04",
+        "new": "bats-vim"
+    },
+    "calendar": {
+        "date": "2026-02-04",
+        "new": "calendar-vim"
+    },
+    "caw": {
+        "date": "2026-02-04",
+        "new": "caw-vim"
+    },
+    "chad": {
+        "date": "2026-02-04",
+        "new": "chadtree"
+    },
+    "maktaba": {
+        "date": "2026-02-04",
+        "new": "vim-maktaba"
+    },
+    "multiple-cursors": {
+        "date": "2026-02-04",
+        "new": "vim-multiple-cursors"
+    },
+    "necoGhc": {
+        "date": "2026-02-04",
+        "new": "neco-ghc"
+    },
+    "neocomplete": {
+        "date": "2026-02-04",
+        "new": "neocomplete-vim"
+    },
+    "neoinclude": {
+        "date": "2026-02-04",
+        "new": "neoinclude-vim"
+    },
+    "neomru": {
+        "date": "2026-02-04",
+        "new": "neomru-vim"
+    },
+    "neosnippet": {
+        "date": "2026-02-04",
+        "new": "neosnippet-vim"
+    },
+    "open-browser": {
+        "date": "2026-02-04",
+        "new": "open-browser-vim"
+    },
+    "pathogen": {
+        "date": "2026-02-04",
+        "new": "vim-pathogen"
+    },
+    "polyglot": {
+        "date": "2026-02-04",
+        "new": "vim-polyglot"
+    },
+    "prettyprint": {
+        "date": "2026-02-04",
+        "new": "vim-prettyprint"
+    },
+    "quickrun": {
+        "date": "2026-02-04",
+        "new": "vim-quickrun"
+    },
+    "rainbow_parentheses": {
+        "date": "2026-02-04",
+        "new": "rainbow_parentheses-vim"
+    },
+    "vimproc": {
+        "date": "2026-02-04",
+        "new": "vimproc-vim"
+    },
+    "vimshell": {
+        "date": "2026-02-04",
+        "new": "vimshell-vim"
+    },
+    "vinegar": {
+        "date": "2026-02-04",
+        "new": "vim-vinegar"
+    },
+    "watchdogs": {
+        "date": "2026-02-04",
+        "new": "vim-watchdogs"
+    },
+    "wombat256": {
+        "date": "2026-02-04",
+        "new": "wombat256-vim"
+    },
+    "xterm-color-table": {
+        "date": "2026-02-04",
+        "new": "xterm-color-table-vim"
+    },
+    "yankring": {
+        "date": "2026-02-04",
+        "new": "YankRing-vim"
+    },
+    "zeavim": {
+        "date": "2026-02-04",
+        "new": "zeavim-vim"
     }
 }

From ddaf531dd63b67fa8c49b721911809092686623d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 4 Feb 2026 11:06:48 -0600
Subject: [PATCH 036/167] vimPlugins: clean up throw messages

Quote and prefix plugin package names

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/aliases.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 42081f02d181..ce5208afcd85 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -42,7 +42,7 @@ mapAliases (
     # keep-sorted start case=no
     blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17
     coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
-    coc-sumneko-lua = throw "coc-sumneko-lua was removed, as it is unmaintained and broken. You should switch to lua_ls"; # added 2026-02-04
+    coc-sumneko-lua = throw "'vimPlugins.coc-sumneko-lua' was removed, as it is unmaintained and broken. You should switch to lua_ls"; # added 2026-02-04
     coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01
     completion-treesitter = throw "completion-treesitter has been archived since 2024-01"; # Added 2025-12-18
     feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
@@ -58,13 +58,13 @@ mapAliases (
     playground = throw "playground has been archived"; # Added 2025-12-18
     pure-lua = lib.warnOnInstantiate "Please replace 'vimPlugins.pure-lua' with 'vimPlugins.moonlight-nvim' as this name was an error" moonlight-nvim; # Added 2025-11-17
     rust-tools-nvim = lib.warnOnInstantiate "'vimPlugins.rust-tools-nvim' is abandoned by upstream; you should use 'vimPlugins.rustaceanvim'" rust-tools-nvim;
-    Spacegray-vim = throw "Spacegray-vim has been removed: abandoned by upstream"; # Added 2025-03-24
+    Spacegray-vim = throw "'vimPlugins.Spacegray-vim' has been removed: abandoned by upstream"; # Added 2025-03-24
     SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
     spacevim = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27
-    sparkup = throw "the upstream repository got deleted"; # added 2025-08-06
-    syntax-tree-surfer = throw "syntax-tree-surfer has been archived"; # Added 2025-12-18
-    todo-nvim = throw "todo-nvim has been removed: abandoned by upstream"; # Added 2023-08-23
-    vim-sourcetrail = throw "vim-sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14
+    sparkup = throw "'vimPlugins.sparkup' was removed: the upstream repository got deleted"; # added 2025-08-06
+    syntax-tree-surfer = throw "'vimPlugins.syntax-tree-surfer' has been archived"; # Added 2025-12-18
+    todo-nvim = throw "'vimPlugins.todo-nvim' has been removed: abandoned by upstream"; # Added 2023-08-23
+    vim-sourcetrail = throw "'vimPlugins.vim-sourcetrail' has been removed: abandoned by upstream"; # Added 2022-08-14
     # keep-sorted end
   }
   // deprecations

From 8dca5e96056207df34d8dfa0c7a472013d1236f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Feb 2026 18:00:43 +0000
Subject: [PATCH 037/167] baresip: 4.4.0 -> 4.5.0

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

diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index d68e5e377a74..b48e824f8d98 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -31,14 +31,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "4.4.0";
+  version = "4.5.0";
   pname = "baresip";
 
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/4XFuOKE/VCIkue9QGwNK/MxkeBU8XoyfLPZd6WAuNg=";
+    hash = "sha256-tut6HC4wn749BqIoRMhk/O2iN4y2hr6MVEnOICroKEM=";
   };
 
   patches = [

From 1f08a01ad842970f9fd95d83bd42bec0d09b0476 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Feb 2026 18:26:47 +0000
Subject: [PATCH 038/167] python3Packages.uproot: 5.7.0 -> 5.7.1

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

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index ebcb284b3953..3c5b8a074377 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "5.7.0";
+  version = "5.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot5";
     tag = "v${version}";
-    hash = "sha256-G3UP+hz2uz58Col3THATDRIiXX8wczFy6ob75iRP9b0=";
+    hash = "sha256-06pMcL2o5hHZLEbi8vdYhAAs5BBkHAskNHUB1o48KDU=";
   };
 
   build-system = [

From e156568f4b93f1b2809ab0d3835acda72dc3b53a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Feb 2026 18:37:58 +0000
Subject: [PATCH 039/167] strawberry: 1.2.17 -> 1.2.18

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

diff --git a/pkgs/by-name/st/strawberry/package.nix b/pkgs/by-name/st/strawberry/package.nix
index 69b8f90c8761..0ab7b54edcca 100644
--- a/pkgs/by-name/st/strawberry/package.nix
+++ b/pkgs/by-name/st/strawberry/package.nix
@@ -38,13 +38,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "strawberry";
-  version = "1.2.17";
+  version = "1.2.18";
 
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = "strawberry";
     rev = finalAttrs.finalPackage.version;
-    hash = "sha256-ZyWVOpa1laBUNW5lwbNeAmVBXEOLlXy+Xz8vbtuLi/8=";
+    hash = "sha256-5h1psYJDKnFFgIGZY3ecCttgkR+zuUwa3b/A4keLk9o=";
   };
 
   # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead

From 72fca0eddc9fb57710e9d9383bca468f9e6396ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Feb 2026 19:04:19 +0000
Subject: [PATCH 040/167] scaleway-cli: 2.51.0 -> 2.52.0

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

diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix
index 93711d5e48d8..bf803a14c4e9 100644
--- a/pkgs/by-name/sc/scaleway-cli/package.nix
+++ b/pkgs/by-name/sc/scaleway-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "scaleway-cli";
-  version = "2.51.0";
+  version = "2.52.0";
 
   src = fetchFromGitHub {
     owner = "scaleway";
     repo = "scaleway-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-osA8YWvS2KqQtYmCRIAGw+/h3UPocW0sBn5IDhk/wWg=";
+    hash = "sha256-92OSk0oJQrLAllbfsJB9FUC8C+0jLQLjw9wYHG+Lc98=";
   };
 
-  vendorHash = "sha256-s3G7zvTCg3voMur4YjHibqsHKLkB79iDgmMhv0C52yY=";
+  vendorHash = "sha256-1pi9WQZ6dwCVsJbpA+seIzRn5lFFOjYUvt8MKUHKcVg=";
 
   env.CGO_ENABLED = 0;
 

From 3f4f2817f91653d597c0e3916619e8171dce4723 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Wed, 4 Feb 2026 20:30:59 +0100
Subject: [PATCH 041/167] gns3-server: 2.2.56 -> 2.2.56.1

Diff: https://github.com/GNS3/gns3-server/compare/v2.2.56...v2.2.56.1
---
 pkgs/by-name/gn/gns3-server/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gns3-server/package.nix b/pkgs/by-name/gn/gns3-server/package.nix
index c817deb471de..767d76988877 100644
--- a/pkgs/by-name/gn/gns3-server/package.nix
+++ b/pkgs/by-name/gn/gns3-server/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gns3-server";
-  version = "2.2.56";
+  version = "2.2.56.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "gns3-server";
     tag = "v${version}";
-    hash = "sha256-akA6P/ONPioce4pJbg4wAzSvb7aSYGM8NfCs7q9svic=";
+    hash = "sha256-1eYUJtrOfe1DXzxJbT1HQ6oiiiS+xHRG/wg9gOs0uTU=";
   };
 
   # GNS3 2.3.26 requires a static BusyBox for the Docker integration
@@ -29,10 +29,12 @@ python3Packages.buildPythonApplication rec {
   '';
 
   pythonRelaxDeps = [
+    "aiofiles"
     "aiohttp"
     "aiohttp-cors"
     "jsonschema"
     "platformdirs"
+    "psutil"
     "sentry-sdk"
   ];
 

From 4ec500e36260205e34bb7a392e12cfa4745c09a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Feb 2026 20:43:18 +0000
Subject: [PATCH 042/167] flannel: 0.28.0 -> 0.28.1

---
 pkgs/tools/networking/flannel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index b692b15038ec..241cd98f93a8 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "flannel";
-  version = "0.28.0";
+  version = "0.28.1";
   rev = "v${version}";
 
-  vendorHash = "sha256-w3Z6iP65HASQD79lNXbVVuBbsYLfMl8dFGLzLszF+wE=";
+  vendorHash = "sha256-Iwfmi9poxubI+l847BYTpE8lpeIHTPwUt8ulfqMGTfQ=";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "flannel-io";
     repo = "flannel";
-    sha256 = "sha256-h2eNdZw84YgOfPktVVZIFPGPHf4JgEFOaqt1txeLxZ0=";
+    sha256 = "sha256-kYUy7Dije5Ba2//bosarDO3UgxKFi7YXrH2RhV2NqPA=";
   };
 
   ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ];

From a9da5e8b0d8729414f0afaff4bd0ab4fe2ef7ebc Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Wed, 4 Feb 2026 21:17:10 +0100
Subject: [PATCH 043/167] gns3-gui: 2.2.55 -> 2.2.56.1

Diff: https://github.com/GNS3/gns3-gui/compare/v2.2.55...v2.2.56.1
---
 pkgs/by-name/gn/gns3-gui/package.nix | 40 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/gn/gns3-gui/package.nix b/pkgs/by-name/gn/gns3-gui/package.nix
index e147afc1ee32..2d1af2ba0725 100644
--- a/pkgs/by-name/gn/gns3-gui/package.nix
+++ b/pkgs/by-name/gn/gns3-gui/package.nix
@@ -1,48 +1,51 @@
 {
   fetchFromGitHub,
+  fetchpatch,
   gns3-gui,
   lib,
   python3Packages,
-  qt5,
+  qt6,
   testers,
   writableTmpDirAsHomeHook,
 }:
 
-let
-  pythonPackages = python3Packages.overrideScope (
-    final: prev: {
-      pyqt5 = prev.pyqt5.override { withWebSockets = true; };
-    }
-  );
-in
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gns3-gui";
-  version = "2.2.55";
+  version = "2.2.56.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "gns3-gui";
     tag = "v${version}";
-    hash = "sha256-6jblQakNpoSQXfy5pU68Aedg661VcwpqQilvqOV15pQ";
+    hash = "sha256-HBTBwn7jAW/SXFTfPbO08bDG5NfS3tuic/Z0ib1/Uo8=";
   };
 
+  patches = [
+    # Fix tests after PyQt6 migration
+    (fetchpatch {
+      url = "https://github.com/GNS3/gns3-gui/commit/e6e2a1cafbc3ce4be9cca3428e60400f25806cde.patch";
+      hash = "sha256-T15OCqm+Te9ZOCg/kFf/fd2DY75LfaLHskAAgGYMloI=";
+    })
+  ];
+
   pythonRelaxDeps = [
     "jsonschema"
+    "psutil"
     "sentry-sdk"
   ];
 
-  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
 
-  buildInputs = [ qt5.qtwayland ];
+  buildInputs = [ qt6.qtwayland ];
 
-  build-system = with pythonPackages; [ setuptools ];
+  build-system = with python3Packages; [ setuptools ];
 
-  dependencies = with pythonPackages; [
+  dependencies = with python3Packages; [
     distro
     jsonschema
     psutil
-    pyqt5
+    pyqt6
     sentry-sdk
     setuptools
     sip
@@ -55,14 +58,13 @@ pythonPackages.buildPythonApplication rec {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
-  nativeCheckInputs = with pythonPackages; [
+  nativeCheckInputs = with python3Packages; [
     pytestCheckHook
     writableTmpDirAsHomeHook
   ];
 
   preCheck = ''
-    export QT_PLUGIN_PATH="${lib.getBin qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"
-    export QT_QPA_PLATFORM_PLUGIN_PATH="${lib.getBin qt5.qtbase}/lib/qt-${qt5.qtbase.version}/plugins";
+    export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"
     export QT_QPA_PLATFORM=offscreen
   '';
 

From 3ecd2d02fac86f747523831e4b71312d8cf9d310 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Wed, 4 Feb 2026 21:48:21 +0100
Subject: [PATCH 044/167] gns3-gui,gns3-server: use passthru.updateScript

gns3-gui and gns3-server versions should kept in sync.
---
 pkgs/by-name/gn/gns3-gui/package.nix    | 10 +++++++---
 pkgs/by-name/gn/gns3-server/package.nix | 22 +++++++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gn/gns3-gui/package.nix b/pkgs/by-name/gn/gns3-gui/package.nix
index 2d1af2ba0725..7ee34cb12eb8 100644
--- a/pkgs/by-name/gn/gns3-gui/package.nix
+++ b/pkgs/by-name/gn/gns3-gui/package.nix
@@ -2,6 +2,7 @@
   fetchFromGitHub,
   fetchpatch,
   gns3-gui,
+  gns3-server,
   lib,
   python3Packages,
   qt6,
@@ -68,9 +69,12 @@ python3Packages.buildPythonApplication rec {
     export QT_QPA_PLATFORM=offscreen
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = gns3-gui;
-    command = "${lib.getExe gns3-gui} --version";
+  passthru = {
+    tests.version = testers.testVersion {
+      package = gns3-gui;
+      command = "${lib.getExe gns3-gui} --version";
+    };
+    inherit (gns3-server.passthru) updateScript;
   };
 
   meta = {
diff --git a/pkgs/by-name/gn/gns3-server/package.nix b/pkgs/by-name/gn/gns3-server/package.nix
index 767d76988877..11c023f94630 100644
--- a/pkgs/by-name/gn/gns3-server/package.nix
+++ b/pkgs/by-name/gn/gns3-server/package.nix
@@ -9,6 +9,7 @@
   testers,
   util-linux,
   writableTmpDirAsHomeHook,
+  writeScript,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -84,12 +85,23 @@ python3Packages.buildPythonApplication rec {
     "tests/controller/test_project.py"
   ];
 
-  passthru.tests = {
-    inherit (nixosTests) gns3-server;
-    version = testers.testVersion {
-      package = gns3-server;
-      command = "${lib.getExe gns3-server} --version";
+  passthru = {
+    tests = {
+      inherit (nixosTests) gns3-server;
+      version = testers.testVersion {
+        package = gns3-server;
+        command = "${lib.getExe gns3-server} --version";
+      };
     };
+    updateScript = writeScript "update-gns3" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p nix-update
+
+      set -eu -o pipefail
+
+      nix-update gns3-gui --version-regex '^v(2\.[\d\.]+)$' --commit
+      nix-update gns3-server --version-regex '^v(2\.[\d\.]+)$' --commit
+    '';
   };
 
   meta = {

From 96a4c7eb129983528e800ded22db9b552db61e08 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Wed, 4 Feb 2026 21:56:16 +0100
Subject: [PATCH 045/167] signal-desktop: 7.87.0 -> 7.88.0

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

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 944c358ad9c1..5ef621d952a8 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -54,13 +54,13 @@ let
     '';
   });
 
-  version = "7.87.0";
+  version = "7.88.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-7Pb8CCCibs/T3Cjx4+Tx1U5Fb4mmbb6P3zmLZ/+zoxc=";
+    hash = "sha256-uKN6zandxyc2VUCq3uINMgeniPyJiE9lskT/Opz1WMA=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1769636497;
+    SOURCE_DATE_EPOCH = 1770233682;
   };
 
   preBuild = ''

From 2d91647d76d668f88ef5f0480f88a8f0393c7807 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 18:19:36 +0100
Subject: [PATCH 046/167] 
 font{adobe{,utopia},bh{,lucidatypewriter},bitstream}100dpi: rename references
 and deprecate aliases

this shouldn't create any rebuilds
---
 pkgs/by-name/x3/x3270/package.nix | 20 ++++++++++----------
 pkgs/top-level/aliases.nix        |  5 +++++
 pkgs/top-level/all-packages.nix   |  5 -----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix
index 997349a24bc1..d3e9c89bbad3 100644
--- a/pkgs/by-name/x3/x3270/package.nix
+++ b/pkgs/by-name/x3/x3270/package.nix
@@ -11,11 +11,11 @@
   libXmu,
   bdftopcf,
   mkfontdir,
-  fontadobe100dpi,
-  fontadobeutopia100dpi,
-  fontbh100dpi,
-  fontbhlucidatypewriter100dpi,
-  fontbitstream100dpi,
+  font-adobe-100dpi,
+  font-adobe-utopia-100dpi,
+  font-bh-100dpi,
+  font-bh-lucidatypewriter-100dpi,
+  font-bitstream-100dpi,
   tcl,
   ncurses,
   openssl,
@@ -73,11 +73,11 @@ stdenv.mkDerivation (finalAttrs: {
     libXmu
     bdftopcf
     mkfontdir
-    fontadobe100dpi
-    fontadobeutopia100dpi
-    fontbh100dpi
-    fontbhlucidatypewriter100dpi
-    fontbitstream100dpi
+    font-adobe-100dpi
+    font-adobe-utopia-100dpi
+    font-bh-100dpi
+    font-bh-lucidatypewriter-100dpi
+    font-bitstream-100dpi
     tcl
     ncurses
     expat
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 70cfdeb0ebca..19603a24534e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -669,15 +669,20 @@ mapAliases {
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
   follow = warnAlias "follow has been renamed to folo" folo; # Added 2025-05-18
   fontadobe75dpi = font-adobe-75dpi; # Added 2026-01-19
+  fontadobe100dpi = font-adobe-100dpi; # Added 2026-02-04
   fontadobeutopia75dpi = font-adobe-utopia-75dpi; # Added 2026-01-19
+  fontadobeutopia100dpi = font-adobe-utopia-100dpi; # Added 2026-02-04
   fontadobeutopiatype1 = font-adobe-utopia-type1; # Added 2026-01-19
   fontalias = font-alias; # Added 2026-01-19
   fontarabicmisc = font-arabic-misc; # Added 2026-01-19
   fontbh75dpi = font-bh-75dpi; # Added 2026-01-19
+  fontbh100dpi = font-bh-100dpi; # Added 2026-02-04
   fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi; # Added 2026-01-19
+  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi; # Added 2026-02-04
   fontbhttf = font-bh-ttf; # Added 2026-01-19
   fontbhtype1 = font-bh-type1; # Added 2026-01-19
   fontbitstream75dpi = font-bitstream-75dpi; # Added 2026-01-19
+  fontbitstream100dpi = font-bitstream-100dpi; # Added 2026-02-04
   fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24
   fontbitstreamtype1 = font-bitstream-type1; # Added 2026-01-19
   fontcronyxcyrillic = font-cronyx-cyrillic; # Added 2026-01-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 751fafe2c40c..671dcdd2f898 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8822,11 +8822,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  fontadobe100dpi = font-adobe-100dpi;
-  fontadobeutopia100dpi = font-adobe-utopia-100dpi;
-  fontbh100dpi = font-bh-100dpi;
-  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
-  fontbitstream100dpi = font-bitstream-100dpi;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;

From 933109d459d2ecf96a7aa2d4eab9e6f78ec7afcb Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 18:21:11 +0100
Subject: [PATCH 047/167] fontutil: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix | 4 ++--
 pkgs/by-name/xa/xarcan/package.nix                  | 4 ++--
 pkgs/by-name/xo/xorg-server/package.nix             | 4 ++--
 pkgs/by-name/xw/xwayland/package.nix                | 4 ++--
 pkgs/top-level/aliases.nix                          | 1 +
 pkgs/top-level/all-packages.nix                     | 1 -
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
index 44a61008c9a3..92a9b9d38ee5 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
@@ -3,7 +3,7 @@
   stdenv,
   autoreconfHook,
   dockapps-sources,
-  fontutil,
+  font-util,
   libX11,
   libXext,
   libXpm,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     libX11
     libXext
     libXpm
-    fontutil
+    font-util
     mkfontdir
   ];
 
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index b67513d0cc9e..331274f75466 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -7,7 +7,7 @@
   dbus,
   dri-pkgconfig-stub,
   libepoxy,
-  fontutil,
+  font-util,
   libGL,
   libX11,
   libXau,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalPackages: rec {
     dbus
     dri-pkgconfig-stub
     libepoxy
-    fontutil
+    font-util
     libGL
     libX11
     libXau
diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix
index 03119738d6fb..b496850c5e00 100644
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -11,7 +11,7 @@
   # deps
   dbus,
   dri-pkgconfig-stub,
-  fontutil,
+  font-util,
   libdrm,
   libepoxy,
   libgbm,
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    fontutil
+    font-util
     libx11
     libxau
     libxcb
diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix
index f8016df2eb22..9fd0ce1a8601 100644
--- a/pkgs/by-name/xw/xwayland/package.nix
+++ b/pkgs/by-name/xw/xwayland/package.nix
@@ -4,7 +4,7 @@
   bash,
   libepoxy,
   fetchurl,
-  fontutil,
+  font-util,
   lib,
   libdecor,
   libgbm,
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     libgbm
     libepoxy
     libei
-    fontutil
+    font-util
     libGL
     libGLU
     libX11
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 19603a24534e..7cc746394295 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -702,6 +702,7 @@ mapAliases {
   fontscreencyrillic = font-screen-cyrillic; # Added 2026-01-19
   fontsonymisc = font-sony-misc; # Added 2026-01-19
   fontsunmisc = font-sun-misc; # Added 2026-01-19
+  fontutil = font-util; # Added 2026-02-04
   fontwinitzkicyrillic = font-winitzki-cyrillic; # Added 2026-01-19
   fontxfree86type1 = font-xfree86-type1; # Added 2026-01-19
   forceSystem = warnAlias "forceSystem is deprecated in favour of explicitly importing Nixpkgs" (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 671dcdd2f898..c87001c26e12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8822,7 +8822,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
   libICE = libice;

From 710fcd2bc5ad66380bef7bfd8edad0f1d1885fd3 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 18:26:54 +0100
Subject: [PATCH 048/167] xorgserver: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/applications/video/vdr/softhddevice/default.nix   |  4 ++--
 pkgs/applications/window-managers/i3/default.nix       |  4 ++--
 pkgs/by-name/ba/bamf/package.nix                       |  4 ++--
 pkgs/by-name/bu/bumblebee/package.nix                  |  6 +++---
 pkgs/by-name/gd/gdm/package.nix                        |  6 +++---
 pkgs/by-name/ge/geis/package.nix                       |  4 ++--
 pkgs/by-name/gn/gnome-control-center/package.nix       |  4 ++--
 pkgs/by-name/he/herbstluftwm/package.nix               |  4 ++--
 pkgs/by-name/lu/lutris-unwrapped/package.nix           |  4 ++--
 pkgs/by-name/mu/muffin/package.nix                     |  4 ++--
 pkgs/by-name/mu/mutter/package.nix                     |  4 ++--
 pkgs/by-name/mu/mutter48/package.nix                   |  4 ++--
 pkgs/by-name/se/selinux-sandbox/package.nix            |  6 +++---
 pkgs/by-name/xf/xf86-input-cmt/package.nix             |  4 ++--
 pkgs/by-name/xf/xf86-input-evdev/package.nix           |  2 +-
 pkgs/by-name/xf/xf86-input-wacom/package.nix           |  4 ++--
 pkgs/by-name/xp/xpra/package.nix                       | 10 +++++-----
 .../python-modules/qtile-extras/default.nix            |  4 ++--
 pkgs/top-level/aliases.nix                             |  1 +
 pkgs/top-level/all-packages.nix                        |  1 -
 20 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix
index dc4c069df341..f6c9e6f274c8 100644
--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@@ -5,7 +5,7 @@
   alsa-lib,
   fetchFromGitHub,
   xcbutilwm,
-  xorgserver,
+  xorg-server,
   ffmpeg,
   libva,
   libvdpau,
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace softhddev.c \
-      --replace "LOCALBASE \"/bin/X\"" "\"${xorgserver}/bin/X\""
+      --replace "LOCALBASE \"/bin/X\"" "\"${xorg-server}/bin/X\""
   '';
 
   meta = {
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index d761e7144297..3eba467c0046 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -22,7 +22,7 @@
   pango,
   perlPackages,
   libxkbcommon,
-  xorgserver,
+  xorg-server,
   xvfb-run,
   xdotool,
   xrandr,
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = stdenv.hostPlatform.isLinux;
 
   nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [
-    xorgserver
+    xorg-server
     xvfb-run
     xdotool
     setxkbmap
diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix
index 0f0dfc309246..4231719ddf11 100644
--- a/pkgs/by-name/ba/bamf/package.nix
+++ b/pkgs/by-name/ba/bamf/package.nix
@@ -15,7 +15,7 @@
   gobject-introspection,
   gtk-doc,
   docbook_xsl,
-  xorgserver,
+  xorg-server,
   dbus,
   python3,
   wrapGAppsHook3,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     vala
     which
     wrapGAppsHook3
-    xorgserver
+    xorg-server
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix
index d44ac9bfaa2e..026b10a1b85d 100644
--- a/pkgs/by-name/bu/bumblebee/package.nix
+++ b/pkgs/by-name/bu/bumblebee/package.nix
@@ -27,7 +27,7 @@
   glib,
   libbsd,
   libX11,
-  xorgserver,
+  xorg-server,
   kmod,
   xf86videonouveau,
   nvidia_x11 ? linuxPackages.nvidia_x11,
@@ -65,12 +65,12 @@ let
 
   bbdPath = lib.makeBinPath [
     kmod
-    xorgserver
+    xorg-server
   ];
 
   xmodules = lib.concatStringsSep "," (
     map (x: "${x.out or x}/lib/xorg/modules") (
-      [ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau
+      [ xorg-server ] ++ lib.optional (!useNvidia) xf86videonouveau
     )
   );
 
diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index d81cb58d5295..ce03f3130dca 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -26,7 +26,7 @@
   gobject-introspection,
   plymouth,
   coreutils,
-  xorgserver,
+  xorg-server,
   dbus,
   nixos-icons,
   runCommand,
@@ -110,9 +110,9 @@ stdenv.mkDerivation (finalAttrs: {
       inherit
         coreutils
         plymouth
-        xorgserver
         dbus
         ;
+      xorgserver = xorg-server;
     })
 
     # The following patches implement certain environment variables in GDM which are set by
@@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # Upstream checks some common paths to find an `X` binary. We already know it.
     echo #!/bin/sh > build-aux/find-x-server.sh
-    echo "echo ${lib.getBin xorgserver}/bin/X" >> build-aux/find-x-server.sh
+    echo "echo ${lib.getBin xorg-server}/bin/X" >> build-aux/find-x-server.sh
     patchShebangs build-aux/find-x-server.sh
 
     # Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7
diff --git a/pkgs/by-name/ge/geis/package.nix b/pkgs/by-name/ge/geis/package.nix
index 4e049ccbc44a..d2d1951c39fd 100644
--- a/pkgs/by-name/ge/geis/package.nix
+++ b/pkgs/by-name/ge/geis/package.nix
@@ -18,7 +18,7 @@
   libxext,
   libx11,
   pango,
-  xorgserver,
+  xorg-server,
   testers,
   validatePkgConfig,
 }:
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxtst
     pango
     python3Packages.python
-    xorgserver
+    xorg-server
   ];
 
   prePatch = ''
diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index 2d84429ee513..947aefe87b30 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -71,7 +71,7 @@
   gnome-user-share,
   gnome-remote-desktop,
   wrapGAppsHook4,
-  xorgserver,
+  xorg-server,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.pygobject3 # for test-networkmanager-service.py
     python3.pkgs.python-dbusmock
     setxkbmap
-    xorgserver # for Xvfb
+    xorg-server # for Xvfb
   ];
 
   doCheck = true;
diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix
index 4f7b6fec3ab9..b33d446464d6 100644
--- a/pkgs/by-name/he/herbstluftwm/package.nix
+++ b/pkgs/by-name/he/herbstluftwm/package.nix
@@ -16,7 +16,7 @@
   freetype,
   asciidoc,
   xdotool,
-  xorgserver,
+  xorg-server,
   xsetroot,
   xterm,
   runtimeShell,
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
       ]
     ))
     xdotool
-    xorgserver
+    xorg-server
     xsetroot
     xterm
     python3.pkgs.pytestCheckHook
diff --git a/pkgs/by-name/lu/lutris-unwrapped/package.nix b/pkgs/by-name/lu/lutris-unwrapped/package.nix
index a06c8fb92384..3846f9245415 100644
--- a/pkgs/by-name/lu/lutris-unwrapped/package.nix
+++ b/pkgs/by-name/lu/lutris-unwrapped/package.nix
@@ -32,7 +32,7 @@
   gettext,
   libstrangle,
   fluidsynth,
-  xorgserver,
+  xorg-server,
   xkbcomp,
   setxkbmap,
   util-linux,
@@ -54,7 +54,7 @@ let
     xgamma
     libstrangle
     fluidsynth
-    xorgserver
+    xorg-server
     setxkbmap
     xkbcomp
     # bypass mount suid wrapper which does not work in fhsenv
diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix
index f249d6ad4d31..eac0caef6cee 100644
--- a/pkgs/by-name/mu/muffin/package.nix
+++ b/pkgs/by-name/mu/muffin/package.nix
@@ -36,7 +36,7 @@
   wayland-protocols,
   wayland-scanner,
   wrapGAppsHook3,
-  xorgserver,
+  xorg-server,
   xwayland,
   zenity,
 }:
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
     wrapGAppsHook3
-    xorgserver # for cvt command
+    xorg-server # for cvt command
     gobject-introspection
     wayland-scanner
   ];
diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index 7dce4468738a..a4fc48ff37be 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -54,7 +54,7 @@
   mesa-gl-headers,
   meson,
   gnome-settings-daemon,
-  xorgserver,
+  xorg-server,
   python3,
   wayland-scanner,
   wrapGAppsHook4,
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
     wrapGAppsHook4
     gi-docgen
-    xorgserver
+    xorg-server
     gobject-introspection
     udevCheckHook
   ];
diff --git a/pkgs/by-name/mu/mutter48/package.nix b/pkgs/by-name/mu/mutter48/package.nix
index 17c973d1751d..96a032e8bdba 100644
--- a/pkgs/by-name/mu/mutter48/package.nix
+++ b/pkgs/by-name/mu/mutter48/package.nix
@@ -54,7 +54,7 @@
   mesa-gl-headers,
   meson,
   gnome-settings-daemon,
-  xorgserver,
+  xorg-server,
   python3,
   wayland-scanner,
   wrapGAppsHook4,
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
     wrapGAppsHook4
     gi-docgen
-    xorgserver
+    xorg-server
     gobject-introspection
     udevCheckHook
   ];
diff --git a/pkgs/by-name/se/selinux-sandbox/package.nix b/pkgs/by-name/se/selinux-sandbox/package.nix
index c6202e84ffea..b4c624e5f26b 100644
--- a/pkgs/by-name/se/selinux-sandbox/package.nix
+++ b/pkgs/by-name/se/selinux-sandbox/package.nix
@@ -9,7 +9,7 @@
   policycoreutils,
   selinux-python,
   dbus,
-  xorgserver,
+  xorg-server,
   openbox,
   xmodmap,
   libselinux,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libcap_ng
     policycoreutils
     python3
-    xorgserver
+    xorg-server
     openbox
     xmodmap
     dbus
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       --replace "#!/bin/sh" "#!${bash}/bin/sh" \
       --replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \
       --replace "/usr/bin/cut" "${coreutils}/bin/cut" \
-      --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
+      --replace "/usr/bin/Xephyr" "${xorg-server}/bin/Xepyhr" \
       --replace "secon" "${policycoreutils}/bin/secon"
     substituteInPlace sandbox \
       --replace "/usr/sbin/seunshare" "$out/bin/seunshare" \
diff --git a/pkgs/by-name/xf/xf86-input-cmt/package.nix b/pkgs/by-name/xf/xf86-input-cmt/package.nix
index 2e7a21877d58..a5af589101a8 100644
--- a/pkgs/by-name/xf/xf86-input-cmt/package.nix
+++ b/pkgs/by-name/xf/xf86-input-cmt/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  xorgserver,
+  xorg-server,
   xorgproto,
   utilmacros,
   libgestures,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    xorgserver
+    xorg-server
     xorgproto
     utilmacros
     libgestures
diff --git a/pkgs/by-name/xf/xf86-input-evdev/package.nix b/pkgs/by-name/xf/xf86-input-evdev/package.nix
index df15fa63733c..3a414ba30662 100644
--- a/pkgs/by-name/xf/xf86-input-evdev/package.nix
+++ b/pkgs/by-name/xf/xf86-input-evdev/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "xf86-input-evdev";
   version = "2.11.0";
 
-  # to get rid of xorgserver.dev; man is tiny
+  # to get rid of xorg-server.dev; man is tiny
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/by-name/xf/xf86-input-wacom/package.nix b/pkgs/by-name/xf/xf86-input-wacom/package.nix
index 7eb6174e950f..99e349e54d7e 100644
--- a/pkgs/by-name/xf/xf86-input-wacom/package.nix
+++ b/pkgs/by-name/xf/xf86-input-wacom/package.nix
@@ -16,7 +16,7 @@
   udev,
   udevCheckHook,
   utilmacros,
-  xorgserver,
+  xorg-server,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     utilmacros
     pixman
     xorgproto
-    xorgserver
+    xorg-server
   ];
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index 0d0c56017985..c482b3071e5c 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -54,7 +54,7 @@
   libx11,
   xorgproto,
   libxkbfile,
-  xorgserver,
+  xorg-server,
   xxHash,
   clang,
   withHtml ? true,
@@ -76,9 +76,9 @@ let
 
   xorgModulePaths = writeText "module-paths" ''
     Section "Files"
-      ModulePath "${xorgserver}/lib/xorg/modules"
-      ModulePath "${xorgserver}/lib/xorg/modules/extensions"
-      ModulePath "${xorgserver}/lib/xorg/modules/drivers"
+      ModulePath "${xorg-server}/lib/xorg/modules"
+      ModulePath "${xorg-server}/lib/xorg/modules/extensions"
+      ModulePath "${xorg-server}/lib/xorg/modules/drivers"
       ModulePath "${xf86videodummy}/lib/xorg/modules/drivers"
     EndSection
   '';
@@ -254,7 +254,7 @@ effectiveBuildPythonApplication rec {
       --prefix PATH : ${
         lib.makeBinPath [
           getopt
-          xorgserver
+          xorg-server
           xauth
           which
           util-linux
diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix
index 82a644355182..f636eed0e849 100644
--- a/pkgs/development/python-modules/qtile-extras/default.nix
+++ b/pkgs/development/python-modules/qtile-extras/default.nix
@@ -19,7 +19,7 @@
   qtile,
   requests,
   setuptools-scm,
-  xorgserver,
+  xorg-server,
   nixosTests,
 }:
 buildPythonPackage rec {
@@ -63,7 +63,7 @@ buildPythonPackage rec {
     python-dateutil
     qtile
     requests
-    xorgserver
+    xorg-server
     # stravalib  # marked as broken due to https://github.com/stravalib/stravalib/issues/379
   ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7cc746394295..8e3d608a39b4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2225,6 +2225,7 @@ mapAliases {
     };
   xorg-autoconf = util-macros; # Added 2025-08-18
   xorgdocs = xorg-docs; # Added 2026-01-19
+  xorgserver = xorg-server; # Added 2026-02-04
   xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19
   xow_dongle-firmware = throw "'xow_dongle-firmware' has been renamed to/replaced by 'xone-dongle-firmware'"; # Added 2025-12-30
   xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c87001c26e12..648244d4d2ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8870,7 +8870,6 @@ with pkgs;
   xf86videonouveau = xf86-video-nouveau;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
-  xorgserver = xorg-server;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From a3544283a3b460f09a9f0066b0e6cbb7171675fe Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 18:29:02 +0100
Subject: [PATCH 049/167] xorgcffiles: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/by-name/na/nas/package.nix | 4 ++--
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/na/nas/package.nix b/pkgs/by-name/na/nas/package.nix
index 779bd289595b..7bdcdad85e25 100644
--- a/pkgs/by-name/na/nas/package.nix
+++ b/pkgs/by-name/na/nas/package.nix
@@ -11,7 +11,7 @@
   libXext,
   libXpm,
   libXt,
-  xorgcffiles,
+  xorg-cf-files,
   xorgproto,
 }:
 
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
-    mv $out/${xorgcffiles}/* $out
+    mv $out/${xorg-cf-files}/* $out
     rm -fr $out/nix
   '';
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8e3d608a39b4..abc48b2f2d53 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2224,6 +2224,7 @@ mapAliases {
       # keep-sorted end
     };
   xorg-autoconf = util-macros; # Added 2025-08-18
+  xorgcffiles = xorg-cf-files; # Added 2026-02-04
   xorgdocs = xorg-docs; # Added 2026-01-19
   xorgserver = xorg-server; # Added 2026-02-04
   xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 648244d4d2ea..82d4756bd2f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8869,7 +8869,6 @@ with pkgs;
   xf86inputlibinput = xf86-input-libinput;
   xf86videonouveau = xf86-video-nouveau;
   xkeyboardconfig = xkeyboard-config;
-  xorgcffiles = xorg-cf-files;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From 1508c3b862c2b41498de5dee95062d2d2e90042e Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 18:31:28 +0100
Subject: [PATCH 050/167] xkeyboardconfig: rename references and deprecate
 alias

this shouldn't create any rebuilds
---
 pkgs/applications/display-managers/sddm/unwrapped.nix | 4 ++--
 pkgs/applications/misc/googleearth-pro/default.nix    | 6 +++---
 pkgs/by-name/id/ideamaker/package.nix                 | 4 ++--
 pkgs/by-name/sa/saleae-logic/package.nix              | 4 ++--
 pkgs/by-name/sy/synergy/package.nix                   | 4 ++--
 pkgs/by-name/xk/xkeyboard-config/custom.nix           | 2 +-
 pkgs/by-name/xo/xorg-server/package.nix               | 4 ++--
 pkgs/by-name/xv/xvfb/package.nix                      | 4 ++--
 pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix  | 4 ++--
 pkgs/top-level/aliases.nix                            | 1 +
 pkgs/top-level/all-packages.nix                       | 1 -
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix
index a1d059d26dae..09fa4c71998d 100644
--- a/pkgs/applications/display-managers/sddm/unwrapped.nix
+++ b/pkgs/applications/display-managers/sddm/unwrapped.nix
@@ -13,7 +13,7 @@
   qtdeclarative,
   qtquickcontrols2 ? null,
   systemd,
-  xkeyboardconfig,
+  xkeyboard-config,
   nixosTests,
   docutils,
 }:
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src/greeter/waylandkeyboardbackend.cpp \
-      --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
+      --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard-config}/share/X11/xkb/rules/evdev.xml"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix
index 46c7eb81c2b1..f886c4942f29 100644
--- a/pkgs/applications/misc/googleearth-pro/default.nix
+++ b/pkgs/applications/misc/googleearth-pro/default.nix
@@ -27,7 +27,7 @@
   cups,
   alsa-lib,
 
-  xkeyboardconfig,
+  xkeyboard-config,
   autoPatchelfHook,
   wrapQtAppsHook,
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
     wrapQtAppsHook
   ];
-  propagatedBuildInputs = [ xkeyboardconfig ];
+  propagatedBuildInputs = [ xkeyboard-config ];
   buildInputs = [
     dbus
     cups
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     wrapProgram $out/bin/googleearth-pro \
       --set QT_QPA_PLATFORM xcb \
-      --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb"
+      --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb"
   '';
 
   meta = {
diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix
index 1711200a3c8a..087d701ea053 100644
--- a/pkgs/by-name/id/ideamaker/package.nix
+++ b/pkgs/by-name/id/ideamaker/package.nix
@@ -22,7 +22,7 @@
   shared-mime-info,
   stdenv,
   writeShellApplication,
-  xkeyboardconfig,
+  xkeyboard-config,
 }:
 let
   pname = "ideamaker";
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
   preFixup = ''
     wrapProgram $out/bin/ideamaker \
       --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-      --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
+      --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" \
       --set QTCOMPOSE "${libX11.out}/share/X11/locale" \
       --set KDEDIRS "$HOME/.nix-profile:/nix/var/nix/profiles/default" \
       --set NIX_REDIRECTS /usr/share=$out/share/
diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix
index 4a6c6a36aac9..21e0d65489b6 100644
--- a/pkgs/by-name/sa/saleae-logic/package.nix
+++ b/pkgs/by-name/sa/saleae-logic/package.nix
@@ -30,7 +30,7 @@
   zlib,
   pciutils,
   makeDesktopItem,
-  xkeyboardconfig,
+  xkeyboard-config,
   dbus,
   runtimeShell,
   libGL,
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     cat > "$out/bin/saleae-logic" << EOF
     #!${runtimeShell}
     export LD_PRELOAD="$out/lib/preload.so"
-    export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
+    export QT_XKB_CONFIG_ROOT="${xkeyboard-config}/share/X11/xkb"
     export PATH="${pciutils}/bin:\$PATH"
     exec "$out/Logic" "\$@"
     EOF
diff --git a/pkgs/by-name/sy/synergy/package.nix b/pkgs/by-name/sy/synergy/package.nix
index 9f4663e3942d..e74af9de4eed 100644
--- a/pkgs/by-name/sy/synergy/package.nix
+++ b/pkgs/by-name/sy/synergy/package.nix
@@ -21,7 +21,7 @@
   libXtst,
   libXrandr,
   libXinerama,
-  xkeyboardconfig,
+  xkeyboard-config,
   xinput,
   avahi-compat,
   libsForQt5,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \
-      --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
+      --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard-config}/share/X11/xkb/rules/evdev.xml"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xk/xkeyboard-config/custom.nix b/pkgs/by-name/xk/xkeyboard-config/custom.nix
index 374112f51b08..0e5663009450 100644
--- a/pkgs/by-name/xk/xkeyboard-config/custom.nix
+++ b/pkgs/by-name/xk/xkeyboard-config/custom.nix
@@ -1,4 +1,4 @@
-# xkeyboardconfig variant extensible with custom layouts.
+# xkeyboard-config variant extensible with custom layouts.
 # See nixos/modules/services/x11/extra-layouts.nix
 {
   lib,
diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix
index b496850c5e00..4f1b6a80cdb0 100644
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -42,7 +42,7 @@
   pixman,
   udev,
   xkbcomp,
-  xkeyboardconfig,
+  xkeyboard-config,
   xorgproto,
   xtrans,
   zlib,
@@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-Ddefault_font_path="
 
     "-Dxkb_bin_dir=${xkbcomp}/bin"
-    "-Dxkb_dir=${xkeyboardconfig}/share/X11/xkb"
+    "-Dxkb_dir=${xkeyboard-config}/share/X11/xkb"
     "-Dxkb_output_dir=$out/share/X11/xkb/compiled"
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index c81ee24becee..9629ebc62bdc 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -26,7 +26,7 @@
   xcbutilrenderutil,
   xcbutilwm,
   xkbcomp,
-  xkeyboardconfig,
+  xkeyboard-config,
   xorgproto,
   xtrans,
 }:
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--disable-xquartz"
     "--disable-xwayland"
     "--with-xkb-bin-directory=${xkbcomp}/bin"
-    "--with-xkb-path=${xkeyboardconfig}/share/X11/xkb"
+    "--with-xkb-path=${xkeyboard-config}/share/X11/xkb"
     "--with-xkb-output=$out/share/X11/xkb/compiled"
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin "--without-dtrace";
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index 0f3822490511..9d38b075135a 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -21,7 +21,7 @@
   kirigami ? null,
   kirigami2 ? null,
   isocodes,
-  xkeyboardconfig,
+  xkeyboard-config,
   libxkbfile,
   libplasma ? null,
   plasma-framework ? null,
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     kitemviews
     kwidgetsaddons
     isocodes
-    xkeyboardconfig
+    xkeyboard-config
     libxkbfile
   ]
   ++ lib.optionals (lib.versions.major qtbase.version == "5") [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index abc48b2f2d53..4ad25d64d538 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1961,6 +1961,7 @@ mapAliases {
   xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
   xinput_calibrator = xinput-calibrator; # Added 2025-08-28
   xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
+  xkeyboardconfig = xkeyboard-config; # Added 2026-02-04
   xkeyboardconfig_custom = xkeyboard-config_custom; # Added 2026-01-19
   xmlada = throw "'xmlada' has been renamed to/replaced by 'gnatPackages.xmlada'"; # Converted to throw 2025-10-27
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82d4756bd2f6..b5940a80b157 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8868,7 +8868,6 @@ with pkgs;
   xf86inputevdev = xf86-input-evdev;
   xf86inputlibinput = xf86-input-libinput;
   xf86videonouveau = xf86-video-nouveau;
-  xkeyboardconfig = xkeyboard-config;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From 07eefa930df51ded457c17813f0274d71f202491 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 18:37:56 +0100
Subject: [PATCH 051/167] xf86{videonouveau,input{evdev,libinput}}: rename
 references and deprecate aliases

this shouldn't create any rebuilds
---
 pkgs/by-name/bu/bumblebee/package.nix        | 4 ++--
 pkgs/by-name/pa/pa_applet/package.nix        | 4 ++--
 pkgs/by-name/xf/xf86-video-intel/package.nix | 2 +-
 pkgs/by-name/xf/xfce4-settings/package.nix   | 4 ++--
 pkgs/desktops/lxqt/lxqt-config/default.nix   | 6 +++---
 pkgs/top-level/aliases.nix                   | 3 +++
 pkgs/top-level/all-packages.nix              | 3 ---
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix
index 026b10a1b85d..26b401397b93 100644
--- a/pkgs/by-name/bu/bumblebee/package.nix
+++ b/pkgs/by-name/bu/bumblebee/package.nix
@@ -29,7 +29,7 @@
   libX11,
   xorg-server,
   kmod,
-  xf86videonouveau,
+  xf86-video-nouveau,
   nvidia_x11 ? linuxPackages.nvidia_x11,
   linuxPackages,
   pkgsi686Linux,
@@ -70,7 +70,7 @@ let
 
   xmodules = lib.concatStringsSep "," (
     map (x: "${x.out or x}/lib/xorg/modules") (
-      [ xorg-server ] ++ lib.optional (!useNvidia) xf86videonouveau
+      [ xorg-server ] ++ lib.optional (!useNvidia) xf86-video-nouveau
     )
   );
 
diff --git a/pkgs/by-name/pa/pa_applet/package.nix b/pkgs/by-name/pa/pa_applet/package.nix
index d6c801cee1fe..227f1bdd374b 100644
--- a/pkgs/by-name/pa/pa_applet/package.nix
+++ b/pkgs/by-name/pa/pa_applet/package.nix
@@ -10,7 +10,7 @@
   automake,
   libnotify,
   libX11,
-  xf86inputevdev,
+  xf86-input-evdev,
 }:
 
 stdenv.mkDerivation {
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     glibc
     libnotify
     libX11
-    xf86inputevdev
+    xf86-input-evdev
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/xf/xf86-video-intel/package.nix b/pkgs/by-name/xf/xf86-video-intel/package.nix
index 27064ca6ea71..6ba5f0a24873 100644
--- a/pkgs/by-name/xf/xf86-video-intel/package.nix
+++ b/pkgs/by-name/xf/xf86-video-intel/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Comment from 037167ae17fefe6b5dc86dc05f0dd168031c3c68:
     #
-    # The i965 driver was removed in Mesa 22, but the xf86videointel driver
+    # The i965 driver was removed in Mesa 22, but the xf86-video-intel driver
     # hasn't been updated to reflect this. This leads to the following error
     # when used with the affected hardware:
     #
diff --git a/pkgs/by-name/xf/xfce4-settings/package.nix b/pkgs/by-name/xf/xfce4-settings/package.nix
index 9694bf28f248..5e87e9d0be48 100644
--- a/pkgs/by-name/xf/xfce4-settings/package.nix
+++ b/pkgs/by-name/xf/xfce4-settings/package.nix
@@ -26,7 +26,7 @@
   wlr-protocols,
   xapp,
   xfconf,
-  xf86inputlibinput,
+  xf86-input-libinput,
   colord,
   withColord ? true,
   gitUpdater,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxklavier
     wlr-protocols
     xapp # org.x.apps.portal
-    xf86inputlibinput
+    xf86-input-libinput
     xfconf
   ]
   ++ lib.optionals withUpower [ upower ]
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index d05fcf85d6a0..388febde0075 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -21,7 +21,7 @@
   qttools,
   qtwayland,
   wrapQtAppsHook,
-  xf86inputlibinput,
+  xf86-input-libinput,
   xkeyboard_config,
   gitUpdater,
 }:
@@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
     qtbase
     qtsvg
     qtwayland
-    xf86inputlibinput
-    xf86inputlibinput.dev
+    xf86-input-libinput
+    xf86-input-libinput.dev
   ];
 
   cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4ad25d64d538..d0049e741696 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1911,8 +1911,10 @@ mapAliases {
   xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12
   xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12
   xf86_video_nested = xf86-video-nested; # added 2026-01-13
+  xf86inputevdev = xf86-input-evdev; # Added 2026-02-04
   xf86inputjoystick = xf86-input-joystick; # Added 2026-01-19
   xf86inputkeyboard = xf86-input-keyboard; # Added 2026-01-19
+  xf86inputlibinput = xf86-input-libinput; # Added 2026-02-04
   xf86inputmouse = xf86-input-mouse; # Added 2026-01-19
   xf86inputsynaptics = xf86-input-synaptics; # Added 2026-01-19
   xf86inputvmmouse = xf86-input-vmmouse; # Added 2026-01-19
@@ -1935,6 +1937,7 @@ mapAliases {
   xf86videomga = xf86-video-mga; # Added 2026-01-19
   xf86videoneomagic = xf86-video-neomagic; # Added 2026-01-19
   xf86videonewport = throw "The Xorg Newport video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
+  xf86videonouveau = xf86-video-nouveau; # Added 2026-02-04
   xf86videonv = xf86-video-nv; # Added 2026-01-19
   xf86videoomap = xf86-video-omap; # Added 2026-01-19
   xf86videoopenchrome = xf86-video-openchrome; # Added 2026-01-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5940a80b157..d2daf430b512 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8865,9 +8865,6 @@ with pkgs;
   xcbutilkeysyms = libxcb-keysyms;
   xcbutilrenderutil = libxcb-render-util;
   xcbutilwm = libxcb-wm;
-  xf86inputevdev = xf86-input-evdev;
-  xf86inputlibinput = xf86-input-libinput;
-  xf86videonouveau = xf86-video-nouveau;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From 50d9a6bd6cd4ec4f21ed3b85b5774b76c617691d Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 18:42:11 +0100
Subject: [PATCH 052/167] utilmacros: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/by-name/in/intel-gpu-tools/package.nix  | 4 ++--
 pkgs/by-name/li/libepoxy/package.nix         | 4 ++--
 pkgs/by-name/xe/xedit/package.nix            | 4 ++--
 pkgs/by-name/xf/xf86-input-cmt/package.nix   | 4 ++--
 pkgs/by-name/xf/xf86-input-wacom/package.nix | 4 ++--
 pkgs/by-name/xo/xorg-server/package.nix      | 4 ++--
 pkgs/top-level/aliases.nix                   | 1 +
 pkgs/top-level/all-packages.nix              | 1 -
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix
index 276c675a0cc1..7ee4a89e01c0 100644
--- a/pkgs/by-name/in/intel-gpu-tools/package.nix
+++ b/pkgs/by-name/in/intel-gpu-tools/package.nix
@@ -12,7 +12,7 @@
   meson,
   ninja,
   pkg-config,
-  utilmacros,
+  util-macros,
 
   # runtime
   alsa-lib,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    utilmacros
+    util-macros
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/li/libepoxy/package.nix b/pkgs/by-name/li/libepoxy/package.nix
index ba41e23ae2f1..c10f2392279d 100644
--- a/pkgs/by-name/li/libepoxy/package.nix
+++ b/pkgs/by-name/li/libepoxy/package.nix
@@ -5,7 +5,7 @@
   meson,
   ninja,
   pkg-config,
-  utilmacros,
+  util-macros,
   python3,
   libGL,
   libX11,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    utilmacros
+    util-macros
     python3
   ];
 
diff --git a/pkgs/by-name/xe/xedit/package.nix b/pkgs/by-name/xe/xedit/package.nix
index 136882cd36c1..eae263bfe633 100644
--- a/pkgs/by-name/xe/xedit/package.nix
+++ b/pkgs/by-name/xe/xedit/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   autoreconfHook,
   pkg-config,
-  utilmacros,
+  util-macros,
   libX11,
   libXaw,
   libXmu,
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    utilmacros
+    util-macros
   ];
   buildInputs = [
     libX11
diff --git a/pkgs/by-name/xf/xf86-input-cmt/package.nix b/pkgs/by-name/xf/xf86-input-cmt/package.nix
index a5af589101a8..75a7501dd390 100644
--- a/pkgs/by-name/xf/xf86-input-cmt/package.nix
+++ b/pkgs/by-name/xf/xf86-input-cmt/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   xorg-server,
   xorgproto,
-  utilmacros,
+  util-macros,
   libgestures,
   libevdevc,
 }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     xorg-server
     xorgproto
-    utilmacros
+    util-macros
     libgestures
     libevdevc
   ];
diff --git a/pkgs/by-name/xf/xf86-input-wacom/package.nix b/pkgs/by-name/xf/xf86-input-wacom/package.nix
index 99e349e54d7e..5b71936462a4 100644
--- a/pkgs/by-name/xf/xf86-input-wacom/package.nix
+++ b/pkgs/by-name/xf/xf86-input-wacom/package.nix
@@ -15,7 +15,7 @@
   pkg-config,
   udev,
   udevCheckHook,
-  utilmacros,
+  util-macros,
   xorg-server,
 }:
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXrender
     ncurses
     udev
-    utilmacros
+    util-macros
     pixman
     xorgproto
     xorg-server
diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix
index 4f1b6a80cdb0..2afcf03a0137 100644
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -49,7 +49,7 @@
 
   # darwin specific deps
   darwin,
-  utilmacros,
+  util-macros,
   libapplewm,
 
   writeScript,
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.bootstrap_cmds
-    utilmacros
+    util-macros
   ];
 
   buildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d0049e741696..0d8613cddb98 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1829,6 +1829,7 @@ mapAliases {
   usync = throw "'usync' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18
   util-linuxCurses = throw "'util-linuxCurses' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27
   utillinux = warnAlias "'utillinux' has been renamed to/replaced by 'util-linux'" util-linux; # Converted to warning 2025-10-28
+  utilmacros = util-macros; # Added 2025-02-04
   vaapiIntel = throw "'vaapiIntel' has been renamed to/replaced by 'intel-vaapi-driver'"; # Converted to throw 2025-10-27
   vaapiVdpau = throw "'vaapiVdpau' has been renamed to/replaced by 'libva-vdpau-driver'"; # Converted to throw 2025-10-27
   valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2daf430b512..aad1e0e11834 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8856,7 +8856,6 @@ with pkgs;
   libXxf86misc = libxxf86misc;
   libXxf86vm = libxxf86vm;
   mkfontdir = mkfontscale;
-  utilmacros = util-macros;
   xcbproto = xcb-proto;
   xcbutil = libxcb-util;
   xcbutilcursor = libxcb-cursor;

From d8dee65535b6dfd71281efb7dcb9d98afad3ad75 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 18:55:16 +0100
Subject: [PATCH 053/167] {xcbutilcursor,xcb-util-cursor}: rename references
 and deprecate aliases

this shouldn't create any rebuilds
---
 pkgs/applications/editors/android-studio/common.nix       | 4 ++--
 pkgs/applications/window-managers/awesome/default.nix     | 4 ++--
 pkgs/applications/window-managers/hyprwm/hypr/default.nix | 4 ++--
 pkgs/applications/window-managers/i3/default.nix          | 4 ++--
 pkgs/by-name/al/alfaview/package.nix                      | 4 ++--
 pkgs/by-name/be/bespokesynth/package.nix                  | 4 ++--
 pkgs/by-name/ch/chow-centaur/package.nix                  | 4 ++--
 pkgs/by-name/dk/dk/package.nix                            | 4 ++--
 pkgs/by-name/li/librearp-lv2/package.nix                  | 4 ++--
 pkgs/by-name/li/librearp/package.nix                      | 4 ++--
 pkgs/by-name/po/polybar/package.nix                       | 4 ++--
 pkgs/by-name/ro/rofi-unwrapped/package.nix                | 4 ++--
 pkgs/by-name/su/surge/package.nix                         | 4 ++--
 pkgs/by-name/we/weston/package.nix                        | 4 ++--
 pkgs/by-name/wm/wmutils-core/package.nix                  | 4 ++--
 pkgs/by-name/wm/wmutils-libwm/package.nix                 | 4 ++--
 pkgs/by-name/xm/xmoji/package.nix                         | 4 ++--
 pkgs/by-name/xw/xwayland-satellite/package.nix            | 4 ++--
 pkgs/by-name/ya/yambar/package.nix                        | 4 ++--
 pkgs/development/python-modules/qtile/default.nix         | 4 ++--
 pkgs/top-level/aliases.nix                                | 2 ++
 pkgs/top-level/all-packages.nix                           | 3 ---
 22 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 6526006ec5ef..0e46fd0178de 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -42,7 +42,7 @@
   xcbutilrenderutil,
   xcbutilkeysyms,
   xcbutilimage,
-  xcbutilcursor,
+  libxcb-cursor,
   libxkbfile,
   libXcomposite,
   libXcursor,
@@ -175,7 +175,7 @@ let
             xcbutilrenderutil
             xcbutilkeysyms
             xcbutilimage
-            xcbutilcursor
+            libxcb-cursor
             libice
             libsm
             libxkbfile
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 6c477bec07f2..4be852e0f0f4 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -22,7 +22,7 @@
   libstartup_notification,
   libxdg_basedir,
   libpthreadstubs,
-  xcb-util-cursor,
+  libxcb-cursor,
   makeWrapper,
   pango,
   gobject-introspection,
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
     lua
     net-tools
     pango
-    xcb-util-cursor
+    libxcb-cursor
     libxau
     libxdmcp
     libxcb
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 2d0d0e8209ad..73fc79d4c56a 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -13,7 +13,7 @@
   makeWrapper,
   pcre2,
   pkg-config,
-  xcbutilcursor,
+  libxcb-cursor,
   xcbutilkeysyms,
   xcbutilwm,
   xcbutil,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXdmcp
     libxcb
     pcre2
-    xcbutilcursor
+    libxcb-cursor
     xcbutilkeysyms
     xcbutilwm
     xcbutil
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 3eba467c0046..b1a2b94df040 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -17,7 +17,7 @@
   pcre2,
   libev,
   yajl,
-  xcb-util-cursor,
+  libxcb-cursor,
   perl,
   pango,
   perlPackages,
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     libev
     yajl
-    xcb-util-cursor
+    libxcb-cursor
     perl
     pango
     perlPackages.AnyEventI3
diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix
index f75cb18919b2..fe9d38198f42 100644
--- a/pkgs/by-name/al/alfaview/package.nix
+++ b/pkgs/by-name/al/alfaview/package.nix
@@ -21,7 +21,7 @@
   libgbm,
   openssl,
   systemd,
-  xcb-util-cursor,
+  libxcb-cursor,
   libxcb-wm,
   libxcb-render-util,
   libxcb-keysyms,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     openssl
     stdenv.cc.cc
     systemd
-    xcb-util-cursor
+    libxcb-cursor
     libx11
     libxcb-wm
     libxcb-image
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index fb8395362b05..804deddef8ca 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -25,7 +25,7 @@
   xcbutil,
   libxkbcommon,
   xcbutilkeysyms,
-  xcb-util-cursor,
+  libxcb-cursor,
   gtk3,
   webkitgtk_4_1,
   python3,
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutil
     libxkbcommon
     xcbutilkeysyms
-    xcb-util-cursor
+    libxcb-cursor
     mount
   ];
 
diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix
index 08aae7013add..97fe2d31747e 100644
--- a/pkgs/by-name/ch/chow-centaur/package.nix
+++ b/pkgs/by-name/ch/chow-centaur/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   cairo,
   libxkbcommon,
-  xcbutilcursor,
+  libxcb-cursor,
   xcbutilkeysyms,
   xcbutil,
   libXrandr,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libxkbcommon
-    xcbutilcursor
+    libxcb-cursor
     xcbutilkeysyms
     xcbutil
     libXrandr
diff --git a/pkgs/by-name/dk/dk/package.nix b/pkgs/by-name/dk/dk/package.nix
index f0bfbba4c528..b357d7333fb5 100644
--- a/pkgs/by-name/dk/dk/package.nix
+++ b/pkgs/by-name/dk/dk/package.nix
@@ -5,7 +5,7 @@
   xcbutil,
   xcbutilkeysyms,
   xcbutilwm,
-  xcb-util-cursor,
+  libxcb-cursor,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutil
     xcbutilkeysyms
     xcbutilwm
-    xcb-util-cursor
+    libxcb-cursor
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix
index c1ee31ca9d1c..a5f920f5f7ed 100644
--- a/pkgs/by-name/li/librearp-lv2/package.nix
+++ b/pkgs/by-name/li/librearp-lv2/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   cairo,
   libxkbcommon,
-  xcbutilcursor,
+  libxcb-cursor,
   xcbutilkeysyms,
   xcbutil,
   libXrandr,
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libxkbcommon
-    xcbutilcursor
+    libxcb-cursor
     xcbutilkeysyms
     xcbutil
     libXrandr
diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix
index 72f167fbe727..8c578d1d7f88 100644
--- a/pkgs/by-name/li/librearp/package.nix
+++ b/pkgs/by-name/li/librearp/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   cairo,
   libxkbcommon,
-  xcbutilcursor,
+  libxcb-cursor,
   xcbutilkeysyms,
   xcbutil,
   libXrandr,
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libxkbcommon
-    xcbutilcursor
+    libxcb-cursor
     xcbutilkeysyms
     xcbutil
     libXrandr
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 72b4c5017305..df6b9378799b 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -16,7 +16,7 @@
   stdenv,
   xcbproto,
   xcbutil,
-  xcbutilcursor,
+  libxcb-cursor,
   xcbutilimage,
   xcbutilrenderutil,
   xcbutilwm,
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     xcbproto
     xcbutil
-    xcbutilcursor
+    libxcb-cursor
     xcbutilimage
     xcbutilrenderutil
     xcbutilwm
diff --git a/pkgs/by-name/ro/rofi-unwrapped/package.nix b/pkgs/by-name/ro/rofi-unwrapped/package.nix
index 49c485e1385d..308302dae498 100644
--- a/pkgs/by-name/ro/rofi-unwrapped/package.nix
+++ b/pkgs/by-name/ro/rofi-unwrapped/package.nix
@@ -25,7 +25,7 @@
   which,
   xcb-imdkit,
   xcbutil,
-  xcb-util-cursor,
+  libxcb-cursor,
   xcbutilkeysyms,
   xcbutilwm,
   xcbutilxrm,
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     xcb-imdkit
     xcbutil
-    xcb-util-cursor
+    libxcb-cursor
     xcbutilkeysyms
     xcbutilwm
     xcbutilxrm
diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix
index 6d8734803635..cedae623458f 100644
--- a/pkgs/by-name/su/surge/package.nix
+++ b/pkgs/by-name/su/surge/package.nix
@@ -13,7 +13,7 @@
   libxcb,
   libxkbcommon,
   xcbutil,
-  xcbutilcursor,
+  libxcb-cursor,
   xcbutilkeysyms,
   zenity,
   curl,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     libxkbcommon
     xcbutil
-    xcbutilcursor
+    libxcb-cursor
     xcbutilkeysyms
     zenity
     curl
diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix
index 1ed7c54d6364..fe1c81ce22a2 100644
--- a/pkgs/by-name/we/weston/package.nix
+++ b/pkgs/by-name/we/weston/package.nix
@@ -19,7 +19,7 @@
   seatd,
   wayland,
   wayland-protocols,
-  xcbutilcursor,
+  libxcb-cursor,
 
   demoSupport ? true,
   jpegSupport ? true,
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional webpSupport libwebp
   ++ lib.optionals xwaylandSupport [
     libXcursor
-    xcbutilcursor
+    libxcb-cursor
     xwayland
   ];
 
diff --git a/pkgs/by-name/wm/wmutils-core/package.nix b/pkgs/by-name/wm/wmutils-core/package.nix
index 2bab3597b7a5..1d4ee12b0484 100644
--- a/pkgs/by-name/wm/wmutils-core/package.nix
+++ b/pkgs/by-name/wm/wmutils-core/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   libxcb,
   xcbutil,
-  xcb-util-cursor,
+  libxcb-cursor,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     xcbutil
-    xcb-util-cursor
+    libxcb-cursor
   ];
 
   installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/wm/wmutils-libwm/package.nix b/pkgs/by-name/wm/wmutils-libwm/package.nix
index 2ed91047c2bb..a14c1fc8f03f 100644
--- a/pkgs/by-name/wm/wmutils-libwm/package.nix
+++ b/pkgs/by-name/wm/wmutils-libwm/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  xcb-util-cursor,
+  libxcb-cursor,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcb-util-cursor
+    libxcb-cursor
   ];
 
   installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix
index f1152d912ad8..06c4a6e318df 100644
--- a/pkgs/by-name/xm/xmoji/package.nix
+++ b/pkgs/by-name/xm/xmoji/package.nix
@@ -10,7 +10,7 @@
   libXcursor,
   xcbutilimage,
   libxkbcommon,
-  xcb-util-cursor,
+  libxcb-cursor,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXcursor
     libpng
     libxkbcommon
-    xcb-util-cursor
+    libxcb-cursor
     xcbutil
     xcbutilimage
   ];
diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix
index 98a31aff70d4..1a223e7496dc 100644
--- a/pkgs/by-name/xw/xwayland-satellite/package.nix
+++ b/pkgs/by-name/xw/xwayland-satellite/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
   pkg-config,
   rustPlatform,
-  xcb-util-cursor,
+  libxcb-cursor,
   xwayland,
   withSystemd ? true,
 }:
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     libxcb
-    xcb-util-cursor
+    libxcb-cursor
   ];
 
   buildNoDefaultFeatures = true;
diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix
index aba3516e2259..788c05c86834 100644
--- a/pkgs/by-name/ya/yambar/package.nix
+++ b/pkgs/by-name/ya/yambar/package.nix
@@ -22,7 +22,7 @@
   wayland-protocols,
   wayland-scanner,
   xcbutil,
-  xcbutilcursor,
+  libxcb-cursor,
   xcbutilerrors,
   xcbutilwm,
   waylandSupport ? true,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals x11Support [
     xcbutil
-    xcbutilcursor
+    libxcb-cursor
     xcbutilerrors
     xcbutilwm
   ];
diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix
index 8f059c4ecea5..efb7eb0c4804 100644
--- a/pkgs/development/python-modules/qtile/default.nix
+++ b/pkgs/development/python-modules/qtile/default.nix
@@ -29,7 +29,7 @@
   wayland-protocols,
   wayland-scanner,
   wlroots,
-  xcbutilcursor,
+  libxcb-cursor,
   xcbutilwm,
   xcffib,
   nixosTests,
@@ -89,7 +89,7 @@ buildPythonPackage (finalAttrs: {
     "--config-setting=GOBJECT=${lib.getLib glib}/lib/libgobject-2.0.so"
     "--config-setting=PANGO=${lib.getLib pango}/lib/libpango-1.0.so"
     "--config-setting=PANGOCAIRO=${lib.getLib pango}/lib/libpangocairo-1.0.so"
-    "--config-setting=XCBCURSOR=${lib.getLib xcbutilcursor}/lib/libxcb-cursor.so"
+    "--config-setting=XCBCURSOR=${lib.getLib libxcb-cursor}/lib/libxcb-cursor.so"
   ];
 
   dependencies = extraPackages ++ [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0d8613cddb98..18a6e7f8e01f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1906,7 +1906,9 @@ mapAliases {
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
   xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
+  xcb-util-cursor = libxcb-cursor; # Added 2026-02-04
   xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12
+  xcbutilcursor = libxcb-cursor; # Added 2026-02-04
   xcursorthemes = xcursor-themes; # Added 2026-01-19
   xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27
   xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aad1e0e11834..113be95794e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7852,8 +7852,6 @@ with pkgs;
     libmagic = file;
   };
 
-  xcb-util-cursor = libxcb-cursor;
-
   xgboostWithCuda = xgboost.override { cudaSupport = true; };
 
   zlib = callPackage ../development/libraries/zlib {
@@ -8858,7 +8856,6 @@ with pkgs;
   mkfontdir = mkfontscale;
   xcbproto = xcb-proto;
   xcbutil = libxcb-util;
-  xcbutilcursor = libxcb-cursor;
   xcbutilerrors = libxcb-errors;
   xcbutilimage = libxcb-image;
   xcbutilkeysyms = libxcb-keysyms;

From 866aa37ba310e7a7ba626bf74acb3be285dac320 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 19:08:13 +0100
Subject: [PATCH 054/167] xcbutilwm: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/applications/editors/android-studio/common.nix           | 4 ++--
 pkgs/applications/version-management/p4v/linux.nix            | 4 ++--
 pkgs/applications/video/vdr/softhddevice/default.nix          | 4 ++--
 pkgs/applications/window-managers/2bwm/default.nix            | 4 ++--
 pkgs/applications/window-managers/hyprwm/hypr/default.nix     | 4 ++--
 pkgs/applications/window-managers/i3/default.nix              | 4 ++--
 .../window-managers/wayfire/wayfire-plugins-extra.nix         | 4 ++--
 pkgs/by-name/ar/arcan/package.nix                             | 4 ++--
 pkgs/by-name/bi/binaryninja-free/package.nix                  | 4 ++--
 pkgs/by-name/bs/bspwm/package.nix                             | 4 ++--
 pkgs/by-name/ca/cage/package.nix                              | 4 ++--
 pkgs/by-name/ca/cagebreak/package.nix                         | 4 ++--
 pkgs/by-name/dk/dk/package.nix                                | 4 ++--
 pkgs/by-name/dw/dwl/package.nix                               | 4 ++--
 pkgs/by-name/ka/kapitonov-plugins-pack/package.nix            | 4 ++--
 pkgs/by-name/la/labwc/package.nix                             | 4 ++--
 pkgs/by-name/lu/luastatus/package.nix                         | 4 ++--
 pkgs/by-name/ma/mangowc/package.nix                           | 4 ++--
 pkgs/by-name/nx/nxwitness-client/package.nix                  | 4 ++--
 pkgs/by-name/po/polybar/package.nix                           | 4 ++--
 pkgs/by-name/ro/rofi-unwrapped/package.nix                    | 4 ++--
 pkgs/by-name/sc/scenefx/package.nix                           | 4 ++--
 pkgs/by-name/sp/spectrwm/package.nix                          | 4 ++--
 pkgs/by-name/sw/swayfx-unwrapped/package.nix                  | 4 ++--
 pkgs/by-name/sx/sxhkd/package.nix                             | 4 ++--
 pkgs/by-name/vk/vkmark/package.nix                            | 4 ++--
 pkgs/by-name/vu/vulkan-tools-lunarg/package.nix               | 4 ++--
 pkgs/by-name/we/webex/package.nix                             | 4 ++--
 pkgs/by-name/we/wechat-uos/package.nix                        | 4 ++--
 pkgs/by-name/we/wezterm/package.nix                           | 4 ++--
 pkgs/by-name/wi/windowchef/package.nix                        | 4 ++--
 pkgs/by-name/xa/xarcan/package.nix                            | 4 ++--
 pkgs/by-name/xd/xdo/package.nix                               | 4 ++--
 pkgs/by-name/xt/xtitle/package.nix                            | 4 ++--
 pkgs/by-name/xv/xvfb/package.nix                              | 4 ++--
 pkgs/by-name/ya/yambar/package.nix                            | 4 ++--
 pkgs/development/libraries/qt-5/modules/qtbase.nix            | 4 ++--
 pkgs/development/libraries/qt-6/modules/qtbase/default.nix    | 4 ++--
 pkgs/development/python-modules/qtile/default.nix             | 4 ++--
 pkgs/tools/inputmethods/fcitx5/default.nix                    | 4 ++--
 pkgs/top-level/aliases.nix                                    | 1 +
 pkgs/top-level/all-packages.nix                               | 1 -
 42 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 0e46fd0178de..410b53b78741 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -38,7 +38,7 @@
   libxcb,
   libxkbcommon,
   mesa-demos,
-  xcbutilwm,
+  libxcb-wm,
   xcbutilrenderutil,
   xcbutilkeysyms,
   xcbutilimage,
@@ -171,7 +171,7 @@ let
             libX11
             libxcb
             libxkbcommon
-            xcbutilwm
+            libxcb-wm
             xcbutilrenderutil
             xcbutilkeysyms
             xcbutilimage
diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix
index f2af8b405600..4b46e0d75e43 100644
--- a/pkgs/applications/version-management/p4v/linux.nix
+++ b/pkgs/applications/version-management/p4v/linux.nix
@@ -27,7 +27,7 @@
   xcbutilimage,
   xcbutilkeysyms,
   xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-wm,
 }:
 
 {
@@ -69,7 +69,7 @@ let
       xcbutilimage
       xcbutilkeysyms
       xcbutilrenderutil
-      xcbutilwm
+      libxcb-wm
     ];
 
     dontBuild = true;
diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix
index f6c9e6f274c8..95dc5c5fecf6 100644
--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@@ -4,7 +4,7 @@
   vdr,
   alsa-lib,
   fetchFromGitHub,
-  xcbutilwm,
+  libxcb-wm,
   xorg-server,
   ffmpeg,
   libva,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     vdr
-    xcbutilwm
+    libxcb-wm
     ffmpeg
     alsa-lib
     libva
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 8e8131a0062d..a9317c1bdedc 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -5,7 +5,7 @@
   patches,
   libxcb,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   libX11,
   xcbutil,
   xcbutilxrm,
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxcb
     xcbutilkeysyms
-    xcbutilwm
+    libxcb-wm
     libX11
     xcbutil
     xcbutilxrm
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 73fc79d4c56a..5e843f9212de 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -15,7 +15,7 @@
   pkg-config,
   libxcb-cursor,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   xcbutil,
   xmodmap,
 }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     libxcb-cursor
     xcbutilkeysyms
-    xcbutilwm
+    libxcb-wm
     xcbutil
   ];
 
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index b1a2b94df040..78594c879346 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -10,7 +10,7 @@
   libxcb,
   xcbutilkeysyms,
   xcbutil,
-  xcbutilwm,
+  libxcb-wm,
   xcbutilxrm,
   libstartup_notification,
   libX11,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     xcbutilkeysyms
     xcbutil
-    xcbutilwm
+    libxcb-wm
     xcbutilxrm
     libxkbcommon
     libstartup_notification
diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix
index 2a96830ffef7..6c3177fdae96 100644
--- a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix
+++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix
@@ -14,7 +14,7 @@
   libinput,
   libxkbcommon,
   vulkan-headers,
-  xcbutilwm,
+  libxcb-wm,
   gtkmm3,
   withFiltersPlugin ? true,
   withFocusRequestPlugin ? true,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     libinput
     libxkbcommon
     vulkan-headers
-    xcbutilwm
+    libxcb-wm
     gtkmm3
   ];
 
diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index 0f723a613e20..a085b71442a1 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -44,7 +44,7 @@
   wayland-protocols,
   wayland-scanner,
   xcbutil,
-  xcbutilwm,
+  libxcb-wm,
   xz,
   # Boolean flags
   buildManPages ? true,
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     xcbutil
-    xcbutilwm
+    libxcb-wm
     xz
   ]
   ++ lib.optionals (!useBuiltinLua) [ luajit ]
diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix
index 0675fb730d59..9efd5ca13852 100644
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@@ -15,7 +15,7 @@
   xcbutilimage,
   xcbutilkeysyms,
   xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-wm,
   libxml2,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutilimage
     xcbutilkeysyms
     xcbutilrenderutil
-    xcbutilwm
+    libxcb-wm
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index e7052cb87b54..b881e71e08f0 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -6,7 +6,7 @@
   libXinerama,
   xcbutil,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   nixosTests,
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXinerama
     xcbutil
     xcbutilkeysyms
-    xcbutilwm
+    libxcb-wm
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/ca/cage/package.nix b/pkgs/by-name/ca/cage/package.nix
index 0d7e15158985..8f8e06024e1a 100644
--- a/pkgs/by-name/ca/cage/package.nix
+++ b/pkgs/by-name/ca/cage/package.nix
@@ -14,7 +14,7 @@
   wayland-protocols,
   pixman,
   libxkbcommon,
-  xcbutilwm,
+  libxcb-wm,
   libGL,
   libX11,
   xwayland ? null,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     pixman
     libxkbcommon
-    xcbutilwm
+    libxcb-wm
     libGL
     libX11
   ];
diff --git a/pkgs/by-name/ca/cagebreak/package.nix b/pkgs/by-name/ca/cagebreak/package.nix
index 5f4a1d2c5b01..adabf5144bfc 100644
--- a/pkgs/by-name/ca/cagebreak/package.nix
+++ b/pkgs/by-name/ca/cagebreak/package.nix
@@ -8,7 +8,7 @@
   libevdev,
   libinput,
   libxkbcommon,
-  xcbutilwm,
+  libxcb-wm,
   makeWrapper,
   meson,
   ninja,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     libevdev
     libinput
     libxkbcommon
-    xcbutilwm
+    libxcb-wm
     pango
     pixman
     systemd
diff --git a/pkgs/by-name/dk/dk/package.nix b/pkgs/by-name/dk/dk/package.nix
index b357d7333fb5..88094a8d9f17 100644
--- a/pkgs/by-name/dk/dk/package.nix
+++ b/pkgs/by-name/dk/dk/package.nix
@@ -4,7 +4,7 @@
   fetchFromBitbucket,
   xcbutil,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   libxcb-cursor,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     xcbutil
     xcbutilkeysyms
-    xcbutilwm
+    libxcb-wm
     libxcb-cursor
   ];
 
diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix
index 0c28d18fa496..748a464ad63e 100644
--- a/pkgs/by-name/dw/dwl/package.nix
+++ b/pkgs/by-name/dw/dwl/package.nix
@@ -16,7 +16,7 @@
   wayland-scanner,
   wlroots_0_18,
   writeText,
-  xcbutilwm,
+  libxcb-wm,
   xwayland,
   # Boolean flags
   enableXWayland ? true,
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableXWayland [
     libX11
-    xcbutilwm
+    libxcb-wm
     xwayland
   ];
 
diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
index e8ce78821b61..573072b2f013 100644
--- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
+++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
@@ -12,7 +12,7 @@
   ladspa-sdk,
   libxcb,
   lv2,
-  xcbutilwm,
+  libxcb-wm,
   libxcb-util,
   zita-convolver,
   zita-resampler,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     ladspa-sdk
     libxcb
     lv2
-    xcbutilwm
+    libxcb-wm
     libxcb-util
     zita-convolver
     zita-resampler
diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index 7c7c9bc4db8a..c39d3e161152 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -23,7 +23,7 @@
   wayland-protocols,
   wayland-scanner,
   wlroots_0_19,
-  xcbutilwm,
+  libxcb-wm,
   xwayland,
 }:
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     wlroots_0_19
-    xcbutilwm
+    libxcb-wm
     xwayland
   ];
 
diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix
index c38a269f0121..725d0c73fd82 100644
--- a/pkgs/by-name/lu/luastatus/package.nix
+++ b/pkgs/by-name/lu/luastatus/package.nix
@@ -25,7 +25,7 @@
   libxcb,
   libX11,
   xcbutil,
-  xcbutilwm,
+  libxcb-wm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     libX11
     xcbutil
-    xcbutilwm
+    libxcb-wm
     libXdmcp
     libXau
     libpulseaudio
diff --git a/pkgs/by-name/ma/mangowc/package.nix b/pkgs/by-name/ma/mangowc/package.nix
index 88e87d30d75e..1a0bb75f0a1d 100644
--- a/pkgs/by-name/ma/mangowc/package.nix
+++ b/pkgs/by-name/ma/mangowc/package.nix
@@ -12,7 +12,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xcbutilwm,
+  libxcb-wm,
   xwayland,
   enableXWayland ? true,
   meson,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableXWayland [
     libX11
-    xcbutilwm
+    libxcb-wm
     xwayland
   ];
 
diff --git a/pkgs/by-name/nx/nxwitness-client/package.nix b/pkgs/by-name/nx/nxwitness-client/package.nix
index e34b7081d4d9..a22eeb8a7277 100644
--- a/pkgs/by-name/nx/nxwitness-client/package.nix
+++ b/pkgs/by-name/nx/nxwitness-client/package.nix
@@ -20,7 +20,7 @@
   xcbutilimage,
   xcbutilkeysyms,
   xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-wm,
 }:
 let
   version = "6.0.6";
@@ -48,7 +48,7 @@ let
     xcbutilimage
     xcbutilkeysyms
     xcbutilrenderutil
-    xcbutilwm
+    libxcb-wm
   ];
 
   meta = {
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index df6b9378799b..74ab0f5e4582 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -19,7 +19,7 @@
   libxcb-cursor,
   xcbutilimage,
   xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-wm,
   xcbutilxrm,
   makeWrapper,
   removeReferencesTo,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     xcbutilimage
     xcbutilrenderutil
-    xcbutilwm
+    libxcb-wm
     xcbutilxrm
   ]
   ++ lib.optional alsaSupport alsa-lib
diff --git a/pkgs/by-name/ro/rofi-unwrapped/package.nix b/pkgs/by-name/ro/rofi-unwrapped/package.nix
index 308302dae498..cd89ba9b40aa 100644
--- a/pkgs/by-name/ro/rofi-unwrapped/package.nix
+++ b/pkgs/by-name/ro/rofi-unwrapped/package.nix
@@ -27,7 +27,7 @@
   xcbutil,
   libxcb-cursor,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   xcbutilxrm,
   waylandSupport ? true,
   x11Support ? true,
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutil
     libxcb-cursor
     xcbutilkeysyms
-    xcbutilwm
+    libxcb-wm
     xcbutilxrm
   ];
 
diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix
index 1ba9df2cf31f..0b0466ea1f43 100644
--- a/pkgs/by-name/sc/scenefx/package.nix
+++ b/pkgs/by-name/sc/scenefx/package.nix
@@ -15,7 +15,7 @@
   libGL,
   libgbm,
   libxcb,
-  xcbutilwm,
+  libxcb-wm,
   validatePkgConfig,
   testers,
   wayland-scanner,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libgbm
     libxcb
-    xcbutilwm
+    libxcb-wm
     pixman
     wayland
     wayland-protocols
diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index 97e930bf1fc0..34dcfbe96297 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -10,7 +10,7 @@
   libXt,
   xcbutil,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   writeShellScript,
   curl,
   jq,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXt
     xcbutil
     xcbutilkeysyms
-    xcbutilwm
+    libxcb-wm
     libbsd
   ];
 
diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
index 6192c86efad2..3fda6fd4c897 100644
--- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix
+++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
@@ -24,7 +24,7 @@
   scdoc,
   scenefx,
   wayland-scanner,
-  xcbutilwm,
+  libxcb-wm,
   wlroots_0_19,
   testers,
   nixosTests,
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     (wlroots_0_19.override { inherit (finalAttrs) enableXWayland; })
   ]
-  ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ];
+  ++ lib.optionals finalAttrs.enableXWayland [ libxcb-wm ];
 
   mesonFlags =
     let
diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix
index 3a454b69034e..b426d6866a89 100644
--- a/pkgs/by-name/sx/sxhkd/package.nix
+++ b/pkgs/by-name/sx/sxhkd/package.nix
@@ -7,7 +7,7 @@
   libxcb,
   xcbutil,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   nixosTests,
 }:
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     xcbutil
     xcbutilkeysyms
-    xcbutilwm
+    libxcb-wm
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix
index 62c1101460f9..bba04b3ba4ad 100644
--- a/pkgs/by-name/vk/vkmark/package.nix
+++ b/pkgs/by-name/vk/vkmark/package.nix
@@ -13,7 +13,7 @@
   glm,
   assimp,
   libxcb,
-  xcbutilwm,
+  libxcb-wm,
   nix-update-script,
 }:
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     glm
     assimp
     libxcb
-    xcbutilwm
+    libxcb-wm
     wayland
     wayland-protocols
   ];
diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
index 6e2a6f298ed3..125e63ab5e5a 100644
--- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -16,7 +16,7 @@
   wayland,
   which,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   valijson,
   vulkan-headers,
   vulkan-loader,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-utility-libraries
     wayland
     xcbutilkeysyms
-    xcbutilwm
+    libxcb-wm
     qt6.qtbase
     qt6.qtwayland
   ];
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 4514c110313c..0a5f55f571ac 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -48,7 +48,7 @@
   xcbutilimage,
   xcbutilkeysyms,
   xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-wm,
   p7zip,
   onetbb,
   wayland,
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
     libXScrnSaver
     xcbutilkeysyms
     xcbutilrenderutil
-    xcbutilwm
+    libxcb-wm
     onetbb
     wayland
   ];
diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index 7970ca56c2c5..fdf62e3ee6af 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -28,7 +28,7 @@
   atkmm,
   libdrm,
   libxkbcommon,
-  xcbutilwm,
+  libxcb-wm,
   xcbutilimage,
   xcbutilkeysyms,
   xcbutilrenderutil,
@@ -84,7 +84,7 @@ let
     stdenv.cc.libc
     pango
     zlib
-    xcbutilwm
+    libxcb-wm
     xcbutilimage
     xcbutilkeysyms
     xcbutilrenderutil
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index 57db01c1ab11..6cbdb1fdcbe1 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -22,7 +22,7 @@
   xcbutil,
   xcbutilimage,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   zlib,
 }:
 
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage rec {
     xcbutil
     xcbutilimage
     xcbutilkeysyms
-    xcbutilwm # contains xcb-ewmh among others
+    libxcb-wm # contains xcb-ewmh among others
   ];
 
   buildFeatures = [ "distro-defaults" ];
diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix
index 24c2105d6ff0..ec5ee9cf6471 100644
--- a/pkgs/by-name/wi/windowchef/package.nix
+++ b/pkgs/by-name/wi/windowchef/package.nix
@@ -6,7 +6,7 @@
   libXrandr,
   xcbutil,
   xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-wm,
   xcbproto,
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXrandr
     xcbutil
     xcbutilkeysyms
-    xcbutilwm
+    libxcb-wm
     xcbproto
   ];
 
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index 331274f75466..20d87cb6cb99 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -31,7 +31,7 @@
   pkg-config,
   systemd,
   xcbutil,
-  xcbutilwm,
+  libxcb-wm,
   xcbutilimage,
   xkbcomp,
   xkeyboard_config,
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalPackages: rec {
     pixman
     systemd
     xcbutil
-    xcbutilwm
+    libxcb-wm
     xcbutilimage
     xkbcomp
     xkeyboard_config
diff --git a/pkgs/by-name/xd/xdo/package.nix b/pkgs/by-name/xd/xdo/package.nix
index c7378e84ef1c..ba37370206b4 100644
--- a/pkgs/by-name/xd/xdo/package.nix
+++ b/pkgs/by-name/xd/xdo/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   libxcb,
   xcbutil,
-  xcbutilwm,
+  libxcb-wm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcbutilwm
+    libxcb-wm
     xcbutil
   ];
 
diff --git a/pkgs/by-name/xt/xtitle/package.nix b/pkgs/by-name/xt/xtitle/package.nix
index 6c4893ac1836..c6c0d007b3b6 100644
--- a/pkgs/by-name/xt/xtitle/package.nix
+++ b/pkgs/by-name/xt/xtitle/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   libxcb,
   xcbutil,
-  xcbutilwm,
+  libxcb-wm,
   git,
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     git
     xcbutil
-    xcbutilwm
+    libxcb-wm
   ];
 
   meta = {
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index 9629ebc62bdc..bc3aff578674 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -24,7 +24,7 @@
   xcbutilimage,
   xcbutilkeysyms,
   xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-wm,
   xkbcomp,
   xkeyboard-config,
   xorgproto,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutilimage
     xcbutilkeysyms
     xcbutilrenderutil
-    xcbutilwm
+    libxcb-wm
     xorgproto
     xtrans
   ];
diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix
index 788c05c86834..bbe16bc6462b 100644
--- a/pkgs/by-name/ya/yambar/package.nix
+++ b/pkgs/by-name/ya/yambar/package.nix
@@ -24,7 +24,7 @@
   xcbutil,
   libxcb-cursor,
   xcbutilerrors,
-  xcbutilwm,
+  libxcb-wm,
   waylandSupport ? true,
   x11Support ? true,
 }:
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutil
     libxcb-cursor
     xcbutilerrors
-    xcbutilwm
+    libxcb-wm
   ];
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 0720a23b8936..4a218f751697 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -46,7 +46,7 @@
   xcbutilimage,
   xcbutilkeysyms,
   xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-wm,
   zlib,
   at-spi2-core,
 
@@ -135,7 +135,7 @@ stdenv.mkDerivation (
           xcbutilimage
           xcbutilkeysyms
           xcbutilrenderutil
-          xcbutilwm
+          libxcb-wm
         ]
         ++ lib.optional libGLSupported libGL
       );
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index cdbe8f0740d1..26370795cbd2 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -60,7 +60,7 @@
   xcbutilimage,
   xcbutilkeysyms,
   xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-wm,
   zlib,
   at-spi2-core,
   unixODBC,
@@ -157,7 +157,7 @@ stdenv.mkDerivation rec {
     xcbutilimage
     xcbutilkeysyms
     xcbutilrenderutil
-    xcbutilwm
+    libxcb-wm
     libxdmcp
     libxtst
     libxcb-cursor
diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix
index efb7eb0c4804..e7ed8e255fa8 100644
--- a/pkgs/development/python-modules/qtile/default.nix
+++ b/pkgs/development/python-modules/qtile/default.nix
@@ -30,7 +30,7 @@
   wayland-scanner,
   wlroots,
   libxcb-cursor,
-  xcbutilwm,
+  libxcb-wm,
   xcffib,
   nixosTests,
   extraPackages ? [ ],
@@ -112,7 +112,7 @@ buildPythonPackage (finalAttrs: {
     libxkbcommon
     wayland
     wlroots
-    xcbutilwm
+    libxcb-wm
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 4287ee5e00f6..de02a1038ddc 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -30,7 +30,7 @@
   libdatrie,
   xcbutilkeysyms,
   xcbutil,
-  xcbutilwm,
+  libxcb-wm,
   xcb-imdkit,
   libxkbfile,
   nixosTests,
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     libXdmcp
     libxkbcommon
     xcbutil
-    xcbutilwm
+    libxcb-wm
     xcbutilkeysyms
     xcb-imdkit
     xkeyboard_config
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 18a6e7f8e01f..42a1b4c30d2f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1909,6 +1909,7 @@ mapAliases {
   xcb-util-cursor = libxcb-cursor; # Added 2026-02-04
   xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12
   xcbutilcursor = libxcb-cursor; # Added 2026-02-04
+  xcbutilwm = libxcb-wm; # Added 2026-02-04
   xcursorthemes = xcursor-themes; # Added 2026-01-19
   xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27
   xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 113be95794e5..09149d73317d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8860,7 +8860,6 @@ with pkgs;
   xcbutilimage = libxcb-image;
   xcbutilkeysyms = libxcb-keysyms;
   xcbutilrenderutil = libxcb-render-util;
-  xcbutilwm = libxcb-wm;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From f7a087d8f2676f4b290291575520a399dd82eac8 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 19:11:06 +0100
Subject: [PATCH 055/167] xcbutilrenderutil: rename references and deprecate
 alias

this shouldn't create any rebuilds
---
 pkgs/applications/editors/android-studio/common.nix        | 4 ++--
 pkgs/applications/version-management/p4v/linux.nix         | 4 ++--
 pkgs/by-name/bi/binaryninja-free/package.nix               | 4 ++--
 pkgs/by-name/nx/nxwitness-client/package.nix               | 4 ++--
 pkgs/by-name/pi/picom/package.nix                          | 4 ++--
 pkgs/by-name/po/polybar/package.nix                        | 4 ++--
 pkgs/by-name/we/webex/package.nix                          | 4 ++--
 pkgs/by-name/we/wechat-uos/package.nix                     | 4 ++--
 pkgs/by-name/xv/xvfb/package.nix                           | 4 ++--
 pkgs/development/libraries/qt-5/modules/qtbase.nix         | 4 ++--
 pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 4 ++--
 pkgs/top-level/aliases.nix                                 | 1 +
 pkgs/top-level/all-packages.nix                            | 1 -
 13 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 410b53b78741..ad14296dbe82 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -39,7 +39,7 @@
   libxkbcommon,
   mesa-demos,
   libxcb-wm,
-  xcbutilrenderutil,
+  libxcb-render-util,
   xcbutilkeysyms,
   xcbutilimage,
   libxcb-cursor,
@@ -172,7 +172,7 @@ let
             libxcb
             libxkbcommon
             libxcb-wm
-            xcbutilrenderutil
+            libxcb-render-util
             xcbutilkeysyms
             xcbutilimage
             libxcb-cursor
diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix
index 4b46e0d75e43..146750114850 100644
--- a/pkgs/applications/version-management/p4v/linux.nix
+++ b/pkgs/applications/version-management/p4v/linux.nix
@@ -26,7 +26,7 @@
   qtwebview,
   xcbutilimage,
   xcbutilkeysyms,
-  xcbutilrenderutil,
+  libxcb-render-util,
   libxcb-wm,
 }:
 
@@ -68,7 +68,7 @@ let
       qtwebview
       xcbutilimage
       xcbutilkeysyms
-      xcbutilrenderutil
+      libxcb-render-util
       libxcb-wm
     ];
 
diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix
index 9efd5ca13852..e56acc1dc319 100644
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@@ -14,7 +14,7 @@
   wayland,
   xcbutilimage,
   xcbutilkeysyms,
-  xcbutilrenderutil,
+  libxcb-render-util,
   libxcb-wm,
   libxml2,
 }:
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     xcbutilimage
     xcbutilkeysyms
-    xcbutilrenderutil
+    libxcb-render-util
     libxcb-wm
   ];
 
diff --git a/pkgs/by-name/nx/nxwitness-client/package.nix b/pkgs/by-name/nx/nxwitness-client/package.nix
index a22eeb8a7277..c584733368f9 100644
--- a/pkgs/by-name/nx/nxwitness-client/package.nix
+++ b/pkgs/by-name/nx/nxwitness-client/package.nix
@@ -19,7 +19,7 @@
   wayland,
   xcbutilimage,
   xcbutilkeysyms,
-  xcbutilrenderutil,
+  libxcb-render-util,
   libxcb-wm,
 }:
 let
@@ -47,7 +47,7 @@ let
     wayland
     xcbutilimage
     xcbutilkeysyms
-    xcbutilrenderutil
+    libxcb-render-util
     libxcb-wm
   ];
 
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index f1a0b3076827..7900f7d92dea 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -26,7 +26,7 @@
   uthash,
   xcbutil,
   xcbutilimage,
-  xcbutilrenderutil,
+  libxcb-render-util,
   xorgproto,
   xwininfo,
   withDebug ? false,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     uthash
     xcbutil
     xcbutilimage
-    xcbutilrenderutil
+    libxcb-render-util
     xorgproto
   ];
 
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 74ab0f5e4582..21c038968147 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -18,7 +18,7 @@
   xcbutil,
   libxcb-cursor,
   xcbutilimage,
-  xcbutilrenderutil,
+  libxcb-render-util,
   libxcb-wm,
   xcbutilxrm,
   makeWrapper,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutil
     libxcb-cursor
     xcbutilimage
-    xcbutilrenderutil
+    libxcb-render-util
     libxcb-wm
     xcbutilxrm
   ]
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 0a5f55f571ac..10a004d9679f 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -47,7 +47,7 @@
   xcbutil,
   xcbutilimage,
   xcbutilkeysyms,
-  xcbutilrenderutil,
+  libxcb-render-util,
   libxcb-wm,
   p7zip,
   onetbb,
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     xcbutilimage
     libXScrnSaver
     xcbutilkeysyms
-    xcbutilrenderutil
+    libxcb-render-util
     libxcb-wm
     onetbb
     wayland
diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index fdf62e3ee6af..fff5963a0101 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -31,7 +31,7 @@
   libxcb-wm,
   xcbutilimage,
   xcbutilkeysyms,
-  xcbutilrenderutil,
+  libxcb-render-util,
   libgbm,
   alsa-lib,
   wayland,
@@ -87,7 +87,7 @@ let
     libxcb-wm
     xcbutilimage
     xcbutilkeysyms
-    xcbutilrenderutil
+    libxcb-render-util
     libx11
     libxt
     libxext
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index bc3aff578674..b0214ca679d9 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -23,7 +23,7 @@
   xcbutil,
   xcbutilimage,
   xcbutilkeysyms,
-  xcbutilrenderutil,
+  libxcb-render-util,
   libxcb-wm,
   xkbcomp,
   xkeyboard-config,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutil
     xcbutilimage
     xcbutilkeysyms
-    xcbutilrenderutil
+    libxcb-render-util
     libxcb-wm
     xorgproto
     xtrans
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 4a218f751697..d343261eabfa 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -45,7 +45,7 @@
   xcbutil,
   xcbutilimage,
   xcbutilkeysyms,
-  xcbutilrenderutil,
+  libxcb-render-util,
   libxcb-wm,
   zlib,
   at-spi2-core,
@@ -134,7 +134,7 @@ stdenv.mkDerivation (
           xcbutil
           xcbutilimage
           xcbutilkeysyms
-          xcbutilrenderutil
+          libxcb-render-util
           libxcb-wm
         ]
         ++ lib.optional libGLSupported libGL
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 26370795cbd2..695ca373e1f9 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -59,7 +59,7 @@
   xcbutil,
   xcbutilimage,
   xcbutilkeysyms,
-  xcbutilrenderutil,
+  libxcb-render-util,
   libxcb-wm,
   zlib,
   at-spi2-core,
@@ -156,7 +156,7 @@ stdenv.mkDerivation rec {
     xcbutil
     xcbutilimage
     xcbutilkeysyms
-    xcbutilrenderutil
+    libxcb-render-util
     libxcb-wm
     libxdmcp
     libxtst
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 42a1b4c30d2f..bc01da2811d6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1909,6 +1909,7 @@ mapAliases {
   xcb-util-cursor = libxcb-cursor; # Added 2026-02-04
   xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12
   xcbutilcursor = libxcb-cursor; # Added 2026-02-04
+  xcbutilrenderutil = libxcb-render-util; # Added 2026-02-04
   xcbutilwm = libxcb-wm; # Added 2026-02-04
   xcursorthemes = xcursor-themes; # Added 2026-01-19
   xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09149d73317d..aec160b45382 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8859,7 +8859,6 @@ with pkgs;
   xcbutilerrors = libxcb-errors;
   xcbutilimage = libxcb-image;
   xcbutilkeysyms = libxcb-keysyms;
-  xcbutilrenderutil = libxcb-render-util;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From 584757f3488f2ce8cd27c994eac580f3ecbd2d98 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 19:14:57 +0100
Subject: [PATCH 056/167] xcbutilkeysyms: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/applications/editors/android-studio/common.nix        | 4 ++--
 pkgs/applications/version-management/p4v/linux.nix         | 4 ++--
 pkgs/applications/window-managers/2bwm/default.nix         | 4 ++--
 pkgs/applications/window-managers/hyprwm/hypr/default.nix  | 4 ++--
 pkgs/applications/window-managers/i3/default.nix           | 4 ++--
 pkgs/applications/window-managers/i3/easyfocus.nix         | 4 ++--
 pkgs/applications/window-managers/i3/lock-color.nix        | 4 ++--
 pkgs/applications/window-managers/i3/lock.nix              | 4 ++--
 pkgs/by-name/an/animeko/package.nix                        | 4 ++--
 pkgs/by-name/be/bespokesynth/package.nix                   | 4 ++--
 pkgs/by-name/bi/binaryninja-free/package.nix               | 4 ++--
 pkgs/by-name/bs/bspwm/package.nix                          | 4 ++--
 pkgs/by-name/ch/chow-centaur/package.nix                   | 4 ++--
 pkgs/by-name/dk/dk/package.nix                             | 4 ++--
 pkgs/by-name/gf/gfxreconstruct/package.nix                 | 4 ++--
 pkgs/by-name/li/librearp-lv2/package.nix                   | 4 ++--
 pkgs/by-name/li/librearp/package.nix                       | 4 ++--
 pkgs/by-name/ma/mathematica/generic.nix                    | 4 ++--
 pkgs/by-name/nx/nxwitness-client/package.nix               | 4 ++--
 pkgs/by-name/ro/rofi-unwrapped/package.nix                 | 4 ++--
 pkgs/by-name/sp/spectrwm/package.nix                       | 4 ++--
 pkgs/by-name/su/surge/package.nix                          | 4 ++--
 pkgs/by-name/sx/sxhkd/package.nix                          | 4 ++--
 pkgs/by-name/uh/uhhyou-plugins/package.nix                 | 4 ++--
 pkgs/by-name/vl/vlc/package.nix                            | 4 ++--
 pkgs/by-name/vu/vulkan-tools-lunarg/package.nix            | 4 ++--
 pkgs/by-name/we/webex/package.nix                          | 4 ++--
 pkgs/by-name/we/wechat-uos/package.nix                     | 4 ++--
 pkgs/by-name/we/wezterm/package.nix                        | 4 ++--
 pkgs/by-name/wi/windowchef/package.nix                     | 4 ++--
 pkgs/by-name/xc/xcb-imdkit/package.nix                     | 4 ++--
 pkgs/by-name/xv/xvfb/package.nix                           | 4 ++--
 pkgs/by-name/ze/zeal/package.nix                           | 4 ++--
 pkgs/development/libraries/mesa/default.nix                | 4 ++--
 pkgs/development/libraries/qt-5/modules/qtbase.nix         | 4 ++--
 pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 4 ++--
 pkgs/tools/inputmethods/fcitx5/default.nix                 | 4 ++--
 pkgs/top-level/aliases.nix                                 | 1 +
 pkgs/top-level/all-packages.nix                            | 1 -
 39 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index ad14296dbe82..938062b13455 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -40,7 +40,7 @@
   mesa-demos,
   libxcb-wm,
   libxcb-render-util,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xcbutilimage,
   libxcb-cursor,
   libxkbfile,
@@ -173,7 +173,7 @@ let
             libxkbcommon
             libxcb-wm
             libxcb-render-util
-            xcbutilkeysyms
+            libxcb-keysyms
             xcbutilimage
             libxcb-cursor
             libice
diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix
index 146750114850..51e4459ee7fc 100644
--- a/pkgs/applications/version-management/p4v/linux.nix
+++ b/pkgs/applications/version-management/p4v/linux.nix
@@ -25,7 +25,7 @@
   qtwebengine,
   qtwebview,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
 }:
@@ -67,7 +67,7 @@ let
       qtwebengine
       qtwebview
       xcbutilimage
-      xcbutilkeysyms
+      libxcb-keysyms
       libxcb-render-util
       libxcb-wm
     ];
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index a9317c1bdedc..fa3d699b1bbb 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   patches,
   libxcb,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   libX11,
   xcbutil,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libxcb
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm
     libX11
     xcbutil
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 5e843f9212de..a5e525375c8a 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -14,7 +14,7 @@
   pcre2,
   pkg-config,
   libxcb-cursor,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   xcbutil,
   xmodmap,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     pcre2
     libxcb-cursor
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm
     xcbutil
   ];
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 78594c879346..e4da7dcb25a5 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -8,7 +8,7 @@
   ninja,
   installShellFiles,
   libxcb,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xcbutil,
   libxcb-wm,
   xcbutilxrm,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcbutilkeysyms
+    libxcb-keysyms
     xcbutil
     libxcb-wm
     xcbutilxrm
diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix
index e1ba87a78404..7689be9806e0 100644
--- a/pkgs/applications/window-managers/i3/easyfocus.nix
+++ b/pkgs/applications/window-managers/i3/easyfocus.nix
@@ -5,7 +5,7 @@
   pkg-config,
   xorgproto,
   libxcb,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libx11,
   i3ipc-glib,
   glib,
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libxcb
-    xcbutilkeysyms
+    libxcb-keysyms
     xorgproto
     libx11.dev
     i3ipc-glib
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 51d3af3ed4b3..e9404c33df79 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -5,7 +5,7 @@
   autoreconfHook,
   pkg-config,
   libxcb,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xcbutilimage,
   pam,
   libX11,
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     libxcb
-    xcbutilkeysyms
+    libxcb-keysyms
     xcbutilimage
     pam
     libX11
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index de64e19608cf..18f85689a89a 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -6,7 +6,7 @@
   ninja,
   pkg-config,
   libxcb,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xcbutilimage,
   xcbutilxrm,
   pam,
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     libxcb
-    xcbutilkeysyms
+    libxcb-keysyms
     xcbutilimage
     xcbutilxrm
     pam
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 532ee5c64ebf..54e8bfe7965e 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -51,7 +51,7 @@
   libshout,
   ffmpeg_6,
   libmpeg2,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   lirc,
   lua5_2,
   taglib,
@@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
     srt
     libshout
     ffmpeg_6
-    xcbutilkeysyms
+    libxcb-keysyms
     lirc
     lua5_2
     taglib
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index 804deddef8ca..a0380336f05c 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -24,7 +24,7 @@
   vst2-sdk,
   xcbutil,
   libxkbcommon,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-cursor,
   gtk3,
   webkitgtk_4_1,
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     xcbutil
     libxkbcommon
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-cursor
     mount
   ];
diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix
index e56acc1dc319..1c0d98220a23 100644
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@@ -13,7 +13,7 @@
   unzip,
   wayland,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
   libxml2,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     stdenv.cc.cc.lib
     wayland
     xcbutilimage
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-render-util
     libxcb-wm
   ];
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index b881e71e08f0..b9111a267594 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -5,7 +5,7 @@
   libxcb,
   libXinerama,
   xcbutil,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   nixosTests,
 }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     libXinerama
     xcbutil
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm
   ];
 
diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix
index 97fe2d31747e..1059b442642c 100644
--- a/pkgs/by-name/ch/chow-centaur/package.nix
+++ b/pkgs/by-name/ch/chow-centaur/package.nix
@@ -7,7 +7,7 @@
   cairo,
   libxkbcommon,
   libxcb-cursor,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xcbutil,
   libXrandr,
   libXinerama,
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     libxkbcommon
     libxcb-cursor
-    xcbutilkeysyms
+    libxcb-keysyms
     xcbutil
     libXrandr
     libXinerama
diff --git a/pkgs/by-name/dk/dk/package.nix b/pkgs/by-name/dk/dk/package.nix
index 88094a8d9f17..db7e14572425 100644
--- a/pkgs/by-name/dk/dk/package.nix
+++ b/pkgs/by-name/dk/dk/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromBitbucket,
   xcbutil,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   libxcb-cursor,
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xcbutil
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm
     libxcb-cursor
   ];
diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
index 93fe2235f906..67a11ffef607 100644
--- a/pkgs/by-name/gf/gfxreconstruct/package.nix
+++ b/pkgs/by-name/gf/gfxreconstruct/package.nix
@@ -11,7 +11,7 @@
   libxcb,
   lz4,
   vulkan-loader,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   zlib,
   zstd,
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     lz4
     python3
     wayland
-    xcbutilkeysyms
+    libxcb-keysyms
     zlib
     zstd
   ];
diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix
index a5f920f5f7ed..ad84a9e10e0a 100644
--- a/pkgs/by-name/li/librearp-lv2/package.nix
+++ b/pkgs/by-name/li/librearp-lv2/package.nix
@@ -7,7 +7,7 @@
   cairo,
   libxkbcommon,
   libxcb-cursor,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xcbutil,
   libXrandr,
   libXinerama,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     libxkbcommon
     libxcb-cursor
-    xcbutilkeysyms
+    libxcb-keysyms
     xcbutil
     libXrandr
     libXinerama
diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix
index 8c578d1d7f88..47de89d21fc9 100644
--- a/pkgs/by-name/li/librearp/package.nix
+++ b/pkgs/by-name/li/librearp/package.nix
@@ -7,7 +7,7 @@
   cairo,
   libxkbcommon,
   libxcb-cursor,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xcbutil,
   libXrandr,
   libXinerama,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     libxkbcommon
     libxcb-cursor
-    xcbutilkeysyms
+    libxcb-keysyms
     xcbutil
     libXrandr
     libXinerama
diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix
index 3c38de14a67f..531ead1a631e 100644
--- a/pkgs/by-name/ma/mathematica/generic.nix
+++ b/pkgs/by-name/ma/mathematica/generic.nix
@@ -43,7 +43,7 @@
   tre,
   unixODBC,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xkeyboard_config,
   libxtst,
   libxscrnsaver,
@@ -128,7 +128,7 @@ stdenv.mkDerivation {
     tre
     unixODBC
     xcbutilimage
-    xcbutilkeysyms
+    libxcb-keysyms
     xkeyboard_config
     libice
     libsm
diff --git a/pkgs/by-name/nx/nxwitness-client/package.nix b/pkgs/by-name/nx/nxwitness-client/package.nix
index c584733368f9..e814ab534eb7 100644
--- a/pkgs/by-name/nx/nxwitness-client/package.nix
+++ b/pkgs/by-name/nx/nxwitness-client/package.nix
@@ -18,7 +18,7 @@
   qt6Packages,
   wayland,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
 }:
@@ -46,7 +46,7 @@ let
     qt6Packages.qtwebview
     wayland
     xcbutilimage
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-render-util
     libxcb-wm
   ];
diff --git a/pkgs/by-name/ro/rofi-unwrapped/package.nix b/pkgs/by-name/ro/rofi-unwrapped/package.nix
index cd89ba9b40aa..71861ca603f8 100644
--- a/pkgs/by-name/ro/rofi-unwrapped/package.nix
+++ b/pkgs/by-name/ro/rofi-unwrapped/package.nix
@@ -26,7 +26,7 @@
   xcb-imdkit,
   xcbutil,
   libxcb-cursor,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   xcbutilxrm,
   waylandSupport ? true,
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcb-imdkit
     xcbutil
     libxcb-cursor
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm
     xcbutilxrm
   ];
diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index 34dcfbe96297..d72b6fc907fa 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -9,7 +9,7 @@
   libXft,
   libXt,
   xcbutil,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   writeShellScript,
   curl,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXft
     libXt
     xcbutil
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm
     libbsd
   ];
diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix
index cedae623458f..056c6549dfdf 100644
--- a/pkgs/by-name/su/surge/package.nix
+++ b/pkgs/by-name/su/surge/package.nix
@@ -14,7 +14,7 @@
   libxkbcommon,
   xcbutil,
   libxcb-cursor,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   zenity,
   curl,
   rsync,
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     xcbutil
     libxcb-cursor
-    xcbutilkeysyms
+    libxcb-keysyms
     zenity
     curl
     rsync
diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix
index b426d6866a89..57131509ae21 100644
--- a/pkgs/by-name/sx/sxhkd/package.nix
+++ b/pkgs/by-name/sx/sxhkd/package.nix
@@ -6,7 +6,7 @@
   asciidoc,
   libxcb,
   xcbutil,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   nixosTests,
 }:
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     xcbutil
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm
   ];
 
diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix
index f24ffa197b58..0335ed4cb315 100644
--- a/pkgs/by-name/uh/uhhyou-plugins/package.nix
+++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix
@@ -11,7 +11,7 @@
   libxcb,
   xcbutil,
   libxcb-cursor,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxkbcommon,
   libX11,
   libXrandr,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     xcbutil
     libxcb-cursor
-    xcbutilkeysyms
+    libxcb-keysyms
     libxkbcommon
     libX11
     libXrandr
diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 94af6b973cc7..0b2710129526 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -83,7 +83,7 @@
   wayland-scanner,
   wrapGAppsHook3,
   writeShellScript,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   zlib,
 
   chromecastSupport ? true,
@@ -193,7 +193,7 @@ stdenv.mkDerivation (finalAttrs: {
     srt
     systemdLibs
     taglib_1
-    xcbutilkeysyms
+    libxcb-keysyms
     zlib
   ]
   ++ optionals (!onlyLibVLC) [ live555 ]
diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
index 125e63ab5e5a..9e37fe8a0099 100644
--- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -15,7 +15,7 @@
   pkg-config,
   wayland,
   which,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   valijson,
   vulkan-headers,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-loader
     vulkan-utility-libraries
     wayland
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm
     qt6.qtbase
     qt6.qtwayland
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 10a004d9679f..bf81b9f5383a 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -46,7 +46,7 @@
   libxshmfence,
   xcbutil,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
   p7zip,
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
     xcbutil
     xcbutilimage
     libXScrnSaver
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-render-util
     libxcb-wm
     onetbb
diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index fff5963a0101..a61d7bda1dcc 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -30,7 +30,7 @@
   libxkbcommon,
   libxcb-wm,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-render-util,
   libgbm,
   alsa-lib,
@@ -86,7 +86,7 @@ let
     zlib
     libxcb-wm
     xcbutilimage
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-render-util
     libx11
     libxt
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index 6cbdb1fdcbe1..04574e2162e7 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -21,7 +21,7 @@
   wezterm,
   xcbutil,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   zlib,
 }:
@@ -80,7 +80,7 @@ rustPlatform.buildRustPackage rec {
     wayland
     xcbutil
     xcbutilimage
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm # contains xcb-ewmh among others
   ];
 
diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix
index ec5ee9cf6471..2f20320890d2 100644
--- a/pkgs/by-name/wi/windowchef/package.nix
+++ b/pkgs/by-name/wi/windowchef/package.nix
@@ -5,7 +5,7 @@
   libxcb,
   libXrandr,
   xcbutil,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-wm,
   xcbproto,
 }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     libXrandr
     xcbutil
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-wm
     xcbproto
   ];
diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix
index f5e3528d2d93..21bb44498918 100644
--- a/pkgs/by-name/xc/xcb-imdkit/package.nix
+++ b/pkgs/by-name/xc/xcb-imdkit/package.nix
@@ -6,7 +6,7 @@
   extra-cmake-modules,
   uthash,
   xcbutil,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xorgproto,
 }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xcbutil
-    xcbutilkeysyms
+    libxcb-keysyms
   ];
 
   meta = {
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index b0214ca679d9..d1ba08962e9c 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -22,7 +22,7 @@
   pixman,
   xcbutil,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
   xkbcomp,
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     pixman
     xcbutil
     xcbutilimage
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-render-util
     libxcb-wm
     xorgproto
diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix
index ab65873822c8..4d66050d23a4 100644
--- a/pkgs/by-name/ze/zeal/package.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -9,7 +9,7 @@
   libarchive,
   libXdmcp,
   libpthreadstubs,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   qt6,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtbase
     qt6.qtimageformats
     qt6.qtwebengine
-    xcbutilkeysyms
+    libxcb-keysyms
   ];
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9bab63c9a711..13944f58ff5d 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -38,7 +38,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxxf86vm,
   libxrandr,
   libxfixes,
@@ -291,7 +291,7 @@ stdenv.mkDerivation {
     vulkan-loader
     wayland
     wayland-protocols
-    xcbutilkeysyms
+    libxcb-keysyms
     xorgproto
     zstd
   ]
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index d343261eabfa..7474b188b13f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -44,7 +44,7 @@
   udev,
   xcbutil,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
   zlib,
@@ -133,7 +133,7 @@ stdenv.mkDerivation (
           libxkbcommon
           xcbutil
           xcbutilimage
-          xcbutilkeysyms
+          libxcb-keysyms
           libxcb-render-util
           libxcb-wm
         ]
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 695ca373e1f9..5fd6462af26b 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -58,7 +58,7 @@
   udev,
   xcbutil,
   xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
   zlib,
@@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
     libxkbcommon
     xcbutil
     xcbutilimage
-    xcbutilkeysyms
+    libxcb-keysyms
     libxcb-render-util
     libxcb-wm
     libxdmcp
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index de02a1038ddc..c66a7f080916 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -28,7 +28,7 @@
   libxkbcommon,
   libthai,
   libdatrie,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   xcbutil,
   libxcb-wm,
   xcb-imdkit,
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     libxkbcommon
     xcbutil
     libxcb-wm
-    xcbutilkeysyms
+    libxcb-keysyms
     xcb-imdkit
     xkeyboard_config
     libxkbfile
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bc01da2811d6..96864d022f12 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1909,6 +1909,7 @@ mapAliases {
   xcb-util-cursor = libxcb-cursor; # Added 2026-02-04
   xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12
   xcbutilcursor = libxcb-cursor; # Added 2026-02-04
+  xcbutilkeysyms = libxcb-keysyms; # Added 2026-02-04
   xcbutilrenderutil = libxcb-render-util; # Added 2026-02-04
   xcbutilwm = libxcb-wm; # Added 2026-02-04
   xcursorthemes = xcursor-themes; # Added 2026-01-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aec160b45382..7bea20b7525c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8858,7 +8858,6 @@ with pkgs;
   xcbutil = libxcb-util;
   xcbutilerrors = libxcb-errors;
   xcbutilimage = libxcb-image;
-  xcbutilkeysyms = libxcb-keysyms;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From 1fff2e7504a1745fd3e2dc2933f53d4b192f2e99 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 19:16:35 +0100
Subject: [PATCH 057/167] xcbutilimage: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/applications/editors/android-studio/common.nix        | 4 ++--
 pkgs/applications/version-management/p4v/linux.nix         | 4 ++--
 pkgs/applications/window-managers/i3/lock-color.nix        | 4 ++--
 pkgs/applications/window-managers/i3/lock.nix              | 4 ++--
 pkgs/by-name/bi/binaryninja-free/package.nix               | 4 ++--
 pkgs/by-name/gu/gummy/package.nix                          | 4 ++--
 pkgs/by-name/ma/mathematica/generic.nix                    | 4 ++--
 pkgs/by-name/nx/nxwitness-client/package.nix               | 4 ++--
 pkgs/by-name/pi/picom/package.nix                          | 4 ++--
 pkgs/by-name/po/polybar/package.nix                        | 4 ++--
 pkgs/by-name/sf/sfml/package.nix                           | 4 ++--
 pkgs/by-name/sf/sfml_2/package.nix                         | 4 ++--
 pkgs/by-name/we/webex/package.nix                          | 4 ++--
 pkgs/by-name/we/wechat-uos/package.nix                     | 4 ++--
 pkgs/by-name/we/wezterm/package.nix                        | 4 ++--
 pkgs/by-name/xa/xarcan/package.nix                         | 4 ++--
 pkgs/by-name/xm/xmoji/package.nix                          | 4 ++--
 pkgs/by-name/xv/xvfb/package.nix                           | 4 ++--
 pkgs/by-name/xw/xwallpaper/package.nix                     | 4 ++--
 pkgs/development/libraries/qt-5/modules/qtbase.nix         | 4 ++--
 pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 4 ++--
 pkgs/top-level/aliases.nix                                 | 1 +
 pkgs/top-level/all-packages.nix                            | 1 -
 23 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 938062b13455..b3dbb8e516b4 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -41,7 +41,7 @@
   libxcb-wm,
   libxcb-render-util,
   libxcb-keysyms,
-  xcbutilimage,
+  libxcb-image,
   libxcb-cursor,
   libxkbfile,
   libXcomposite,
@@ -174,7 +174,7 @@ let
             libxcb-wm
             libxcb-render-util
             libxcb-keysyms
-            xcbutilimage
+            libxcb-image
             libxcb-cursor
             libice
             libsm
diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix
index 51e4459ee7fc..c8808b66928c 100644
--- a/pkgs/applications/version-management/p4v/linux.nix
+++ b/pkgs/applications/version-management/p4v/linux.nix
@@ -24,7 +24,7 @@
   qttools,
   qtwebengine,
   qtwebview,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
@@ -66,7 +66,7 @@ let
       qttools
       qtwebengine
       qtwebview
-      xcbutilimage
+      libxcb-image
       libxcb-keysyms
       libxcb-render-util
       libxcb-wm
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index e9404c33df79..bfa39114c90d 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -6,7 +6,7 @@
   pkg-config,
   libxcb,
   libxcb-keysyms,
-  xcbutilimage,
+  libxcb-image,
   pam,
   libX11,
   libev,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxcb
     libxcb-keysyms
-    xcbutilimage
+    libxcb-image
     pam
     libX11
     libev
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 18f85689a89a..6918a964de26 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -7,7 +7,7 @@
   pkg-config,
   libxcb,
   libxcb-keysyms,
-  xcbutilimage,
+  libxcb-image,
   xcbutilxrm,
   pam,
   libX11,
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxcb
     libxcb-keysyms
-    xcbutilimage
+    libxcb-image
     xcbutilxrm
     pam
     libX11
diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix
index 1c0d98220a23..9e1d352a9828 100644
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@@ -12,7 +12,7 @@
   stdenv,
   unzip,
   wayland,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     stdenv.cc.cc.lib
     wayland
-    xcbutilimage
+    libxcb-image
     libxcb-keysyms
     libxcb-render-util
     libxcb-wm
diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix
index eb272661ea7a..ca89df1aa601 100644
--- a/pkgs/by-name/gu/gummy/package.nix
+++ b/pkgs/by-name/gu/gummy/package.nix
@@ -8,7 +8,7 @@
   libXext,
   sdbus-cpp,
   udev,
-  xcbutilimage,
+  libxcb-image,
   coreutils,
   cli11,
   ddcutil,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     sdbus-cpp
     spdlog
     udev
-    xcbutilimage
+    libxcb-image
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix
index 531ead1a631e..5c6e1c747e32 100644
--- a/pkgs/by-name/ma/mathematica/generic.nix
+++ b/pkgs/by-name/ma/mathematica/generic.nix
@@ -42,7 +42,7 @@
   pciutils,
   tre,
   unixODBC,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   xkeyboard_config,
   libxtst,
@@ -127,7 +127,7 @@ stdenv.mkDerivation {
     pciutils
     tre
     unixODBC
-    xcbutilimage
+    libxcb-image
     libxcb-keysyms
     xkeyboard_config
     libice
diff --git a/pkgs/by-name/nx/nxwitness-client/package.nix b/pkgs/by-name/nx/nxwitness-client/package.nix
index e814ab534eb7..419f8c7976a2 100644
--- a/pkgs/by-name/nx/nxwitness-client/package.nix
+++ b/pkgs/by-name/nx/nxwitness-client/package.nix
@@ -17,7 +17,7 @@
   openal,
   qt6Packages,
   wayland,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
@@ -45,7 +45,7 @@ let
     qt6Packages.qtwebsockets
     qt6Packages.qtwebview
     wayland
-    xcbutilimage
+    libxcb-image
     libxcb-keysyms
     libxcb-render-util
     libxcb-wm
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index 7900f7d92dea..1add7236f4fe 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -25,7 +25,7 @@
   stdenv,
   uthash,
   xcbutil,
-  xcbutilimage,
+  libxcb-image,
   libxcb-render-util,
   xorgproto,
   xwininfo,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     pixman
     uthash
     xcbutil
-    xcbutilimage
+    libxcb-image
     libxcb-render-util
     xorgproto
   ];
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 21c038968147..58e6b03bdeec 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -17,7 +17,7 @@
   xcbproto,
   xcbutil,
   libxcb-cursor,
-  xcbutilimage,
+  libxcb-image,
   libxcb-render-util,
   libxcb-wm,
   xcbutilxrm,
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbproto
     xcbutil
     libxcb-cursor
-    xcbutilimage
+    libxcb-image
     libxcb-render-util
     libxcb-wm
     xcbutilxrm
diff --git a/pkgs/by-name/sf/sfml/package.nix b/pkgs/by-name/sf/sfml/package.nix
index 214289478f3e..00ee98350a60 100644
--- a/pkgs/by-name/sf/sfml/package.nix
+++ b/pkgs/by-name/sf/sfml/package.nix
@@ -20,7 +20,7 @@
   libXcursor,
   libXrandr,
   libXrender,
-  xcbutilimage,
+  libxcb-image,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXcursor
     libXrandr
     libXrender
-    xcbutilimage
+    libxcb-image
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/sf/sfml_2/package.nix b/pkgs/by-name/sf/sfml_2/package.nix
index f18d872c830d..060cb935fcd0 100644
--- a/pkgs/by-name/sf/sfml_2/package.nix
+++ b/pkgs/by-name/sf/sfml_2/package.nix
@@ -18,7 +18,7 @@
   libXcursor,
   libXrandr,
   libXrender,
-  xcbutilimage,
+  libxcb-image,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "sfml";
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXcursor
     libXrandr
     libXrender
-    xcbutilimage
+    libxcb-image
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index bf81b9f5383a..277f77188c8f 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -45,7 +45,7 @@
   libXtst,
   libxshmfence,
   xcbutil,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     libXtst
     libxshmfence
     xcbutil
-    xcbutilimage
+    libxcb-image
     libXScrnSaver
     libxcb-keysyms
     libxcb-render-util
diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index a61d7bda1dcc..f6c89f75e50e 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -29,7 +29,7 @@
   libdrm,
   libxkbcommon,
   libxcb-wm,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
   libgbm,
@@ -85,7 +85,7 @@ let
     pango
     zlib
     libxcb-wm
-    xcbutilimage
+    libxcb-image
     libxcb-keysyms
     libxcb-render-util
     libx11
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index 04574e2162e7..defaefc1eba7 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -20,7 +20,7 @@
   wayland,
   wezterm,
   xcbutil,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   libxcb-wm,
   zlib,
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec {
     libxkbcommon
     wayland
     xcbutil
-    xcbutilimage
+    libxcb-image
     libxcb-keysyms
     libxcb-wm # contains xcb-ewmh among others
   ];
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index 20d87cb6cb99..3f67984d9f61 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -32,7 +32,7 @@
   systemd,
   xcbutil,
   libxcb-wm,
-  xcbutilimage,
+  libxcb-image,
   xkbcomp,
   xkeyboard_config,
   xorgproto,
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalPackages: rec {
     systemd
     xcbutil
     libxcb-wm
-    xcbutilimage
+    libxcb-image
     xkbcomp
     xkeyboard_config
     xorgproto
diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix
index 06c4a6e318df..f404dfc15f31 100644
--- a/pkgs/by-name/xm/xmoji/package.nix
+++ b/pkgs/by-name/xm/xmoji/package.nix
@@ -8,7 +8,7 @@
   libpng,
   xcbutil,
   libXcursor,
-  xcbutilimage,
+  libxcb-image,
   libxkbcommon,
   libxcb-cursor,
 }:
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libxcb-cursor
     xcbutil
-    xcbutilimage
+    libxcb-image
   ];
 
   makeFlags = [ "prefix=${placeholder "out"}" ];
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index d1ba08962e9c..d91e318e557e 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -21,7 +21,7 @@
   openssl,
   pixman,
   xcbutil,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
     pixman
     xcbutil
-    xcbutilimage
+    libxcb-image
     libxcb-keysyms
     libxcb-render-util
     libxcb-wm
diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix
index 182721cc68ff..b277975bc0ec 100644
--- a/pkgs/by-name/xw/xwallpaper/package.nix
+++ b/pkgs/by-name/xw/xwallpaper/package.nix
@@ -7,7 +7,7 @@
   installShellFiles,
   pixman,
   xcbutil,
-  xcbutilimage,
+  libxcb-image,
   libseccomp,
   libjpeg,
   libpng,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     pixman
-    xcbutilimage
+    libxcb-image
     xcbutil
     libseccomp
     libjpeg
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 7474b188b13f..7e4a9a98d4d4 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -43,7 +43,7 @@
   sqlite,
   udev,
   xcbutil,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
@@ -132,7 +132,7 @@ stdenv.mkDerivation (
           libxcb
           libxkbcommon
           xcbutil
-          xcbutilimage
+          libxcb-image
           libxcb-keysyms
           libxcb-render-util
           libxcb-wm
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 5fd6462af26b..6adf79beacd7 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -57,7 +57,7 @@
   sqlite,
   udev,
   xcbutil,
-  xcbutilimage,
+  libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
   libxcb-wm,
@@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
     libxcb
     libxkbcommon
     xcbutil
-    xcbutilimage
+    libxcb-image
     libxcb-keysyms
     libxcb-render-util
     libxcb-wm
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 96864d022f12..3f8a9150421a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1909,6 +1909,7 @@ mapAliases {
   xcb-util-cursor = libxcb-cursor; # Added 2026-02-04
   xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12
   xcbutilcursor = libxcb-cursor; # Added 2026-02-04
+  xcbutilimage = libxcb-image; # Added 2026-02-04
   xcbutilkeysyms = libxcb-keysyms; # Added 2026-02-04
   xcbutilrenderutil = libxcb-render-util; # Added 2026-02-04
   xcbutilwm = libxcb-wm; # Added 2026-02-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bea20b7525c..a2cb5579ce90 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8857,7 +8857,6 @@ with pkgs;
   xcbproto = xcb-proto;
   xcbutil = libxcb-util;
   xcbutilerrors = libxcb-errors;
-  xcbutilimage = libxcb-image;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From abcb7426afd1ef52b6235b7f72ad1994c25bc26a Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 19:18:20 +0100
Subject: [PATCH 058/167] xcbutilerrors: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/by-name/ya/yambar/package.nix | 4 ++--
 pkgs/top-level/aliases.nix         | 1 +
 pkgs/top-level/all-packages.nix    | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix
index bbe16bc6462b..9fb56e898672 100644
--- a/pkgs/by-name/ya/yambar/package.nix
+++ b/pkgs/by-name/ya/yambar/package.nix
@@ -23,7 +23,7 @@
   wayland-scanner,
   xcbutil,
   libxcb-cursor,
-  xcbutilerrors,
+  libxcb-errors,
   libxcb-wm,
   waylandSupport ? true,
   x11Support ? true,
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals x11Support [
     xcbutil
     libxcb-cursor
-    xcbutilerrors
+    libxcb-errors
     libxcb-wm
   ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3f8a9150421a..de7f9eb12531 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1909,6 +1909,7 @@ mapAliases {
   xcb-util-cursor = libxcb-cursor; # Added 2026-02-04
   xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12
   xcbutilcursor = libxcb-cursor; # Added 2026-02-04
+  xcbutilerrors = libxcb-errors; # Added 2026-02-04
   xcbutilimage = libxcb-image; # Added 2026-02-04
   xcbutilkeysyms = libxcb-keysyms; # Added 2026-02-04
   xcbutilrenderutil = libxcb-render-util; # Added 2026-02-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2cb5579ce90..09a87ff1841d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8856,7 +8856,6 @@ with pkgs;
   mkfontdir = mkfontscale;
   xcbproto = xcb-proto;
   xcbutil = libxcb-util;
-  xcbutilerrors = libxcb-errors;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From a024c30a8a1948911cff08b7127c864666b6ef1b Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 19:21:01 +0100
Subject: [PATCH 059/167] xcbutil: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/applications/window-managers/2bwm/default.nix         | 4 ++--
 pkgs/applications/window-managers/hyprwm/hypr/default.nix  | 4 ++--
 pkgs/applications/window-managers/i3/default.nix           | 4 ++--
 pkgs/by-name/ar/arcan/package.nix                          | 4 ++--
 pkgs/by-name/be/bespokesynth/package.nix                   | 4 ++--
 pkgs/by-name/bo/boinc/package.nix                          | 4 ++--
 pkgs/by-name/bs/bspwm/package.nix                          | 4 ++--
 pkgs/by-name/c6/c64-debugger/package.nix                   | 4 ++--
 pkgs/by-name/ch/chow-centaur/package.nix                   | 4 ++--
 pkgs/by-name/dk/dk/package.nix                             | 4 ++--
 pkgs/by-name/li/librearp-lv2/package.nix                   | 4 ++--
 pkgs/by-name/li/librearp/package.nix                       | 4 ++--
 pkgs/by-name/li/libstartup_notification/package.nix        | 4 ++--
 pkgs/by-name/lu/luastatus/package.nix                      | 4 ++--
 pkgs/by-name/pi/picom/package.nix                          | 4 ++--
 pkgs/by-name/po/polybar/package.nix                        | 4 ++--
 pkgs/by-name/ro/rofi-unwrapped/package.nix                 | 4 ++--
 pkgs/by-name/sp/spectrwm/package.nix                       | 4 ++--
 pkgs/by-name/su/surge/package.nix                          | 4 ++--
 pkgs/by-name/sx/sxhkd/package.nix                          | 4 ++--
 pkgs/by-name/uh/uhhyou-plugins/package.nix                 | 4 ++--
 pkgs/by-name/we/webex/package.nix                          | 4 ++--
 pkgs/by-name/we/wezterm/package.nix                        | 4 ++--
 pkgs/by-name/wi/windowchef/package.nix                     | 4 ++--
 pkgs/by-name/wm/wmutils-core/package.nix                   | 4 ++--
 pkgs/by-name/xa/xarcan/package.nix                         | 4 ++--
 pkgs/by-name/xc/xcb-imdkit/package.nix                     | 4 ++--
 pkgs/by-name/xc/xcbutilxrm/package.nix                     | 4 ++--
 pkgs/by-name/xd/xdo/package.nix                            | 4 ++--
 pkgs/by-name/xf/xfe/package.nix                            | 4 ++--
 pkgs/by-name/xm/xmoji/package.nix                          | 4 ++--
 pkgs/by-name/xs/xss-lock/package.nix                       | 4 ++--
 pkgs/by-name/xt/xtitle/package.nix                         | 4 ++--
 pkgs/by-name/xv/xvfb/package.nix                           | 4 ++--
 pkgs/by-name/xw/xwallpaper/package.nix                     | 4 ++--
 pkgs/by-name/ya/yambar/package.nix                         | 4 ++--
 pkgs/development/libraries/qt-5/modules/qtbase.nix         | 4 ++--
 pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 4 ++--
 pkgs/development/tools/rgp/default.nix                     | 4 ++--
 pkgs/tools/inputmethods/fcitx5/default.nix                 | 4 ++--
 pkgs/top-level/aliases.nix                                 | 1 +
 pkgs/top-level/all-packages.nix                            | 1 -
 42 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index fa3d699b1bbb..f5a54b9c229b 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -7,7 +7,7 @@
   libxcb-keysyms,
   libxcb-wm,
   libX11,
-  xcbutil,
+  libxcb-util,
   xcbutilxrm,
 }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     libxcb-keysyms
     libxcb-wm
     libX11
-    xcbutil
+    libxcb-util
     xcbutilxrm
   ];
 
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index a5e525375c8a..30f79ff8d5ee 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -16,7 +16,7 @@
   libxcb-cursor,
   libxcb-keysyms,
   libxcb-wm,
-  xcbutil,
+  libxcb-util,
   xmodmap,
 }:
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     libxcb-keysyms
     libxcb-wm
-    xcbutil
+    libxcb-util
   ];
 
   # src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index e4da7dcb25a5..a104a4902897 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -9,7 +9,7 @@
   installShellFiles,
   libxcb,
   libxcb-keysyms,
-  xcbutil,
+  libxcb-util,
   libxcb-wm,
   xcbutilxrm,
   libstartup_notification,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     libxcb-keysyms
-    xcbutil
+    libxcb-util
     libxcb-wm
     xcbutilxrm
     libxkbcommon
diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index a085b71442a1..75d471de2e3a 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -43,7 +43,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xcbutil,
+  libxcb-util,
   libxcb-wm,
   xz,
   # Boolean flags
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     valgrind
     wayland
     wayland-protocols
-    xcbutil
+    libxcb-util
     libxcb-wm
     xz
   ]
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index a0380336f05c..36a29a13c4d7 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -22,7 +22,7 @@
   libGL,
   libxcb,
   vst2-sdk,
-  xcbutil,
+  libxcb-util,
   libxkbcommon,
   libxcb-keysyms,
   libxcb-cursor,
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
     zenity
     alsa-tools
     libxcb
-    xcbutil
+    libxcb-util
     libxkbcommon
     libxcb-keysyms
     libxcb-cursor
diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix
index 7d037a93aaf9..1825c41d476c 100644
--- a/pkgs/by-name/bo/boinc/package.nix
+++ b/pkgs/by-name/bo/boinc/package.nix
@@ -15,7 +15,7 @@
   libjpeg,
   libtool,
   wxGTK32,
-  xcbutil,
+  libxcb-util,
   sqlite,
   gtk3,
   patchelf,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     libnotify
     libX11
     libxcb
-    xcbutil
+    libxcb-util
   ];
 
   NIX_LDFLAGS = lib.optionalString (!headless) "-lX11";
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index b9111a267594..c5e621f5eba4 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   libxcb,
   libXinerama,
-  xcbutil,
+  libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
   nixosTests,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     libXinerama
-    xcbutil
+    libxcb-util
     libxcb-keysyms
     libxcb-wm
   ];
diff --git a/pkgs/by-name/c6/c64-debugger/package.nix b/pkgs/by-name/c6/c64-debugger/package.nix
index bb13dd188b3e..4ddc6309cdd7 100644
--- a/pkgs/by-name/c6/c64-debugger/package.nix
+++ b/pkgs/by-name/c6/c64-debugger/package.nix
@@ -9,7 +9,7 @@
   libX11,
   pkg-config,
   upx,
-  xcbutil,
+  libxcb-util,
 }:
 
 stdenv.mkDerivation {
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     libGL
     libGLU
     libX11
-    xcbutil
+    libxcb-util
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix
index 1059b442642c..9e5aa61cbda2 100644
--- a/pkgs/by-name/ch/chow-centaur/package.nix
+++ b/pkgs/by-name/ch/chow-centaur/package.nix
@@ -8,7 +8,7 @@
   libxkbcommon,
   libxcb-cursor,
   libxcb-keysyms,
-  xcbutil,
+  libxcb-util,
   libXrandr,
   libXinerama,
   libXcursor,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libxcb-cursor
     libxcb-keysyms
-    xcbutil
+    libxcb-util
     libXrandr
     libXinerama
     libXcursor
diff --git a/pkgs/by-name/dk/dk/package.nix b/pkgs/by-name/dk/dk/package.nix
index db7e14572425..d3bc13495cc9 100644
--- a/pkgs/by-name/dk/dk/package.nix
+++ b/pkgs/by-name/dk/dk/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromBitbucket,
-  xcbutil,
+  libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
   libxcb-cursor,
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    xcbutil
+    libxcb-util
     libxcb-keysyms
     libxcb-wm
     libxcb-cursor
diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix
index ad84a9e10e0a..a1a0900ee3f1 100644
--- a/pkgs/by-name/li/librearp-lv2/package.nix
+++ b/pkgs/by-name/li/librearp-lv2/package.nix
@@ -8,7 +8,7 @@
   libxkbcommon,
   libxcb-cursor,
   libxcb-keysyms,
-  xcbutil,
+  libxcb-util,
   libXrandr,
   libXinerama,
   libXcursor,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libxcb-cursor
     libxcb-keysyms
-    xcbutil
+    libxcb-util
     libXrandr
     libXinerama
     libXcursor
diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix
index 47de89d21fc9..e1bc9b01086c 100644
--- a/pkgs/by-name/li/librearp/package.nix
+++ b/pkgs/by-name/li/librearp/package.nix
@@ -8,7 +8,7 @@
   libxkbcommon,
   libxcb-cursor,
   libxcb-keysyms,
-  xcbutil,
+  libxcb-util,
   libXrandr,
   libXinerama,
   libXcursor,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libxcb-cursor
     libxcb-keysyms
-    xcbutil
+    libxcb-util
     libXrandr
     libXinerama
     libXcursor
diff --git a/pkgs/by-name/li/libstartup_notification/package.nix b/pkgs/by-name/li/libstartup_notification/package.nix
index fd308cde106c..a1a00404d835 100644
--- a/pkgs/by-name/li/libstartup_notification/package.nix
+++ b/pkgs/by-name/li/libstartup_notification/package.nix
@@ -5,7 +5,7 @@
   libX11,
   libxcb,
   pkg-config,
-  xcbutil,
+  libxcb-util,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libX11
     libxcb
-    xcbutil
+    libxcb-util
   ];
 
   meta = {
diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix
index 725d0c73fd82..826d2dba15e7 100644
--- a/pkgs/by-name/lu/luastatus/package.nix
+++ b/pkgs/by-name/lu/luastatus/package.nix
@@ -24,7 +24,7 @@
   docutils,
   libxcb,
   libX11,
-  xcbutil,
+  libxcb-util,
   libxcb-wm,
 }:
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     libX11
-    xcbutil
+    libxcb-util
     libxcb-wm
     libXdmcp
     libXau
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index 1add7236f4fe..c3579e63b692 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -24,7 +24,7 @@
   pkg-config,
   stdenv,
   uthash,
-  xcbutil,
+  libxcb-util,
   libxcb-image,
   libxcb-render-util,
   xorgproto,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     pixman
     uthash
-    xcbutil
+    libxcb-util
     libxcb-image
     libxcb-render-util
     xorgproto
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 58e6b03bdeec..a6e8ccae4abe 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -15,7 +15,7 @@
   lib,
   stdenv,
   xcbproto,
-  xcbutil,
+  libxcb-util,
   libxcb-cursor,
   libxcb-image,
   libxcb-render-util,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     pcre
     python3
     xcbproto
-    xcbutil
+    libxcb-util
     libxcb-cursor
     libxcb-image
     libxcb-render-util
diff --git a/pkgs/by-name/ro/rofi-unwrapped/package.nix b/pkgs/by-name/ro/rofi-unwrapped/package.nix
index 71861ca603f8..c47e3a2bef96 100644
--- a/pkgs/by-name/ro/rofi-unwrapped/package.nix
+++ b/pkgs/by-name/ro/rofi-unwrapped/package.nix
@@ -24,7 +24,7 @@
   wayland-scanner,
   which,
   xcb-imdkit,
-  xcbutil,
+  libxcb-util,
   libxcb-cursor,
   libxcb-keysyms,
   libxcb-wm,
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals x11Support [
     libxcb
     xcb-imdkit
-    xcbutil
+    libxcb-util
     libxcb-cursor
     libxcb-keysyms
     libxcb-wm
diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index d72b6fc907fa..c7cb34ce513c 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -8,7 +8,7 @@
   libXcursor,
   libXft,
   libXt,
-  xcbutil,
+  libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
   writeShellScript,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXcursor
     libXft
     libXt
-    xcbutil
+    libxcb-util
     libxcb-keysyms
     libxcb-wm
     libbsd
diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix
index 056c6549dfdf..505c2755f0c4 100644
--- a/pkgs/by-name/su/surge/package.nix
+++ b/pkgs/by-name/su/surge/package.nix
@@ -12,7 +12,7 @@
   libsndfile,
   libxcb,
   libxkbcommon,
-  xcbutil,
+  libxcb-util,
   libxcb-cursor,
   libxcb-keysyms,
   zenity,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsndfile
     libxcb
     libxkbcommon
-    xcbutil
+    libxcb-util
     libxcb-cursor
     libxcb-keysyms
     zenity
diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix
index 57131509ae21..d7e9cf4abff0 100644
--- a/pkgs/by-name/sx/sxhkd/package.nix
+++ b/pkgs/by-name/sx/sxhkd/package.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   asciidoc,
   libxcb,
-  xcbutil,
+  libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
   nixosTests,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcbutil
+    libxcb-util
     libxcb-keysyms
     libxcb-wm
   ];
diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix
index 0335ed4cb315..fbc7aa820fe3 100644
--- a/pkgs/by-name/uh/uhhyou-plugins/package.nix
+++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix
@@ -9,7 +9,7 @@
   fontconfig,
   freetype,
   libxcb,
-  xcbutil,
+  libxcb-util,
   libxcb-cursor,
   libxcb-keysyms,
   libxkbcommon,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig
     freetype
     libxcb
-    xcbutil
+    libxcb-util
     libxcb-cursor
     libxcb-keysyms
     libxkbcommon
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 277f77188c8f..3834e5e1db41 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -44,7 +44,7 @@
   libXrender,
   libXtst,
   libxshmfence,
-  xcbutil,
+  libxcb-util,
   libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
     libXrender
     libXtst
     libxshmfence
-    xcbutil
+    libxcb-util
     libxcb-image
     libXScrnSaver
     libxcb-keysyms
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index defaefc1eba7..f025c6940b10 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -19,7 +19,7 @@
   vulkan-loader,
   wayland,
   wezterm,
-  xcbutil,
+  libxcb-util,
   libxcb-image,
   libxcb-keysyms,
   libxcb-wm,
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec {
     libxcb
     libxkbcommon
     wayland
-    xcbutil
+    libxcb-util
     libxcb-image
     libxcb-keysyms
     libxcb-wm # contains xcb-ewmh among others
diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix
index 2f20320890d2..7d06b697c4a1 100644
--- a/pkgs/by-name/wi/windowchef/package.nix
+++ b/pkgs/by-name/wi/windowchef/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   libxcb,
   libXrandr,
-  xcbutil,
+  libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
   xcbproto,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     libXrandr
-    xcbutil
+    libxcb-util
     libxcb-keysyms
     libxcb-wm
     xcbproto
diff --git a/pkgs/by-name/wm/wmutils-core/package.nix b/pkgs/by-name/wm/wmutils-core/package.nix
index 1d4ee12b0484..61ef453b2a11 100644
--- a/pkgs/by-name/wm/wmutils-core/package.nix
+++ b/pkgs/by-name/wm/wmutils-core/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  xcbutil,
+  libxcb-util,
   libxcb-cursor,
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcbutil
+    libxcb-util
     libxcb-cursor
   ];
 
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index 3f67984d9f61..e662f887d8e2 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -30,7 +30,7 @@
   pixman,
   pkg-config,
   systemd,
-  xcbutil,
+  libxcb-util,
   libxcb-wm,
   libxcb-image,
   xkbcomp,
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalPackages: rec {
     openssl
     pixman
     systemd
-    xcbutil
+    libxcb-util
     libxcb-wm
     libxcb-image
     xkbcomp
diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix
index 21bb44498918..185fbb26b8dd 100644
--- a/pkgs/by-name/xc/xcb-imdkit/package.nix
+++ b/pkgs/by-name/xc/xcb-imdkit/package.nix
@@ -5,7 +5,7 @@
   cmake,
   extra-cmake-modules,
   uthash,
-  xcbutil,
+  libxcb-util,
   libxcb-keysyms,
   xorgproto,
 }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    xcbutil
+    libxcb-util
     libxcb-keysyms
   ];
 
diff --git a/pkgs/by-name/xc/xcbutilxrm/package.nix b/pkgs/by-name/xc/xcbutilxrm/package.nix
index e5a8b0694242..1474cb6389a8 100644
--- a/pkgs/by-name/xc/xcbutilxrm/package.nix
+++ b/pkgs/by-name/xc/xcbutilxrm/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   m4,
   libxcb,
-  xcbutil,
+  libxcb-util,
   libX11,
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   buildInputs = [
     libxcb
-    xcbutil
+    libxcb-util
     libX11
   ];
 
diff --git a/pkgs/by-name/xd/xdo/package.nix b/pkgs/by-name/xd/xdo/package.nix
index ba37370206b4..ac3ca72065ff 100644
--- a/pkgs/by-name/xd/xdo/package.nix
+++ b/pkgs/by-name/xd/xdo/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  xcbutil,
+  libxcb-util,
   libxcb-wm,
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     libxcb-wm
-    xcbutil
+    libxcb-util
   ];
 
   meta = {
diff --git a/pkgs/by-name/xf/xfe/package.nix b/pkgs/by-name/xf/xfe/package.nix
index 081e9f9b766b..70bcb4aea66d 100644
--- a/pkgs/by-name/xf/xfe/package.nix
+++ b/pkgs/by-name/xf/xfe/package.nix
@@ -7,7 +7,7 @@
   freetype,
   pkg-config,
   gettext,
-  xcbutil,
+  libxcb-util,
   gcc,
   intltool,
   file,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fox_1_6
     gettext
-    xcbutil
+    libxcb-util
     gcc
     file
     libpng
diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix
index f404dfc15f31..c2e3f03afd51 100644
--- a/pkgs/by-name/xm/xmoji/package.nix
+++ b/pkgs/by-name/xm/xmoji/package.nix
@@ -6,7 +6,7 @@
   fontconfig,
   harfbuzz,
   libpng,
-  xcbutil,
+  libxcb-util,
   libXcursor,
   libxcb-image,
   libxkbcommon,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libxkbcommon
     libxcb-cursor
-    xcbutil
+    libxcb-util
     libxcb-image
   ];
 
diff --git a/pkgs/by-name/xs/xss-lock/package.nix b/pkgs/by-name/xs/xss-lock/package.nix
index 972199367a33..dcb755548cbd 100644
--- a/pkgs/by-name/xs/xss-lock/package.nix
+++ b/pkgs/by-name/xs/xss-lock/package.nix
@@ -9,7 +9,7 @@
   libpthreadstubs,
   libXau,
   libXdmcp,
-  xcbutil,
+  libxcb-util,
   nixosTests,
 }:
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     libpthreadstubs
     libXau
     libXdmcp
-    xcbutil
+    libxcb-util
   ];
 
   passthru.tests = { inherit (nixosTests) xss-lock; };
diff --git a/pkgs/by-name/xt/xtitle/package.nix b/pkgs/by-name/xt/xtitle/package.nix
index c6c0d007b3b6..6ef2a03e99f0 100644
--- a/pkgs/by-name/xt/xtitle/package.nix
+++ b/pkgs/by-name/xt/xtitle/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  xcbutil,
+  libxcb-util,
   libxcb-wm,
   git,
 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     git
-    xcbutil
+    libxcb-util
     libxcb-wm
   ];
 
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index d91e318e557e..afa62f072a22 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -20,7 +20,7 @@
   mesa-gl-headers,
   openssl,
   pixman,
-  xcbutil,
+  libxcb-util,
   libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     mesa-gl-headers
     openssl
     pixman
-    xcbutil
+    libxcb-util
     libxcb-image
     libxcb-keysyms
     libxcb-render-util
diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix
index b277975bc0ec..d7906269f86e 100644
--- a/pkgs/by-name/xw/xwallpaper/package.nix
+++ b/pkgs/by-name/xw/xwallpaper/package.nix
@@ -6,7 +6,7 @@
   autoreconfHook,
   installShellFiles,
   pixman,
-  xcbutil,
+  libxcb-util,
   libxcb-image,
   libseccomp,
   libjpeg,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     pixman
     libxcb-image
-    xcbutil
+    libxcb-util
     libseccomp
     libjpeg
     libpng
diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix
index 9fb56e898672..5bc7402d919b 100644
--- a/pkgs/by-name/ya/yambar/package.nix
+++ b/pkgs/by-name/ya/yambar/package.nix
@@ -21,7 +21,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xcbutil,
+  libxcb-util,
   libxcb-cursor,
   libxcb-errors,
   libxcb-wm,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
   ]
   ++ lib.optionals x11Support [
-    xcbutil
+    libxcb-util
     libxcb-cursor
     libxcb-errors
     libxcb-wm
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 7e4a9a98d4d4..8b83ec4d8c08 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -42,7 +42,7 @@
   pcre2,
   sqlite,
   udev,
-  xcbutil,
+  libxcb-util,
   libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
@@ -131,7 +131,7 @@ stdenv.mkDerivation (
           libXrender
           libxcb
           libxkbcommon
-          xcbutil
+          libxcb-util
           libxcb-image
           libxcb-keysyms
           libxcb-render-util
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 6adf79beacd7..03b455aa67ac 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -56,7 +56,7 @@
   pcre2,
   sqlite,
   udev,
-  xcbutil,
+  libxcb-util,
   libxcb-image,
   libxcb-keysyms,
   libxcb-render-util,
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
     libXrender
     libxcb
     libxkbcommon
-    xcbutil
+    libxcb-util
     libxcb-image
     libxcb-keysyms
     libxcb-render-util
diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix
index 3c63a8ace6fc..007fe6c050f4 100644
--- a/pkgs/development/tools/rgp/default.nix
+++ b/pkgs/development/tools/rgp/default.nix
@@ -22,7 +22,7 @@
   libxml2_13,
   ncurses,
   wayland,
-  xcbutil,
+  libxcb-util,
   zlib,
   zstd,
 }:
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     libxml2_13
     ncurses
     wayland
-    xcbutil
+    libxcb-util
     zlib
     zstd
   ];
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index c66a7f080916..9eb8b05a05fa 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -29,7 +29,7 @@
   libthai,
   libdatrie,
   libxcb-keysyms,
-  xcbutil,
+  libxcb-util,
   libxcb-wm,
   xcb-imdkit,
   libxkbfile,
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
     libsepol
     libXdmcp
     libxkbcommon
-    xcbutil
+    libxcb-util
     libxcb-wm
     libxcb-keysyms
     xcb-imdkit
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index de7f9eb12531..b34a4189c2ec 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1908,6 +1908,7 @@ mapAliases {
   xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
   xcb-util-cursor = libxcb-cursor; # Added 2026-02-04
   xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12
+  xcbutil = libxcb-util; # Added 2026-02-04
   xcbutilcursor = libxcb-cursor; # Added 2026-02-04
   xcbutilerrors = libxcb-errors; # Added 2026-02-04
   xcbutilimage = libxcb-image; # Added 2026-02-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09a87ff1841d..c3884b5b1597 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8855,7 +8855,6 @@ with pkgs;
   libXxf86vm = libxxf86vm;
   mkfontdir = mkfontscale;
   xcbproto = xcb-proto;
-  xcbutil = libxcb-util;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

From 396ddecbdbb13b036e41dcaf2694263be34bfc07 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 21:58:23 +0100
Subject: [PATCH 060/167] libAppleWM: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/by-name/qu/quartz-wm/package.nix | 4 ++--
 pkgs/top-level/aliases.nix            | 1 +
 pkgs/top-level/all-packages.nix       | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qu/quartz-wm/package.nix b/pkgs/by-name/qu/quartz-wm/package.nix
index 65b3708a7f1b..324533c5cc29 100644
--- a/pkgs/by-name/qu/quartz-wm/package.nix
+++ b/pkgs/by-name/qu/quartz-wm/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   util-macros,
   libXinerama,
-  libAppleWM,
+  libapplewm,
   xorgproto,
   libXrandr,
   libXext,
@@ -31,7 +31,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     libXinerama
-    libAppleWM
+    libapplewm
     xorgproto
     libXrandr
     libXext
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b34a4189c2ec..2fc94749f1ce 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -955,6 +955,7 @@ mapAliases {
   ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-27
   lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2025-06-09
   lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27
+  libAppleWM = libapplewm; # Added 2026-02-04
   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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3884b5b1597..f85bdb68af49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8820,7 +8820,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  libAppleWM = libapplewm;
   libFS = libfs;
   libICE = libice;
   libpthreadstubs = libpthread-stubs;

From 6c2607a4ea7602394645f1c3b3e7eca4aa526d3a Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 21:59:59 +0100
Subject: [PATCH 061/167] libFS: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/by-name/xa/xawtv/package.nix | 4 ++--
 pkgs/top-level/aliases.nix        | 1 +
 pkgs/top-level/all-packages.nix   | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xa/xawtv/package.nix b/pkgs/by-name/xa/xawtv/package.nix
index 8a176bc2ebe5..05baac58554b 100644
--- a/pkgs/by-name/xa/xawtv/package.nix
+++ b/pkgs/by-name/xa/xawtv/package.nix
@@ -11,7 +11,7 @@
   libXft,
   xorgproto,
   libv4l,
-  libFS,
+  libfs,
   libXaw,
   libXpm,
   libXext,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXt
     libXft
     xorgproto
-    libFS
+    libfs
     perl
     alsa-lib
     aalib
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2fc94749f1ce..0b24afe7142b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -970,6 +970,7 @@ mapAliases {
   libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
   libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04
   libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
+  libFS = libfs; # Added 2026-02-04
   libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
   libgda = throw "'libgda' has been renamed to/replaced by 'libgda5'"; # Converted to throw 2025-10-27
   libgme = throw "'libgme' has been renamed to/replaced by 'game-music-emu'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f85bdb68af49..3bdf346810f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8820,7 +8820,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  libFS = libfs;
   libICE = libice;
   libpthreadstubs = libpthread-stubs;
   libSM = libsm;

From bf63af185150edc32030b0ebe7cc8bf08563a67c Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 22:09:08 +0100
Subject: [PATCH 062/167] libICE: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/applications/editors/jetbrains/ides/rider.nix          | 4 ++--
 pkgs/applications/editors/vim/full.nix                      | 4 ++--
 .../applications/graphics/unigine-superposition/default.nix | 6 +++---
 pkgs/applications/misc/avalonia-ilspy/default.nix           | 4 ++--
 .../networking/instant-messengers/pidgin/default.nix        | 4 ++--
 pkgs/applications/window-managers/ion-3/default.nix         | 4 ++--
 pkgs/build-support/dotnet/fetch-nupkg/overrides.nix         | 4 ++--
 pkgs/by-name/af/afterstep/package.nix                       | 4 ++--
 pkgs/by-name/at/ataripp/package.nix                         | 4 ++--
 pkgs/by-name/av/avalonia/package.nix                        | 4 ++--
 pkgs/by-name/bu/budgie-session/package.nix                  | 4 ++--
 pkgs/by-name/ds/dssi/package.nix                            | 4 ++--
 pkgs/by-name/ex/extremetuxracer/package.nix                 | 4 ++--
 pkgs/by-name/fa/factorio/package.nix                        | 4 ++--
 pkgs/by-name/fl/flightgear/package.nix                      | 4 ++--
 pkgs/by-name/fr/freeglut/package.nix                        | 4 ++--
 pkgs/by-name/fr/fricas/package.nix                          | 4 ++--
 pkgs/by-name/gk/gkrellm/package.nix                         | 4 ++--
 pkgs/by-name/gn/gnome-session/package.nix                   | 4 ++--
 pkgs/by-name/gr/gravit/package.nix                          | 4 ++--
 pkgs/by-name/hu/hubstaff/package.nix                        | 4 ++--
 pkgs/by-name/ic/icesl/package.nix                           | 4 ++--
 pkgs/by-name/ic/icewm/package.nix                           | 4 ++--
 pkgs/by-name/in/input-leap/package.nix                      | 4 ++--
 pkgs/by-name/li/libmatchbox/package.nix                     | 4 ++--
 pkgs/by-name/li/libxfce4ui/package.nix                      | 4 ++--
 pkgs/by-name/li/lincity/package.nix                         | 4 ++--
 pkgs/by-name/li/lirc/package.nix                            | 4 ++--
 pkgs/by-name/lm/lms/package.nix                             | 4 ++--
 pkgs/by-name/lu/lunacy/package.nix                          | 6 +++---
 pkgs/by-name/lw/lwm/package.nix                             | 4 ++--
 pkgs/by-name/mc/mc/package.nix                              | 4 ++--
 pkgs/by-name/mu/muse-sounds-manager/package.nix             | 4 ++--
 pkgs/by-name/mu/mutter48/package.nix                        | 4 ++--
 pkgs/by-name/op/openbox/package.nix                         | 4 ++--
 pkgs/by-name/op/openscad-unstable/package.nix               | 4 ++--
 pkgs/by-name/pi/pixieditor/package.nix                      | 4 ++--
 pkgs/by-name/po/povray/package.nix                          | 4 ++--
 pkgs/by-name/ri/rigsofrods-bin/package.nix                  | 4 ++--
 pkgs/by-name/ry/ryubing/package.nix                         | 4 ++--
 pkgs/by-name/sa/saleae-logic/package.nix                    | 4 ++--
 pkgs/by-name/sa/sawfish/package.nix                         | 4 ++--
 pkgs/by-name/se/segger-ozone/package.nix                    | 4 ++--
 pkgs/by-name/si/simgear/package.nix                         | 4 ++--
 pkgs/by-name/sp/space-station-14-launcher/package.nix       | 4 ++--
 pkgs/by-name/sp/speed-dreams/package.nix                    | 6 +++---
 pkgs/by-name/sp/spideroak/package.nix                       | 4 ++--
 pkgs/by-name/su/survex/package.nix                          | 4 ++--
 pkgs/by-name/sy/synergy/package.nix                         | 4 ++--
 pkgs/by-name/tk/tkmm/package.nix                            | 4 ++--
 pkgs/by-name/to/torcs/package.nix                           | 4 ++--
 pkgs/by-name/vi/vivaldi/package.nix                         | 4 ++--
 pkgs/by-name/vn/vncrec/package.nix                          | 4 ++--
 pkgs/by-name/wi/widelands/package.nix                       | 4 ++--
 pkgs/by-name/wo/workrave/package.nix                        | 4 ++--
 pkgs/by-name/xa/xawtv/package.nix                           | 4 ++--
 pkgs/by-name/xb/xboard/package.nix                          | 4 ++--
 pkgs/development/compilers/openjdk/generic.nix              | 4 ++--
 pkgs/development/libraries/ogre/default.nix                 | 4 ++--
 pkgs/development/tools/rgp/default.nix                      | 4 ++--
 pkgs/top-level/aliases.nix                                  | 1 +
 pkgs/top-level/all-packages.nix                             | 1 -
 62 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix
index 44489af09de8..50cfc05d442b 100644
--- a/pkgs/applications/editors/jetbrains/ides/rider.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rider.nix
@@ -10,7 +10,7 @@
   libxcrypt,
   lttng-ust_2_12,
   musl,
-  libICE,
+  libice,
   libSM,
   libX11,
   dotnetCorePackages,
@@ -73,7 +73,7 @@ in
   ];
   extraLdPath = lib.optionals (stdenv.hostPlatform.isLinux) [
     # Avalonia dependencies needed for dotMemory
-    libICE
+    libice
     libSM
     libX11
   ];
diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix
index 752be0d2484c..ba3395814114 100644
--- a/pkgs/applications/editors/vim/full.nix
+++ b/pkgs/applications/editors/vim/full.nix
@@ -25,7 +25,7 @@
   libXau,
   libXmu,
   libsodium,
-  libICE,
+  libice,
   wayland-scanner,
   vimPlugins,
   makeWrapper,
@@ -178,7 +178,7 @@ stdenv.mkDerivation {
   # All X related dependencies
   ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
     libSM
-    libICE
+    libice
     libX11
     libXext
     libXpm
diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix
index 3b200ed30ac1..0819fa6eec58 100644
--- a/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/pkgs/applications/graphics/unigine-superposition/default.nix
@@ -16,7 +16,7 @@
   libXrandr,
   mailspring,
   libX11,
-  libICE,
+  libice,
   libXrender,
   autoPatchelfHook,
   makeWrapper,
@@ -61,7 +61,7 @@ let
       libXrandr
       mailspring
       libX11
-      libICE
+      libice
       libXrender
     ];
 
@@ -118,7 +118,7 @@ buildFHSEnv {
     libXrandr
     mailspring
     libX11
-    libICE
+    libice
     libXrender
     openal
   ];
diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index d9984f028989..7dfe5b49d1c8 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -5,7 +5,7 @@
   buildDotnetModule,
   dotnetCorePackages,
   libX11,
-  libICE,
+  libice,
   libSM,
   libXi,
   libXcursor,
@@ -60,7 +60,7 @@ buildDotnetModule rec {
   runtimeDeps = [
     # Avalonia UI
     libX11
-    libICE
+    libice
     libSM
     libXi
     libXcursor
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index f3878220f640..bfda3edd76c7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -16,7 +16,7 @@
   gtkspell2,
   intltool,
   lib,
-  libICE,
+  libice,
   libSM,
   libXScrnSaver,
   libXext,
@@ -74,7 +74,7 @@ let
         gst_all_1.gst-plugins-base
         gst_all_1.gst-plugins-good
         gst_all_1.gstreamer
-        libICE
+        libice
         libSM
         libXScrnSaver
         libXext
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index 195461b39beb..d8f63d6d4ae7 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -5,7 +5,7 @@
   lua,
   gettext,
   groff,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXext,
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libICE
+    libice
     libSM
     libX11
     libXext
diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
index b33910cc9c1f..40aab3e1aab5 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
@@ -3,7 +3,7 @@
   dotnetCorePackages,
   fontconfig,
   lib,
-  libICE,
+  libice,
   libSM,
   libX11,
   stdenv,
@@ -56,7 +56,7 @@
       lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
         setupHook = writeText "setupHook.sh" ''
           prependToVar dotnetRuntimeDeps \
-            "${lib.getLib libICE}" \
+            "${lib.getLib libice}" \
             "${lib.getLib libSM}" \
             "${lib.getLib libX11}"
         '';
diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix
index a71585cad7df..ae6be2c9f6f8 100644
--- a/pkgs/by-name/af/afterstep/package.nix
+++ b/pkgs/by-name/af/afterstep/package.nix
@@ -6,7 +6,7 @@
   dbus,
   fltk_1_3,
   gtk2,
-  libICE,
+  libice,
   libSM,
   libtiff,
   pkg-config,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     fltk_1_3
     gtk2
-    libICE
+    libice
     libSM
     libtiff
   ];
diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix
index 427aac0c0c21..c53506f92eb8 100644
--- a/pkgs/by-name/at/ataripp/package.nix
+++ b/pkgs/by-name/at/ataripp/package.nix
@@ -5,7 +5,7 @@
   alsa-lib,
   fetchurl,
   gcc-unwrapped,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXext,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL
     alsa-lib
     gcc-unwrapped
-    libICE
+    libice
     libSM
     libX11
     libXext
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 19a69b17e4aa..91b034e30935 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -5,7 +5,7 @@
   fetchzip,
   fontconfig,
   lib,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXcursor,
@@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation (
         patchShebangs build.sh
 
         substituteInPlace src/Avalonia.X11/ICELib.cs \
-          --replace-fail '"libICE.so.6"' '"${lib.getLib libICE}/lib/libICE.so.6"'
+          --replace-fail '"libICE.so.6"' '"${lib.getLib libice}/lib/libICE.so.6"'
         substituteInPlace src/Avalonia.X11/SMLib.cs \
           --replace-fail '"libSM.so.6"' '"${lib.getLib libSM}/lib/libSM.so.6"'
         substituteInPlace src/Avalonia.X11/XLib.cs \
diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix
index 2aae236f1527..91f0d2e8f4ef 100644
--- a/pkgs/by-name/bu/budgie-session/package.nix
+++ b/pkgs/by-name/bu/budgie-session/package.nix
@@ -14,7 +14,7 @@
   gnome-settings-daemon,
   dbus,
   json-glib,
-  libICE,
+  libice,
   xmlto,
   docbook_xsl,
   docbook_xml_dtd_412,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    libICE
+    libice
     gnome-desktop
     json-glib
     xtrans
diff --git a/pkgs/by-name/ds/dssi/package.nix b/pkgs/by-name/ds/dssi/package.nix
index 43eb9c06ce32..4bac543c8eec 100644
--- a/pkgs/by-name/ds/dssi/package.nix
+++ b/pkgs/by-name/ds/dssi/package.nix
@@ -14,7 +14,7 @@
   autoconf,
   automake,
   xorgproto,
-  libICE,
+  libice,
   pkg-config,
 }:
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     libsamplerate
     libtool
     xorgproto
-    libICE
+    libice
   ];
 
   meta = {
diff --git a/pkgs/by-name/ex/extremetuxracer/package.nix b/pkgs/by-name/ex/extremetuxracer/package.nix
index b2c6b1799f65..d5e759ca5cd8 100644
--- a/pkgs/by-name/ex/extremetuxracer/package.nix
+++ b/pkgs/by-name/ex/extremetuxracer/package.nix
@@ -15,7 +15,7 @@
   libXext,
   libXt,
   libSM,
-  libICE,
+  libice,
   libpng,
   pkg-config,
   gettext,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXext
     libXt
     libSM
-    libICE
+    libice
     libpng
     gettext
   ];
diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix
index 62511cc4c77b..f5e3346869c6 100644
--- a/pkgs/by-name/fa/factorio/package.nix
+++ b/pkgs/by-name/fa/factorio/package.nix
@@ -4,7 +4,7 @@
   factorio-utils,
   fetchurl,
   libGL,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXcursor,
@@ -242,7 +242,7 @@ let
       libPath = lib.makeLibraryPath [
         alsa-lib
         libGL
-        libICE
+        libice
         libSM
         libX11
         libXcursor
diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index 19a427320bac..5aa12632fa24 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -7,7 +7,7 @@
   freealut,
   libGLU,
   libGL,
-  libICE,
+  libice,
   libjpeg,
   openal,
   plib,
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     freealut
     libGLU
     libGL
-    libICE
+    libice
     libjpeg
     openal
     openscenegraph
diff --git a/pkgs/by-name/fr/freeglut/package.nix b/pkgs/by-name/fr/freeglut/package.nix
index c6d5d0883f5d..028bb23b892a 100644
--- a/pkgs/by-name/fr/freeglut/package.nix
+++ b/pkgs/by-name/fr/freeglut/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libICE,
+  libice,
   libXext,
   libXi,
   libXrandr,
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    libICE
+    libice
     libXext
     libXi
     libXrandr
diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index 8227890003a2..fc0a26c62f5b 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -5,7 +5,7 @@
   sbcl,
   libX11,
   libXpm,
-  libICE,
+  libice,
   libSM,
   libXt,
   libXau,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     sbcl
     libX11
     libXpm
-    libICE
+    libice
     libSM
     libXt
     libXau
diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix
index 9db44ac580f3..90d6d3f80241 100644
--- a/pkgs/by-name/gk/gkrellm/package.nix
+++ b/pkgs/by-name/gk/gkrellm/package.nix
@@ -8,7 +8,7 @@
   gtk2,
   libX11,
   libSM,
-  libICE,
+  libice,
   which,
   copyDesktopItems,
   makeDesktopItem,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk2
     libX11
     libSM
-    libICE
+    libice
   ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix
index 4fc3f41a0ed4..bcb2f7e15e56 100644
--- a/pkgs/by-name/gn/gnome-session/package.nix
+++ b/pkgs/by-name/gn/gnome-session/package.nix
@@ -17,7 +17,7 @@
   gnome-shell,
   dbus,
   json-glib,
-  libICE,
+  libice,
   xmlto,
   docbook_xsl,
   docbook_xml_dtd_45,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk4
-    libICE
+    libice
     gnome-desktop
     json-glib
     xtrans
diff --git a/pkgs/by-name/gr/gravit/package.nix b/pkgs/by-name/gr/gravit/package.nix
index ea3216dba79a..65fbc8617a6d 100644
--- a/pkgs/by-name/gr/gravit/package.nix
+++ b/pkgs/by-name/gr/gravit/package.nix
@@ -7,7 +7,7 @@
   SDL_ttf,
   SDL_image,
   libSM,
-  libICE,
+  libice,
   libGLU,
   libGL,
   libpng,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     lua5
     libpng
     libSM
-    libICE
+    libice
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix
index afb7e2c9256f..1ece972fb293 100644
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@@ -7,7 +7,7 @@
   libX11,
   zlib,
   libSM,
-  libICE,
+  libice,
   libXext,
   freetype,
   libXrender,
@@ -39,7 +39,7 @@ let
     libX11
     zlib
     libSM
-    libICE
+    libice
     libXext
     freetype
     libXrender
diff --git a/pkgs/by-name/ic/icesl/package.nix b/pkgs/by-name/ic/icesl/package.nix
index 636cebd144fb..eeda9782f253 100644
--- a/pkgs/by-name/ic/icesl/package.nix
+++ b/pkgs/by-name/ic/icesl/package.nix
@@ -6,7 +6,7 @@
   libXmu,
   libXi,
   libX11,
-  libICE,
+  libice,
   libGLU,
   libGL,
   libSM,
@@ -25,7 +25,7 @@ let
     libXi
     libX11
     libglut
-    libICE
+    libice
     libGLU
     libGL
     libSM
diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index ddec31d3fbb3..8175a34c6be6 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -14,7 +14,7 @@
   giflib,
   glib,
   imlib2,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXcomposite,
@@ -71,7 +71,7 @@ gccStdenv.mkDerivation (finalAttrs: {
     giflib
     glib
     imlib2
-    libICE
+    libice
     libSM
     libX11
     libXcomposite
diff --git a/pkgs/by-name/in/input-leap/package.nix b/pkgs/by-name/in/input-leap/package.nix
index 329d388aec42..06602e4c7140 100644
--- a/pkgs/by-name/in/input-leap/package.nix
+++ b/pkgs/by-name/in/input-leap/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   curl,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXdmcp,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXinerama
     libXrandr
     libXdmcp
-    libICE
+    libice
     libSM
   ]
   ++ lib.optionals withLibei [
diff --git a/pkgs/by-name/li/libmatchbox/package.nix b/pkgs/by-name/li/libmatchbox/package.nix
index 70ec8514213b..9eedb7d2d29d 100644
--- a/pkgs/by-name/li/libmatchbox/package.nix
+++ b/pkgs/by-name/li/libmatchbox/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   autoreconfHook,
-  libICE,
+  libice,
   libjpeg,
   libpng,
   libX11,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   propagatedBuildInputs = [
-    libICE
+    libice
     libjpeg
     libpng
     libX11
diff --git a/pkgs/by-name/li/libxfce4ui/package.nix b/pkgs/by-name/li/libxfce4ui/package.nix
index c809c5cd15d6..d2d56098adee 100644
--- a/pkgs/by-name/li/libxfce4ui/package.nix
+++ b/pkgs/by-name/li/libxfce4ui/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   xfce4-dev-tools,
   wrapGAppsHook3,
-  libICE,
+  libice,
   libSM,
   libepoxy,
   libgtop,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libICE
+    libice
     libSM
     libepoxy
     libgtop
diff --git a/pkgs/by-name/li/lincity/package.nix b/pkgs/by-name/li/lincity/package.nix
index b399b8c0427c..8fc10d7d4efa 100644
--- a/pkgs/by-name/li/lincity/package.nix
+++ b/pkgs/by-name/li/lincity/package.nix
@@ -7,7 +7,7 @@
   libX11,
   libXext,
   xorgproto,
-  libICE,
+  libice,
   libSM,
   libpng12,
   zlib,
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
 
   buildInputs = [
-    libICE
+    libice
     libpng12
     libSM
     libX11
diff --git a/pkgs/by-name/li/lirc/package.nix b/pkgs/by-name/li/lirc/package.nix
index 21ccc1a8dd31..58f9a092e701 100644
--- a/pkgs/by-name/li/lirc/package.nix
+++ b/pkgs/by-name/li/lirc/package.nix
@@ -14,7 +14,7 @@
   systemd,
   libusb-compat-0_1,
   libftdi1,
-  libICE,
+  libice,
   libSM,
   libX11,
 }:
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     systemd
     libusb-compat-0_1
     libftdi1
-    libICE
+    libice
     libSM
     libX11
   ];
diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index 093043be1999..de64ba4945da 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -14,7 +14,7 @@
   ffmpeg,
   zlib,
   libSM,
-  libICE,
+  libice,
   stb,
   openssl,
   xxHash,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     ffmpeg
     zlib
     libSM
-    libICE
+    libice
     stb
     openssl
     xxHash
diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix
index e5770012c882..00f9bbc913d0 100644
--- a/pkgs/by-name/lu/lunacy/package.nix
+++ b/pkgs/by-name/lu/lunacy/package.nix
@@ -10,7 +10,7 @@
   libX11,
   lttng-ust,
   icu,
-  libICE,
+  libice,
   libSM,
   libXcursor,
   openssl,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig.lib
 
     # Runtime deps
-    libICE
+    libice
     libSM
     libX11
     libXcursor
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # will add to the RPATH of executable only
   runtimeDependencies = [
-    libICE
+    libice
     libSM
     libX11
     libXcursor
diff --git a/pkgs/by-name/lw/lwm/package.nix b/pkgs/by-name/lw/lwm/package.nix
index 0d2aed4af706..35419f104a72 100644
--- a/pkgs/by-name/lw/lwm/package.nix
+++ b/pkgs/by-name/lw/lwm/package.nix
@@ -6,7 +6,7 @@
   libX11,
   libSM,
   libXext,
-  libICE,
+  libice,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     libX11
     libSM
     libXext
-    libICE
+    libice
   ];
 
   dontConfigure = true;
diff --git a/pkgs/by-name/mc/mc/package.nix b/pkgs/by-name/mc/mc/package.nix
index 9b0e35b1a75b..320f552cfd59 100644
--- a/pkgs/by-name/mc/mc/package.nix
+++ b/pkgs/by-name/mc/mc/package.nix
@@ -8,7 +8,7 @@
   gpm,
   file,
   e2fsprogs,
-  libICE,
+  libice,
   perl,
   zip,
   unzip,
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     file
     gettext
     glib
-    libICE
+    libice
     libssh2
     openssl
     slang
diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix
index ab19be802e90..6e8c13901c03 100644
--- a/pkgs/by-name/mu/muse-sounds-manager/package.nix
+++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix
@@ -10,7 +10,7 @@
   libXext,
   libXi,
   libXrandr,
-  libICE,
+  libice,
   libSM,
   openssl,
   unzip,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     libXext
     libXi
     libXrandr
-    libICE
+    libice
     libSM
     openssl
   ];
diff --git a/pkgs/by-name/mu/mutter48/package.nix b/pkgs/by-name/mu/mutter48/package.nix
index 96a032e8bdba..a5a6686212b0 100644
--- a/pkgs/by-name/mu/mutter48/package.nix
+++ b/pkgs/by-name/mu/mutter48/package.nix
@@ -18,7 +18,7 @@
   libadwaita,
   libxcvt,
   libGL,
-  libICE,
+  libice,
   libX11,
   libXcomposite,
   libXcursor,
@@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     # X11 client
     gtk4
-    libICE
+    libice
     libX11
     libXcomposite
     libXcursor
diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix
index 8281275cb594..43165e61013e 100644
--- a/pkgs/by-name/op/openbox/package.nix
+++ b/pkgs/by-name/op/openbox/package.nix
@@ -11,7 +11,7 @@
   libXcursor,
   libXau,
   libXrandr,
-  libICE,
+  libice,
   libSM,
   imlib2,
   pango,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libXcursor
     libXau
     libXrandr
-    libICE
+    libice
     libSM
     libstartup_notification
     python3
diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 5e6d54e1a958..0f3aa7f17b86 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -25,7 +25,7 @@
   hidapi,
   lib3mf,
   libGLU,
-  libICE,
+  libice,
   libSM,
   libsForQt5,
   libspnav,
@@ -107,7 +107,7 @@ clangStdenv.mkDerivation rec {
     ]
     ++ lib.optionals clangStdenv.hostPlatform.isLinux [
       libxdmcp
-      libICE
+      libice
       libSM
       wayland
       wayland-protocols
diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix
index cb836ae71fee..162f1d45bdf5 100644
--- a/pkgs/by-name/pi/pixieditor/package.nix
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@@ -14,7 +14,7 @@
   openssl,
   libGL,
   libX11,
-  libICE,
+  libice,
   libSM,
   libXi,
   libXcursor,
@@ -103,7 +103,7 @@ buildDotnetModule (finalAttrs: {
     openssl
     libGL
     libX11
-    libICE
+    libice
     libSM
     libXi
     libXcursor
diff --git a/pkgs/by-name/po/povray/package.nix b/pkgs/by-name/po/povray/package.nix
index 9dd19ef88e2a..81db08e5dfaf 100644
--- a/pkgs/by-name/po/povray/package.nix
+++ b/pkgs/by-name/po/povray/package.nix
@@ -7,7 +7,7 @@
   boost,
   zlib,
   libX11,
-  libICE,
+  libice,
   libSM,
   libpng,
   libjpeg,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     boost
     libX11
-    libICE
+    libice
     libSM
     libpng
     libjpeg
diff --git a/pkgs/by-name/ri/rigsofrods-bin/package.nix b/pkgs/by-name/ri/rigsofrods-bin/package.nix
index 31a0701f7f82..ad478d3adc8e 100644
--- a/pkgs/by-name/ri/rigsofrods-bin/package.nix
+++ b/pkgs/by-name/ri/rigsofrods-bin/package.nix
@@ -6,7 +6,7 @@
   makeWrapper,
   unzip,
   libGL,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXrandr,
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libGL
-    libICE
+    libice
     libSM
     libX11
     libXrandr
diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix
index 25f193b56a88..b3be306bb59b 100644
--- a/pkgs/by-name/ry/ryubing/package.nix
+++ b/pkgs/by-name/ry/ryubing/package.nix
@@ -17,7 +17,7 @@
   vulkan-loader,
   glew,
   libGL,
-  libICE,
+  libice,
   libSM,
   libXcursor,
   libXext,
@@ -70,7 +70,7 @@ buildDotnetModule rec {
 
     # Avalonia UI
     glew
-    libICE
+    libice
     libSM
     libXcursor
     libXext
diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix
index 21e0d65489b6..59bcc5f8ae2b 100644
--- a/pkgs/by-name/sa/saleae-logic/package.nix
+++ b/pkgs/by-name/sa/saleae-logic/package.nix
@@ -13,7 +13,7 @@
   unzip,
   glib,
   libSM,
-  libICE,
+  libice,
   gtk2,
   libXext,
   libXft,
@@ -41,7 +41,7 @@ let
   libPath = lib.makeLibraryPath [
     glib
     libSM
-    libICE
+    libice
     gtk2
     libXext
     libXft
diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix
index aa1e8290dc70..aea2e4df068b 100644
--- a/pkgs/by-name/sa/sawfish/package.nix
+++ b/pkgs/by-name/sa/sawfish/package.nix
@@ -6,7 +6,7 @@
   gdk-pixbuf-xlib,
   gettext,
   gtk2-x11,
-  libICE,
+  libice,
   libSM,
   libxcrypt,
   libXinerama,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gdk-pixbuf-xlib
     gtk2-x11
-    libICE
+    libice
     libSM
     libxcrypt
     libXinerama
diff --git a/pkgs/by-name/se/segger-ozone/package.nix b/pkgs/by-name/se/segger-ozone/package.nix
index 40417d0004a7..f8f618939b7a 100644
--- a/pkgs/by-name/se/segger-ozone/package.nix
+++ b/pkgs/by-name/se/segger-ozone/package.nix
@@ -6,7 +6,7 @@
   copyDesktopItems,
   fontconfig,
   freetype,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXcursor,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     freetype
-    libICE
+    libice
     libSM
     libX11
     libXcursor
diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix
index e19359c316e5..283bbdd5163a 100644
--- a/pkgs/by-name/si/simgear/package.nix
+++ b/pkgs/by-name/si/simgear/package.nix
@@ -8,7 +8,7 @@
   libX11,
   libXext,
   libXi,
-  libICE,
+  libice,
   libSM,
   libXt,
   libXmu,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     libX11
     libXext
     libXi
-    libICE
+    libice
     libSM
     libXt
     libXmu
diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix
index d2b30d91ea90..acfead7e6445 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -9,7 +9,7 @@
   copyDesktopItems,
   makeDesktopItem,
   libX11,
-  libICE,
+  libice,
   libSM,
   libXi,
   libXcursor,
@@ -87,7 +87,7 @@ buildDotnetModule rec {
     freetype
     glib
     libX11
-    libICE
+    libice
     libSM
     libXi
     libXcursor
diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix
index 9db2623d7374..ab98d7487b11 100644
--- a/pkgs/by-name/sp/speed-dreams/package.nix
+++ b/pkgs/by-name/sp/speed-dreams/package.nix
@@ -12,7 +12,7 @@
   xorgproto,
   libXext,
   libSM,
-  libICE,
+  libice,
   libXi,
   libXt,
   libXrender,
@@ -52,7 +52,7 @@ let
     libXrandr
     libXext
     libSM
-    libICE
+    libice
     libXi
     libXt
     libXrender
@@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
     xorgproto
     libXext
     libSM
-    libICE
+    libice
     libXi
     libXt
     libXrender
diff --git a/pkgs/by-name/sp/spideroak/package.nix b/pkgs/by-name/sp/spideroak/package.nix
index 38fd69606ebc..f4c44fb2151c 100644
--- a/pkgs/by-name/sp/spideroak/package.nix
+++ b/pkgs/by-name/sp/spideroak/package.nix
@@ -7,7 +7,7 @@
   fontconfig,
   freetype,
   glib,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXext,
@@ -22,7 +22,7 @@ let
     fontconfig
     freetype
     glib
-    libICE
+    libice
     libSM
     libX11
     libXext
diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix
index f4e1fd3f3765..ad85eadba84c 100644
--- a/pkgs/by-name/su/survex/package.nix
+++ b/pkgs/by-name/su/survex/package.nix
@@ -5,7 +5,7 @@
   ffmpeg,
   glib,
   libGLU,
-  libICE,
+  libice,
   libX11,
   libgbm,
   perl,
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     # (#233265); is it required for anything?
     libGLU
     libgbm
-    libICE
+    libice
     libX11
   ];
 
diff --git a/pkgs/by-name/sy/synergy/package.nix b/pkgs/by-name/sy/synergy/package.nix
index e74af9de4eed..9e6936c07593 100644
--- a/pkgs/by-name/sy/synergy/package.nix
+++ b/pkgs/by-name/sy/synergy/package.nix
@@ -13,7 +13,7 @@
   pkg-config,
   gdk-pixbuf,
   libnotify,
-  libICE,
+  libice,
   libSM,
   libX11,
   libxkbfile,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     util-linux
     libselinux
     libsepol
-    libICE
+    libice
     libSM
     libX11
     libXi
diff --git a/pkgs/by-name/tk/tkmm/package.nix b/pkgs/by-name/tk/tkmm/package.nix
index 081b4a09d8c5..1e7736835877 100644
--- a/pkgs/by-name/tk/tkmm/package.nix
+++ b/pkgs/by-name/tk/tkmm/package.nix
@@ -8,7 +8,7 @@
   libX11,
   glew,
   libGL,
-  libICE,
+  libice,
   libSM,
   libXcursor,
   libXext,
@@ -50,7 +50,7 @@ buildDotnetModule (finalAttrs: {
     libX11
     libGL
     glew
-    libICE
+    libice
     libSM
     libXcursor
     libXext
diff --git a/pkgs/by-name/to/torcs/package.nix b/pkgs/by-name/to/torcs/package.nix
index b3e79ea0b51e..9a3d073ecf0f 100644
--- a/pkgs/by-name/to/torcs/package.nix
+++ b/pkgs/by-name/to/torcs/package.nix
@@ -13,7 +13,7 @@
   xorgproto,
   libXext,
   libSM,
-  libICE,
+  libice,
   libXi,
   libXt,
   libXrender,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     xorgproto
     libXext
     libSM
-    libICE
+    libice
     libXi
     libXt
     libXrender
diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 772503549fea..8ebcd2d8f169 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -7,7 +7,7 @@
   libX11,
   libXext,
   libSM,
-  libICE,
+  libice,
   libxkbcommon,
   libxshmfence,
   libXfixes,
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
     libXt
     libXext
     libSM
-    libICE
+    libice
     libxcb
     libxkbcommon
     libxshmfence
diff --git a/pkgs/by-name/vn/vncrec/package.nix b/pkgs/by-name/vn/vncrec/package.nix
index 859d202c7e2e..dc4da170e4c1 100644
--- a/pkgs/by-name/vn/vncrec/package.nix
+++ b/pkgs/by-name/vn/vncrec/package.nix
@@ -11,7 +11,7 @@
   libXaw,
   libXext,
   libSM,
-  libICE,
+  libice,
   libXpm,
   libXp,
 }:
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
     libXaw
     libXext
     libSM
-    libICE
+    libice
     libXpm
     libXp
   ];
diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index 8a2ba417c0a6..d3c67b8bc17f 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -24,7 +24,7 @@
   minizip,
   asio,
   libSM,
-  libICE,
+  libice,
   libXext,
 }:
 
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     minizip
     asio
     libSM # XXX: these should be propagated by SDL2?
-    libICE
+    libice
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux libXext;
 
diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix
index f9b5e4ff1840..513f25724c02 100644
--- a/pkgs/by-name/wo/workrave/package.nix
+++ b/pkgs/by-name/wo/workrave/package.nix
@@ -10,7 +10,7 @@
   intltool,
   libtool,
   pkg-config,
-  libICE,
+  libice,
   libSM,
   libXScrnSaver,
   libXtst,
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libICE
+    libice
     libSM
     libXScrnSaver
     libXtst
diff --git a/pkgs/by-name/xa/xawtv/package.nix b/pkgs/by-name/xa/xawtv/package.nix
index 05baac58554b..da1548151586 100644
--- a/pkgs/by-name/xa/xawtv/package.nix
+++ b/pkgs/by-name/xa/xawtv/package.nix
@@ -16,7 +16,7 @@
   libXpm,
   libXext,
   libSM,
-  libICE,
+  libice,
   perl,
 }:
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXpm
     libXext
     libSM
-    libICE
+    libice
     libv4l
   ];
 
diff --git a/pkgs/by-name/xb/xboard/package.nix b/pkgs/by-name/xb/xboard/package.nix
index 2d6e349927c9..d5c7225f61bb 100644
--- a/pkgs/by-name/xb/xboard/package.nix
+++ b/pkgs/by-name/xb/xboard/package.nix
@@ -8,7 +8,7 @@
   libXt,
   libXaw,
   libSM,
-  libICE,
+  libice,
   libXmu,
   libXext,
   gnuchess,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXt
     libXaw
     libSM
-    libICE
+    libice
     libXmu
     libXext
     gnuchess
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index f4dac2209f92..0282b52d3c0f 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -30,7 +30,7 @@
   libpng,
   lcms2,
   libX11,
-  libICE,
+  libice,
   libXext,
   libXrender,
   libXtst,
@@ -277,7 +277,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     giflib
     libX11
-    libICE
+    libice
     libXext
     libXrender
     libXtst
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 3788b865dcbc..97e6a16620bc 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -16,7 +16,7 @@
   libglut,
   libGL,
   libGLU,
-  libICE,
+  libice,
   libSM,
   libX11,
   libXaw,
@@ -84,7 +84,7 @@ let
         libglut
         libGL
         libGLU
-        libICE
+        libice
         libSM
         libX11
         libXaw
diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix
index 007fe6c050f4..090a2eaccd80 100644
--- a/pkgs/development/tools/rgp/default.nix
+++ b/pkgs/development/tools/rgp/default.nix
@@ -12,7 +12,7 @@
   libdrm,
   libGLU,
   libglvnd,
-  libICE,
+  libice,
   libkrb5,
   libSM,
   libX11,
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
     libdrm
     libGLU
     libglvnd
-    libICE
+    libice
     libkrb5
     libSM
     libX11
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0b24afe7142b..b358ae783e2b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -976,6 +976,7 @@ mapAliases {
   libgme = throw "'libgme' has been renamed to/replaced by 'game-music-emu'"; # Converted to throw 2025-10-27
   libgnome-keyring3 = throw "'libgnome-keyring3' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2025-10-27
   libheimdal = throw "'libheimdal' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2025-10-27
+  libICE = libice; # Added 2026-02-04
   libiconv-darwin = throw "'libiconv-darwin' has been renamed to/replaced by 'darwin.libiconv'"; # Converted to throw 2025-10-27
   libixp_hg = throw "'libixp_hg' has been renamed to/replaced by 'libixp'"; # Converted to throw 2025-10-27
   libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # Added 2025-08-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bdf346810f3..e62432ccf845 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8820,7 +8820,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  libICE = libice;
   libpthreadstubs = libpthread-stubs;
   libSM = libsm;
   libX11 = libx11;

From d118fe0cf816fcea07eca13110e06040e0cd0d4c Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 22:13:02 +0100
Subject: [PATCH 063/167] libpthreadstubs: rename references and deprecate
 alias

this shouldn't create any rebuilds
---
 pkgs/applications/graphics/rawtherapee/default.nix          | 4 ++--
 pkgs/applications/misc/pdfpc/default.nix                    | 4 ++--
 pkgs/applications/misc/peaclock/default.nix                 | 4 ++--
 pkgs/applications/video/kodi/unwrapped.nix                  | 4 ++--
 pkgs/applications/video/obs-studio/default.nix              | 4 ++--
 pkgs/applications/window-managers/awesome/default.nix       | 4 ++--
 pkgs/by-name/ar/art/package.nix                             | 4 ++--
 pkgs/by-name/ar/artyFX/package.nix                          | 4 ++--
 pkgs/by-name/au/audacity/package.nix                        | 4 ++--
 pkgs/by-name/cl/clightd/package.nix                         | 4 ++--
 pkgs/by-name/do/dolphin-emu-primehack/package.nix           | 4 ++--
 pkgs/by-name/dr/drumgizmo/package.nix                       | 4 ++--
 pkgs/by-name/em/embree/package.nix                          | 4 ++--
 pkgs/by-name/gr/gromit-mpx/package.nix                      | 4 ++--
 pkgs/by-name/hy/hybridreverb2/package.nix                   | 4 ++--
 pkgs/by-name/ic/icewm/package.nix                           | 4 ++--
 pkgs/by-name/in/infamousPlugins/package.nix                 | 4 ++--
 pkgs/by-name/in/intel-media-sdk/package.nix                 | 4 ++--
 pkgs/by-name/io/io/package.nix                              | 4 ++--
 pkgs/by-name/ki/kicad/base.nix                              | 4 ++--
 pkgs/by-name/li/libdrm/package.nix                          | 4 ++--
 pkgs/by-name/li/libvdpau-va-gl/package.nix                  | 4 ++--
 pkgs/by-name/ma/magma/package.nix                           | 4 ++--
 pkgs/by-name/mp/mpv-unwrapped/package.nix                   | 4 ++--
 pkgs/by-name/ne/neko/package.nix                            | 4 ++--
 pkgs/by-name/op/openrct2/package.nix                        | 4 ++--
 pkgs/by-name/pa/pari/package.nix                            | 6 +++---
 pkgs/by-name/po/polybar/package.nix                         | 4 ++--
 pkgs/by-name/qt/qtox/package.nix                            | 4 ++--
 pkgs/by-name/re/remmina/package.nix                         | 4 ++--
 pkgs/by-name/re/renderdoc/package.nix                       | 4 ++--
 pkgs/by-name/ro/roxterm/package.nix                         | 4 ++--
 pkgs/by-name/st/strawberry/package.nix                      | 4 ++--
 pkgs/by-name/te/tenacity/package.nix                        | 4 ++--
 pkgs/by-name/ti/tint2/package.nix                           | 4 ++--
 pkgs/by-name/xs/xss-lock/package.nix                        | 4 ++--
 pkgs/by-name/ze/zeal/package.nix                            | 4 ++--
 pkgs/data/themes/qtcurve/default.nix                        | 4 ++--
 pkgs/desktops/lxqt/libfm-qt/default.nix                     | 4 ++--
 pkgs/desktops/lxqt/lximage-qt/default.nix                   | 4 ++--
 pkgs/desktops/lxqt/lxqt-config/default.nix                  | 4 ++--
 pkgs/desktops/lxqt/lxqt-panel/default.nix                   | 4 ++--
 pkgs/desktops/lxqt/lxqt-session/default.nix                 | 4 ++--
 pkgs/desktops/lxqt/obconf-qt/default.nix                    | 4 ++--
 pkgs/desktops/lxqt/screengrab/default.nix                   | 4 ++--
 pkgs/development/libraries/allegro/5.nix                    | 4 ++--
 .../libraries/kde-frameworks/kwindowsystem/default.nix      | 4 ++--
 pkgs/development/libraries/qcoro/default.nix                | 4 ++--
 pkgs/development/libraries/webkitgtk/default.nix            | 4 ++--
 pkgs/top-level/aliases.nix                                  | 1 +
 pkgs/top-level/all-packages.nix                             | 1 -
 51 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index e1d571e4dbd0..644aa457acba 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -16,7 +16,7 @@
   wrapGAppsHook3,
   makeWrapper,
   pixman,
-  libpthreadstubs,
+  libpthread-stubs,
   gtkmm3,
   libXau,
   libXdmcp,
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     libepoxy
     libXtst
     pixman
-    libpthreadstubs
+    libpthread-stubs
     gtkmm3
     libXau
     libXdmcp
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 8a43134d20d7..111109a18312 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -8,7 +8,7 @@
   gtk3,
   libgee,
   poppler,
-  libpthreadstubs,
+  libpthread-stubs,
   gstreamer,
   gst-plugins-base,
   gst-plugins-good,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
           [ librsvg ]
         else
           [
-            libpthreadstubs
+            libpthread-stubs
             webkitgtk_4_1
           ];
     in
diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix
index 7564bc874abe..daf65937b5b4 100644
--- a/pkgs/applications/misc/peaclock/default.nix
+++ b/pkgs/applications/misc/peaclock/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libpthreadstubs,
+  libpthread-stubs,
   icu,
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    libpthreadstubs
+    libpthread-stubs
     icu
   ];
 
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index bf5f0a40752a..b4a87cee6961 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -81,7 +81,7 @@
   harfbuzz,
   lcms2,
   libidn2,
-  libpthreadstubs,
+  libpthread-stubs,
   libtasn1,
   libplist,
   p11-kit,
@@ -335,7 +335,7 @@ stdenv.mkDerivation (
       glib
       harfbuzz
       lcms2
-      libpthreadstubs
+      libpthread-stubs
       ffmpeg
       flatbuffers
       fstrcmp
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 255ba02e5f3d..62e3f8a03e32 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -17,7 +17,7 @@
   jansson,
   libjack2,
   libxkbcommon,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   qtbase,
   qtsvg,
@@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjack2
     libv4l
     libxkbcommon
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     qtbase
     qtsvg
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 4be852e0f0f4..8c7ef0442848 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -21,7 +21,7 @@
   libxcb,
   libstartup_notification,
   libxdg_basedir,
-  libpthreadstubs,
+  libpthread-stubs,
   libxcb-cursor,
   makeWrapper,
   pango,
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
     dbus
     gdk-pixbuf
     luaEnv
-    libpthreadstubs
+    libpthread-stubs
     libstartup_notification
     libxdg_basedir
     lua
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 845c910b6748..72ab394c00dc 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -15,7 +15,7 @@
   libXtst,
   wrapGAppsHook3,
   pixman,
-  libpthreadstubs,
+  libpthread-stubs,
   gtkmm3,
   libXau,
   libXdmcp,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     libXtst
     pixman
-    libpthreadstubs
+    libpthread-stubs
     gtkmm3
     libXau
     libXdmcp
diff --git a/pkgs/by-name/ar/artyFX/package.nix b/pkgs/by-name/ar/artyFX/package.nix
index 6064c7d8cd11..68694583fe50 100644
--- a/pkgs/by-name/ar/artyFX/package.nix
+++ b/pkgs/by-name/ar/artyFX/package.nix
@@ -5,7 +5,7 @@
   cairomm,
   cmake,
   libjack2,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libxshmfence,
   libsndfile,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairomm
     libjack2
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libxshmfence
     libsndfile
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index 55c926e91fbe..b876eadd8880 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -42,7 +42,7 @@
   libepoxy,
   libXdmcp,
   libXtst,
-  libpthreadstubs,
+  libpthread-stubs,
   libsbsms_2_3_0,
   libselinux,
   libsepol,
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     libXdmcp
     libXtst
-    libpthreadstubs
+    libpthread-stubs
     libxkbcommon
     libselinux
     libsepol
diff --git a/pkgs/by-name/cl/clightd/package.nix b/pkgs/by-name/cl/clightd/package.nix
index 0d4881e449f0..33fa4c4fd91f 100644
--- a/pkgs/by-name/cl/clightd/package.nix
+++ b/pkgs/by-name/cl/clightd/package.nix
@@ -14,7 +14,7 @@
   libmodule,
   libXdmcp,
   util-linux,
-  libpthreadstubs,
+  libpthread-stubs,
   enableDdc ? true,
   ddcutil,
   enableDpms ? true,
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     libXdmcp
     util-linux
-    libpthreadstubs
+    libpthread-stubs
   ]
   ++ lib.optionals enableDdc [ ddcutil ]
   ++ lib.optionals enableDpms [ libXext ]
diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
index 0aea13b4ce0d..38a7561b3986 100644
--- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix
+++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
@@ -23,7 +23,7 @@
   libXrandr,
   libXxf86vm,
   libao,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libusb1,
   mbedtls,
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXrandr
     libXxf86vm
     libao
-    libpthreadstubs
+    libpthread-stubs
     libpulseaudio
     libusb1
     mbedtls
diff --git a/pkgs/by-name/dr/drumgizmo/package.nix b/pkgs/by-name/dr/drumgizmo/package.nix
index b37e56fa9757..5b37f44fabb1 100644
--- a/pkgs/by-name/dr/drumgizmo/package.nix
+++ b/pkgs/by-name/dr/drumgizmo/package.nix
@@ -10,7 +10,7 @@
   libXext,
   libX11,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libsmf,
   libsndfile,
   lv2,
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     libXext
     libX11
     libpng
-    libpthreadstubs
+    libpthread-stubs
     libsmf
     libsndfile
     lv2
diff --git a/pkgs/by-name/em/embree/package.nix b/pkgs/by-name/em/embree/package.nix
index eb4519e13742..6a16aee8f1ed 100644
--- a/pkgs/by-name/em/embree/package.nix
+++ b/pkgs/by-name/em/embree/package.nix
@@ -10,7 +10,7 @@
   openimageio,
   libjpeg,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libX11,
   glib,
 }:
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libpng
     libX11
-    libpthreadstubs
+    libpthread-stubs
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ];
 
diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix
index fcd3148602a3..ea65d36cb5f2 100644
--- a/pkgs/by-name/gr/gromit-mpx/package.nix
+++ b/pkgs/by-name/gr/gromit-mpx/package.nix
@@ -7,7 +7,7 @@
   gtk3,
   glib,
   libappindicator-gtk3,
-  libpthreadstubs,
+  libpthread-stubs,
   libxdmcp,
   libxkbcommon,
   libepoxy,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     glib
     libappindicator-gtk3
-    libpthreadstubs
+    libpthread-stubs
     libxdmcp
     libxkbcommon
     libepoxy
diff --git a/pkgs/by-name/hy/hybridreverb2/package.nix b/pkgs/by-name/hy/hybridreverb2/package.nix
index 17588b42ccbe..20eb1f6fe840 100644
--- a/pkgs/by-name/hy/hybridreverb2/package.nix
+++ b/pkgs/by-name/hy/hybridreverb2/package.nix
@@ -11,7 +11,7 @@
   libX11,
   gtk3,
   pcre,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libxkbcommon,
   libepoxy,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     libX11
     gtk3
     pcre
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libxkbcommon
     libepoxy
diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index 8175a34c6be6..18a761b7d59a 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -29,7 +29,7 @@
   libjpeg,
   libogg,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libsndfile,
   libtiff,
   libxcb,
@@ -86,7 +86,7 @@ gccStdenv.mkDerivation (finalAttrs: {
     libjpeg
     libogg
     libpng
-    libpthreadstubs
+    libpthread-stubs
     libsndfile
     libtiff
     libxcb
diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousPlugins/package.nix
index bf63c3781a9a..23d0fc4498db 100644
--- a/pkgs/by-name/in/infamousPlugins/package.nix
+++ b/pkgs/by-name/in/infamousPlugins/package.nix
@@ -6,7 +6,7 @@
   cairomm,
   cmake,
   lv2,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libXft,
   ntk,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairomm
     lv2
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libXft
     ntk
diff --git a/pkgs/by-name/in/intel-media-sdk/package.nix b/pkgs/by-name/in/intel-media-sdk/package.nix
index dd04951d2fac..ed5d7f982ea6 100644
--- a/pkgs/by-name/in/intel-media-sdk/package.nix
+++ b/pkgs/by-name/in/intel-media-sdk/package.nix
@@ -11,7 +11,7 @@
   libX11,
   libXau,
   libXdmcp,
-  libpthreadstubs,
+  libpthread-stubs,
   fetchpatch,
 }:
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     libX11
     libXau
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
   ];
   nativeCheckInputs = [ gtest ];
 
diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix
index 03f1c5ad7fe5..1bce2be773cb 100644
--- a/pkgs/by-name/io/io/package.nix
+++ b/pkgs/by-name/io/io/package.nix
@@ -29,7 +29,7 @@
   openssl,
   glfw,
   pkg-config,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libmemcached,
 }:
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
     yajl
     glfw
     openssl
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libmemcached
     python3
diff --git a/pkgs/by-name/ki/kicad/base.nix b/pkgs/by-name/ki/kicad/base.nix
index a52799550842..3dcee6002355 100644
--- a/pkgs/by-name/ki/kicad/base.nix
+++ b/pkgs/by-name/ki/kicad/base.nix
@@ -18,7 +18,7 @@
   pkg-config,
   doxygen,
   graphviz,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   unixODBC,
   libgit2,
@@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     glew
     glm
-    libpthreadstubs
+    libpthread-stubs
     cairo
     curl
     openssl
diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix
index 8edb48ef2fe8..7b5560e36e37 100644
--- a/pkgs/by-name/li/libdrm/package.nix
+++ b/pkgs/by-name/li/libdrm/package.nix
@@ -6,7 +6,7 @@
   meson,
   ninja,
   docutils,
-  libpthreadstubs,
+  libpthread-stubs,
   withIntel ? lib.meta.availableOn stdenv.hostPlatform libpciaccess,
   libpciaccess,
   withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !stdenv.cc.isClang,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     docutils
   ];
   buildInputs = [
-    libpthreadstubs
+    libpthread-stubs
   ]
   ++ lib.optional withIntel libpciaccess
   ++ lib.optional withValgrind valgrind-light;
diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index fd71b4049bdc..e380334562de 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   libX11,
-  libpthreadstubs,
+  libpthread-stubs,
   libXau,
   libXdmcp,
   libXext,
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libX11
-    libpthreadstubs
+    libpthread-stubs
     libXau
     libXdmcp
     libXext
diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix
index 9aac8699c4c9..4215a8b204ef 100644
--- a/pkgs/by-name/ma/magma/package.nix
+++ b/pkgs/by-name/ma/magma/package.nix
@@ -11,7 +11,7 @@
   rocmPackages,
   lapack,
   lib,
-  libpthreadstubs,
+  libpthread-stubs,
   ninja,
   perl,
   python3,
@@ -188,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    libpthreadstubs
+    libpthread-stubs
     lapack
     blas
     python3
diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix
index 80193dc6af98..19b44bbc49a6 100644
--- a/pkgs/by-name/mp/mpv-unwrapped/package.nix
+++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix
@@ -30,7 +30,7 @@
   libdvdnav,
   libjack2,
   libplacebo,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libsixel,
   libuchardet,
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     libass
     libplacebo
-    libpthreadstubs
+    libpthread-stubs
     libuchardet
     luaEnv
     python3
diff --git a/pkgs/by-name/ne/neko/package.nix b/pkgs/by-name/ne/neko/package.nix
index 649bb8db3d22..b2702962fc73 100644
--- a/pkgs/by-name/ne/neko/package.nix
+++ b/pkgs/by-name/ne/neko/package.nix
@@ -16,7 +16,7 @@
   mbedtls,
   openssl,
   gtk3,
-  libpthreadstubs,
+  libpthread-stubs,
   nix-update-script,
 }:
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmysqlclient
     mbedtls
     openssl
-    libpthreadstubs
+    libpthread-stubs
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux gtk3;
   cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ];
diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix
index 9c176a9b2222..f23dcfd47d29 100644
--- a/pkgs/by-name/op/openrct2/package.nix
+++ b/pkgs/by-name/op/openrct2/package.nix
@@ -22,7 +22,7 @@
   libiconv,
   libogg,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libvorbis,
   libzip,
   nlohmann_json,
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     libiconv
     libogg
     libpng
-    libpthreadstubs
+    libpthread-stubs
     libvorbis
     libzip
     nlohmann_json
diff --git a/pkgs/by-name/pa/pari/package.nix b/pkgs/by-name/pa/pari/package.nix
index 74d700b358e0..1c46403914c6 100644
--- a/pkgs/by-name/pa/pari/package.nix
+++ b/pkgs/by-name/pa/pari/package.nix
@@ -4,14 +4,14 @@
   fetchurl,
   gmp,
   libX11,
-  libpthreadstubs,
+  libpthread-stubs,
   perl,
   readline,
   texliveBasic,
   withThread ? true,
 }:
 
-assert withThread -> libpthreadstubs != null;
+assert withThread -> libpthread-stubs != null;
 
 stdenv.mkDerivation rec {
   pname = "pari";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     texliveBasic
   ]
   ++ lib.optionals withThread [
-    libpthreadstubs
+    libpthread-stubs
   ];
 
   configureScript = "./Configure";
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index a6e8ccae4abe..6adee06b5ff5 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -6,7 +6,7 @@
   fetchpatch,
   libuv,
   libXdmcp,
-  libpthreadstubs,
+  libpthread-stubs,
   libxcb,
   pcre,
   pkg-config,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     libuv
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
     libxcb
     pcre
     python3
diff --git a/pkgs/by-name/qt/qtox/package.nix b/pkgs/by-name/qt/qtox/package.nix
index 75c5eacc3f23..a63ce14c9b86 100644
--- a/pkgs/by-name/qt/qtox/package.nix
+++ b/pkgs/by-name/qt/qtox/package.nix
@@ -7,7 +7,7 @@
   perl,
   kdePackages,
   libtoxcore,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libXScrnSaver,
   ffmpeg,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     kdePackages.sonnet
     libtoxcore
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libXScrnSaver
     ffmpeg
diff --git a/pkgs/by-name/re/remmina/package.nix b/pkgs/by-name/re/remmina/package.nix
index 7f40f0f8d9b3..0c6e0e9dab7d 100644
--- a/pkgs/by-name/re/remmina/package.nix
+++ b/pkgs/by-name/re/remmina/package.nix
@@ -23,7 +23,7 @@
   libdbusmenu-gtk3,
   libappindicator-gtk3,
   libvncserver,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libxkbcommon,
   libsecret,
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnutls
     pcre2
     libvncserver
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libxkbcommon
     libsoup_3
diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index 085a3f7c1d71..5eb038d83252 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -9,7 +9,7 @@
   fetchpatch,
   libXdmcp,
   libglvnd,
-  libpthreadstubs,
+  libpthread-stubs,
   makeWrapper,
   nix-update-script,
   pcre,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
     python312Packages.pyside2
     python312Packages.pyside2-tools
     python312Packages.shiboken2
diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix
index 8f66925bb3fb..0c0a7f281104 100644
--- a/pkgs/by-name/ro/roxterm/package.nix
+++ b/pkgs/by-name/ro/roxterm/package.nix
@@ -12,7 +12,7 @@
   libXdmcp,
   libXtst,
   libepoxy,
-  libpthreadstubs,
+  libpthread-stubs,
   libselinux,
   libsepol,
   libtasn1,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXdmcp
     libXtst
     libepoxy
-    libpthreadstubs
+    libpthread-stubs
     libselinux
     libsepol
     libtasn1
diff --git a/pkgs/by-name/st/strawberry/package.nix b/pkgs/by-name/st/strawberry/package.nix
index 69b8f90c8761..e6c79790a329 100644
--- a/pkgs/by-name/st/strawberry/package.nix
+++ b/pkgs/by-name/st/strawberry/package.nix
@@ -15,7 +15,7 @@
   libebur128,
   libidn2,
   libmtp,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libselinux,
   libsepol,
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     libebur128
     libidn2
     libmtp
-    libpthreadstubs
+    libpthread-stubs
     libtasn1
     qt6.qtbase
     sqlite
diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index 4f9fbbc5348a..b191502d57ec 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -41,7 +41,7 @@
   libepoxy,
   libXdmcp,
   libXtst,
-  libpthreadstubs,
+  libpthread-stubs,
   libselinux,
   libsepol,
   libxkbcommon,
@@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     libXdmcp
     libXtst
-    libpthreadstubs
+    libpthread-stubs
     libxkbcommon
     libselinux
     libsepol
diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix
index 976badf097d8..127f53c1c5e2 100644
--- a/pkgs/by-name/ti/tint2/package.nix
+++ b/pkgs/by-name/ti/tint2/package.nix
@@ -18,7 +18,7 @@
   libX11,
   libXrandr,
   librsvg,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libstartup_notification,
   wrapGAppsHook3,
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     libX11
     libXrandr
     librsvg
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libstartup_notification
   ];
diff --git a/pkgs/by-name/xs/xss-lock/package.nix b/pkgs/by-name/xs/xss-lock/package.nix
index dcb755548cbd..24602a98cb13 100644
--- a/pkgs/by-name/xs/xss-lock/package.nix
+++ b/pkgs/by-name/xs/xss-lock/package.nix
@@ -6,7 +6,7 @@
   docutils,
   pkg-config,
   glib,
-  libpthreadstubs,
+  libpthread-stubs,
   libXau,
   libXdmcp,
   libxcb-util,
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     glib
-    libpthreadstubs
+    libpthread-stubs
     libXau
     libXdmcp
     libxcb-util
diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix
index 4d66050d23a4..58c0f78ef04c 100644
--- a/pkgs/by-name/ze/zeal/package.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -8,7 +8,7 @@
   httplib,
   libarchive,
   libXdmcp,
-  libpthreadstubs,
+  libpthread-stubs,
   libxcb-keysyms,
   qt6,
 }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     httplib
     libXdmcp
     libarchive
-    libpthreadstubs
+    libpthread-stubs
     qt6.qtbase
     qt6.qtimageformats
     qt6.qtwebengine
diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index 66e648ba38b0..e2bb3289d9d6 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -20,7 +20,7 @@
   kwindowsystem,
   kdelibs4support,
   kiconthemes,
-  libpthreadstubs,
+  libpthread-stubs,
   pcre,
   libXdmcp,
   libX11,
@@ -76,7 +76,7 @@ mkDerivation rec {
     kwindowsystem
     kdelibs4support
     frameworkintegration
-    libpthreadstubs
+    libpthread-stubs
     pcre
     libXdmcp
     libX11
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 86cdf13cdc8c..19e005ac9e1d 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -6,7 +6,7 @@
   libXdmcp,
   libexif,
   libfm,
-  libpthreadstubs,
+  libpthread-stubs,
   libxcb,
   lxqt-build-tools,
   lxqt-menu-data,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXdmcp
     libexif
     libfm
-    libpthreadstubs
+    libpthread-stubs
     libxcb
     lxqt-menu-data
     menu-cache
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 26fb9cc3cfc2..b6d0eb7cfe1e 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -7,7 +7,7 @@
   libXdmcp,
   libexif,
   libfm-qt,
-  libpthreadstubs,
+  libpthread-stubs,
   lxqt-build-tools,
   menu-cache,
   qtbase,
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     libXdmcp
     libexif
     libfm-qt
-    libpthreadstubs
+    libpthread-stubs
     menu-cache
     qtbase
     qtimageformats # add-on module to support more image file formats
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index 388febde0075..81477a03a7c5 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -10,7 +10,7 @@
   libXdmcp,
   libkscreen,
   liblxqt,
-  libpthreadstubs,
+  libpthread-stubs,
   libqtxdg,
   libxcb,
   lxqt-build-tools,
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     libXdmcp
     libkscreen
     liblxqt
-    libpthreadstubs
+    libpthread-stubs
     libqtxdg
     libxcb
     lxqt-menu-data
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 424a9c1780b9..77b627c97e3a 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -14,7 +14,7 @@
   libXtst,
   libdbusmenu,
   liblxqt,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libqtxdg,
   libstatgrab,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXtst
     libdbusmenu
     liblxqt
-    libpthreadstubs
+    libpthread-stubs
     libpulseaudio
     libqtxdg
     libstatgrab
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index d1900e45717a..e3f885ffcd1e 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -7,7 +7,7 @@
   layer-shell-qt,
   libXdmcp,
   liblxqt,
-  libpthreadstubs,
+  libpthread-stubs,
   libqtxdg,
   lxqt-build-tools,
   pkg-config,
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     layer-shell-qt
     libXdmcp
     liblxqt
-    libpthreadstubs
+    libpthread-stubs
     libqtxdg
     procps
     qtbase
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 00a3b1a10c10..3fba8acd0e1e 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -5,7 +5,7 @@
   cmake,
   libSM,
   libXdmcp,
-  libpthreadstubs,
+  libpthread-stubs,
   lxqt-build-tools,
   openbox,
   pcre,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libSM
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
     openbox
     pcre
     qtbase
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index 292985ceb2db..1414ed9973e4 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -8,7 +8,7 @@
   kwindowsystem,
   layer-shell-qt,
   libXdmcp,
-  libpthreadstubs,
+  libpthread-stubs,
   libqtxdg,
   lxqt-build-tools,
   perl,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     kwindowsystem
     layer-shell-qt
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
     libqtxdg
     qtbase
     qtsvg
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 018b21108edf..33109f4656af 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -14,7 +14,7 @@
   libGLU,
   libjpeg,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libtheora,
   libvorbis,
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libpthreadstubs
+    libpthread-stubs
     libpulseaudio
     libX11
     libXcursor
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 0bb6952dda41..ff5da40077aa 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation,
   extra-cmake-modules,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   qtbase,
   qttools,
@@ -12,7 +12,7 @@ mkDerivation {
   pname = "kwindowsystem";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     qttools
     qtx11extras
diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix
index a58e8362c02b..f4204439a36f 100644
--- a/pkgs/development/libraries/qcoro/default.nix
+++ b/pkgs/development/libraries/qcoro/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libpthreadstubs,
+  libpthread-stubs,
   qtbase,
   qtwebsockets,
   wrapQtAppsHook,
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qtwebsockets
-    libpthreadstubs
+    libpthread-stubs
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 5178cae8a87f..3b56d3c9bc39 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -37,7 +37,7 @@
   hyphen,
   icu,
   libsysprof-capture,
-  libpthreadstubs,
+  libpthread-stubs,
   nettle,
   libtasn1,
   p11-kit,
@@ -160,7 +160,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     libidn
     libintl
     lcms2
-    libpthreadstubs
+    libpthread-stubs
     libsysprof-capture
     libtasn1
     libwebp
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b358ae783e2b..cd4b7dc077f1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -989,6 +989,7 @@ mapAliases {
   libosmo-sccp = throw "'libosmo-sccp' has been renamed to/replaced by 'libosmo-sigtran'"; # Converted to throw 2025-10-27
   libpromhttp = throw "'libpromhttp' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-16
   libpseudo = throw "'libpseudo' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
+  libpthreadstubs = libpthread-stubs; # Added 2025-02-04
   libpulseaudio-vanilla = throw "'libpulseaudio-vanilla' has been renamed to/replaced by 'libpulseaudio'"; # Converted to throw 2025-10-27
   libqt5pas = throw "'libqt5pas' has been renamed to/replaced by 'libsForQt5.libqtpas'"; # Converted to throw 2025-10-27
   libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e62432ccf845..60c39ede5e3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8820,7 +8820,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  libpthreadstubs = libpthread-stubs;
   libSM = libsm;
   libX11 = libx11;
   libXau = libxau;

From 03c297aea5ce45e1f6b009d52188d359e992b9c8 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 4 Feb 2026 22:20:23 +0100
Subject: [PATCH 064/167] libSM: rename references and deprecate alias

this shouldn't create any rebuilds
---
 pkgs/applications/editors/jetbrains/ides/rider.nix          | 4 ++--
 pkgs/applications/editors/vim/full.nix                      | 4 ++--
 pkgs/applications/emulators/kega-fusion/default.nix         | 4 ++--
 .../applications/graphics/unigine-superposition/default.nix | 6 +++---
 pkgs/applications/misc/avalonia-ilspy/default.nix           | 4 ++--
 pkgs/applications/misc/googleearth-pro/default.nix          | 4 ++--
 .../networking/instant-messengers/pidgin/default.nix        | 4 ++--
 pkgs/applications/networking/remote/teamviewer/default.nix  | 4 ++--
 pkgs/applications/science/misc/gplates/default.nix          | 4 ++--
 pkgs/applications/window-managers/ion-3/default.nix         | 4 ++--
 pkgs/build-support/dotnet/fetch-nupkg/overrides.nix         | 4 ++--
 pkgs/by-name/af/afterstep/package.nix                       | 4 ++--
 pkgs/by-name/at/ataripp/package.nix                         | 4 ++--
 pkgs/by-name/av/avalonia/package.nix                        | 4 ++--
 pkgs/by-name/do/dolphin-emu-primehack/package.nix           | 4 ++--
 pkgs/by-name/dr/dreamchess/package.nix                      | 4 ++--
 pkgs/by-name/ds/dssi/package.nix                            | 4 ++--
 pkgs/by-name/e1/e16/package.nix                             | 4 ++--
 pkgs/by-name/ex/extremetuxracer/package.nix                 | 4 ++--
 pkgs/by-name/fa/factorio/package.nix                        | 4 ++--
 pkgs/by-name/fl/flightgear/package.nix                      | 4 ++--
 pkgs/by-name/fr/freewheeling/package.nix                    | 4 ++--
 pkgs/by-name/fr/fricas/package.nix                          | 4 ++--
 pkgs/by-name/fv/fvwm3/package.nix                           | 4 ++--
 pkgs/by-name/gk/gkrellm/package.nix                         | 4 ++--
 pkgs/by-name/gr/gravit/package.nix                          | 4 ++--
 pkgs/by-name/hu/hubstaff/package.nix                        | 4 ++--
 pkgs/by-name/ic/icesl/package.nix                           | 4 ++--
 pkgs/by-name/ic/icewm/package.nix                           | 4 ++--
 pkgs/by-name/in/input-leap/package.nix                      | 4 ++--
 pkgs/by-name/li/libxfce4ui/package.nix                      | 4 ++--
 pkgs/by-name/li/lincity/package.nix                         | 4 ++--
 pkgs/by-name/li/lirc/package.nix                            | 4 ++--
 pkgs/by-name/lm/lms/package.nix                             | 4 ++--
 pkgs/by-name/lu/lunacy/package.nix                          | 6 +++---
 pkgs/by-name/lw/lwm/package.nix                             | 4 ++--
 pkgs/by-name/me/mediainfo-gui/package.nix                   | 4 ++--
 pkgs/by-name/mu/muse-sounds-manager/package.nix             | 4 ++--
 pkgs/by-name/mu/mutter/package.nix                          | 4 ++--
 pkgs/by-name/mu/mutter48/package.nix                        | 4 ++--
 pkgs/by-name/no/notion/package.nix                          | 4 ++--
 pkgs/by-name/ob/obconf/package.nix                          | 4 ++--
 pkgs/by-name/op/openbox/package.nix                         | 4 ++--
 pkgs/by-name/op/openscad-unstable/package.nix               | 4 ++--
 pkgs/by-name/pi/pixieditor/package.nix                      | 4 ++--
 pkgs/by-name/pl/plib/package.nix                            | 4 ++--
 pkgs/by-name/po/povray/package.nix                          | 4 ++--
 pkgs/by-name/ri/rigsofrods-bin/package.nix                  | 4 ++--
 pkgs/by-name/ro/rox-filer/package.nix                       | 4 ++--
 pkgs/by-name/rp/rpcs3/package.nix                           | 4 ++--
 pkgs/by-name/ru/runescape/package.nix                       | 6 +++---
 pkgs/by-name/ry/ryubing/package.nix                         | 4 ++--
 pkgs/by-name/sa/saleae-logic/package.nix                    | 4 ++--
 pkgs/by-name/sa/sawfish/package.nix                         | 4 ++--
 pkgs/by-name/se/segger-ozone/package.nix                    | 4 ++--
 pkgs/by-name/si/simgear/package.nix                         | 4 ++--
 pkgs/by-name/sl/slop/package.nix                            | 4 ++--
 pkgs/by-name/sp/space-station-14-launcher/package.nix       | 4 ++--
 pkgs/by-name/sp/speed-dreams/package.nix                    | 6 +++---
 pkgs/by-name/sp/spideroak/package.nix                       | 4 ++--
 pkgs/by-name/su/superTux/package.nix                        | 4 ++--
 pkgs/by-name/su/supercell-wx/package.nix                    | 4 ++--
 pkgs/by-name/sw/swi-prolog/package.nix                      | 4 ++--
 pkgs/by-name/sy/synaesthesia/package.nix                    | 4 ++--
 pkgs/by-name/sy/synergy/package.nix                         | 4 ++--
 pkgs/by-name/tk/tkmm/package.nix                            | 4 ++--
 pkgs/by-name/to/torcs/package.nix                           | 4 ++--
 pkgs/by-name/tr/transcribe/package.nix                      | 4 ++--
 pkgs/by-name/vi/vivaldi/package.nix                         | 4 ++--
 pkgs/by-name/vl/vlc/package.nix                             | 4 ++--
 pkgs/by-name/vn/vncrec/package.nix                          | 4 ++--
 pkgs/by-name/wi/widelands/package.nix                       | 4 ++--
 pkgs/by-name/wo/workrave/package.nix                        | 4 ++--
 pkgs/by-name/wx/wxGTK31/package.nix                         | 4 ++--
 pkgs/by-name/wx/wxGTK32/package.nix                         | 4 ++--
 pkgs/by-name/wx/wxwidgets_3_3/package.nix                   | 4 ++--
 pkgs/by-name/xa/xawtv/package.nix                           | 4 ++--
 pkgs/by-name/xb/xboard/package.nix                          | 4 ++--
 pkgs/by-name/xp/xpilot-ng/package.nix                       | 4 ++--
 pkgs/by-name/ya/yabasic/package.nix                         | 4 ++--
 pkgs/desktops/lxqt/obconf-qt/default.nix                    | 4 ++--
 pkgs/desktops/mate/mate-session-manager/default.nix         | 4 ++--
 pkgs/development/libraries/ogre/default.nix                 | 4 ++--
 pkgs/development/python-modules/wxpython/4.2.nix            | 4 ++--
 pkgs/development/tools/rgp/default.nix                      | 4 ++--
 pkgs/games/dwarf-fortress/unfuck.nix                        | 4 ++--
 pkgs/top-level/aliases.nix                                  | 1 +
 pkgs/top-level/all-packages.nix                             | 1 -
 88 files changed, 177 insertions(+), 177 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix
index 50cfc05d442b..c7db457d1740 100644
--- a/pkgs/applications/editors/jetbrains/ides/rider.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rider.nix
@@ -11,7 +11,7 @@
   lttng-ust_2_12,
   musl,
   libice,
-  libSM,
+  libsm,
   libX11,
   dotnetCorePackages,
   libxcb-keysyms,
@@ -74,7 +74,7 @@ in
   extraLdPath = lib.optionals (stdenv.hostPlatform.isLinux) [
     # Avalonia dependencies needed for dotMemory
     libice
-    libSM
+    libsm
     libX11
   ];
 
diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix
index ba3395814114..7ea0de1676ae 100644
--- a/pkgs/applications/editors/vim/full.nix
+++ b/pkgs/applications/editors/vim/full.nix
@@ -18,7 +18,7 @@
   ruby,
   libX11,
   libXext,
-  libSM,
+  libsm,
   libXpm,
   libXt,
   libXaw,
@@ -177,7 +177,7 @@ stdenv.mkDerivation {
   ]
   # All X related dependencies
   ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
-    libSM
+    libsm
     libice
     libX11
     libXext
diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix
index c3a9cc999983..fd5ed5924b27 100644
--- a/pkgs/applications/emulators/kega-fusion/default.nix
+++ b/pkgs/applications/emulators/kega-fusion/default.nix
@@ -9,7 +9,7 @@
   glib,
   gtk2,
   alsa-lib,
-  libSM,
+  libsm,
   libX11,
   gdk-pixbuf,
   pango,
@@ -26,7 +26,7 @@ let
     glib
     gtk2
     alsa-lib
-    libSM
+    libsm
     libX11
     gdk-pixbuf
     pango
diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix
index 0819fa6eec58..78ddf8f4edae 100644
--- a/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/pkgs/applications/graphics/unigine-superposition/default.nix
@@ -9,7 +9,7 @@
   qtquickcontrols2,
   libXinerama,
   libxcb,
-  libSM,
+  libsm,
   libXi,
   libglvnd,
   libXext,
@@ -54,7 +54,7 @@ let
       qtquickcontrols2
       libXinerama
       libxcb
-      libSM
+      libsm
       libXi
       libglvnd
       libXext
@@ -111,7 +111,7 @@ buildFHSEnv {
     qtquickcontrols2
     libXinerama
     libxcb
-    libSM
+    libsm
     libXi
     libglvnd
     libXext
diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index 7dfe5b49d1c8..be52ef6a3a82 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -6,7 +6,7 @@
   dotnetCorePackages,
   libX11,
   libice,
-  libSM,
+  libsm,
   libXi,
   libXcursor,
   libXext,
@@ -61,7 +61,7 @@ buildDotnetModule rec {
     # Avalonia UI
     libX11
     libice
-    libSM
+    libsm
     libXi
     libXcursor
     libXext
diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix
index f886c4942f29..0b476660c585 100644
--- a/pkgs/applications/misc/googleearth-pro/default.nix
+++ b/pkgs/applications/misc/googleearth-pro/default.nix
@@ -6,7 +6,7 @@
   glib,
   libGL,
   libGLU,
-  libSM,
+  libsm,
 
   libXcomposite,
   libXi,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     gst_all_1.gstreamer
     libGL
     libGLU
-    libSM
+    libsm
     libX11
     libXcomposite
     libXi
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index bfda3edd76c7..9d4903adc988 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -17,7 +17,7 @@
   intltool,
   lib,
   libice,
-  libSM,
+  libsm,
   libXScrnSaver,
   libXext,
   libgcrypt,
@@ -75,7 +75,7 @@ let
         gst_all_1.gst-plugins-good
         gst_all_1.gstreamer
         libice
-        libSM
+        libsm
         libXScrnSaver
         libXext
         libgnt
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 7ab61b6a91c1..446ba3f40a64 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -13,7 +13,7 @@
   libXext,
   libXdamage,
   libXtst,
-  libSM,
+  libsm,
   libXfixes,
   coreutils,
   wrapQtAppsHook,
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
         libXext
         libXdamage
         libXtst
-        libSM
+        libsm
         libXfixes
         dbus
         icu63
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 435ed3f28a44..353600b8cc90 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -13,7 +13,7 @@
   gmp,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   mpfr,
   proj,
   python3,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     gmp
     libGL
     libGLU
-    libSM
+    libsm
     mpfr
     proj
     python
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index d8f63d6d4ae7..098f7d4c3e62 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -6,7 +6,7 @@
   gettext,
   groff,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXext,
 }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libice
-    libSM
+    libsm
     libX11
     libXext
     lua
diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
index 40aab3e1aab5..8728631bf4e1 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
@@ -4,7 +4,7 @@
   fontconfig,
   lib,
   libice,
-  libSM,
+  libsm,
   libX11,
   stdenv,
   writeText,
@@ -57,7 +57,7 @@
         setupHook = writeText "setupHook.sh" ''
           prependToVar dotnetRuntimeDeps \
             "${lib.getLib libice}" \
-            "${lib.getLib libSM}" \
+            "${lib.getLib libsm}" \
             "${lib.getLib libX11}"
         '';
       }
diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix
index ae6be2c9f6f8..22e30b1905a7 100644
--- a/pkgs/by-name/af/afterstep/package.nix
+++ b/pkgs/by-name/af/afterstep/package.nix
@@ -7,7 +7,7 @@
   fltk_1_3,
   gtk2,
   libice,
-  libSM,
+  libsm,
   libtiff,
   pkg-config,
 }:
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     fltk_1_3
     gtk2
     libice
-    libSM
+    libsm
     libtiff
   ];
 
diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix
index c53506f92eb8..d31bb3b4f897 100644
--- a/pkgs/by-name/at/ataripp/package.nix
+++ b/pkgs/by-name/at/ataripp/package.nix
@@ -6,7 +6,7 @@
   fetchurl,
   gcc-unwrapped,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXext,
 }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     gcc-unwrapped
     libice
-    libSM
+    libsm
     libX11
     libXext
   ];
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 91b034e30935..3c18fc19fd7a 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -6,7 +6,7 @@
   fontconfig,
   lib,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXcursor,
   libXext,
@@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (
         substituteInPlace src/Avalonia.X11/ICELib.cs \
           --replace-fail '"libICE.so.6"' '"${lib.getLib libice}/lib/libICE.so.6"'
         substituteInPlace src/Avalonia.X11/SMLib.cs \
-          --replace-fail '"libSM.so.6"' '"${lib.getLib libSM}/lib/libSM.so.6"'
+          --replace-fail '"libSM.so.6"' '"${lib.getLib libsm}/lib/libSM.so.6"'
         substituteInPlace src/Avalonia.X11/XLib.cs \
           --replace-fail '"libX11.so.6"' '"${lib.getLib libX11}/lib/libX11.so.6"' \
           --replace-fail '"libXrandr.so.2"' '"${lib.getLib libXrandr}/lib/libXrandr.so.2"' \
diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
index 38a7561b3986..a15859c43049 100644
--- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix
+++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
@@ -16,7 +16,7 @@
   gettext,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXdmcp,
   libXext,
   libXinerama,
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     libGL
     libGLU
-    libSM
+    libsm
     libXdmcp
     libXext
     libXinerama
diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix
index 6862666c8980..dca3b4a027d8 100644
--- a/pkgs/by-name/dr/dreamchess/package.nix
+++ b/pkgs/by-name/dr/dreamchess/package.nix
@@ -13,7 +13,7 @@
   expat,
   glew,
   freetype,
-  libSM,
+  libsm,
   libXext,
   libGL,
   libGLU,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     expat
     glew
     freetype
-    libSM
+    libsm
     libXext
     libGL
     libGLU
diff --git a/pkgs/by-name/ds/dssi/package.nix b/pkgs/by-name/ds/dssi/package.nix
index 4bac543c8eec..8c6f694f1050 100644
--- a/pkgs/by-name/ds/dssi/package.nix
+++ b/pkgs/by-name/ds/dssi/package.nix
@@ -8,7 +8,7 @@
   alsa-lib,
   libX11,
   libsndfile,
-  libSM,
+  libsm,
   libsamplerate,
   libtool,
   autoconf,
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     libX11
     libsndfile
-    libSM
+    libsm
     libsamplerate
     libtool
     xorgproto
diff --git a/pkgs/by-name/e1/e16/package.nix b/pkgs/by-name/e1/e16/package.nix
index d2e70a0beefa..96d3f75d26b1 100644
--- a/pkgs/by-name/e1/e16/package.nix
+++ b/pkgs/by-name/e1/e16/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   freetype,
   imlib2,
-  libSM,
+  libsm,
   libXcomposite,
   libXdamage,
   libXext,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     freetype
     imlib2
-    libSM
+    libsm
     libXcomposite
     libXdamage
     libXext
diff --git a/pkgs/by-name/ex/extremetuxracer/package.nix b/pkgs/by-name/ex/extremetuxracer/package.nix
index d5e759ca5cd8..8c4f315ce370 100644
--- a/pkgs/by-name/ex/extremetuxracer/package.nix
+++ b/pkgs/by-name/ex/extremetuxracer/package.nix
@@ -14,7 +14,7 @@
   libXmu,
   libXext,
   libXt,
-  libSM,
+  libsm,
   libice,
   libpng,
   pkg-config,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXmu
     libXext
     libXt
-    libSM
+    libsm
     libice
     libpng
     gettext
diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix
index f5e3346869c6..e8893ae7f1ae 100644
--- a/pkgs/by-name/fa/factorio/package.nix
+++ b/pkgs/by-name/fa/factorio/package.nix
@@ -5,7 +5,7 @@
   fetchurl,
   libGL,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXcursor,
   libXext,
@@ -243,7 +243,7 @@ let
         alsa-lib
         libGL
         libice
-        libSM
+        libsm
         libX11
         libXcursor
         libXext
diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index 5aa12632fa24..055af0bbdb2c 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -11,7 +11,7 @@
   libjpeg,
   openal,
   plib,
-  libSM,
+  libsm,
   libunwind,
   libX11,
   xorgproto,
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     openal
     openscenegraph
     plib
-    libSM
+    libsm
     libunwind
     libX11
     xorgproto
diff --git a/pkgs/by-name/fr/freewheeling/package.nix b/pkgs/by-name/fr/freewheeling/package.nix
index 7d5c1f84ffa2..16d6e3104982 100644
--- a/pkgs/by-name/fr/freewheeling/package.nix
+++ b/pkgs/by-name/fr/freewheeling/package.nix
@@ -13,7 +13,7 @@
   alsa-lib,
   libjack2,
   libvorbis,
-  libSM,
+  libsm,
   libsndfile,
   libogg,
   libX11,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     libvorbis
     libsndfile
     libogg
-    libSM
+    libsm
     libX11
     nettle
   ];
diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index fc0a26c62f5b..3f76a5ff11a6 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -6,7 +6,7 @@
   libX11,
   libXpm,
   libice,
-  libSM,
+  libsm,
   libXt,
   libXau,
   libXdmcp,
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     libX11
     libXpm
     libice
-    libSM
+    libsm
     libXt
     libXau
     libXdmcp
diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix
index 887001e5be72..41b13cffc17a 100644
--- a/pkgs/by-name/fv/fvwm3/package.nix
+++ b/pkgs/by-name/fv/fvwm3/package.nix
@@ -7,7 +7,7 @@
   fontconfig,
   freetype,
   fribidi,
-  libSM,
+  libsm,
   libX11,
   libXcursor,
   libXft,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig
     freetype
     fribidi
-    libSM
+    libsm
     libX11
     libXcursor
     libXft
diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix
index 90d6d3f80241..806d99f17a1d 100644
--- a/pkgs/by-name/gk/gkrellm/package.nix
+++ b/pkgs/by-name/gk/gkrellm/package.nix
@@ -7,7 +7,7 @@
   glib,
   gtk2,
   libX11,
-  libSM,
+  libsm,
   libice,
   which,
   copyDesktopItems,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk2
     libX11
-    libSM
+    libsm
     libice
   ];
 
diff --git a/pkgs/by-name/gr/gravit/package.nix b/pkgs/by-name/gr/gravit/package.nix
index 65fbc8617a6d..7b04fa94285a 100644
--- a/pkgs/by-name/gr/gravit/package.nix
+++ b/pkgs/by-name/gr/gravit/package.nix
@@ -6,7 +6,7 @@
   SDL,
   SDL_ttf,
   SDL_image,
-  libSM,
+  libsm,
   libice,
   libGLU,
   libGL,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL_image
     lua5
     libpng
-    libSM
+    libsm
     libice
   ];
 
diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix
index 1ece972fb293..776493e07b5a 100644
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@@ -6,7 +6,7 @@
   makeWrapper,
   libX11,
   zlib,
-  libSM,
+  libsm,
   libice,
   libXext,
   freetype,
@@ -38,7 +38,7 @@ let
   rpath = lib.makeLibraryPath [
     libX11
     zlib
-    libSM
+    libsm
     libice
     libXext
     freetype
diff --git a/pkgs/by-name/ic/icesl/package.nix b/pkgs/by-name/ic/icesl/package.nix
index eeda9782f253..a3a1bfae3d96 100644
--- a/pkgs/by-name/ic/icesl/package.nix
+++ b/pkgs/by-name/ic/icesl/package.nix
@@ -9,7 +9,7 @@
   libice,
   libGLU,
   libGL,
-  libSM,
+  libsm,
   libXext,
   glibc,
   lua,
@@ -28,7 +28,7 @@ let
     libice
     libGLU
     libGL
-    libSM
+    libsm
     libXext
     glibc
     lua
diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index 18a761b7d59a..bfa10432754d 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -15,7 +15,7 @@
   glib,
   imlib2,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXcomposite,
   libXdamage,
@@ -72,7 +72,7 @@ gccStdenv.mkDerivation (finalAttrs: {
     glib
     imlib2
     libice
-    libSM
+    libsm
     libX11
     libXcomposite
     libXdamage
diff --git a/pkgs/by-name/in/input-leap/package.nix b/pkgs/by-name/in/input-leap/package.nix
index 06602e4c7140..1432e0a04cc2 100644
--- a/pkgs/by-name/in/input-leap/package.nix
+++ b/pkgs/by-name/in/input-leap/package.nix
@@ -5,7 +5,7 @@
   cmake,
   curl,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXdmcp,
   libXext,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXrandr
     libXdmcp
     libice
-    libSM
+    libsm
   ]
   ++ lib.optionals withLibei [
     libei
diff --git a/pkgs/by-name/li/libxfce4ui/package.nix b/pkgs/by-name/li/libxfce4ui/package.nix
index d2d56098adee..0a580612e1a0 100644
--- a/pkgs/by-name/li/libxfce4ui/package.nix
+++ b/pkgs/by-name/li/libxfce4ui/package.nix
@@ -8,7 +8,7 @@
   xfce4-dev-tools,
   wrapGAppsHook3,
   libice,
-  libSM,
+  libsm,
   libepoxy,
   libgtop,
   libgudev,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libice
-    libSM
+    libsm
     libepoxy
     libgtop
     libgudev
diff --git a/pkgs/by-name/li/lincity/package.nix b/pkgs/by-name/li/lincity/package.nix
index 8fc10d7d4efa..3082377791e9 100644
--- a/pkgs/by-name/li/lincity/package.nix
+++ b/pkgs/by-name/li/lincity/package.nix
@@ -8,7 +8,7 @@
   libXext,
   xorgproto,
   libice,
-  libSM,
+  libsm,
   libpng12,
   zlib,
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libice
     libpng12
-    libSM
+    libsm
     libX11
     libXext
     xorgproto
diff --git a/pkgs/by-name/li/lirc/package.nix b/pkgs/by-name/li/lirc/package.nix
index 58f9a092e701..0b92ac4d0867 100644
--- a/pkgs/by-name/li/lirc/package.nix
+++ b/pkgs/by-name/li/lirc/package.nix
@@ -15,7 +15,7 @@
   libusb-compat-0_1,
   libftdi1,
   libice,
-  libSM,
+  libsm,
   libX11,
 }:
 
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     libusb-compat-0_1
     libftdi1
     libice
-    libSM
+    libsm
     libX11
   ];
 
diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index de64ba4945da..6320250049e2 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -13,7 +13,7 @@
   graphicsmagick,
   ffmpeg,
   zlib,
-  libSM,
+  libsm,
   libice,
   stb,
   openssl,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     graphicsmagick
     ffmpeg
     zlib
-    libSM
+    libsm
     libice
     stb
     openssl
diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix
index 00f9bbc913d0..231d32a5f13a 100644
--- a/pkgs/by-name/lu/lunacy/package.nix
+++ b/pkgs/by-name/lu/lunacy/package.nix
@@ -11,7 +11,7 @@
   lttng-ust,
   icu,
   libice,
-  libSM,
+  libsm,
   libXcursor,
   openssl,
   imagemagick,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Runtime deps
     libice
-    libSM
+    libsm
     libX11
     libXcursor
   ];
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   # will add to the RPATH of executable only
   runtimeDependencies = [
     libice
-    libSM
+    libsm
     libX11
     libXcursor
   ];
diff --git a/pkgs/by-name/lw/lwm/package.nix b/pkgs/by-name/lw/lwm/package.nix
index 35419f104a72..2bc924986e46 100644
--- a/pkgs/by-name/lw/lwm/package.nix
+++ b/pkgs/by-name/lw/lwm/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   imake,
   libX11,
-  libSM,
+  libsm,
   libXext,
   libice,
 }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libX11
-    libSM
+    libsm
     libXext
     libice
   ];
diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix
index 860d44195592..878c491e45ee 100644
--- a/pkgs/by-name/me/mediainfo-gui/package.nix
+++ b/pkgs/by-name/me/mediainfo-gui/package.nix
@@ -7,7 +7,7 @@
   libmediainfo,
   wxGTK32,
   desktop-file-utils,
-  libSM,
+  libsm,
   imagemagick,
   wrapGAppsHook3,
 }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmediainfo
     wxGTK32
     desktop-file-utils
-    libSM
+    libsm
     imagemagick
   ];
 
diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix
index 6e8c13901c03..c99e4a7ca42d 100644
--- a/pkgs/by-name/mu/muse-sounds-manager/package.nix
+++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix
@@ -11,7 +11,7 @@
   libXi,
   libXrandr,
   libice,
-  libSM,
+  libsm,
   openssl,
   unzip,
   xdg-utils,
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     libXi
     libXrandr
     libice
-    libSM
+    libsm
     openssl
   ];
 
diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index a4fc48ff37be..b070d0e0a709 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -49,7 +49,7 @@
   pipewire,
   libgudev,
   libwacom,
-  libSM,
+  libsm,
   xwayland,
   mesa-gl-headers,
   meson,
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     libinput
     libstartup_notification
     libwacom
-    libSM
+    libsm
     colord
     lcms2
     pango
diff --git a/pkgs/by-name/mu/mutter48/package.nix b/pkgs/by-name/mu/mutter48/package.nix
index a5a6686212b0..f52fdde8852a 100644
--- a/pkgs/by-name/mu/mutter48/package.nix
+++ b/pkgs/by-name/mu/mutter48/package.nix
@@ -49,7 +49,7 @@
   pipewire,
   libgudev,
   libwacom,
-  libSM,
+  libsm,
   xwayland,
   mesa-gl-headers,
   meson,
@@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: {
     libinput
     libstartup_notification
     libwacom
-    libSM
+    libsm
     colord
     lcms2
     pango
diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index b53dcd200445..fd823a4bd993 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -6,7 +6,7 @@
   fontconfig,
   gettext,
   groff,
-  libSM,
+  libsm,
   libX11,
   libXext,
   libXft,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libSM
+    libsm
     libX11
     libXext
     libXft
diff --git a/pkgs/by-name/ob/obconf/package.nix b/pkgs/by-name/ob/obconf/package.nix
index e35e4d2fc7f1..48e02703fbc6 100644
--- a/pkgs/by-name/ob/obconf/package.nix
+++ b/pkgs/by-name/ob/obconf/package.nix
@@ -7,7 +7,7 @@
   wrapGAppsHook3,
   gtk3,
   imlib2,
-  libSM,
+  libsm,
   libstartup_notification,
   libxml2,
   openbox,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtk3
     imlib2
-    libSM
+    libsm
     libstartup_notification
     libxml2
     openbox
diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix
index 43165e61013e..4a07ba73ae84 100644
--- a/pkgs/by-name/op/openbox/package.nix
+++ b/pkgs/by-name/op/openbox/package.nix
@@ -12,7 +12,7 @@
   libXau,
   libXrandr,
   libice,
-  libSM,
+  libsm,
   imlib2,
   pango,
   libstartup_notification,
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     libXau
     libXrandr
     libice
-    libSM
+    libsm
     libstartup_notification
     python3
   ];
diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 0f3aa7f17b86..4340ae1f6002 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -26,7 +26,7 @@
   lib3mf,
   libGLU,
   libice,
-  libSM,
+  libsm,
   libsForQt5,
   libspnav,
   libzip,
@@ -108,7 +108,7 @@ clangStdenv.mkDerivation rec {
     ++ lib.optionals clangStdenv.hostPlatform.isLinux [
       libxdmcp
       libice
-      libSM
+      libsm
       wayland
       wayland-protocols
       qtwayland
diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix
index 162f1d45bdf5..1a48c79d4fc2 100644
--- a/pkgs/by-name/pi/pixieditor/package.nix
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@@ -15,7 +15,7 @@
   libGL,
   libX11,
   libice,
-  libSM,
+  libsm,
   libXi,
   libXcursor,
   libXext,
@@ -104,7 +104,7 @@ buildDotnetModule (finalAttrs: {
     libGL
     libX11
     libice
-    libSM
+    libsm
     libXi
     libXcursor
     libXext
diff --git a/pkgs/by-name/pl/plib/package.nix b/pkgs/by-name/pl/plib/package.nix
index 2471a673c5c6..85cd87d474a9 100644
--- a/pkgs/by-name/pl/plib/package.nix
+++ b/pkgs/by-name/pl/plib/package.nix
@@ -8,7 +8,7 @@
   libglut,
   SDL,
   libXi,
-  libSM,
+  libsm,
   libXmu,
   libXext,
   libX11,
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
     # The following libs ought to be propagated build inputs of Mesa.
     libXi
-    libSM
+    libsm
     libXmu
     libXext
     libX11
diff --git a/pkgs/by-name/po/povray/package.nix b/pkgs/by-name/po/povray/package.nix
index 81db08e5dfaf..dd99c2ef343f 100644
--- a/pkgs/by-name/po/povray/package.nix
+++ b/pkgs/by-name/po/povray/package.nix
@@ -8,7 +8,7 @@
   zlib,
   libX11,
   libice,
-  libSM,
+  libsm,
   libpng,
   libjpeg,
   libtiff,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     libX11
     libice
-    libSM
+    libsm
     libpng
     libjpeg
     libtiff
diff --git a/pkgs/by-name/ri/rigsofrods-bin/package.nix b/pkgs/by-name/ri/rigsofrods-bin/package.nix
index ad478d3adc8e..bae73c216e5f 100644
--- a/pkgs/by-name/ri/rigsofrods-bin/package.nix
+++ b/pkgs/by-name/ri/rigsofrods-bin/package.nix
@@ -7,7 +7,7 @@
   unzip,
   libGL,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXrandr,
   zlib,
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   buildInputs = [
     libGL
     libice
-    libSM
+    libsm
     libX11
     libXrandr
     stdenv.cc.cc
diff --git a/pkgs/by-name/ro/rox-filer/package.nix b/pkgs/by-name/ro/rox-filer/package.nix
index 5e362ccdaef9..38691d8cc796 100644
--- a/pkgs/by-name/ro/rox-filer/package.nix
+++ b/pkgs/by-name/ro/rox-filer/package.nix
@@ -7,7 +7,7 @@
   wrapGAppsHook3,
   libxml2,
   gtk2,
-  libSM,
+  libsm,
   shared-mime-info,
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
     gtk2
     shared-mime-info
-    libSM
+    libsm
   ];
 
   env = {
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index b192f4ccfb7d..e9d92c320dd3 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -12,7 +12,7 @@
   vulkan-headers,
   vulkan-loader,
   libpng,
-  libSM,
+  libsm,
   ffmpeg,
   libevdev,
   libusb1,
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
     sdl3
     flatbuffers
     llvm_18
-    libSM
+    libsm
     opencv.cxxdev
     cubeb
     miniupnpc
diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix
index f45dbb9458dc..8b357475ebf1 100644
--- a/pkgs/by-name/ru/runescape/package.nix
+++ b/pkgs/by-name/ru/runescape/package.nix
@@ -12,7 +12,7 @@
   gtk2-x11,
   libGL,
   libpulseaudio,
-  libSM,
+  libsm,
   libXxf86vm,
   libx11,
   openssl_1_1,
@@ -48,7 +48,7 @@ let
       glib
       glibc
       gtk2-x11
-      libSM
+      libsm
       libXxf86vm
       libx11
       openssl_1_1
@@ -123,7 +123,7 @@ buildFHSEnv {
     gtk2-x11
     libGL
     libpulseaudio
-    libSM
+    libsm
     libXxf86vm
     libx11
     openssl_1_1
diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix
index b3be306bb59b..b386c9aad439 100644
--- a/pkgs/by-name/ry/ryubing/package.nix
+++ b/pkgs/by-name/ry/ryubing/package.nix
@@ -18,7 +18,7 @@
   glew,
   libGL,
   libice,
-  libSM,
+  libsm,
   libXcursor,
   libXext,
   libXi,
@@ -71,7 +71,7 @@ buildDotnetModule rec {
     # Avalonia UI
     glew
     libice
-    libSM
+    libsm
     libXcursor
     libXext
     libXi
diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix
index 59bcc5f8ae2b..a10d428f773c 100644
--- a/pkgs/by-name/sa/saleae-logic/package.nix
+++ b/pkgs/by-name/sa/saleae-logic/package.nix
@@ -12,7 +12,7 @@
   fetchurl,
   unzip,
   glib,
-  libSM,
+  libsm,
   libice,
   gtk2,
   libXext,
@@ -40,7 +40,7 @@ let
 
   libPath = lib.makeLibraryPath [
     glib
-    libSM
+    libsm
     libice
     gtk2
     libXext
diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix
index aea2e4df068b..9f75c6fc2b0e 100644
--- a/pkgs/by-name/sa/sawfish/package.nix
+++ b/pkgs/by-name/sa/sawfish/package.nix
@@ -7,7 +7,7 @@
   gettext,
   gtk2-x11,
   libice,
-  libSM,
+  libsm,
   libxcrypt,
   libXinerama,
   libXrandr,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf-xlib
     gtk2-x11
     libice
-    libSM
+    libsm
     libxcrypt
     libXinerama
     libXrandr
diff --git a/pkgs/by-name/se/segger-ozone/package.nix b/pkgs/by-name/se/segger-ozone/package.nix
index f8f618939b7a..3eba28100d6d 100644
--- a/pkgs/by-name/se/segger-ozone/package.nix
+++ b/pkgs/by-name/se/segger-ozone/package.nix
@@ -7,7 +7,7 @@
   fontconfig,
   freetype,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXcursor,
   libXfixes,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig
     freetype
     libice
-    libSM
+    libsm
     libX11
     libXcursor
     libXfixes
diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix
index 283bbdd5163a..101230bf241d 100644
--- a/pkgs/by-name/si/simgear/package.nix
+++ b/pkgs/by-name/si/simgear/package.nix
@@ -9,7 +9,7 @@
   libXext,
   libXi,
   libice,
-  libSM,
+  libsm,
   libXt,
   libXmu,
   libGLU,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXext
     libXi
     libice
-    libSM
+    libsm
     libXt
     libXmu
     libGLU
diff --git a/pkgs/by-name/sl/slop/package.nix b/pkgs/by-name/sl/slop/package.nix
index da7536f4f2e0..1d4987633000 100644
--- a/pkgs/by-name/sl/slop/package.nix
+++ b/pkgs/by-name/sl/slop/package.nix
@@ -12,7 +12,7 @@
   libXext,
   libXrender,
   icu74,
-  libSM,
+  libsm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXext
     libXrender
     icu74
-    libSM
+    libsm
   ];
 
   meta = {
diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix
index acfead7e6445..55b9cf96b391 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -10,7 +10,7 @@
   makeDesktopItem,
   libX11,
   libice,
-  libSM,
+  libsm,
   libXi,
   libXcursor,
   libXext,
@@ -88,7 +88,7 @@ buildDotnetModule rec {
     glib
     libX11
     libice
-    libSM
+    libsm
     libXi
     libXcursor
     libXext
diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix
index ab98d7487b11..936b3547b319 100644
--- a/pkgs/by-name/sp/speed-dreams/package.nix
+++ b/pkgs/by-name/sp/speed-dreams/package.nix
@@ -11,7 +11,7 @@
   libXrandr,
   xorgproto,
   libXext,
-  libSM,
+  libsm,
   libice,
   libXi,
   libXt,
@@ -51,7 +51,7 @@ let
     freealut
     libXrandr
     libXext
-    libSM
+    libsm
     libice
     libXi
     libXt
@@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXrandr
     xorgproto
     libXext
-    libSM
+    libsm
     libice
     libXi
     libXt
diff --git a/pkgs/by-name/sp/spideroak/package.nix b/pkgs/by-name/sp/spideroak/package.nix
index f4c44fb2151c..4cc19a53bc5d 100644
--- a/pkgs/by-name/sp/spideroak/package.nix
+++ b/pkgs/by-name/sp/spideroak/package.nix
@@ -8,7 +8,7 @@
   freetype,
   glib,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXext,
   libXrender,
@@ -23,7 +23,7 @@ let
     freetype
     glib
     libice
-    libSM
+    libsm
     libX11
     libXext
     libXrender
diff --git a/pkgs/by-name/su/superTux/package.nix b/pkgs/by-name/su/superTux/package.nix
index 4055f7323f60..472ffd65ed0a 100644
--- a/pkgs/by-name/su/superTux/package.nix
+++ b/pkgs/by-name/su/superTux/package.nix
@@ -8,7 +8,7 @@
   curl,
   SDL2,
   SDL2_image,
-  libSM,
+  libsm,
   libXext,
   libpng,
   freetype,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     SDL2
     SDL2_image
-    libSM
+    libsm
     libXext
     libpng
     freetype
diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix
index 34e274c8c2c0..9631281f6046 100644
--- a/pkgs/by-name/su/supercell-wx/package.nix
+++ b/pkgs/by-name/su/supercell-wx/package.nix
@@ -21,7 +21,7 @@
   glm,
   gtest,
   howard-hinnant-date,
-  libSM,
+  libsm,
   libcpr,
   libpng,
   onetbb,
@@ -134,7 +134,7 @@ buildStdenv.mkDerivation (finalAttrs: {
     glm
     gtest
     howard-hinnant-date
-    libSM
+    libsm
     libcpr
     libpng
     onetbb
diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix
index ee6745c234a3..23fb6516d913 100644
--- a/pkgs/by-name/sw/swi-prolog/package.nix
+++ b/pkgs/by-name/sw/swi-prolog/package.nix
@@ -40,7 +40,7 @@
   libXinerama,
   libjpeg,
   libXt,
-  libSM,
+  libsm,
   freetype,
   fontconfig,
 
@@ -108,7 +108,7 @@ let
       libXft
       libXinerama
       libjpeg
-      libSM
+      libsm
       freetype
       fontconfig
     ])
diff --git a/pkgs/by-name/sy/synaesthesia/package.nix b/pkgs/by-name/sy/synaesthesia/package.nix
index f4e14474bca4..9defac42f914 100644
--- a/pkgs/by-name/sy/synaesthesia/package.nix
+++ b/pkgs/by-name/sy/synaesthesia/package.nix
@@ -4,7 +4,7 @@
   fetchzip,
   SDL,
   pkg-config,
-  libSM,
+  libsm,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "synaesthesia";
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL
-    libSM
+    libsm
   ];
 
   meta = {
diff --git a/pkgs/by-name/sy/synergy/package.nix b/pkgs/by-name/sy/synergy/package.nix
index 9e6936c07593..c7ab360d0e81 100644
--- a/pkgs/by-name/sy/synergy/package.nix
+++ b/pkgs/by-name/sy/synergy/package.nix
@@ -14,7 +14,7 @@
   gdk-pixbuf,
   libnotify,
   libice,
-  libSM,
+  libsm,
   libX11,
   libxkbfile,
   libXi,
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     libselinux
     libsepol
     libice
-    libSM
+    libsm
     libX11
     libXi
     libXtst
diff --git a/pkgs/by-name/tk/tkmm/package.nix b/pkgs/by-name/tk/tkmm/package.nix
index 1e7736835877..83da8700efbb 100644
--- a/pkgs/by-name/tk/tkmm/package.nix
+++ b/pkgs/by-name/tk/tkmm/package.nix
@@ -9,7 +9,7 @@
   glew,
   libGL,
   libice,
-  libSM,
+  libsm,
   libXcursor,
   libXext,
   libXi,
@@ -51,7 +51,7 @@ buildDotnetModule (finalAttrs: {
     libGL
     glew
     libice
-    libSM
+    libsm
     libXcursor
     libXext
     libXi
diff --git a/pkgs/by-name/to/torcs/package.nix b/pkgs/by-name/to/torcs/package.nix
index 9a3d073ecf0f..7912a04c0d88 100644
--- a/pkgs/by-name/to/torcs/package.nix
+++ b/pkgs/by-name/to/torcs/package.nix
@@ -12,7 +12,7 @@
   libXrandr,
   xorgproto,
   libXext,
-  libSM,
+  libsm,
   libice,
   libXi,
   libXt,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXrandr
     xorgproto
     libXext
-    libSM
+    libsm
     libice
     libXi
     libXt
diff --git a/pkgs/by-name/tr/transcribe/package.nix b/pkgs/by-name/tr/transcribe/package.nix
index bbb95e135321..ae8f70a66568 100644
--- a/pkgs/by-name/tr/transcribe/package.nix
+++ b/pkgs/by-name/tr/transcribe/package.nix
@@ -13,7 +13,7 @@
   glib,
   gst_all_1,
   gtk3,
-  libSM,
+  libsm,
   libX11,
   libXtst,
   libpng12,
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       alsa-lib
       libX11
       libXtst
-      libSM
+      libsm
       libpng12
       gstreamer
       gst-plugins-base
diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 8ebcd2d8f169..22eda1bbf2cd 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -6,7 +6,7 @@
   zlib,
   libX11,
   libXext,
-  libSM,
+  libsm,
   libice,
   libxkbcommon,
   libxshmfence,
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
     libX11
     libXt
     libXext
-    libSM
+    libsm
     libice
     libxcb
     libxkbcommon
diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 0b2710129526..2ad8eba462cc 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -21,7 +21,7 @@
   gnutls,
   harfbuzz,
   libGL,
-  libSM,
+  libsm,
   libXext,
   libXinerama,
   libXpm,
@@ -150,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnutls
     harfbuzz
     libGL
-    libSM
+    libsm
     libarchive
     libass
     libbluray-full
diff --git a/pkgs/by-name/vn/vncrec/package.nix b/pkgs/by-name/vn/vncrec/package.nix
index dc4da170e4c1..e5f8e60a236b 100644
--- a/pkgs/by-name/vn/vncrec/package.nix
+++ b/pkgs/by-name/vn/vncrec/package.nix
@@ -10,7 +10,7 @@
   libXmu,
   libXaw,
   libXext,
-  libSM,
+  libsm,
   libice,
   libXpm,
   libXp,
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
     libXmu
     libXaw
     libXext
-    libSM
+    libsm
     libice
     libXpm
     libXp
diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index d3c67b8bc17f..f22d0c7a9614 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -23,7 +23,7 @@
   zlib,
   minizip,
   asio,
-  libSM,
+  libsm,
   libice,
   libXext,
 }:
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     zlib
     minizip
     asio
-    libSM # XXX: these should be propagated by SDL2?
+    libsm # XXX: these should be propagated by SDL2?
     libice
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux libXext;
diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix
index 513f25724c02..545b4f511f19 100644
--- a/pkgs/by-name/wo/workrave/package.nix
+++ b/pkgs/by-name/wo/workrave/package.nix
@@ -11,7 +11,7 @@
   libtool,
   pkg-config,
   libice,
-  libSM,
+  libsm,
   libXScrnSaver,
   libXtst,
   gobject-introspection,
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libice
-    libSM
+    libsm
     libXScrnSaver
     libXtst
     glib
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix
index 5957a5c73210..9fd4bf665814 100644
--- a/pkgs/by-name/wx/wxGTK31/package.nix
+++ b/pkgs/by-name/wx/wxGTK31/package.nix
@@ -7,7 +7,7 @@
   gtk3,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXinerama,
   libXtst,
   libXxf86vm,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     gtk3
-    libSM
+    libsm
     libXinerama
     libXtst
     libXxf86vm
diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index c820a2e39f92..b7bf1124e034 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXinerama,
   libXtst,
   libXxf86vm,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     gspell # wxTextCtrl spell checking
     gtk3
-    libSM
+    libsm
     libXinerama
     libXtst
     libXxf86vm
diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
index 7a8236a7792f..973fd1d4a91c 100644
--- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXinerama,
   libXtst,
   libXxf86vm,
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     gspell # wxTextCtrl spell checking
     gtk3
-    libSM
+    libsm
     libXinerama
     libXtst
     libXxf86vm
diff --git a/pkgs/by-name/xa/xawtv/package.nix b/pkgs/by-name/xa/xawtv/package.nix
index da1548151586..6e9e1c0e6067 100644
--- a/pkgs/by-name/xa/xawtv/package.nix
+++ b/pkgs/by-name/xa/xawtv/package.nix
@@ -15,7 +15,7 @@
   libXaw,
   libXpm,
   libXext,
-  libSM,
+  libsm,
   libice,
   perl,
 }:
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXaw
     libXpm
     libXext
-    libSM
+    libsm
     libice
     libv4l
   ];
diff --git a/pkgs/by-name/xb/xboard/package.nix b/pkgs/by-name/xb/xboard/package.nix
index d5c7225f61bb..c0fb2a389fff 100644
--- a/pkgs/by-name/xb/xboard/package.nix
+++ b/pkgs/by-name/xb/xboard/package.nix
@@ -7,7 +7,7 @@
   xorgproto,
   libXt,
   libXaw,
-  libSM,
+  libsm,
   libice,
   libXmu,
   libXext,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     xorgproto
     libXt
     libXaw
-    libSM
+    libsm
     libice
     libXmu
     libXext
diff --git a/pkgs/by-name/xp/xpilot-ng/package.nix b/pkgs/by-name/xp/xpilot-ng/package.nix
index 2e28be64ee9a..54d5facb3971 100644
--- a/pkgs/by-name/xp/xpilot-ng/package.nix
+++ b/pkgs/by-name/xp/xpilot-ng/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   libX11,
-  libSM,
+  libsm,
   libXext,
   SDL,
   libGLU,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
   buildInputs = [
     libX11
-    libSM
+    libsm
     libXext
     SDL
     SDL_ttf
diff --git a/pkgs/by-name/ya/yabasic/package.nix b/pkgs/by-name/ya/yabasic/package.nix
index ea31e7f753c0..3213e98bc5fc 100644
--- a/pkgs/by-name/ya/yabasic/package.nix
+++ b/pkgs/by-name/ya/yabasic/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libSM,
+  libsm,
   libX11,
   libXt,
   libffi,
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libSM
+    libsm
     libX11
     libXt
     libffi
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 3fba8acd0e1e..8f77173f9c7a 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libSM,
+  libsm,
   libXdmcp,
   libpthread-stubs,
   lxqt-build-tools,
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libSM
+    libsm
     libXdmcp
     libpthread-stubs
     openbox
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index cba2e8c7d722..06eed5cb86e9 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -7,7 +7,7 @@
   xtrans,
   dbus-glib,
   systemd,
-  libSM,
+  libsm,
   libXtst,
   glib,
   gtk3,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     dbus-glib
     systemd
-    libSM
+    libsm
     libXtst
     gtk3
     mate-desktop
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 97e6a16620bc..137857b8c1df 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -17,7 +17,7 @@
   libGL,
   libGLU,
   libice,
-  libSM,
+  libsm,
   libX11,
   libXaw,
   libXmu,
@@ -85,7 +85,7 @@ let
         libGL
         libGLU
         libice
-        libSM
+        libsm
         libX11
         libXaw
         libXmu
diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix
index 46b7601844df..8802cb45a94b 100644
--- a/pkgs/development/python-modules/wxpython/4.2.nix
+++ b/pkgs/development/python-modules/wxpython/4.2.nix
@@ -25,7 +25,7 @@
   gtk3,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXinerama,
   libXtst,
   libXxf86vm,
@@ -102,7 +102,7 @@ buildPythonPackage rec {
     gst_all_1.gstreamer
     libGL
     libGLU
-    libSM
+    libsm
     libXinerama
     libXtst
     libXxf86vm
diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix
index 090a2eaccd80..12f751a208b3 100644
--- a/pkgs/development/tools/rgp/default.nix
+++ b/pkgs/development/tools/rgp/default.nix
@@ -14,7 +14,7 @@
   libglvnd,
   libice,
   libkrb5,
-  libSM,
+  libsm,
   libX11,
   libxcb,
   libXi,
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     libglvnd
     libice
     libkrb5
-    libSM
+    libsm
     libX11
     libxcb
     libXi
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 174470b7368c..fc0077124475 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   cmake,
   libGL,
-  libSM,
+  libsm,
   SDL,
   SDL_image,
   SDL_ttf,
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    libSM
+    libsm
     SDL
     SDL_image
     SDL_ttf
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cd4b7dc077f1..c5e5957fba97 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1004,6 +1004,7 @@ mapAliases {
   librewolf-wayland = throw "'librewolf-wayland' has been renamed to/replaced by 'librewolf'"; # Converted to throw 2025-10-27
   librtlsdr = throw "'librtlsdr' has been renamed to/replaced by 'rtl-sdr'"; # Converted to throw 2025-10-27
   libsForQt515 = throw "'libsForQt515' has been renamed to/replaced by 'libsForQt5'"; # Converted to throw 2025-10-27
+  libSM = libsm; # Added 2026-02-04
   libsmartcols = warnAlias "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
   libsoup = throw "'libsoup' has been renamed to/replaced by 'libsoup_2_4'"; # Converted to throw 2025-10-27
   libtap = throw "libtap has been removed, as it was unused and deprecated by its author in favour of cmocka"; # Added 2025-09-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60c39ede5e3e..c518224423a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8820,7 +8820,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  libSM = libsm;
   libX11 = libx11;
   libXau = libxau;
   libXaw = libxaw;

From 659d10aa00f2528bec8f03e0e16a857117560710 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Feb 2026 22:19:23 +0000
Subject: [PATCH 065/167] opkssh: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix
index 2911f791f417..d55208e26bc0 100644
--- a/pkgs/by-name/op/opkssh/package.nix
+++ b/pkgs/by-name/op/opkssh/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "opkssh";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "openpubkey";
     repo = "opkssh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DTxELj3OifKrEEzMCk7JVjVUoIKEofzUj4MdR6tYYZc=";
+    hash = "sha256-cIIbeCsQq/TWf58m9l07aVg2gJNqsEyGqC3UPPb63sQ=";
   };
 
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 
-  vendorHash = "sha256-t8BaV5DlAXcqytqiGczzSUENV4GIql3KovLAn/mRdh8=";
+  vendorHash = "sha256-aZUwuujE5x2ZCbalvH8DzKP835tgRr6MQbDtvcAZRsk=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From ab9b662b74da86e44af80b41d7437b91f0e61c71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 00:51:22 +0000
Subject: [PATCH 066/167] uutils-tar: 0-unstable-2026-01-28 ->
 0-unstable-2026-02-04

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

diff --git a/pkgs/by-name/uu/uutils-tar/package.nix b/pkgs/by-name/uu/uutils-tar/package.nix
index 7e296e5dd65b..20110032a130 100644
--- a/pkgs/by-name/uu/uutils-tar/package.nix
+++ b/pkgs/by-name/uu/uutils-tar/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-tar";
-  version = "0-unstable-2026-01-28";
+  version = "0-unstable-2026-02-04";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "tar";
-    rev = "113912e981c979efb95b4112d218563fa0ef6329";
-    hash = "sha256-ZNK3dpdJx4L8un35LQPZgtXiPC6hcOTFIJ26YKAqSNg=";
+    rev = "7c563ac2bad0527558dabd82b57a2c72a458a812";
+    hash = "sha256-XYSCqXUxtE07o/elHKUnP6hDzWYP1XIfifU31mQ/z2o=";
   };
 
-  cargoHash = "sha256-cpYhIH6aYaWCcD8IA4iYuHMrcDCkLvkiwkwPc+UJw3g=";
+  cargoHash = "sha256-4PFGlgkosF3qU9GnyR34tlarYxiG+ek4VERK1ZI/2pg=";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--version=branch" ];

From af835bfe9331800f6ae308e3850d5cd5355ffa9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 00:55:03 +0000
Subject: [PATCH 067/167] uutils-login: 0-unstable-2026-01-28 ->
 0-unstable-2026-02-04

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

diff --git a/pkgs/by-name/uu/uutils-login/package.nix b/pkgs/by-name/uu/uutils-login/package.nix
index 477bf720ca41..a02b7e65e650 100644
--- a/pkgs/by-name/uu/uutils-login/package.nix
+++ b/pkgs/by-name/uu/uutils-login/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-login";
-  version = "0-unstable-2026-01-28";
+  version = "0-unstable-2026-02-04";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "login";
-    rev = "ec2c270122a4fdb5f7cae5d8ff5ae9c66018fb69";
-    hash = "sha256-LqlxsztC+9XgCqErtTLt7lYcBKz9Ht7pvWLclptW834=";
+    rev = "18ca37671e817c80de264586840c75f30237f791";
+    hash = "sha256-NvpMLaK5PTjw9/fdxu6Qj92jr0xS3Bbq935CPorYCTY=";
   };
 
-  cargoHash = "sha256-1Ph+vJeRTWYTfj2Qu74T7L8GpT1PiI1GKyOHTwo0HXA=";
+  cargoHash = "sha256-onpSytr65iUN6sTSaJF+1AUr/GUNnhvnpcj1ksAylks=";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--version=branch" ];

From ee6e383740ea71665e7d930766d0da8ee40e8a90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 00:55:45 +0000
Subject: [PATCH 068/167] uutils-hostname: 0-unstable-2026-01-28 ->
 0-unstable-2026-02-04

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

diff --git a/pkgs/by-name/uu/uutils-hostname/package.nix b/pkgs/by-name/uu/uutils-hostname/package.nix
index 8d4b85bf4b76..4d81cbc84833 100644
--- a/pkgs/by-name/uu/uutils-hostname/package.nix
+++ b/pkgs/by-name/uu/uutils-hostname/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-hostname";
-  version = "0-unstable-2026-01-28";
+  version = "0-unstable-2026-02-04";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "hostname";
-    rev = "99bba3d33b03da1ff7d961d542ad5804d007b76c";
-    hash = "sha256-f5LTvSsBsFbK9+MMiJQRvY2ze1t4qE2mEUsV0+2oO9A=";
+    rev = "d79af67c4bc7b431de0e0c7058af2602396f6e39";
+    hash = "sha256-KjVt3KE0OdX8bBqFxd2B48Vf0nrg5jKix2JkjazU0+c=";
   };
 
-  cargoHash = "sha256-nbpyflP4J6V6aEeCp5I+FP2NNmXDS4JhbGWUBbOyJEc=";
+  cargoHash = "sha256-PYux+7DU0LS0ugLKKr1S65XMmugZyK+FlWJkWKd+C4w=";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--version=branch" ];

From 3c082cba20e9e6a73a7dc394ce84496fd6dd016a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 00:57:41 +0000
Subject: [PATCH 069/167] docker-buildx: 0.31.0 -> 0.31.1

---
 pkgs/applications/virtualization/docker/buildx.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 2cec30a4f719..64bc3b9885c5 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "docker-buildx";
-  version = "0.31.0";
+  version = "0.31.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
     rev = "v${version}";
-    hash = "sha256-SQO9wAU+OS4ct+Evny2ZZXP7AUU2IyNwwgR1AaEzTmA=";
+    hash = "sha256-9O/vdgVQF3TPyN+WdUYAuVWjAa1ZRKGCCyQ6eZ+EZAs=";
   };
 
   doCheck = false;

From 21c84c6af1d90d52421b6b2dc149a28f3ab9792e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 02:00:43 +0000
Subject: [PATCH 070/167] lunar-client: 3.5.19 -> 3.5.20

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

diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index f8588e7d52b1..b32f068cda9f 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.5.19";
+  version = "3.5.20";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
-    hash = "sha512-Dae5PPrnuA6zj9CyZ12b6oBaMLx8M0rBqwhj/PlBVj82GQTyYvBUChSj/qdR1AXVPJXb47Hc2yQ4eQwNufgIfQ==";
+    hash = "sha512-Ib3/FrsOTcezoAESXm4r6qKxvD1e0++YYxfBjkTvYkrjuDkGWmhn2exlJljO4UiuO//22c78v6QHNOP59sOFLw==";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a2a91397e8e43f6c63a5bb03faafe6b675b060b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 02:19:24 +0000
Subject: [PATCH 071/167] roxctl: 4.9.2 -> 4.9.3

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

diff --git a/pkgs/by-name/ro/roxctl/package.nix b/pkgs/by-name/ro/roxctl/package.nix
index 987e65cb8bad..a2d1f5b86129 100644
--- a/pkgs/by-name/ro/roxctl/package.nix
+++ b/pkgs/by-name/ro/roxctl/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "roxctl";
-  version = "4.9.2";
+  version = "4.9.3";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
     rev = version;
-    sha256 = "sha256-A9uumIOtuRXMIy0K5BEUp4iICr1jVWiXxfSTESQYkIg=";
+    sha256 = "sha256-awu4KWcljQAMm/zHA4bDguwngRIosNjHPJZvBnxXGjE=";
   };
 
-  vendorHash = "sha256-AWR24cqv0h/lESMit4U4FnaxkBLl1fe/TlXeE8rI9EE=";
+  vendorHash = "sha256-VwtFK5AAPIVF34WQ8pPHTDyMdUs8cAhNX5ytHBkWSug=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 43995f067024ab58c2e6070682df65d54629b031 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 02:32:32 +0000
Subject: [PATCH 072/167] python3Packages.glymur: 0.14.6 -> 0.14.7

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

diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix
index d2ab960d923f..b2a88ceb8ea3 100644
--- a/pkgs/development/python-modules/glymur/default.nix
+++ b/pkgs/development/python-modules/glymur/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "glymur";
-  version = "0.14.6";
+  version = "0.14.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "quintusdias";
     repo = "glymur";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-k6NvXeEk2N7+2LCvgOqq7fF7sgp/5r9uf6Vv5NLEyzA=";
+    hash = "sha256-tcc37By5xukcN/C+RxA+B8fmFRlGQDl0aSkkT3zE9ws=";
   };
 
   patches = [

From b2bf6fd642c35d878c9f08dac4952c6905469d53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 02:38:49 +0000
Subject: [PATCH 073/167] python3Packages.pymongo-search-utils: 0.2.1 -> 0.3.0

---
 .../python-modules/pymongo-search-utils/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymongo-search-utils/default.nix b/pkgs/development/python-modules/pymongo-search-utils/default.nix
index befb10f13705..a519075871b4 100644
--- a/pkgs/development/python-modules/pymongo-search-utils/default.nix
+++ b/pkgs/development/python-modules/pymongo-search-utils/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pymongo-search-utils";
-  version = "0.2.1";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mongodb-labs";
     repo = "pymongo-search-utils";
     tag = version;
-    hash = "sha256-nNXJwRtN5AICpI/OdS+ToYbUIfMSL88XiO6Hrh2R8NA=";
+    hash = "sha256-2wfFYpkfVb5yrYnTSoqnCCuiq3PTgCuteBsI0cs0Bjg=";
   };
 
   build-system = [

From c5506791ffa80effe737f5e8356fe75a002c0ea0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 02:53:03 +0000
Subject: [PATCH 074/167] xl2tpd: 1.3.19 -> 1.3.20

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

diff --git a/pkgs/by-name/xl/xl2tpd/package.nix b/pkgs/by-name/xl/xl2tpd/package.nix
index 4d0a575997fb..2476e108be85 100644
--- a/pkgs/by-name/xl/xl2tpd/package.nix
+++ b/pkgs/by-name/xl/xl2tpd/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xl2tpd";
-  version = "1.3.19";
+  version = "1.3.20";
 
   src = fetchFromGitHub {
     owner = "xelerance";
     repo = "xl2tpd";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Oyy64b5xrKOYSkiCtWksh0vKGDXHsmUNlNgVTRXftOw=";
+    sha256 = "sha256-T4oEMMLb/SPkXfJ55fxBx9ii98qZVZRxPoU/eXlKb4U=";
   };
 
   buildInputs = [ libpcap ];

From ff8f1f00dac752be5a0667edb9d28a993d16b218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 03:29:44 +0000
Subject: [PATCH 075/167] rancher: 2.13.1 -> 2.13.2

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

diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index 04eb69d63097..13404da11088 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "rancher";
-  version = "2.13.1";
+  version = "2.13.2";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-s7nt3A2VO23hN3EplB2Df3JvIqENwikexJXjOFr5BKo=";
+    hash = "sha256-5nGUxdhMhhwDaVRwURis3FElMonwoe8h6M09EDwf+Bc=";
   };
 
   env.CGO_ENABLED = 0;
@@ -25,7 +25,7 @@ buildGoModule rec {
     "-static"
   ];
 
-  vendorHash = "sha256-YeWy8JPd1YkLkE56ckvpg4Z35F5U9wcKQC1N+diNQsA=";
+  vendorHash = "sha256-CQkM7zC5RPCguGp6dxBSjnDkWe11hp5v6QwZ6kRAXQE=";
 
   postInstall = ''
     mv $out/bin/cli $out/bin/rancher

From 60002f6bba1212d1bc14d0864c5a257374643057 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 03:38:58 +0000
Subject: [PATCH 076/167] python3Packages.langchain-aws: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index c5343acb1878..b5be28f8924c 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-aws";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-aws";
     tag = "langchain-aws==${version}";
-    hash = "sha256-FJRlt8+Xo2TqXevgx/Pb9LF/fjej+VXzfxZwZEC67ok=";
+    hash = "sha256-QTRQ7cVZ62Mbr5fYygsDeQU8z9S8owkGs5rmSe7dWgk=";
   };
 
   postPatch = ''

From babf72e6e88defc07673a91b38e74b4e496615e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 03:39:32 +0000
Subject: [PATCH 077/167] melange: 0.40.0 -> 0.40.5

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

diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix
index 3db132303df1..0f738e354229 100644
--- a/pkgs/by-name/me/melange/package.nix
+++ b/pkgs/by-name/me/melange/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "melange";
-  version = "0.40.0";
+  version = "0.40.5";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "melange";
     rev = "v${version}";
-    hash = "sha256-04e6ncAaMVRIfJ1wV6QpcsgHWeJJcZDvxSV4ceVK5bk=";
+    hash = "sha256-Xqq/BhA4tQcWc8fDvBmfrdK07wYIk2XVSDjHhJFQIlU=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-nJyThLtyQSOFp37Wpqkpqiy8sIh2wRzuZPJ5PT7WT74=";
+  vendorHash = "sha256-exUzkOBTSBE1+ggLcRj8FNQFqtxjM6bb6HHCWI0NF+E=";
 
   subPackages = [ "." ];
 

From e3c6eb286bd72522dec81546f044b74f20fa9a9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 04:22:04 +0000
Subject: [PATCH 078/167] oh-my-zsh: 2026-01-26 -> 2026-02-02

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

diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix
index 4c6eb3039c5b..3c6f2c86c815 100644
--- a/pkgs/by-name/oh/oh-my-zsh/package.nix
+++ b/pkgs/by-name/oh/oh-my-zsh/package.nix
@@ -19,14 +19,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2026-01-26";
+  version = "2026-02-02";
   pname = "oh-my-zsh";
 
   src = fetchFromGitHub {
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    rev = "67cd8c4673512d08238461f7ce00715da01665d4";
-    sha256 = "sha256-xFXPUUTdF2B/PO5phZA/kptrhux89daB172Oj9UKMYM=";
+    rev = "9df4ea095fe27ccd0ee95f2d34bab884c4a75585";
+    sha256 = "sha256-SR0Lopccq8oSKHOl5p/YMXNzds5pAqUgeXsy2mLbtS0=";
   };
 
   strictDeps = true;

From cc02d57f3d1ccd86ff6693faebcd8a6c42520c55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 05:19:11 +0000
Subject: [PATCH 079/167] python3Packages.pydo: 0.25.0 -> 0.26.0

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

diff --git a/pkgs/development/python-modules/pydo/default.nix b/pkgs/development/python-modules/pydo/default.nix
index 761f54a8e26e..08a23d999df0 100644
--- a/pkgs/development/python-modules/pydo/default.nix
+++ b/pkgs/development/python-modules/pydo/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pydo";
-  version = "0.25.0";
+  version = "0.26.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "pydo";
     tag = "v${version}";
-    hash = "sha256-NqQ3xFZd+ELOMinn7GBvYA1ov9Ff4s+qvom5l7ZV81k=";
+    hash = "sha256-BybqCYGZ6x8JhZM5UO3s+hLbAR8qKut+eOJSTbFyEUg=";
   };
 
   build-system = [ poetry-core ];

From 0f1db63370a8b6ff13ec0bf5496ed096311573be Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 5 Feb 2026 05:19:55 +0000
Subject: [PATCH 080/167] uv-sort: 0.6.1 -> 0.7.0

---
 pkgs/by-name/uv/uv-sort/package.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/uv/uv-sort/package.nix b/pkgs/by-name/uv/uv-sort/package.nix
index 9210539d006a..f34cf5803fa2 100644
--- a/pkgs/by-name/uv/uv-sort/package.nix
+++ b/pkgs/by-name/uv/uv-sort/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "uv-sort";
-  version = "0.6.1";
+  version = "0.7.0";
   pyproject = true;
 
   # Build from GitHub does not work. Use fetchPypi instead of fetchFromGitHub.
@@ -14,14 +14,9 @@ python3Packages.buildPythonApplication rec {
   src = fetchPypi {
     pname = "uv_sort";
     inherit version;
-    hash = "sha256-ovOCiu22ClSheWDsPBAx5s+LcR5jIQFqb1Dm0wpEKGU=";
+    hash = "sha256-vOD4QPrI5EoofLpMkRPvwz1pONDpg5hDcK0pdPX4pFA=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail '"packaging~=24.1"' '"packaging"'
-  '';
-
   build-system = with python3Packages; [
     hatchling
     uv-dynamic-versioning

From 8eee373050397fd48f26d3e3c46ed070b3ec611e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 05:35:12 +0000
Subject: [PATCH 081/167] plasticity: 25.3.7 -> 25.3.8

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

diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix
index 9dda2ff5ee73..11d4ec9cb731 100644
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@@ -40,11 +40,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "plasticity";
-  version = "25.3.7";
+  version = "25.3.8";
 
   src = fetchurl {
     url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
-    hash = "sha256-l4kuxB5Lh0BiwIxdu3BLdu0VyAeDK0QR6tf6ckqGweY=";
+    hash = "sha256-b3SsVd5y0GvM2cnil+ar4OGoaNlQn13gIEfzqOs4HfI=";
   };
 
   passthru.updateScript = ./update.sh;

From 11f3512114393d5b94d1945e1c5c36253f3b5c29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 05:49:38 +0000
Subject: [PATCH 082/167] beeper: 4.2.495 -> 4.2.532

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

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index cd0c7fcdaba1..2e9cf71d09c7 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
 }:
 let
   pname = "beeper";
-  version = "4.2.495";
+  version = "4.2.532";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
-    hash = "sha256-UZtJTKSFnKR192i2lRUYw/kjxGzq45VI4Rac6vzcQc0=";
+    hash = "sha256-7v3MPwfsW47rP8Nnt39M9aBR4niYEaG2UZ6cuMfVp+Q=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;

From d4e5e78ac6368c1cf83213c2e3e53662581cb765 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 07:34:27 +0000
Subject: [PATCH 083/167] python3Packages.docling-core: 2.61.0 -> 2.63.0

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

diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index 91e9ccd4faa8..5d45f0b485dc 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "docling-core";
-  version = "2.61.0";
+  version = "2.63.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-core";
     tag = "v${version}";
-    hash = "sha256-D1p6YHWePE9aKOEj81X/nxZQFne0FO7+Rz3vc5Q2i6U=";
+    hash = "sha256-j1z9xxlUeuVEu2EtfsnCFm0WQc4nhulQSv0dAbBYXBY=";
   };
 
   build-system = [

From 757326af776a0ed7b190b3e7e08fda80942cb045 Mon Sep 17 00:00:00 2001
From: "Claudio M.D." <86542704+3rdPix@users.noreply.github.com>
Date: Thu, 5 Feb 2026 04:35:20 -0300
Subject: [PATCH 084/167] ankama-launcher: 3.13.18 -> 3.13.37

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

diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix
index 8fdd2a665264..4fe2ec5fb7ea 100644
--- a/pkgs/by-name/an/ankama-launcher/package.nix
+++ b/pkgs/by-name/an/ankama-launcher/package.nix
@@ -5,15 +5,15 @@
 }:
 let
   pname = "ankama-launcher";
-  version = "3.13.18";
+  version = "3.13.37";
 
   # The original URL for the launcher is:
   # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage
   # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL.
   # To update the client, head to web.archive.org and create a new snapshot of the download page.
   src = fetchurl {
-    url = "https://web.archive.org/web/20251121131316/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
-    hash = "sha256-0GI3qBt/hwRqmfvg817C5IiD8s9AYzTX6w2UAmyR02I=";
+    url = "https://web.archive.org/web/20260205070121/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
+    hash = "sha256-6BGx4eS9H2CmvcncVufRrhruVHk78eBfB5PtVFfK0eg=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From 789de1d5614756acb41f96cf525e3773dfdb07f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 08:07:26 +0000
Subject: [PATCH 085/167] rqlite: 9.3.16 -> 9.3.21

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

diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix
index c472105b8f67..d4db606bf2ee 100644
--- a/pkgs/by-name/rq/rqlite/package.nix
+++ b/pkgs/by-name/rq/rqlite/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rqlite";
-  version = "9.3.16";
+  version = "9.3.21";
 
   src = fetchFromGitHub {
     owner = "rqlite";
     repo = "rqlite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pWZy8xuKIuJZXjzLwR15Q5CWCexNbqiA8PkvFEjxkYY=";
+    hash = "sha256-PG9O+t96AKgDACm03WTEdu2ALKVygV+QNrTlZWmchsY=";
   };
 
-  vendorHash = "sha256-wOeYMj1jlMCnckDsO/y7vHsi2QnR8va8cVtl79dc9qs=";
+  vendorHash = "sha256-XWTVyYfkwmLuTTiYhoKKK0n6ZGf6JvT5DYcMQC1xXzQ=";
 
   subPackages = [
     "cmd/rqlite"

From 10a8699608c1434ce56b043dfb0d7f116ebf095c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 08:15:00 +0000
Subject: [PATCH 086/167] fishnet: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index 62e0331aad90..33fc2f29c17e 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -13,8 +13,8 @@
 
 let
   # These files can be found in Stockfish/src/evaluate.h
-  nnueBigFile = "nn-1c0000000000.nnue";
-  nnueBigHash = "sha256-HAAAAAAApn1imZnZMtDDc/dFDOQ80S0FYoaPTq+a4q0=";
+  nnueBigFile = "nn-c288c895ea92.nnue";
+  nnueBigHash = "sha256-wojIleqSRCnqkJLj82srPB8A8qOkx1n/flfnnjtD5Kc=";
   nnueBig = fetchurl {
     url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}";
     hash = nnueBigHash;
@@ -28,13 +28,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fishnet";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "lichess-org";
     repo = "fishnet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-35/izbCfDA5R+HudL8gdk7CVmwu+GLuVtwTuYAwSBDg=";
+    hash = "sha256-SW51EQvh73ZnMX6MflEzL06a4+XnqPPs7ooaTqY9eVc=";
     fetchSubmodules = true;
   };
 
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cp -v '${nnueSmall}' 'Fairy-Stockfish/src/${nnueSmallFile}'
   '';
 
-  cargoHash = "sha256-cBNooWIVRk3DsXuF03mSOPYrgadxg8gEhG2aReeUkGs=";
+  cargoHash = "sha256-NzjgYS9AVQcKzI86Y3RPs2keqnby/LN5KGd6j4IesDQ=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 5af95fe86d3de3ef32a0085f4e33ce8e8fe68c68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 08:31:41 +0000
Subject: [PATCH 087/167] python3Packages.dbus-python-client-gen: 0.8.3 ->
 0.8.4

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

diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix
index 1c820eb8e02d..eb8b5ffd4ce7 100644
--- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix
+++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "dbus-python-client-gen";
-  version = "0.8.3";
+  version = "0.8.4";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = "dbus-python-client-gen";
     tag = "v${version}";
-    hash = "sha256-4Y4cL254ZlZKF6d6cStIOya3J4ZfypuumwKOdDNzuNc=";
+    hash = "sha256-nmF6fdUgr7ACK7Pvy3ikc0Xjzfh6iTYNLc+rAf9I9Mg=";
   };
 
   propagatedBuildInputs = [

From 6db7cdc58cfe095a2fddf7ad3b64c5344f1d9adc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Feb 2026 09:23:58 +0000
Subject: [PATCH 088/167] python3Packages.torchrl: 0.11.0 -> 0.11.1

Diff: https://github.com/pytorch/rl/compare/v0.11.0...v0.11.1

Changelog: https://github.com/pytorch/rl/releases/tag/v0.11.1
---
 pkgs/development/python-modules/torchrl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix
index bfad80770364..fdc32563e15e 100644
--- a/pkgs/development/python-modules/torchrl/default.nix
+++ b/pkgs/development/python-modules/torchrl/default.nix
@@ -75,14 +75,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "torchrl";
-  version = "0.11.0";
+  version = "0.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "rl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ae1zhc3lESCsuAJbbjrT5Vv0zTIiiBw9HBtKwWsbVzc=";
+    hash = "sha256-1S/A9zb6hlRYIV8Jf1lQ31TzxuA16lDiQHTu+Y6WSQk=";
   };
 
   postPatch = ''

From 3ea81a3e18f6b78f9f00fc7ec3a4de0b833ce5cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 09:30:39 +0000
Subject: [PATCH 089/167] hermitcli: 0.47.0 -> 0.48.0

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

diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix
index 40c252d4d33a..80fba6b65b6b 100644
--- a/pkgs/by-name/he/hermitcli/package.nix
+++ b/pkgs/by-name/he/hermitcli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "hermit";
-  version = "0.47.0";
+  version = "0.48.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "cashapp";
     repo = "hermit";
-    hash = "sha256-VAAdsZ3ZFY+BrH5KDERngxX5xp8CckcnlpSLq4XWU2s=";
+    hash = "sha256-gV8moz9wSAt7gy2cTjl4IGOYHnm+4alBUhyKZmhgot8=";
   };
 
   vendorHash = "sha256-KEwbADLm7oTChoLyx/0SykQX1Fy4bJxNbYcGmfEka7Q=";

From 8bf0bcee45e9c447ebde686471660ca79ee79fe5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 10:01:32 +0000
Subject: [PATCH 090/167] obs-studio-plugins.obs-vertical-canvas: 1.6.1 ->
 1.6.2

---
 .../video/obs-studio/plugins/obs-vertical-canvas.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
index b1dfad17ada0..097417f3c905 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-vertical-canvas";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "Aitum";
     repo = "obs-vertical-canvas";
     rev = version;
-    sha256 = "sha256-tvoNdv0HkGch8FZCiK7S4BR7iWOqLvTj0blFxyyUjQE=";
+    sha256 = "sha256-LaVDwC+L96cvq3OpNnD33bf+tV1RZ9AdUHjG4oIFzpY=";
   };
 
   # Remove after https://github.com/Aitum/obs-vertical-canvas/pull/26 is released :)

From e1e18d9628c56105d6366953f2ffeeeff72e1c8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 10:10:28 +0000
Subject: [PATCH 091/167] okta-aws-cli: 2.5.2 -> 2.5.3

---
 pkgs/by-name/ok/okta-aws-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ok/okta-aws-cli/package.nix b/pkgs/by-name/ok/okta-aws-cli/package.nix
index 227f6430ab90..aea0436e8f53 100644
--- a/pkgs/by-name/ok/okta-aws-cli/package.nix
+++ b/pkgs/by-name/ok/okta-aws-cli/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "okta-aws-cli";
-  version = "2.5.2";
+  version = "2.5.3";
 
   subPackages = [ "cmd/okta-aws-cli" ];
 
@@ -14,7 +14,7 @@ buildGoModule rec {
     owner = "okta";
     repo = "okta-aws-cli";
     rev = "v${version}";
-    sha256 = "sha256-z+bW/cTy63bGEhF7ug2GUXDB+kbTi4WhUEuHPOu5iw4=";
+    sha256 = "sha256-l9sbkMcL35GezqJc1z4+1cTvJkyyCrI0NaNdVvmTSB0=";
   };
 
   vendorHash = "sha256-MnK0zCwPOTzsPrkULEYwnmIBmVrPiwK2yDr3tqVHHRY=";

From efe8f11636ed0b9d36617513eed124b6df8be24d Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Thu, 5 Feb 2026 07:05:06 -0300
Subject: [PATCH 092/167] anydesk: 7.1.1 -> 7.1.3

---
 pkgs/by-name/an/anydesk/package.nix | 55 ++++++++++++++++++++++-------
 pkgs/by-name/an/anydesk/pin.json    |  5 +++
 2 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/by-name/an/anydesk/pin.json

diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix
index cde5f239b70f..3d1e6d1a197b 100644
--- a/pkgs/by-name/an/anydesk/package.nix
+++ b/pkgs/by-name/an/anydesk/package.nix
@@ -32,6 +32,7 @@
   libxkbfile,
   libxcb,
   minizip,
+  net-tools,
   lsb-release,
   freetype,
   fontconfig,
@@ -40,21 +41,29 @@
   pciutils,
   copyDesktopItems,
   pulseaudio,
+  udev,
 }:
 
 let
   description = "Desktop sharing application, providing remote support and online meetings";
+  pin = lib.importJSON ./pin.json;
+  inherit (pin) version;
+  inherit (stdenv.hostPlatform) system;
+  url =
+    if system == "x86_64-linux" then
+      "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
+    else if system == "aarch64-linux" then
+      "https://download.anydesk.com/rpi/anydesk-${version}-arm64.tar.gz"
+    else
+      throw "cannot install AnyDesk on ${system}";
+  hash = pin.${system};
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "anydesk";
-  version = "7.1.1";
+  inherit version;
 
   src = fetchurl {
-    urls = [
-      "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
-      "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
-    ];
-    hash = "sha256-pGzU4dBeWlACAOvshBzTPN6PcNdQkQXAjGFnK+yrKA4=";
+    inherit url hash;
   };
 
   buildInputs = [
@@ -90,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     libice
     libsm
     libxrender
+    udev
   ];
 
   nativeBuildInputs = [
@@ -139,17 +149,32 @@ stdenv.mkDerivation (finalAttrs: {
         ]
       } \
       --prefix GDK_BACKEND : x11 \
+      --suffix PATH : ${
+        lib.makeBinPath [
+          net-tools
+        ]
+      } \
       --set GTK_THEME Adwaita
   '';
 
   passthru = {
     updateScript = genericUpdater {
-      versionLister = writeShellScript "anydesk-versionLister" ''
-        curl -s https://anydesk.com/en/downloads/linux \
-          | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \
-          | uniq \
-          | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g'
-      '';
+      versionLister =
+        let
+          arch =
+            if system == "x86_64-linux" then
+              "amd64"
+            else if system == "aarch64-linux" then
+              "arm64"
+            else
+              throw "cannot update AnyDesk on ${system}";
+        in
+        writeShellScript "anydesk-versionLister" ''
+          curl -s https://anydesk.com/en/downloads/linux \
+            | grep "https://[a-z0-9._/-]*-${arch}.tar.gz" -o \
+            | uniq \
+            | sed 's,.*/anydesk-\(.*\)-${arch}.tar.gz,\1,g'
+        '';
     };
   };
 
@@ -158,7 +183,11 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.anydesk.com";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    mainProgram = "anydesk";
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/an/anydesk/pin.json b/pkgs/by-name/an/anydesk/pin.json
new file mode 100644
index 000000000000..825e8fdd0a83
--- /dev/null
+++ b/pkgs/by-name/an/anydesk/pin.json
@@ -0,0 +1,5 @@
+{
+  "version": "7.1.3",
+  "x86_64-linux": "sha256-b1WSQMRlFaqhECCBKoPjUIww5Fj3yfN8wxwACuO7RR4=",
+  "aarch64-linux": "sha256-Yb5Jnjxs8AmMeFvWY+VYGTovpLwW1PRPBEJZUF63gA0="
+}

From 1e1db1ca6223a2d577cfe3376df772724f5e439c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 10:42:26 +0000
Subject: [PATCH 093/167] clickhouse: 25.12.4.35-stable -> 26.1.2.11-stable

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

diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix
index 3a52e1378bf7..bfa3c9f64f31 100644
--- a/pkgs/by-name/cl/clickhouse/package.nix
+++ b/pkgs/by-name/cl/clickhouse/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "25.12.4.35-stable";
-  rev = "4b2fbdcba83cf43fcf641e8dc492dfe0eaddce1a";
-  hash = "sha256-XC6Mt+XmCcRp4V0U8RPBIqPNZdN3KdSz8IDh49ZcWBE=";
+  version = "26.1.2.11-stable";
+  rev = "53779390caa67a65a2368cdbb7533ed925608ba9";
+  hash = "sha256-azzrQ37AhC0KvA7ZMLlSSWxEdwzSfrbaBFSUerOqVCY=";
   lts = false;
 }

From 03b85a4b4d966735fc098c3f2e10243cc02ce846 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Feb 2026 11:14:00 +0000
Subject: [PATCH 094/167] oboete: 0.2.2 -> 0.2.3

Diff: https://github.com/mariinkys/oboete/compare/0.2.2...0.2.3

Changelog: https://github.com/mariinkys/oboete/releases/tag/0.2.3
---
 pkgs/by-name/ob/oboete/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix
index 27198218a00a..088dd0f2f246 100644
--- a/pkgs/by-name/ob/oboete/package.nix
+++ b/pkgs/by-name/ob/oboete/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oboete";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "mariinkys";
     repo = "oboete";
     tag = finalAttrs.version;
-    hash = "sha256-MBWqAQekGdJHQhyObjnR8AUV+yjM++R11ALpE5BuUHc=";
+    hash = "sha256-Ydl6gVlE/6dN/qp348wc626TSG8FIBv2U7H/FVahrOs=";
   };
 
-  cargoHash = "sha256-deQeX1hVwJvzwCmtACiugEpRbzVP4Z2OBi2y2PPLVCM=";
+  cargoHash = "sha256-R8y0UpSY8K5yMZK719eXb+R9ABllpRV/QoAcISV138w=";
 
   nativeBuildInputs = [
     libcosmicAppHook

From 6e0f2c1acf3065f7da618e23558159ac862036ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 11:20:10 +0000
Subject: [PATCH 095/167] vscode-extensions.firsttris.vscode-jest-runner:
 0.4.112 -> 0.4.123

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index f0d581203676..f9c6878cd6e7 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1711,8 +1711,8 @@ let
         mktplcRef = {
           name = "vscode-jest-runner";
           publisher = "firsttris";
-          version = "0.4.112";
-          hash = "sha256-NKnAGGgckVsIn3O842BPWJ3cXM1Ap0yK9Rsrdjfmf5M=";
+          version = "0.4.123";
+          hash = "sha256-QQX201DtAnzML9HeMMtXgm2IJ1K8BNDXcZd3iPFg2pw=";
         };
         meta = {
           description = "Simple way to run or debug a single (or multiple) tests from context-menu";

From 47d94a3e8bc4e73c8a0542a2e81b424619d307f8 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <write@ownrisk.dk>
Date: Thu, 5 Feb 2026 12:20:14 +0100
Subject: [PATCH 096/167] kubevirt: add johanot as maintainer

---
 pkgs/by-name/ku/kubevirt/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix
index c72c179dba66..c07e6c2dbbb8 100644
--- a/pkgs/by-name/ku/kubevirt/package.nix
+++ b/pkgs/by-name/ku/kubevirt/package.nix
@@ -50,7 +50,10 @@ buildGoModule rec {
     description = "Client tool to use advanced features such as console access";
     homepage = "https://kubevirt.io/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ haslersn ];
+    maintainers = with lib.maintainers; [
+      haslersn
+      johanot
+    ];
     mainProgram = "virtctl";
   };
 }

From 3995dddc8159bf6065a66a63fd2823e0c5dc557e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 11:22:49 +0000
Subject: [PATCH 097/167] vscode-extensions.google.colab: 0.2.0 -> 0.2.1

---
 .../editors/vscode/extensions/google.colab/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/google.colab/default.nix b/pkgs/applications/editors/vscode/extensions/google.colab/default.nix
index 4eebfda679c3..be28eb840596 100644
--- a/pkgs/applications/editors/vscode/extensions/google.colab/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/google.colab/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "google";
     name = "colab";
-    version = "0.2.0";
-    hash = "sha256-2kib32Dt1d6FADO/z8HEux+x1Mig4Hso3KTwCR5IjR0=";
+    version = "0.2.1";
+    hash = "sha256-bEeWXaG9tvwkqbcR7FxRmKEpJod5RSw0gSTtKEweipg=";
   };
 
   meta = {

From 5f1d65fee0bea2ed985337fcb5c47b6d972cc821 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 11:47:52 +0000
Subject: [PATCH 098/167] nitter: 0-unstable-2025-12-24 ->
 0-unstable-2026-01-29

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

diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix
index 74ef6fa07bd3..91fb44d61a3e 100644
--- a/pkgs/by-name/ni/nitter/package.nix
+++ b/pkgs/by-name/ni/nitter/package.nix
@@ -10,13 +10,13 @@
 buildNimPackage (
   finalAttrs: prevAttrs: {
     pname = "nitter";
-    version = "0-unstable-2025-12-24";
+    version = "0-unstable-2026-01-29";
 
     src = fetchFromGitHub {
       owner = "zedeus";
       repo = "nitter";
-      rev = "a92e79ebc3581702dc427434a782a5fc1d28cc91";
-      hash = "sha256-bCogvVO99HPiZZOMDd0IDBNGBKIZ+My493SnbK+6HxM=";
+      rev = "a45227b8835719dfb443600052d69374db8b515c";
+      hash = "sha256-e6u+CBdOoxLnxC4L1vE7XFr7YlXQ379Ow+khohSXNpg=";
     };
 
     lockFile = ./lock.json;

From 2d42cafb397d82a3bdf321f1078493b917e2073a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Feb 2026 03:55:56 +0000
Subject: [PATCH 099/167] moonraker: 0.9.3-unstable-2025-11-16 -> 0.10.0

---
 pkgs/by-name/mo/moonraker/package.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix
index 1a49a5ded0f3..359392931708 100644
--- a/pkgs/by-name/mo/moonraker/package.nix
+++ b/pkgs/by-name/mo/moonraker/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   python3,
   makeWrapper,
-  unstableGitUpdater,
+  nix-update-script,
   nixosTests,
   useGpiod ? false,
 }:
@@ -35,13 +35,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "moonraker";
-  version = "0.9.3-unstable-2025-11-16";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "Arksine";
     repo = "moonraker";
-    rev = "3129d89f0f951d475aa86f303c1ef9b6a612cb73";
-    sha256 = "sha256-lKuoHWonAA/DBuLNsySyxohZPnEB4SrkpVZvECQtjA8=";
+    tag = "v${version}";
+    hash = "sha256-jprhbO3wQF/ozOf6VUrDYqNK0TstmLc4nZsZrB6hjOY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -55,10 +55,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = unstableGitUpdater {
-      url = meta.homepage;
-      tagPrefix = "v";
-    };
+    updateScript = nix-update-script { };
     tests.moonraker = nixosTests.moonraker;
   };
 

From c342e08e41bf1a6553de92df8b4379008560f054 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 13:12:14 +0000
Subject: [PATCH 100/167] redumper: 686 -> 689

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

diff --git a/pkgs/by-name/re/redumper/package.nix b/pkgs/by-name/re/redumper/package.nix
index d629fc4d26b7..d94c03cc28bf 100644
--- a/pkgs/by-name/re/redumper/package.nix
+++ b/pkgs/by-name/re/redumper/package.nix
@@ -9,13 +9,13 @@
 # redumper is using C++ modules, this requires latest C++20 compiler and build tools
 llvmPackages.libcxxStdenv.mkDerivation (finalAttrs: {
   pname = "redumper";
-  version = "686";
+  version = "689";
 
   src = fetchFromGitHub {
     owner = "superg";
     repo = "redumper";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-oyF8NLMgnNzUPgcwu7WvVoOFQt1qUuFMtzKxJqyOq9A=";
+    hash = "sha256-VCC6cxbG/PGCPFQuBpPtOoV//nVaMvm87TA32YyYkSc=";
   };
 
   nativeBuildInputs = [

From 255f206c65d40a654fc2abd95819e65d273ced59 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Feb 2026 10:02:21 +0000
Subject: [PATCH 101/167] csharp-ls: 0.21.0 -> 0.22.0

Diff:
https://github.com/razzmatazz/csharp-language-server/compare/0.21.0...0.22.0

Changelog:
https://github.com/razzmatazz/csharp-language-server/releases/tag/0.22.0
---
 pkgs/by-name/cs/csharp-ls/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix
index fa60764f1238..f1b2122d502d 100644
--- a/pkgs/by-name/cs/csharp-ls/package.nix
+++ b/pkgs/by-name/cs/csharp-ls/package.nix
@@ -9,11 +9,11 @@ let
   dotnet-sdk = dotnetCorePackages.sdk_10_0;
 in
 
-buildDotnetGlobalTool rec {
+buildDotnetGlobalTool (finalAttrs: {
   pname = "csharp-ls";
-  version = "0.21.0";
+  version = "0.22.0";
 
-  nugetHash = "sha256-XFzTJ7UWaFQEmFmdY/zY4zjKZaKK9aUq4Zbt3h+19bg=";
+  nugetHash = "sha256-11ysfIiYnQG1vpfvmUWHuCR//rOLfYVRoQWedThojqc=";
 
   inherit dotnet-sdk;
   dotnet-runtime = dotnet-sdk;
@@ -29,7 +29,7 @@ buildDotnetGlobalTool rec {
     description = "Roslyn-based LSP language server for C#";
     mainProgram = "csharp-ls";
     homepage = "https://github.com/razzmatazz/csharp-language-server";
-    changelog = "https://github.com/razzmatazz/csharp-language-server/releases/tag/v${version}";
+    changelog = "https://github.com/razzmatazz/csharp-language-server/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ GaetanLepage ];
@@ -40,4 +40,4 @@ buildDotnetGlobalTool rec {
       "aarch64-darwin"
     ];
   };
-}
+})

From c8167fca350c79c61ac79dbd379302fa3c49dabb Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Thu, 5 Feb 2026 21:36:29 +0800
Subject: [PATCH 102/167] vampire: allow custom z3 version to be overridden

---
 pkgs/by-name/va/vampire/package.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/va/vampire/package.nix b/pkgs/by-name/va/vampire/package.nix
index bd7f48dd99c6..89224bc491b6 100644
--- a/pkgs/by-name/va/vampire/package.nix
+++ b/pkgs/by-name/va/vampire/package.nix
@@ -4,10 +4,7 @@
   fetchFromGitHub,
   cmake,
   z3,
-}:
-
-let
-  z3_4_14_0 = z3.overrideAttrs rec {
+  z3' ? z3.overrideAttrs rec {
     version = "4.14.0";
     src = fetchFromGitHub {
       owner = "Z3Prover";
@@ -15,8 +12,8 @@ let
       rev = "z3-${version}";
       hash = "sha256-Bv7+0J7ilJNFM5feYJqDpYsOjj7h7t1Bx/4OIar43EI=";
     };
-  };
-in
+  },
+}:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vampire";
   version = "5.0.1";
@@ -31,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    z3_4_14_0
+    z3'
   ];
 
-  cmakeFlags = [ (lib.cmakeFeature "Z3_DIR" "${z3_4_14_0.dev}/lib/cmake") ];
+  cmakeFlags = [ (lib.cmakeFeature "Z3_DIR" "${z3'.dev}/lib/cmake") ];
 
   enableParallelBuilding = true;
 

From b33ae2d70296f19a0d862bace044d0b270d05c02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 13:37:43 +0000
Subject: [PATCH 103/167] phpExtensions.mongodb: 2.1.7 -> 2.1.8

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

diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix
index bced37bd9712..ce5fb7f5d6f1 100644
--- a/pkgs/development/php-packages/mongodb/default.nix
+++ b/pkgs/development/php-packages/mongodb/default.nix
@@ -15,13 +15,13 @@
 
 buildPecl rec {
   pname = "mongodb";
-  version = "2.1.7";
+  version = "2.1.8";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-php-driver";
     rev = version;
-    hash = "sha256-07Sc9bg5MHWhAyhrghqGjblMrgP/kuKwIjtt0WUCnDo=";
+    hash = "sha256-KX4e14D3oA8OpvoeeM6z/OY6Xtvf7OgxPjJM66DbJlw=";
     fetchSubmodules = true;
   };
 

From 03613923463aae5be24cd58a3d9cfe45771f0e27 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Thu, 5 Feb 2026 21:41:04 +0800
Subject: [PATCH 104/167] vampire: add nix-update-script

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

diff --git a/pkgs/by-name/va/vampire/package.nix b/pkgs/by-name/va/vampire/package.nix
index 89224bc491b6..f0324e379638 100644
--- a/pkgs/by-name/va/vampire/package.nix
+++ b/pkgs/by-name/va/vampire/package.nix
@@ -13,6 +13,7 @@
       hash = "sha256-Bv7+0J7ilJNFM5feYJqDpYsOjj7h7t1Bx/4OIar43EI=";
     };
   },
+  nix-update-script,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vampire";
@@ -39,6 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     rm -rf z3
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://vprover.github.io/";
     description = "Vampire Theorem Prover";

From 1c1bf1b8dabacac016819661592ea756b41453c5 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Thu, 5 Feb 2026 21:41:48 +0800
Subject: [PATCH 105/167] isabelle: remove z3 as vampire dependency

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

diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index 0e483c20773e..297fb7c15a3d 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -51,28 +51,33 @@ let
   # Isabelle uses a branch of vampire that is not in the normal release line
   # that adds support for higher order goals
   vampireStdenv = if stdenv.hostPlatform.isLinux then gcc14Stdenv else stdenv;
-  vampire' = (vampire.override { stdenv = vampireStdenv; }).overrideAttrs (_: {
-    pname = "vampire-for-isabelle";
-    version = "4.8";
+  vampire' =
+    (vampire.override {
+      stdenv = vampireStdenv;
+      z3' = null;
+    }).overrideAttrs
+      (_: {
+        pname = "vampire-for-isabelle";
+        version = "4.8";
 
-    src = fetchFromGitHub {
-      owner = "vprover";
-      repo = "vampire";
-      tag = "v4.8HO4Sledgahammer";
-      hash = "sha256-CmppaGa4M9tkE1b25cY1LSPFygJy5yV4kpHKbPqvcVE=";
-    };
+        src = fetchFromGitHub {
+          owner = "vprover";
+          repo = "vampire";
+          tag = "v4.8HO4Sledgahammer";
+          hash = "sha256-CmppaGa4M9tkE1b25cY1LSPFygJy5yV4kpHKbPqvcVE=";
+        };
 
-    patches = [ ./vampire-add-install-directive.patch ];
+        patches = [ ./vampire-add-install-directive.patch ];
 
-    postInstall = ''
-      mv $out/bin/vampire_rel $out/bin/vampire
-    '';
+        postInstall = ''
+          mv $out/bin/vampire_rel $out/bin/vampire
+        '';
 
-    cmakeFlags = [
-      (lib.cmakeFeature "CMAKE_BUILD_HOL" "On")
-      (lib.cmakeFeature "CMAKE_DISABLE_FIND_PACKAGE_Z3" "On")
-    ];
-  });
+        cmakeFlags = [
+          (lib.cmakeFeature "CMAKE_BUILD_HOL" "On")
+          (lib.cmakeFeature "CMAKE_DISABLE_FIND_PACKAGE_Z3" "On")
+        ];
+      });
 
   sha1 = stdenv.mkDerivation {
     pname = "isabelle-sha1";

From e889c24547f6b9be2c69d0b0ac4440dff32078a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 13:45:19 +0000
Subject: [PATCH 106/167] files-cli: 2.15.195 -> 2.15.200

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

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index 63bdcc535478..f3c8f3c0fcc0 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.15.195";
+  version = "2.15.200";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-tr1l+5JcGIKsT4EvoYM4Nb9KS8DEoSiFRANNSb4lKBY=";
+    hash = "sha256-z3Zcrb9cPhiKe/Pj2W4Mr7QVOwBaDNq3AwjruioiHJI=";
   };
 
-  vendorHash = "sha256-ctld8euKWNwmfk9qfwSAdkBeuPGcklbIBaIs+r9nHT4=";
+  vendorHash = "sha256-bkLHprUxr14LmkEEVzFYtTxTXhSESadjm1y32xzHaJY=";
 
   ldflags = [
     "-s"

From 09a81881251a986b151f5e3c2d7ace19d655a8d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 13:47:25 +0000
Subject: [PATCH 107/167] jarl: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/by-name/ja/jarl/package.nix b/pkgs/by-name/ja/jarl/package.nix
index 742c082e073a..918c701766c5 100644
--- a/pkgs/by-name/ja/jarl/package.nix
+++ b/pkgs/by-name/ja/jarl/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jarl";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "etiennebacher";
     repo = "jarl";
     tag = finalAttrs.version;
-    hash = "sha256-bfN6HkrGzONbJJzJNDan+txh4eSqLDMJtlRutZHzcCs=";
+    hash = "sha256-96ekjR0lcNhcmkEILYZd/QpeJl1pXJ2OBP4WyJ3AX90=";
   };
 
   postPatch = ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
                    '(?:/nix)?/(?:build)/(?:nix[\-0-9]+/)?'
   '';
 
-  cargoHash = "sha256-4pXIbrwtSwRfBgS1XGj/X25bgrLuMTYqlFlhRPEw6o4=";
+  cargoHash = "sha256-FfoYed147pR8fa2176vvFJmAiXMTGE/UVtT57rKuj9s=";
 
   # Don't run integration_tests for jarl-lsp, because it doesn't see
   # the CARGO_BIN_EXE_jarl env var even if exported in preCheck

From a8d729a0331807fdedfc04401915a88dee1faff3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 14:01:03 +0000
Subject: [PATCH 108/167] vscode-extensions.geequlim.godot-tools: 2.6.0 ->
 2.6.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index f0d581203676..3bab00e0081c 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1851,8 +1851,8 @@ let
         mktplcRef = {
           name = "godot-tools";
           publisher = "geequlim";
-          version = "2.6.0";
-          hash = "sha256-b6aH4LAqXjwRp2dFa7+hhQL3ac9K7Zmat5ncaRLooD0=";
+          version = "2.6.1";
+          hash = "sha256-x+u5t4HB+uM2CbhSw0h/zoYPgBPTZNFaMuzL+KB9mAM=";
         };
         meta = {
           description = "VS Code extension for game development with Godot Engine and GDScript";

From 32e1cd1748874b06ef023eadfd8304b9594432ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 14:02:49 +0000
Subject: [PATCH 109/167] vscode-extensions.redhat.java: 1.51.0 -> 1.52.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index f0d581203676..af1fc716ef8d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3856,8 +3856,8 @@ let
         mktplcRef = {
           publisher = "redhat";
           name = "java";
-          version = "1.51.0";
-          hash = "sha256-uOTvQjLDkMjzTfc98cq+WlvKwRQfPpTrlXKbWG7Gy+c=";
+          version = "1.52.0";
+          hash = "sha256-V+ufW8RgYplxFRa+BILp1lmitktDucrN0FhsBY1zAmY=";
         };
         buildInputs = [ jdk ];
         meta = {

From ee06439c43fdcafbecf098e7d7f8ce1e06da09ac Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Thu, 5 Feb 2026 22:03:20 +0800
Subject: [PATCH 110/167] z3: version macos compat patches

patches fix a bug only present in the latest versions of z3
fixes the vampire build, which requires an older version of z3
---
 pkgs/by-name/z3/z3/package.nix | 47 ++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix
index 3b93c40f9bc7..c68a8dfeb7b1 100644
--- a/pkgs/by-name/z3/z3/package.nix
+++ b/pkgs/by-name/z3/z3/package.nix
@@ -38,28 +38,31 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-eyF3ELv81xEgh9Km0Ehwos87e4VJ82cfsp53RCAtuTo=";
   };
 
-  patches = lib.optionals useCmakeBuild [
-    ./fix-pkg-config-paths.patch
-    # fix Segmentation fault. See https://github.com/Z3Prover/z3/pull/8264 and
-    # https://github.com/NixOS/nixpkgs/issues/486491
-    (fetchpatch2 {
-      name = "preserve-the-initial-state-of-the-solver.patch";
-      url = "https://github.com/Z3Prover/z3/commit/850a3236adab92f9f6f569ac66ffbb69be179f4c.patch?full_index=1";
-      hash = "sha256-C6p+dj3i3DpOnd2wr+R8ZwClHoMFfk5i5/+JRhTDNcs=";
-    })
-    # needs to include a cosmetic change to apply patch for memory corruption
-    (fetchpatch2 {
-      name = "cosmetic-changes-to-i.patch";
-      url = "https://github.com/Z3Prover/z3/commit/243694379475d983605f87578452a330f3e3b28f.patch?full_index=1";
-      includes = [ "src/api/api_polynomial.cpp" ];
-      hash = "sha256-huo5S73WrFrEEUcaP+1LDQwGwo+n2iYT4x/OjK5rmqQ=";
-    })
-    (fetchpatch2 {
-      name = "fix-memory-corruption.patch";
-      url = "https://github.com/Z3Prover/z3/commit/e7b6f3f33bcc6c88a0f2ace47ff2f09b59239433.patch?full_index=1";
-      hash = "sha256-kEEeod4s8i9SI2e2TFD2U4yd1qEPoGnJOfE0y+1Cq6M=";
-    })
-  ];
+  patches =
+    lib.optionals useCmakeBuild [
+      ./fix-pkg-config-paths.patch
+    ]
+    ++ lib.optionals (lib.versionAtLeast finalAttrs.version "4.15.4") [
+      # fix Segmentation fault. See https://github.com/Z3Prover/z3/pull/8264 and
+      # https://github.com/NixOS/nixpkgs/issues/486491
+      (fetchpatch2 {
+        name = "preserve-the-initial-state-of-the-solver.patch";
+        url = "https://github.com/Z3Prover/z3/commit/850a3236adab92f9f6f569ac66ffbb69be179f4c.patch?full_index=1";
+        hash = "sha256-C6p+dj3i3DpOnd2wr+R8ZwClHoMFfk5i5/+JRhTDNcs=";
+      })
+      # needs to include a cosmetic change to apply patch for memory corruption
+      (fetchpatch2 {
+        name = "cosmetic-changes-to-i.patch";
+        url = "https://github.com/Z3Prover/z3/commit/243694379475d983605f87578452a330f3e3b28f.patch?full_index=1";
+        includes = [ "src/api/api_polynomial.cpp" ];
+        hash = "sha256-huo5S73WrFrEEUcaP+1LDQwGwo+n2iYT4x/OjK5rmqQ=";
+      })
+      (fetchpatch2 {
+        name = "fix-memory-corruption.patch";
+        url = "https://github.com/Z3Prover/z3/commit/e7b6f3f33bcc6c88a0f2ace47ff2f09b59239433.patch?full_index=1";
+        hash = "sha256-kEEeod4s8i9SI2e2TFD2U4yd1qEPoGnJOfE0y+1Cq6M=";
+      })
+    ];
 
   strictDeps = true;
 

From 80fa11c59e76a89ed6437fdbabe0384e989d0b1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 14:28:30 +0000
Subject: [PATCH 111/167] python3Packages.twilio: 9.10.0 -> 9.10.1

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

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index b017c92c8877..b53676d23803 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "twilio";
-  version = "9.10.0";
+  version = "9.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
     tag = finalAttrs.version;
-    hash = "sha256-DJxyDnAv3wKcujBFCE808PJ9NZe/PN8+Z9J2o49n0HU=";
+    hash = "sha256-0y0WCH0d25P8FD0pbmzgZG8zX05HFziu2vNVawWE38g=";
   };
 
   build-system = [ setuptools ];

From b6f20537edba34fa4eff4eb621660af88188a040 Mon Sep 17 00:00:00 2001
From: Lu Wang <rebmit@rebmit.moe>
Date: Thu, 29 Jan 2026 21:50:12 +0800
Subject: [PATCH 112/167] vkmark: fix build with vulkan-headers >= 1.4.333

---
 .../fix-build-with-newer-vulkan-headers.patch | 73 +++++++++++++++++++
 pkgs/by-name/vk/vkmark/package.nix            |  6 ++
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/by-name/vk/vkmark/fix-build-with-newer-vulkan-headers.patch

diff --git a/pkgs/by-name/vk/vkmark/fix-build-with-newer-vulkan-headers.patch b/pkgs/by-name/vk/vkmark/fix-build-with-newer-vulkan-headers.patch
new file mode 100644
index 000000000000..58a38b39cca1
--- /dev/null
+++ b/pkgs/by-name/vk/vkmark/fix-build-with-newer-vulkan-headers.patch
@@ -0,0 +1,73 @@
+From abc5fc8495692df968636c29f44719e0999a73b5 Mon Sep 17 00:00:00 2001
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Wed, 10 Dec 2025 10:59:49 +0100
+Subject: [PATCH 1/2] core: Register custom dispatcher with isDispatchLoader
+
+Since Vulkan 1.4.333, custom dispatch loaders must be registered
+with isDispatchLoader to be recognized.
+---
+ src/vulkan_state.cpp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/vulkan_state.cpp b/src/vulkan_state.cpp
+index a36b2994dbba3e74cb1fb378e4dbb054157ae516..847095147bf5e050e558065623921ac3f06eb7e7 100644
+--- a/src/vulkan_state.cpp
++++ b/src/vulkan_state.cpp
+@@ -65,6 +65,18 @@ class DebugUtilsDispatcher
+ 
+ }
+ 
++#if VK_HEADER_VERSION >= 333
++namespace vk::detail {
++
++template <>
++struct isDispatchLoader<::DebugUtilsDispatcher>
++{
++    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
++};
++
++}
++#endif
++
+ VulkanState::VulkanState(VulkanWSI& vulkan_wsi, ChoosePhysicalDeviceStrategy const& pd_strategy, bool debug)
+     : debug_enabled(debug)
+ {
+
+From ab3f3d709e2f93859b528b1ace56423675940290 Mon Sep 17 00:00:00 2001
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Wed, 10 Dec 2025 10:59:49 +0100
+Subject: [PATCH 2/2] kms: Register custom dispatcher with isDispatchLoader
+
+Since Vulkan 1.4.333, custom dispatch loaders must be registered
+with isDispatchLoader to be recognized.
+---
+ src/ws/kms_window_system.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/ws/kms_window_system.cpp b/src/ws/kms_window_system.cpp
+index 4bf7838cee0512925ef084b641de3c2a11389c6d..1bc04581eee233f33ad3ea7a719ec4c3894b1104 100644
+--- a/src/ws/kms_window_system.cpp
++++ b/src/ws/kms_window_system.cpp
+@@ -474,6 +474,22 @@ class GetFormatProperties2Dispatcher
+     PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2KHR;
+ };
+ 
++}
++
++#if VK_HEADER_VERSION >= 333
++namespace vk::detail {
++
++template <>
++struct isDispatchLoader<::GetFormatProperties2Dispatcher>
++{
++    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
++};
++
++}
++#endif
++
++namespace {
++
+ std::vector<uint64_t> vk_get_supported_mods_for_format(VulkanState& vulkan,
+                                                        vk::Format format)
+ {
diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix
index 62c1101460f9..4ef602d4d7fc 100644
--- a/pkgs/by-name/vk/vkmark/package.nix
+++ b/pkgs/by-name/vk/vkmark/package.nix
@@ -28,6 +28,12 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-Rjpjqe7htwlhDdwELm74MvSzHzXLhRD/P8IES7nz/VY=";
   };
 
+  patches = [
+    # Fix build with vulkan-headers >= 1.4.333
+    # Remove once https://github.com/vkmark/vkmark/pull/80 is included in a release
+    ./fix-build-with-newer-vulkan-headers.patch
+  ];
+
   postPatch = ''
     substituteInPlace src/meson.build \
       --replace-fail "vulkan_dep.get_pkgconfig_variable('prefix')" "'${vulkan-headers}'"

From a75747b87ac7b165e7798aa2c9a041a51e2dea70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 14:48:15 +0000
Subject: [PATCH 113/167] ecspresso: 2.7.0 -> 2.7.1

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

diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix
index 6b62fbabee70..8a3fc15978f0 100644
--- a/pkgs/by-name/ec/ecspresso/package.nix
+++ b/pkgs/by-name/ec/ecspresso/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "ecspresso";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "kayac";
     repo = "ecspresso";
     tag = "v${version}";
-    hash = "sha256-GaxMpc6VUnPPlpFxptWFEpAec5VuSR0EOBOuZufrxvM=";
+    hash = "sha256-YKFaz31Dy4w8QLsNMyjVbbK/984D37snlFbNYeYr8SE=";
   };
 
   subPackages = [

From 34c014c2db9b76a3d59af2a25f3a7df43edb7697 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 15:24:32 +0000
Subject: [PATCH 114/167] miniz: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/by-name/mi/miniz/package.nix b/pkgs/by-name/mi/miniz/package.nix
index 667dee71c116..55a0d4fd983f 100644
--- a/pkgs/by-name/mi/miniz/package.nix
+++ b/pkgs/by-name/mi/miniz/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miniz";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "richgel999";
     repo = "miniz";
     rev = finalAttrs.version;
-    hash = "sha256-DQbXz1ehBNGFhuaW5Nz509njpPe73QpMHyKDbpqX0aI=";
+    hash = "sha256-hRB/0TVVQjr4VwjozfRnYKUJfeqO+1PNfdvP/rrOCR4=";
   };
   passthru.updateScript = nix-update-script { };
 

From 72a11ad82f6b7ce746984b75785a52ac81e3874a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 15:42:56 +0000
Subject: [PATCH 115/167] uutils-acl: 0.0.1-unstable-2026-01-28 ->
 0.0.1-unstable-2026-02-04

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

diff --git a/pkgs/by-name/uu/uutils-acl/package.nix b/pkgs/by-name/uu/uutils-acl/package.nix
index 8ebb5bde222b..7d1a9e8379f9 100644
--- a/pkgs/by-name/uu/uutils-acl/package.nix
+++ b/pkgs/by-name/uu/uutils-acl/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-acl";
-  version = "0.0.1-unstable-2026-01-28";
+  version = "0.0.1-unstable-2026-02-04";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "acl";
-    rev = "064d238441a4ed20b0f6a82203b3920c0b39e8f8";
-    hash = "sha256-Pu3ulcCw02dMp85YPpqwN2DX4La7TXnbhVbsNcBcK38=";
+    rev = "8ba4838795d65b63f4bd6b7f945c4f92932e95e3";
+    hash = "sha256-mamqwBwTBnuf+XPT492F3GRSoX0Kj7dLKxhLLYRzNII=";
   };
 
-  cargoHash = "sha256-EhUjlZ6xNMRcgUnsRNzSv3CYfDpVc0bxHZF9EFwzKi8=";
+  cargoHash = "sha256-JvGIEBUjpH/6V53VJKi27XdNi3rDd6u7j+NtW/Pq8cQ=";
 
   checkFlags = [
     # Operation not supported

From 80450e55f8993f90e05b4ad8070dfdc40c21b84e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 15:48:26 +0000
Subject: [PATCH 116/167] uutils-util-linux: 0.0.1-unstable-2026-01-28 ->
 0.0.1-unstable-2026-02-04

---
 pkgs/by-name/uu/uutils-util-linux/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/uu/uutils-util-linux/package.nix b/pkgs/by-name/uu/uutils-util-linux/package.nix
index 28e88411dec6..5925524f3297 100644
--- a/pkgs/by-name/uu/uutils-util-linux/package.nix
+++ b/pkgs/by-name/uu/uutils-util-linux/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-util-linux";
-  version = "0.0.1-unstable-2026-01-28";
+  version = "0.0.1-unstable-2026-02-04";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "util-linux";
-    rev = "1f82e16a308c2dd3b5b514153c81df1d4936273d";
-    hash = "sha256-2ZrbzaWZjxlKhrzcOL+N5N2D5818Y2OB+rGfH34pwy4=";
+    rev = "b4bcb74168eb16d69b7c467cd5a525b4f599ac5d";
+    hash = "sha256-YqxUlZpuo4dmRo9eq6bpRhHn00icLfLm1e3r5t8nu+g=";
   };
 
   postPatch = ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"cut"' '"${lib.getExe' coreutils "cut"}"'
   '';
 
-  cargoHash = "sha256-pvfZP6sHfh2kRVYOOTUGPw6Pq6Tsxud8+fU4qTwggcE=";
+  cargoHash = "sha256-9z/XuoJTxBpK15xVvV8uYb7YXmQ7glBK9GCViu2w590=";
 
   nativeBuildInputs = [
     pkg-config

From 50043e5ed4026d9f61982e0f656a1234caa1df6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 15:49:04 +0000
Subject: [PATCH 117/167] uutils-procps: 0.0.1-unstable-2026-01-28 ->
 0.0.1-unstable-2026-02-04

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

diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix
index 9ad528bf700f..d5291f563ff4 100644
--- a/pkgs/by-name/uu/uutils-procps/package.nix
+++ b/pkgs/by-name/uu/uutils-procps/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-procps";
-  version = "0.0.1-unstable-2026-01-28";
+  version = "0.0.1-unstable-2026-02-04";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "procps";
-    rev = "0e758a54ff243fbcf3ae6ec1f1761798b148de3a";
-    hash = "sha256-IhnxiPDJ+FStCdNQc19C2SwBXQ1qN8VYFGxR8b4o48o=";
+    rev = "99bc7776eb666b2b9592ed31b58917d80b75dabe";
+    hash = "sha256-gKv+P0AGP0E0hjF70s8OYkYH5vFovaNkfyoGR/973MI=";
   };
 
-  cargoHash = "sha256-sdmZGJYvuQaagEX+ve/1gXveUV7nphDIi5gY8apKGWE=";
+  cargoHash = "sha256-bQneJ0rScnz6KsDLBBzv5s9pzC6V5f1p4kxSe6FSPS4=";
 
   nativeBuildInputs = [
     pkg-config

From 8b27f064c3e7238321f4b520029954fb7eb629db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 16:05:45 +0000
Subject: [PATCH 118/167] python3Packages.pysma: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix
index 71e9f563b301..bf743bd24bc4 100644
--- a/pkgs/development/python-modules/pysma/default.nix
+++ b/pkgs/development/python-modules/pysma/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pysma";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kellerza";
     repo = "pysma";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fRYpWr3eny9Ore2uQhPgVDSb+M1KYy1cy9bE2+Em3xU=";
+    hash = "sha256-9y93BQz3x0IAcYhVNmuHN2vqgUu2tqITjoZioR8InjY=";
   };
 
   postPatch = ''

From eaabd2e8fa20488a463b02c0eadd8adbb10482f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 16:24:07 +0000
Subject: [PATCH 119/167] grafanaPlugins.victoriametrics-logs-datasource:
 0.24.0 -> 0.24.1

---
 .../plugins/victoriametrics-logs-datasource/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
index 1c54814debdd..3151b1fd92a0 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-logs-datasource";
-  version = "0.24.0";
-  zipHash = "sha256-8I2reNVW4iiJ3JHEExixpd5qHWp/uRiHNvICPgJSHEY=";
+  version = "0.24.1";
+  zipHash = "sha256-/I1X86KY9flUjHwYnxLIyT2Gwzrgypa2Vt5K9MFWUXM=";
   meta = {
     description = "Grafana datasource for VictoriaLogs";
     license = lib.licenses.asl20;

From d09fa822401ff4515d13000d463496b50f4bf6c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 16:35:21 +0000
Subject: [PATCH 120/167] python3Packages.ariadne: 0.27.1 -> 0.28.0

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

diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix
index dd745a848eb2..f7d75fe4095e 100644
--- a/pkgs/development/python-modules/ariadne/default.nix
+++ b/pkgs/development/python-modules/ariadne/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "ariadne";
-  version = "0.27.1";
+  version = "0.28.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mirumee";
     repo = "ariadne";
     tag = version;
-    hash = "sha256-Ew01tj/UzZw3IBY33tDfLihWKImjKTZfFcfThphk+H8=";
+    hash = "sha256-7rDlt+f+53UXUa3IpGzm0AX/pqnzDc8b3nwpY1TRAZs=";
   };
 
   patches = [ ./remove-opentracing.patch ];

From 5245680c25531061a418f89504b283883ae1b3c0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 4 Feb 2026 13:28:33 -0600
Subject: [PATCH 121/167] luarocks-packages-updater: remove nix-commands
 dependency

Make it functional without experimental features.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/lu/luarocks-packages-updater/package.nix | 2 ++
 pkgs/by-name/lu/luarocks-packages-updater/updater.py  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/luarocks-packages-updater/package.nix b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
index d597834c7bc0..1f799449c282 100644
--- a/pkgs/by-name/lu/luarocks-packages-updater/package.nix
+++ b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
@@ -1,5 +1,6 @@
 {
   nix,
+  nixfmt,
   makeWrapper,
   python3Packages,
   lib,
@@ -15,6 +16,7 @@ let
 
   path = lib.makeBinPath [
     nix
+    nixfmt
     nix-prefetch-scripts
     luarocks-nix
     lua5_1
diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
index 8b70d01d41b0..2d9accce0351 100755
--- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py
+++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
@@ -161,8 +161,8 @@ class LuaEditor(nixpkgs_plugin_update.Editor):
 
         print(f"updated {outfilename}")
 
-        # Format the generated file with nix fmt
-        subprocess.run(["nix", "fmt", outfilename], check=True)
+        # Format the generated file with nixfmt
+        subprocess.run(["nixfmt", outfilename], check=True)
 
     @property
     def attr_path(self):

From def772531ba37c3ece12b7de88db7dca4907f840 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 5 Feb 2026 10:52:48 -0600
Subject: [PATCH 122/167] luaPackages.luarocks-build-rust-mlua: 0.2.5-1-0.2.5
 -> 0.2.7-1-0.2.7

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/development/lua-modules/generated-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 2232c1e45cd3..f5bdb2613776 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -2948,17 +2948,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luarocks-build-rust-mlua";
-      version = "0.2.5-1";
+      version = "0.2.7-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.5-1.rockspec";
-          sha256 = "0h5y2wjv6zpd44jsgv4aiiv5wjj0fls0c81m6wbgr7vl5sx10dnm";
+          url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.7-1.rockspec";
+          sha256 = "0wh1n7rg0fdllxi1vyvbqkrcl3jcqnjr3fwhwx9hc52xba850bna";
         }).outPath;
       src = fetchFromGitHub {
         owner = "mlua-rs";
         repo = "luarocks-build-rust-mlua";
-        rev = "0.2.5";
-        hash = "sha256-OJk0UgM+GzuE7+AlpdTc3wcoelOk4tS3uOzjsZreBKs=";
+        rev = "0.2.7";
+        hash = "sha256-Zf/Ey5utsgzXqR8zlDse7KsyWA0RGx3hyvnJ36qhKG8=";
       };
 
       meta = {

From ea13ea1d97385d7612c23945ce951f2d2f83f1b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 17:06:18 +0000
Subject: [PATCH 123/167] copilot-language-server: 1.418.0 -> 1.421.0

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

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 81552196fb2a..2170abd80a3c 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.418.0";
+  version = "1.421.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-DFFQav3UTCItIQo1ksxy29smIMyyAHEDdhrdKf4NH1k=";
+    hash = "sha256-W9uEfP/2wEBm/KcsH0iNVzFT8rGj34xkNKtAglsQbMg=";
     stripRoot = false;
   };
 

From acc8c77416a3b00bdacd4e4bb6164f63a8e9d281 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 17:16:41 +0000
Subject: [PATCH 124/167] python3Packages.ihcsdk: 2.8.10 -> 2.8.11

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

diff --git a/pkgs/development/python-modules/ihcsdk/default.nix b/pkgs/development/python-modules/ihcsdk/default.nix
index c3bbe36d7e3c..0f05d1e37e46 100644
--- a/pkgs/development/python-modules/ihcsdk/default.nix
+++ b/pkgs/development/python-modules/ihcsdk/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ihcsdk";
-  version = "2.8.10";
+  version = "2.8.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dingusdk";
     repo = "PythonIhcSdk";
     tag = "v${version}";
-    hash = "sha256-mJHRnvG3bUd/KjGu55dZEx899blLT3WP0fTXCFHlRec=";
+    hash = "sha256-3hUXPqat+yrDy91SGBjpdjqt6YIl5tNTdszTD3zqog4=";
   };
 
   build-system = [ setuptools ];

From dfdcdd3818792cab4c58f88504f5aadc7924c4b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 17:37:42 +0000
Subject: [PATCH 125/167] v2ray-domain-list-community: 20260129053508 ->
 20260205133226

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 5e3bd2262227..4a169ffa9de5 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20260129053508";
+    version = "20260205133226";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-Nm9LmAgJQwlRit2oreWyTymbu1PZjTpu2LH5twU0X6o=";
+      hash = "sha256-mr6hQg5D1ejMeZ0BemVYA5fDCXiClvmKi/DehG56Mgk=";
     };
     vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk=";
     meta = {

From 7a9730192f693c2f35a6770b9e3263f324993326 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 17:40:43 +0000
Subject: [PATCH 126/167] home-assistant-custom-components.elegoo_printer:
 2.5.1 -> 2.6.0b9

---
 .../custom-components/elegoo_printer/package.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
index 5272edf01d74..8b5863958e1a 100644
--- a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
@@ -19,13 +19,13 @@
 buildHomeAssistantComponent rec {
   owner = "danielcherubini";
   domain = "elegoo_printer";
-  version = "2.5.1";
+  version = "2.6.0b9";
 
   src = fetchFromGitHub {
     owner = "danielcherubini";
     repo = "elegoo-homeassistant";
     tag = "v${version}";
-    hash = "sha256-qug2UsLPhBL9LobUr+Tns1cmg+Z0rVaLS4J8jGCF79M=";
+    hash = "sha256-dFbj982JVFLiAdzm6Tc6OPw/PRDxVNlGQiyEtmXW1Dg=";
   };
 
   dependencies = [

From 10eea93870ba579ec18b4ff6461c55806a23820e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 17:57:40 +0000
Subject: [PATCH 127/167] yaookctl: 0-unstable-2026-01-13 ->
 0-unstable-2026-02-05

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

diff --git a/pkgs/by-name/ya/yaookctl/package.nix b/pkgs/by-name/ya/yaookctl/package.nix
index 36e59b6fbd88..868fb32ebf12 100644
--- a/pkgs/by-name/ya/yaookctl/package.nix
+++ b/pkgs/by-name/ya/yaookctl/package.nix
@@ -6,13 +6,13 @@
 }:
 python3.pkgs.buildPythonApplication {
   pname = "yaookctl";
-  version = "0-unstable-2026-01-13";
+  version = "0-unstable-2026-02-05";
 
   src = fetchFromGitLab {
     owner = "yaook";
     repo = "yaookctl";
-    rev = "97ff5ceb948c6e61ef5fe288d84fca8b60e1c984";
-    hash = "sha256-+pWfm39WRybN9ldTf9Emm120NwvGQhtX0nU1CVZSot0=";
+    rev = "c0e3f92cbf15fdf985ac7dba9ed9edb320bda8f1";
+    hash = "sha256-TUAKHK/kxQHFpOGYP56lv4PmnfpkXFUY60BBZusV7b8=";
   };
 
   pyproject = true;

From 7136764d0fc17910b255fb54afd4ebab3149a621 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 4 Feb 2026 15:01:45 -0500
Subject: [PATCH 128/167] wine: Inline `staging.nix` and `util.nix`

Re `staging.nix`: It wasn't carrying its weight, and it interacted with
`base.nix` vs `default.nix` in bad ways.

Re `util.nix`: Once `staging.nix` is gone, `util.nix` is only used in
one file, and only one definition of it is used. Move that binding to
`base.nix`, and delete the rest.
---
 pkgs/applications/emulators/wine/base.nix     | 66 ++++++++++++++++---
 pkgs/applications/emulators/wine/default.nix  |  7 +-
 pkgs/applications/emulators/wine/packages.nix | 14 ++++
 pkgs/applications/emulators/wine/staging.nix  | 53 ---------------
 pkgs/applications/emulators/wine/util.nix     |  6 --
 5 files changed, 74 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/applications/emulators/wine/staging.nix
 delete mode 100644 pkgs/applications/emulators/wine/util.nix

diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 2cde881e05ed..ff6a01114671 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -24,14 +24,21 @@
   buildScript ? null,
   configureFlags ? [ ],
   mainProgram ? "wine",
+  # Staging support
+  useStaging ? false,
+  autoconf,
+  hexdump,
+  perl,
+  python3,
+  gitMinimal,
 }:
 
-with import ./util.nix { inherit lib; };
-
 let
   prevName = pname;
   prevConfigFlags = configureFlags;
 
+  toBuildInputs = pkgArches: archPkgs: lib.concatLists (map archPkgs pkgArches);
+
   setupHookDarwin = makeSetupHook {
     name = "darwin-mingw-hook";
     substitutions = {
@@ -61,7 +68,15 @@ let
   badPlatforms = lib.optional (
     !supportFlags.mingwSupport || lib.any (flag: supportFlags.${flag}) darwinUnsupportedFlags
   ) "x86_64-darwin";
+
+  # Staging patches (from src.staging when useStaging is true)
+  stagingPatches = src.staging or null;
 in
+assert
+  useStaging
+  ->
+    stagingPatches != null
+    && lib.versions.majorMinor version == lib.versions.majorMinor stagingPatches.version;
 stdenv.mkDerivation (
   finalAttrs:
   lib.optionalAttrs (buildScript != null) { builder = buildScript; }
@@ -89,7 +104,14 @@ stdenv.mkDerivation (
 
     nativeBuildInputs =
       with supportFlags;
-      [
+      lib.optionals useStaging [
+        autoconf
+        hexdump
+        perl
+        python3
+        gitMinimal
+      ]
+      ++ [
         bison
         flex
         fontforge
@@ -101,9 +123,20 @@ stdenv.mkDerivation (
         mingwGccs ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin
       );
 
-    buildInputs = toBuildInputs pkgArches (
-      with supportFlags;
-      (
+    buildInputs =
+      lib.optionals useStaging (
+        toBuildInputs pkgArches (
+          pkgs:
+          [
+            pkgs.perl
+            pkgs.autoconf
+            pkgs.gitMinimal
+          ]
+          ++ lib.optional stdenv.hostPlatform.isLinux pkgs.util-linux
+        )
+      )
+      ++ toBuildInputs pkgArches (
+        with supportFlags;
         pkgs:
         [
           pkgs.freetype
@@ -191,11 +224,24 @@ stdenv.mkDerivation (
         ++ lib.optionals ffmpegSupport [
           pkgs.ffmpeg-headless
         ]
-      )
-    );
+      );
 
     inherit patches;
 
+    prePatch =
+      if !useStaging then
+        null
+      else
+        ''
+          patchShebangs tools
+          cp -r ${stagingPatches}/patches ${stagingPatches}/staging .
+          chmod +w patches
+          patchShebangs ./patches/gitapply.sh
+          python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${
+            lib.concatMapStringsSep " " (ps: "-W ${ps}") stagingPatches.disabledPatchsets
+          }
+        '';
+
     configureFlags =
       prevConfigFlags
       ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ]
@@ -291,7 +337,9 @@ stdenv.mkDerivation (
         fromSource
         binaryNativeCode # mono, gecko
       ];
-      description = "Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
+      description =
+        "Open Source implementation of the Windows API on top of X, OpenGL, and Unix"
+        + lib.optionalString useStaging " (with staging patches)";
       inherit badPlatforms platforms;
       maintainers = with lib.maintainers; [
         avnik
diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix
index acc89c0ee11a..55a4172b402a 100644
--- a/pkgs/applications/emulators/wine/default.nix
+++ b/pkgs/applications/emulators/wine/default.nix
@@ -100,10 +100,9 @@ let
     .${wineRelease} or null;
 in
 if baseRelease != null then
-  callPackage ./staging.nix {
-    wineUnstable = (wine-build wineBuild baseRelease).override {
-      inherit wineRelease;
-    };
+  (wine-build wineBuild baseRelease).override {
+    inherit wineRelease;
+    useStaging = true;
   }
 else
   wine-build wineBuild wineRelease
diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix
index c0dc9e9af2bb..b5d6942ae914 100644
--- a/pkgs/applications/emulators/wine/packages.nix
+++ b/pkgs/applications/emulators/wine/packages.nix
@@ -9,6 +9,12 @@
   moltenvk,
   wineRelease ? "stable",
   supportFlags,
+  # Staging native build deps
+  autoconf,
+  hexdump,
+  perl,
+  python3,
+  gitMinimal,
 }:
 
 let
@@ -25,6 +31,14 @@ with src;
       patches
       moltenvk
       wineRelease
+      # Forcing these `nativeBuildInputs` used in the `staging` to come
+      # from ambient `pkgs`, rather than being provided by
+      # `pkgsi686Linux.callPackage` for that platform.
+      autoconf
+      hexdump
+      perl
+      python3
+      gitMinimal
       ;
     pkgArches = [ pkgsi686Linux ];
     geckos = [ gecko32 ];
diff --git a/pkgs/applications/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix
deleted file mode 100644
index 74619c225eee..000000000000
--- a/pkgs/applications/emulators/wine/staging.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  lib,
-  stdenv,
-  callPackage,
-  autoconf,
-  hexdump,
-  perl,
-  python3,
-  wineUnstable,
-  gitMinimal,
-}:
-
-with callPackage ./util.nix { };
-
-let
-  patch = wineUnstable.src.staging;
-  build-inputs = pkgNames: extra: (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
-in
-assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version;
-
-wineUnstable.overrideAttrs (self: {
-  buildInputs = build-inputs (
-    [
-      "perl"
-      "autoconf"
-      "gitMinimal"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux "util-linux"
-  ) self.buildInputs;
-  nativeBuildInputs = [
-    autoconf
-    hexdump
-    perl
-    python3
-    gitMinimal
-  ]
-  ++ self.nativeBuildInputs;
-
-  prePatch = self.prePatch or "" + ''
-    patchShebangs tools
-    cp -r ${patch}/patches ${patch}/staging .
-    chmod +w patches
-    patchShebangs ./patches/gitapply.sh
-    python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${
-      lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets
-    }
-  '';
-})
-// {
-  meta = wineUnstable.meta // {
-    description = wineUnstable.meta.description + " (with staging patches)";
-  };
-}
diff --git a/pkgs/applications/emulators/wine/util.nix b/pkgs/applications/emulators/wine/util.nix
deleted file mode 100644
index 5eb27588f653..000000000000
--- a/pkgs/applications/emulators/wine/util.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ lib }:
-rec {
-  toPackages = pkgNames: pkgs: map (pn: lib.getAttr pn pkgs) pkgNames;
-  toBuildInputs = pkgArches: archPkgs: lib.concatLists (map archPkgs pkgArches);
-  mkBuildInputs = pkgArches: pkgNames: toBuildInputs pkgArches (toPackages pkgNames);
-}

From 8fe76aeb646682deaf2cd64e5cc7246f9b40d7c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 19:13:08 +0000
Subject: [PATCH 129/167] raffi: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix
index 75a81d6c690c..9cb051237013 100644
--- a/pkgs/by-name/ra/raffi/package.nix
+++ b/pkgs/by-name/ra/raffi/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "raffi";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "raffi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0Sx+NEDmBxv6ZfVVWzHLAW9a9MYLkUR8kudQEOE/Uu8=";
+    hash = "sha256-v+Y+x9DCxMDn8qtUmsq9c4Zbc5sG7mLX9Y1ZKgXcPEI=";
   };
 
-  cargoHash = "sha256-Q8RDsBBZy47VaCbMs5oqB/vYmZIIpUtpoUydV9awXuk=";
+  cargoHash = "sha256-uXZ3OWLGrYUzS5eailvMvWpr2eadvG/bIs2ZdO1WCSo=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From ce569b28643d470f4b1c7d557e239a103089b8e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 19:14:49 +0000
Subject: [PATCH 130/167] snakemake: 9.16.2 -> 9.16.3

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

diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index 5bf6bb6d2665..b1a837e1625d 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "9.16.2";
+  version = "9.16.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake";
     tag = "v${version}";
-    hash = "sha256-8pxl1GE30kM3wbbsgDnH1TKfVjQ6ZpFJ3980L7/Balk=";
+    hash = "sha256-+eEzpRY6ZEKB3v1/AkHDg4bOcM2Y6pt4UMrdKF6soac=";
   };
 
   postPatch = ''

From aba88fed15839f1e88171b5b35ad0624a0cd0888 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 19:15:18 +0000
Subject: [PATCH 131/167] pmtiles: 1.29.1 -> 1.30.0

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

diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix
index 2a60e9131a9c..42aca87d1e97 100644
--- a/pkgs/by-name/pm/pmtiles/package.nix
+++ b/pkgs/by-name/pm/pmtiles/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "pmtiles";
-  version = "1.29.1";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "protomaps";
     repo = "go-pmtiles";
     tag = "v${version}";
-    hash = "sha256-3MWrTqPoEwceOx7zoYOrsKArZKvPXhyaRp5gXVCLOzs=";
+    hash = "sha256-7Xkkna85ls5kRelar2DMf+U/4tCa9up/H+uuDJTXJr8=";
   };
 
   vendorHash = "sha256-UzpyvWsfbzYTngMdWU+fgZj/yQvSfJzhFWpFRsD24GE=";

From 46ce70b27cd7427add229600ca416669071534e6 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 5 Feb 2026 22:18:59 +0300
Subject: [PATCH 132/167] opencloud: 5.0.1 -> 5.0.2

Diff: https://github.com/opencloud-eu/opencloud/compare/v5.0.1...v5.0.2

Changelog: https://github.com/opencloud-eu/opencloud/blob/v5.0.2/CHANGELOG.md
---
 pkgs/by-name/op/opencloud/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix
index 14342ffd7b1a..ed9e107ebfb7 100644
--- a/pkgs/by-name/op/opencloud/package.nix
+++ b/pkgs/by-name/op/opencloud/package.nix
@@ -28,13 +28,13 @@ let
 in
 buildGoModule rec {
   pname = "opencloud";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "opencloud";
     tag = "v${version}";
-    hash = "sha256-q0K73j69ZzMK2IGHRt8nDaeLxubky62MyKnziNKHiMw=";
+    hash = "sha256-ncV7aPT56NNJawNLVuHfTlHMpXsW+3Rq/NEaTnoKz/c=";
   };
 
   postPatch = ''

From 72883634c4539fd6590d0e143747783eed49ed2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 13:06:21 +0000
Subject: [PATCH 133/167] wiki-js: 2.5.308 -> 2.5.311

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

diff --git a/pkgs/by-name/wi/wiki-js/package.nix b/pkgs/by-name/wi/wiki-js/package.nix
index ba04ef934f7d..1b8541c66be9 100644
--- a/pkgs/by-name/wi/wiki-js/package.nix
+++ b/pkgs/by-name/wi/wiki-js/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wiki-js";
-  version = "2.5.308";
+  version = "2.5.311";
 
   src = fetchurl {
     url = "https://github.com/Requarks/wiki/releases/download/v${version}/wiki-js.tar.gz";
-    sha256 = "sha256-DvMkzGET5UcnmWcBmhiFk4MictkE3LYa621QWxBu190=";
+    hash = "sha256-XNWJ2XyjTJmt+/Yjiu+w2nIZS9fqlyi11aiV5V4ekwI=";
   };
 
   # Unpack the tarball into a subdir. All the contents are copied into `$out`.

From 072fd71c7d1ef7581c3e11d801a664e255c47916 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 19:32:24 +0000
Subject: [PATCH 134/167] python3Packages.ytmusicapi: 1.11.4 -> 1.11.5

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

diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
index fd95125e5332..4854852bd10f 100644
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "ytmusicapi";
-  version = "1.11.4";
+  version = "1.11.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sigma67";
     repo = "ytmusicapi";
     tag = version;
-    hash = "sha256-BumEdKosAe6A0K6Im8gVNMW89iljlvgbKSEo60/DpYg=";
+    hash = "sha256-csTe1fxoqc2/sDIq/2aVFvhfdhHpXlCrMkPoxZtScnY=";
   };
 
   build-system = [ setuptools-scm ];

From e3e4fc5cd0e1e5f816d23977fd5be090012645e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 19:36:07 +0000
Subject: [PATCH 135/167] terraform-providers.okta_okta: 6.5.4 -> 6.5.5

---
 .../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 41afba93e27b..74fcc08659d7 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1004,13 +1004,13 @@
     "vendorHash": "sha256-ucXmHK7jrahc78nE2cf5p5PPCSNV5DAQ53KM2SfJnjo="
   },
   "okta_okta": {
-    "hash": "sha256-tihXPwZUyR8vfYRxbmzwrpbcyDxBoW+Zq//rr6CzqRc=",
+    "hash": "sha256-rWmlXxWijaaoeU7Yo4xeBFNfdt+Jd+Byt75Ah7dXkxI=",
     "homepage": "https://registry.terraform.io/providers/okta/okta",
     "owner": "okta",
     "repo": "terraform-provider-okta",
-    "rev": "v6.5.4",
+    "rev": "v6.5.5",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-V5eM87qIVpHofeM7uKEJREDPGSw7HIWja/JZOp5CnbA="
+    "vendorHash": "sha256-7oOk9M92RuEZbVdV4eVvgkF7pndR/QI3A5/ao3A8H2U="
   },
   "oktadeveloper_oktaasa": {
     "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",

From ccf48cf16b4595e90e893019317c7bed78804fe7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 5 Feb 2026 14:08:30 -0500
Subject: [PATCH 136/167] wine: Get rid of overcomplicated `overrride` dance in
 `default.nix`

The new logic is much easier to read, and (I hope!) better documented.

As an added bonus, replace with the `with src` with a more targeted `let
inherit`.
---
 pkgs/applications/emulators/wine/default.nix  | 19 +++-----------
 pkgs/applications/emulators/wine/packages.nix | 26 +++++++++++++++++--
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix
index 55a4172b402a..1d34ce36b5b1 100644
--- a/pkgs/applications/emulators/wine/default.nix
+++ b/pkgs/applications/emulators/wine/default.nix
@@ -49,10 +49,10 @@
 
 let
   wine-build =
-    build: release:
+    build:
     lib.getAttr build (
       callPackage ./packages.nix {
-        wineRelease = release;
+        inherit wineRelease;
         supportFlags = {
           inherit
             alsaSupport
@@ -91,18 +91,5 @@ let
         inherit moltenvk;
       }
     );
-
-  baseRelease =
-    {
-      staging = "unstable";
-      yabridge = "yabridge";
-    }
-    .${wineRelease} or null;
 in
-if baseRelease != null then
-  (wine-build wineBuild baseRelease).override {
-    inherit wineRelease;
-    useStaging = true;
-  }
-else
-  wine-build wineBuild wineRelease
+wine-build wineBuild
diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix
index b5d6942ae914..6070c68b64c2 100644
--- a/pkgs/applications/emulators/wine/packages.nix
+++ b/pkgs/applications/emulators/wine/packages.nix
@@ -18,9 +18,27 @@
 }:
 
 let
-  src = lib.getAttr wineRelease (callPackage ./sources.nix { });
+  sources = callPackage ./sources.nix { };
+
+  # "staging" of course enables staging, but for "yabridge" we do too
+  # --- we are not interested in yabridge without the staging patches
+  # applied.
+  useStaging = wineRelease == "staging" || wineRelease == "yabridge";
+
+  # Map wineRelease to actual source. Many versions have a "staging"
+  # variant, but when we say "staging", the version we want to use is
+  # "unstable".
+  baseRelease = if wineRelease == "staging" then "unstable" else wineRelease;
+
+  src = lib.getAttr baseRelease (callPackage ./sources.nix { });
+  inherit (src)
+    version
+    patches
+    gecko32
+    gecko64
+    mono
+    ;
 in
-with src;
 {
   wine32 = pkgsi686Linux.callPackage ./base.nix {
     pname = "wine";
@@ -31,6 +49,7 @@ with src;
       patches
       moltenvk
       wineRelease
+      useStaging
       # Forcing these `nativeBuildInputs` used in the `staging` to come
       # from ambient `pkgs`, rather than being provided by
       # `pkgsi686Linux.callPackage` for that platform.
@@ -58,6 +77,7 @@ with src;
       patches
       moltenvk
       wineRelease
+      useStaging
       ;
     pkgArches = [ pkgs ];
     mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
@@ -79,6 +99,7 @@ with src;
       patches
       moltenvk
       wineRelease
+      useStaging
       ;
     stdenv = stdenv_32bit;
     pkgArches = [
@@ -112,6 +133,7 @@ with src;
       patches
       moltenvk
       wineRelease
+      useStaging
       ;
     supportFlags = supportFlags // {
       mingwSupport = true;

From f3894b7238f2f2c9172b5ca0859b426a9ab918d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 19:49:07 +0000
Subject: [PATCH 137/167] autoprefixer: 10.4.23 -> 10.4.24

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

diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix
index 8958d3d958b7..01adf38abd5c 100644
--- a/pkgs/by-name/au/autoprefixer/package.nix
+++ b/pkgs/by-name/au/autoprefixer/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "autoprefixer";
-  version = "10.4.23";
+  version = "10.4.24";
 
   src = fetchFromGitHub {
     owner = "postcss";
     repo = "autoprefixer";
     rev = finalAttrs.version;
-    hash = "sha256-sz4tE0WqSHJ4ExJ0yL24mTux5/eGuhIyKyrZqs4hSxQ=";
+    hash = "sha256-9XZWkBDqkaBbIHq3wIbo4neToPM+NCxi9c1AyVqmnvc=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 1;
-    hash = "sha256-xPG67b54h+KmDrCgMmTVVVnBah9L6rgjh+EWnEzzI0w=";
+    hash = "sha256-fyygZMpRMm5tL5/kpERKXUNA9qqDt6ZkzT4zWtqQSv8=";
   };
 
   installPhase = ''

From 13b5e194fde08a2cdccab1f8aed56f0a0ed5c85f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Dec 2025 12:56:56 +0000
Subject: [PATCH 138/167] sipp: 3.7.5 -> 3.7.7

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

diff --git a/pkgs/by-name/si/sipp/package.nix b/pkgs/by-name/si/sipp/package.nix
index 5853b7c021fd..74930f27f569 100644
--- a/pkgs/by-name/si/sipp/package.nix
+++ b/pkgs/by-name/si/sipp/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sipp";
-  version = "3.7.5";
+  version = "3.7.7";
 
   src = fetchFromGitHub {
     owner = "SIPp";
     repo = "sipp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W5KOvBBaUmyYJshYEg39QpkS8rrpGSEj4g3NZD29YrY=";
+    hash = "sha256-1JKKD3rEddCzXrbNpbzvhFXlTlkTXlP7vmRXvlGzkgI=";
   };
 
   postPatch = ''

From ef2ed476e1146e4f7e91b4072090a10fb4ecd706 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 15:38:46 -0500
Subject: [PATCH 139/167] mpvScripts: remove meta = with lib;

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/mp/mpv/scripts/cut.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mp/mpv/scripts/cut.nix b/pkgs/by-name/mp/mpv/scripts/cut.nix
index 592afadcb1e5..d5d59b14bea6 100644
--- a/pkgs/by-name/mp/mpv/scripts/cut.nix
+++ b/pkgs/by-name/mp/mpv/scripts/cut.nix
@@ -29,10 +29,10 @@ stdenvNoCC.mkDerivation {
 
   passthru.scriptName = "cut.lua";
 
-  meta = with lib; {
+  meta = {
     description = "An mpv plugin for cutting videos incredibly quickly";
     homepage = "https://github.com/familyfriendlymikey/mpv-cut";
-    license = licenses.unfree; # the repository doesn't have a license
-    maintainers = with maintainers; [ ncfavier ];
+    license = lib.licenses.unfree; # the repository doesn't have a license
+    maintainers = with lib.maintainers; [ ncfavier ];
   };
 }

From 26829ce5f3c65e3bbf4218a8eab8ef7968a53cf1 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 15:42:57 -0500
Subject: [PATCH 140/167] phantom: remove meta = with lib;

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ph/phantom/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ph/phantom/package.nix b/pkgs/by-name/ph/phantom/package.nix
index 75325e55c0dd..ecb6a120f06b 100644
--- a/pkgs/by-name/ph/phantom/package.nix
+++ b/pkgs/by-name/ph/phantom/package.nix
@@ -41,12 +41,12 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Markdown editor with support for multi-tab";
     homepage = "https://codeberg.org/ItsZariep/Phantom";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "phantom";
-    platforms = platforms.all;
-    maintainers = with maintainers; [ reylak ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ reylak ];
   };
 }

From a2e055ea72f03060230cd15fabc750c4ac2e6ad6 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 15:43:23 -0500
Subject: [PATCH 141/167] opentxl: remove meta = with lib;

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/op/opentxl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opentxl/package.nix b/pkgs/by-name/op/opentxl/package.nix
index 277be7f19c99..790eae5a7d23 100644
--- a/pkgs/by-name/op/opentxl/package.nix
+++ b/pkgs/by-name/op/opentxl/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.tests.factorial = callPackage ./factorial-test.nix { opentxl = finalAttrs.finalPackage; };
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source compiler for the Txl language";
     mainProgram = "txl";
     platforms = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/CordyJ/OpenTxl";
     downloadPage = "https://github.com/CordyJ/OpenTxl/releases";
     changelog = "https://github.com/CordyJ/OpenTxl/releases/tag/v${finalAttrs.version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ MysteryBlokHed ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ MysteryBlokHed ];
   };
 })

From f1871baee4d4a700f56914dfdca95d4643284a01 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 15:43:53 -0500
Subject: [PATCH 142/167] opencode-desktop: remove meta = with lib;

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/op/opencode-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix
index 085ff3fb8567..4e49e03d8919 100644
--- a/pkgs/by-name/op/opencode-desktop/package.nix
+++ b/pkgs/by-name/op/opencode-desktop/package.nix
@@ -79,11 +79,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cp ${opencode}/bin/opencode packages/desktop/src-tauri/sidecars/opencode-cli-${stdenv.hostPlatform.rust.rustcTarget}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "AI coding agent desktop client";
     homepage = "https://opencode.ai";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       xiaoxiangmoe
     ];
     mainProgram = "OpenCode";

From c4d431a697a1b48c57032f983934fd48568a3c0a Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 15:44:56 -0500
Subject: [PATCH 143/167] libfprint-2-tod1-broadcom-cv3plus: remove meta = with
 lib;

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../li/libfprint-2-tod1-broadcom-cv3plus/package.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libfprint-2-tod1-broadcom-cv3plus/package.nix b/pkgs/by-name/li/libfprint-2-tod1-broadcom-cv3plus/package.nix
index 623c2ad82f99..4d47843ea426 100644
--- a/pkgs/by-name/li/libfprint-2-tod1-broadcom-cv3plus/package.nix
+++ b/pkgs/by-name/li/libfprint-2-tod1-broadcom-cv3plus/package.nix
@@ -77,15 +77,15 @@ stdenv.mkDerivation {
 
   passthru.driverPath = "/lib/libfprint-2/tod-1";
 
-  meta = with lib; {
+  meta = {
     description = "Broadcom driver module for libfprint-2-tod Touch OEM Driver for Dell ControlVault v3+";
     homepage = "https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/libfprint-2-tod1-broadcom-cv3plus/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       aionescu
       pitkling
     ];
     platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 }

From 197cd394b863ec78ebcc444c3a00a3b3f30011d7 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 15:45:44 -0500
Subject: [PATCH 144/167] vikunja-desktop: remove meta = with lib;

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/vi/vikunja-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vikunja-desktop/package.nix b/pkgs/by-name/vi/vikunja-desktop/package.nix
index 0e478625d529..d99641f30eec 100644
--- a/pkgs/by-name/vi/vikunja-desktop/package.nix
+++ b/pkgs/by-name/vi/vikunja-desktop/package.nix
@@ -112,10 +112,10 @@ stdenv.mkDerivation (finalAttrs: {
     ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Desktop App of the Vikunja to-do list app";
     homepage = "https://vikunja.io/";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ kolaente ];
     mainProgram = "vikunja-desktop";
     inherit (electron.meta) platforms;

From 87fb84856394517edd1e1c673c49e1c17c58f171 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 15:46:19 -0500
Subject: [PATCH 145/167] sqlauncher: remove meta = with lib;

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/sq/sqlauncher/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sq/sqlauncher/package.nix b/pkgs/by-name/sq/sqlauncher/package.nix
index fc514e4c048f..2fe2bb349dbe 100644
--- a/pkgs/by-name/sq/sqlauncher/package.nix
+++ b/pkgs/by-name/sq/sqlauncher/package.nix
@@ -36,12 +36,12 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple QT6 Program Launcher";
     homepage = "https://codeberg.org/ItsZariep/SQLauncher";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "sqlauncher";
-    platforms = platforms.linux;
-    maintainers = [ maintainers.reylak ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.reylak ];
   };
 }

From b0e30e64e4ac13524d7c4e29646f8f10893785a3 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 15:47:18 -0500
Subject: [PATCH 146/167] turingplus: remove meta = with lib;

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/tu/turingplus/bootstrap.nix | 8 ++++----
 pkgs/by-name/tu/turingplus/package.nix   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/tu/turingplus/bootstrap.nix b/pkgs/by-name/tu/turingplus/bootstrap.nix
index 074b6d52c7d7..5f4cf44bdb58 100644
--- a/pkgs/by-name/tu/turingplus/bootstrap.nix
+++ b/pkgs/by-name/tu/turingplus/bootstrap.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
         --set NIX_ENFORCE_PURITY 0
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Extended version of the Turing programming language with concurrency and systems programming features";
     mainProgram = "tpc";
     platforms = [
@@ -86,8 +86,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/CordyJ/Open-TuringPlus";
     downloadPage = "https://github.com/CordyJ/Open-TuringPlus/releases";
     changelog = "https://github.com/CordyJ/Open-TuringPlus/releases/tag/v${finalAttrs.version}";
-    license = licenses.mit;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ MysteryBlokHed ];
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ MysteryBlokHed ];
   };
 })
diff --git a/pkgs/by-name/tu/turingplus/package.nix b/pkgs/by-name/tu/turingplus/package.nix
index 10cad49005a7..1f5fa93451bf 100644
--- a/pkgs/by-name/tu/turingplus/package.nix
+++ b/pkgs/by-name/tu/turingplus/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Extended version of the Turing programming language with concurrency and systems programming features";
     mainProgram = "tpc";
     platforms = [
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/CordyJ/Open-TuringPlus";
     downloadPage = "https://github.com/CordyJ/Open-TuringPlus/releases";
     changelog = "https://github.com/CordyJ/Open-TuringPlus/releases/tag/v${finalAttrs.version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ MysteryBlokHed ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ MysteryBlokHed ];
   };
 })

From fa7d2ac87ac773bc3cd2adf48445093d5c515c7f Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@gmail.com>
Date: Thu, 5 Feb 2026 22:03:36 +0100
Subject: [PATCH 147/167] burpsuite: chrome hardware acceleration fix

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

diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index 87c5dec4e0af..9b59be0c76ba 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -73,6 +73,7 @@ buildFHSEnv {
       udev
       libxkbcommon
       libgbm
+      libglvnd
       nspr
       nss
       pango

From 1d5af748e3492b09e597fcdfaaf2db5c995c020e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 21:10:56 +0000
Subject: [PATCH 148/167] alistral: 0.6.5 -> 0.6.6

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

diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix
index 5fae411a7640..a40ee4ae233b 100644
--- a/pkgs/by-name/al/alistral/package.nix
+++ b/pkgs/by-name/al/alistral/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alistral";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "RustyNova016";
     repo = "Alistral";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X+yTt/oaV0ev0yexTcS0egcv0SQHFMysqSNEhZgikV0=";
+    hash = "sha256-b6htcjBdh4E9cCUw4ETl3AnmMO3yT6654PLKIGPOPlo=";
   };
 
-  cargoHash = "sha256-XFBBtTF9V5l2CIyCRbvJqNkbPAT+Yi6PtnN1hjpKrsI=";
+  cargoHash = "sha256-Udbf0h8XZ8uD7MLTNRKaIJ8AdTvzq1dDQKPXWXunR/w=";
 
   buildNoDefaultFeatures = true;
   # Would be cleaner with an "--all-features" option

From 4a57974db809e8bef6550c8e8b6fafd743d8b18c Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 11:46:52 -0500
Subject: [PATCH 149/167] dub-to-nix: set pname, version

In an effort to set pname + version for all packages

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/build-support/dlang/dub-to-nix/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/dlang/dub-to-nix/default.nix b/pkgs/build-support/dlang/dub-to-nix/default.nix
index 87db7eed0933..ca947e7f6050 100644
--- a/pkgs/build-support/dlang/dub-to-nix/default.nix
+++ b/pkgs/build-support/dlang/dub-to-nix/default.nix
@@ -15,6 +15,8 @@ let
 in
 runCommand "dub-to-nix"
   {
+    pname = "dub-to-nix";
+    version = lib.trivial.version;
     nativeBuildInputs = [ makeWrapper ];
     buildInputs = [ python3 ];
   }

From 997556c11ac6908ac5c3376251dc55738b7f371b Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 5 Feb 2026 11:51:07 -0500
Subject: [PATCH 150/167] hello-cpp: set pname, version

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/he/hello-cpp/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/he/hello-cpp/package.nix b/pkgs/by-name/he/hello-cpp/package.nix
index e8391645f934..0d17f17ad7e5 100644
--- a/pkgs/by-name/he/hello-cpp/package.nix
+++ b/pkgs/by-name/he/hello-cpp/package.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "hello-cpp";
+  pname = "hello-cpp";
+  version = lib.trivial.version;
   src = ./src;
   nativeBuildInputs = [
     cmake

From 45ca1b414cc2d4887a0de8fe320ef5736db44d99 Mon Sep 17 00:00:00 2001
From: William Fish <william.michael.fish@gmail.com>
Date: Thu, 5 Feb 2026 21:19:01 +0000
Subject: [PATCH 151/167] maintainers: add email for willfish

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f12146861833..e7cf343c9946 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28298,6 +28298,7 @@
     name = "Will Cohen";
   };
   willfish = {
+    email = "willfish@pescado.mozmail.com";
     github = "willfish";
     githubId = 8156884;
     name = "William Fish";

From 9f89865a59d5bc7f36d2abf44f8eac81d605196d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Feb 2026 22:46:33 +0100
Subject: [PATCH 152/167] python312Packages.mypy-boto3-athena: 1.42.3 ->
 1.42.43

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3191120f96df..8dd82cf7c154 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -139,8 +139,8 @@ in
       "sha256-9GHZy/GvevYqzWoY9ubb+/8P33SMvNUurg9WsUq82ls=";
 
   mypy-boto3-athena =
-    buildMypyBoto3Package "athena" "1.42.3"
-      "sha256-+XScvF3ZrTdLnbZ0hhURO/tvTVRWOcBwNL3JvHUfwq8=";
+    buildMypyBoto3Package "athena" "1.42.43"
+      "sha256-1IGcRscPDjjEn/7129vTl8jWakc/jBsRawOhxFq/66c=";
 
   mypy-boto3-auditmanager =
     buildMypyBoto3Package "auditmanager" "1.42.3"

From a2036e51c127e193776a4cc9327531b309cf5dec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Feb 2026 22:47:04 +0100
Subject: [PATCH 153/167] python312Packages.mypy-boto3-glue: 1.42.25 -> 1.42.43

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 8dd82cf7c154..06c0d5d7102b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -571,8 +571,8 @@ in
       "sha256-N0kQ7Fc44SFKXhl4V+oAclPNlWhluOs53NDokiXcSNM=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.42.25"
-      "sha256-wzYmHUL7I6KOi7PxXk/bUqkSEWD14hkICD+dLo1Gkrs=";
+    buildMypyBoto3Package "glue" "1.42.43"
+      "sha256-PBFrSU7QbOuaU5kWjYe6eA8k9BHdAZUuD3jMYLlFwF0=";
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.42.3"
       "sha256-wVeFhJIXV8wFQpCizH8IUh6JAFg+S67aTR60dqWk/3M=";

From 39869ced03c281dda14ace12e9fe01cadf866804 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Feb 2026 22:47:37 +0100
Subject: [PATCH 154/167] python312Packages.mypy-boto3-medialive: 1.42.42 ->
 1.42.43

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 06c0d5d7102b..581b33723097 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -862,8 +862,8 @@ in
       "sha256-Z+TiVg/mjr0vTU+awHlS7GCynOeSl+IPl0n9GaLTsYE=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.42.42"
-      "sha256-Dd+4rZcLa6mnVHVXt30ty1Cl56bH+TC/93ZzzOX0SOQ=";
+    buildMypyBoto3Package "medialive" "1.42.43"
+      "sha256-gDG9tW/b6kg1GYeKNV3rD5Jco5+Si1xrvn9VQpAkZrM=";
 
   mypy-boto3-mediapackage =
     buildMypyBoto3Package "mediapackage" "1.42.3"

From bceb5e23edb904c7d5163e6cd790f7c154fa6556 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Feb 2026 22:47:52 +0100
Subject: [PATCH 155/167] python312Packages.mypy-boto3-ram: 1.42.3 -> 1.42.43

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 581b33723097..3503c43809d1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1074,8 +1074,8 @@ in
       "sha256-q7GExVZQ4fHaCZ/xcFKUg09DH079zesCaqFB9KMr+eI=";
 
   mypy-boto3-ram =
-    buildMypyBoto3Package "ram" "1.42.3"
-      "sha256-Lk7eFLA/9yJkEdu0YML192R3pKdIe5hm0cQfKsugl3U=";
+    buildMypyBoto3Package "ram" "1.42.43"
+      "sha256-FpciTe6Hh8CMVneGk5dBHYHsUsOU8rikKReiH90BMaY=";
 
   mypy-boto3-rbin =
     buildMypyBoto3Package "rbin" "1.42.3"

From 5abd3aafd9f2b92df7ca4162215514e500095082 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Feb 2026 22:48:13 +0100
Subject: [PATCH 156/167] python312Packages.mypy-boto3-transfer: 1.42.3 ->
 1.42.43

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3503c43809d1..6a1be9d6a0ee 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1366,8 +1366,8 @@ in
       "sha256-RQkxMKk7svSYMoPac44m9X0YyEEQWCz/geSRD2qjlI8=";
 
   mypy-boto3-transfer =
-    buildMypyBoto3Package "transfer" "1.42.3"
-      "sha256-/ehkFniPKAPY5m1ijVnJhVccUgIbY5vnYGgv7E9TPhs=";
+    buildMypyBoto3Package "transfer" "1.42.43"
+      "sha256-rGnE1SfoFMgojEeHIz9kk3a76El0wccnm+4m2Cl1+hE=";
 
   mypy-boto3-translate =
     buildMypyBoto3Package "translate" "1.42.3"

From 31965d05221974c85affce0df9cb7d7687ddb314 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Feb 2026 22:48:18 +0100
Subject: [PATCH 157/167] python312Packages.mypy-boto3-workspaces: 1.42.24 ->
 1.42.43

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 6a1be9d6a0ee..00e6ca7d3bb1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1422,8 +1422,8 @@ in
       "sha256-bxh+mhwsHHwt/cx/njegTa/QGHu+xa7YPg4SRos1deM=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.42.24"
-      "sha256-M+FLFC+5NZyLL9opOIIqXF6H5g3YvbqHJ4rpDKL0uKw=";
+    buildMypyBoto3Package "workspaces" "1.42.43"
+      "sha256-uZ/xdc5xCp0Kb+5LlHGEyo+iBB1iWB7Jo9szx+aY4SQ=";
 
   mypy-boto3-workspaces-web =
     buildMypyBoto3Package "workspaces-web" "1.42.42"

From 4f7b1f6a3230248f236180012cff0db4a8f59509 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Feb 2026 22:48:26 +0100
Subject: [PATCH 158/167] python314Packages.boto3-stubs: 1.42.42 -> 1.42.43

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index dd764a0d7656..ec50e1f07ddd 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.42.42";
+  version = "1.42.43";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-TQXMsLbQPCxekCcsHFjk6HVlGwiODuG+YYu0HggrhTA=";
+    hash = "sha256-+TaFk0tiRRQiKXGvSNSZfvqLeXus+WrRIZsyf2RZoic=";
   };
 
   build-system = [ setuptools ];

From 6d285780eaf6b1d031b7c3da6762513c483514cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 21:56:41 +0000
Subject: [PATCH 159/167] cnspec: 12.20.1 -> 12.21.0

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

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 4e8a271f62c4..1516f6ea7450 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "cnspec";
-  version = "12.20.1";
+  version = "12.21.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tckUExRppqjpO2yS4J/+8w8SE4b6zKWjFY6xlpVFcKE=";
+    hash = "sha256-MxdCYUxPKRwnZuoBBI6CB6vAansojfdQ0aiBpZiYnHw=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-z6Y4d76TaormYbtstm1uytfXGfoHQ+9/6bw6uyRYsP8=";
+  vendorHash = "sha256-y1IXxytA5n1m8qOhZiZ7X1O7qJlx7Q+VCuox53miX2M=";
 
   subPackages = [ "apps/cnspec" ];
 

From c592e23b8474be8984b0fe9315d78bc5896f4e70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 22:09:15 +0000
Subject: [PATCH 160/167] beszel: 0.18.2 -> 0.18.3

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

diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix
index 5d87c316e8fd..bf90aba94d43 100644
--- a/pkgs/by-name/be/beszel/package.nix
+++ b/pkgs/by-name/be/beszel/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "beszel";
-  version = "0.18.2";
+  version = "0.18.3";
 
   src = fetchFromGitHub {
     owner = "henrygd";
     repo = "beszel";
     tag = "v${version}";
-    hash = "sha256-7jXhlstGuQc3EP4fm5k9FD22nge0ecXVZAk8mXdyKc0=";
+    hash = "sha256-/rFVH3kWf9OB3/iJNOARG85y1WH03hW8LvsIRzq1vnU=";
   };
 
   webui = buildNpmPackage {
@@ -48,10 +48,10 @@ buildGoModule rec {
 
     sourceRoot = "${src.name}/internal/site";
 
-    npmDepsHash = "sha256-Ks78fCJeHoLCImkyEHo1fSRJqIOEEvL6Zyydpy5LlTw=";
+    npmDepsHash = "sha256-509/n5OH4z6LZH+jlmDLl2DlqKrD7M5ajtalmF/4n1o=";
   };
 
-  vendorHash = "sha256-OnCX/0DGtkcACuWxGfIreS6SSx9dKq+feWKSymtkABs=";
+  vendorHash = "sha256-O5gFpQ90AQFSAidPTWPrODZ4LWuwrOMpzEH/8HrjBig=";
 
   preBuild = ''
     mkdir -p internal/site/dist

From 73fa69908c3791a0328f13012075a8bf563329eb Mon Sep 17 00:00:00 2001
From: langsjo <104687438+langsjo@users.noreply.github.com>
Date: Thu, 5 Feb 2026 13:32:55 +0200
Subject: [PATCH 161/167] torcs: split compilation and installing data into
 separate derivations

This allows for the compilation result of the package to be built and
cached by Hydra, while not needing to keep all the data of the package
in the cache.
---
 pkgs/by-name/to/torcs/package.nix      | 109 +++++++++----------------
 pkgs/by-name/to/torcs/without-data.nix |  74 +++++++++++++++++
 pkgs/top-level/all-packages.nix        |   2 +
 3 files changed, 114 insertions(+), 71 deletions(-)
 create mode 100644 pkgs/by-name/to/torcs/without-data.nix

diff --git a/pkgs/by-name/to/torcs/package.nix b/pkgs/by-name/to/torcs/package.nix
index 7912a04c0d88..e35e35932e0b 100644
--- a/pkgs/by-name/to/torcs/package.nix
+++ b/pkgs/by-name/to/torcs/package.nix
@@ -1,84 +1,51 @@
 {
-  fetchpatch,
-  fetchurl,
-  lib,
   stdenv,
-  libGLU,
-  libglut,
-  libX11,
-  plib,
-  openal,
-  freealut,
-  libXrandr,
-  xorgproto,
-  libXext,
-  libsm,
-  libice,
-  libXi,
-  libXt,
-  libXrender,
-  libXxf86vm,
-  libvorbis,
-  libpng,
-  zlib,
-  makeWrapper,
+  symlinkJoin,
+  torcs-without-data,
 }:
+let
+  # This package is split into two parts because the complete package includes
+  # the game data, which takes up a lot of space and is not worth serving from
+  # the official cache. The compiled program gets built by Hydra and cached,
+  # while the game data does not and gets handled locally instead.
+  torcs-data = stdenv.mkDerivation (finalAttrs: {
+    pname = "torcs-data";
+    inherit (torcs-without-data)
+      version
+      src
+      buildInputs
+      ;
 
-stdenv.mkDerivation (finalAttrs: {
+    dontBuild = true;
+
+    installTargets = "export datainstall";
+    postInstall = ''
+      install -D -m644 Ticon.png $out/share/pixmaps/torcs.png
+      install -D -m644 torcs.desktop $out/share/applications/torcs.desktop
+    '';
+
+    meta.hydraPlatforms = [ ];
+  });
+in
+symlinkJoin {
   pname = "torcs";
-  version = "1.3.8";
+  inherit (torcs-without-data)
+    version
+    ;
 
-  src = fetchurl {
-    url = "mirror://sourceforge/torcs/torcs-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-S5Z3NUX7NkEZgqbziXIF64/VciedTOVp8s4HsI6Jp68=";
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/format-argument.patch";
-      sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja";
-    })
+  paths = [
+    torcs-without-data
+    torcs-data
   ];
 
-  postInstall = ''
-    install -D -m644 Ticon.png $out/share/pixmaps/torcs.png
-    install -D -m644 torcs.desktop $out/share/applications/torcs.desktop
+  postBuild = ''
+    cp --remove-destination $(realpath $out/bin/torcs) $out/bin/torcs
+    substituteInPlace $out/bin/torcs \
+      --replace-fail "${torcs-without-data}" "$out"
   '';
 
-  postPatch = ''
-    sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in
-  '';
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [
-    libGLU
-    libglut
-    libX11
-    plib
-    openal
-    freealut
-    libXrandr
-    xorgproto
-    libXext
-    libsm
-    libice
-    libXi
-    libXt
-    libXrender
-    libXxf86vm
-    libpng
-    zlib
-    libvorbis
-  ];
-
-  installTargets = "install datainstall";
-
-  meta = {
+  meta = torcs-without-data.meta // {
     description = "Car racing game";
-    homepage = "https://torcs.sourceforge.net/";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ pixel-87 ];
-    platforms = lib.platforms.linux;
     hydraPlatforms = [ ];
   };
-})
+}
diff --git a/pkgs/by-name/to/torcs/without-data.nix b/pkgs/by-name/to/torcs/without-data.nix
new file mode 100644
index 000000000000..05634a1b7d71
--- /dev/null
+++ b/pkgs/by-name/to/torcs/without-data.nix
@@ -0,0 +1,74 @@
+{
+  fetchpatch,
+  fetchurl,
+  lib,
+  stdenv,
+  libGLU,
+  libglut,
+  libX11,
+  plib,
+  openal,
+  freealut,
+  libXrandr,
+  xorgproto,
+  libXext,
+  libsm,
+  libice,
+  libXi,
+  libXt,
+  libXrender,
+  libXxf86vm,
+  libvorbis,
+  libpng,
+  zlib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "torcs-without-data";
+  version = "1.3.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/torcs/torcs-${finalAttrs.version}.tar.bz2";
+    sha256 = "sha256-S5Z3NUX7NkEZgqbziXIF64/VciedTOVp8s4HsI6Jp68=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/format-argument.patch";
+      sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja";
+    })
+  ];
+
+  postPatch = ''
+    sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in
+  '';
+
+  buildInputs = [
+    libGLU
+    libglut
+    libX11
+    plib
+    openal
+    freealut
+    libXrandr
+    xorgproto
+    libXext
+    libsm
+    libice
+    libXi
+    libXt
+    libXrender
+    libXxf86vm
+    libpng
+    zlib
+    libvorbis
+  ];
+
+  meta = {
+    description = "Car racing game (does not come with the game data required to run)";
+    homepage = "https://torcs.sourceforge.net/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ pixel-87 ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 968fec3c04b1..1a94717248bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12983,6 +12983,8 @@ with pkgs;
 
   tora = libsForQt5.callPackage ../development/tools/tora { };
 
+  torcs-without-data = callPackage ../../pkgs/by-name/to/torcs/without-data.nix { };
+
   nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };
 
   nitrokey-app2 = python3Packages.callPackage ../tools/security/nitrokey-app2 { };

From 16eae2919665cbb3082e77b74f8f3942c8047b38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 22:31:21 +0000
Subject: [PATCH 162/167] python3Packages.busypie: 0.5.2 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/busypie/default.nix b/pkgs/development/python-modules/busypie/default.nix
index 788d833dd7c8..3e03c55fc548 100644
--- a/pkgs/development/python-modules/busypie/default.nix
+++ b/pkgs/development/python-modules/busypie/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "busypie";
-  version = "0.5.2";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rockem";
     repo = "busypie";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LaPgK36ieHKAbm9btx6t//dMdSGdzcaDJVou96D6J3U=";
+    hash = "sha256-dw0Sc/a27/EYY7LVMQqDkYuxrUFYK+N6XLk6A7A/eS8=";
   };
 
   postPatch = ''

From f53e69e34656ce19ca2cbe45ba2edde03420c29b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 22:34:15 +0000
Subject: [PATCH 163/167] terraform-providers.rootlyhq_rootly: 5.5.0 -> 5.5.1

---
 .../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 41afba93e27b..46713900db40 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1130,11 +1130,11 @@
     "vendorHash": "sha256-33NOGIvqLpgndG68GxAeoiISjWV7ApR4jmvqyZHjPKo="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-DtyllGs7VDeX57mQ5sBP6obEzeTatlYw3Z8SEC29RQ4=",
+    "hash": "sha256-9FpwNJpIlg8OWLsfPigiSbJXYIJIR2uRTqClJNSsQ7k=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v5.5.0",
+    "rev": "v5.5.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-UyfCHBSdGKCulExhUdYfvEab8cVjaHGDfgslRS0d1Co="
   },

From 443434b81e3292803ae7f1934cca6e6971a8a719 Mon Sep 17 00:00:00 2001
From: bitbloxhub <45184892+bitbloxhub@users.noreply.github.com>
Date: Thu, 5 Feb 2026 23:01:06 +0000
Subject: [PATCH 164/167] vimPlugins.qfctl-nvim: init at 0-unstable-2026-01-07

https://github.com/marcelbeumer/qfctl.nvim
---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 82b9e4d9c192..d679909fe41b 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -13453,6 +13453,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  qfctl-nvim = buildVimPlugin {
+    pname = "qfctl.nvim";
+    version = "0-unstable-2026-01-07";
+    src = fetchFromGitHub {
+      owner = "marcelbeumer";
+      repo = "qfctl.nvim";
+      rev = "c7779de59f61c2474f594a6e11ddbbff338d9e3f";
+      hash = "sha256-uNToBV6iYuRrWsd7Rs2Q/4VZ/mgmg7PipIVO2YVMqBE=";
+    };
+    meta.homepage = "https://github.com/marcelbeumer/qfctl.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   qmk-nvim = buildVimPlugin {
     pname = "qmk.nvim";
     version = "1.0.0-unstable-2025-06-22";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 8df1014f41c5..2508344be1c9 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1033,6 +1033,7 @@ https://github.com/purescript-contrib/purescript-vim/,,
 https://github.com/python-mode/python-mode/,,
 https://github.com/vim-python/python-syntax/,,
 https://github.com/AlphaTechnolog/pywal.nvim/,,
+https://github.com/marcelbeumer/qfctl.nvim/,HEAD,
 https://github.com/codethread/qmk.nvim/,HEAD,
 https://github.com/quarto-dev/quarto-nvim/,,
 https://github.com/unblevable/quick-scope/,,

From 36a8284c406533d47401a2625612b6fae539e7bb Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 Jan 2026 16:17:47 -0800
Subject: [PATCH 165/167] python314Packages.uqbar: disable failing tests on
 python 3.14

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

diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix
index 3de66296c37c..0e0c0ad38680 100644
--- a/pkgs/development/python-modules/uqbar/default.nix
+++ b/pkgs/development/python-modules/uqbar/default.nix
@@ -63,6 +63,11 @@ buildPythonPackage rec {
   ++ lib.optional (pythonAtLeast "3.12") [
     # https://github.com/josiah-wolf-oberholtzer/uqbar/issues/93
     "objects.get_vars"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    # https://github.com/josiah-wolf-oberholtzer/uqbar/issues/106
+    "test_04"
+    "SummarizingClassDocumenter"
   ];
 
   pythonImportsCheck = [ "uqbar" ];

From d9eca2cf83ee3e95323c63177d0af7d2ec4e7832 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 2 Feb 2026 09:09:12 -0800
Subject: [PATCH 166/167] python3Packages.uqbar: build from GitHub

---
 .../python-modules/uqbar/default.nix           | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix
index 0e0c0ad38680..b1c14bc8756a 100644
--- a/pkgs/development/python-modules/uqbar/default.nix
+++ b/pkgs/development/python-modules/uqbar/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
   pytest-asyncio,
   pythonAtLeast,
@@ -17,9 +17,11 @@ buildPythonPackage rec {
   version = "0.9.6";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-BaycnI00SgZzpvHPueXAAzV/yWDJEeaViWRSZkJofaY=";
+  src = fetchFromGitHub {
+    owner = "supriya-project";
+    repo = "uqbar";
+    tag = "v${version}";
+    hash = "sha256-1rK40lwZ3YmQZXhia2+iYRZxDCYvijXgBMIL5p7KmR0=";
   };
 
   postPatch = ''
@@ -61,11 +63,11 @@ buildPythonPackage rec {
     "test_sphinx_style"
   ]
   ++ lib.optional (pythonAtLeast "3.12") [
-    # https://github.com/josiah-wolf-oberholtzer/uqbar/issues/93
+    # https://github.com/supriya-project/uqbar/issues/93
     "objects.get_vars"
   ]
   ++ lib.optionals (pythonAtLeast "3.14") [
-    # https://github.com/josiah-wolf-oberholtzer/uqbar/issues/106
+    # https://github.com/supriya-project/uqbar/issues/106
     "test_04"
     "SummarizingClassDocumenter"
   ];
@@ -74,8 +76,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Tools for creating Sphinx and Graphviz documentation";
-    homepage = "https://github.com/josiah-wolf-oberholtzer/uqbar";
-    changelog = "https://github.com/josiah-wolf-oberholtzer/uqbar/releases/tag/v${version}";
+    homepage = "https://github.com/supriya-project/uqbar";
+    changelog = "https://github.com/supriya-project/uqbar/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ davisrichard437 ];
   };

From 92490a34cf736e50b39d182bfb6407d027b110d4 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 2 Feb 2026 09:17:24 -0800
Subject: [PATCH 167/167] python3Packages.uqbar: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix
index b1c14bc8756a..2185be8f8c3e 100644
--- a/pkgs/development/python-modules/uqbar/default.nix
+++ b/pkgs/development/python-modules/uqbar/default.nix
@@ -12,7 +12,7 @@
   unidecode,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "uqbar";
   version = "0.9.6";
   pyproject = true;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "supriya-project";
     repo = "uqbar";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-1rK40lwZ3YmQZXhia2+iYRZxDCYvijXgBMIL5p7KmR0=";
   };
 
@@ -77,8 +77,8 @@ buildPythonPackage rec {
   meta = {
     description = "Tools for creating Sphinx and Graphviz documentation";
     homepage = "https://github.com/supriya-project/uqbar";
-    changelog = "https://github.com/supriya-project/uqbar/releases/tag/v${version}";
+    changelog = "https://github.com/supriya-project/uqbar/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ davisrichard437 ];
   };
-}
+})