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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

The wrapper was using a makeWrapper targeting the buildPlatform

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

An example configuration could contain:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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