From 40d2be94285c4c80d1107675594f99ca1583b2ab Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Mon, 22 Dec 2025 16:00:55 +0100
Subject: [PATCH 001/336] nixos/peering-manager: replace grab_prefixes with
 get_irr_data

The grab_prefixes command is deprecated and got replaced with
get_irr_data. While grab_prefixes still works, it is deprecated and will
be removed in a future version.

https://peering-manager.readthedocs.io/en/v1.10.1/integrations/irr-prefixes/#settings
---
 nixos/modules/services/web-apps/peering-manager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix
index 40533ae760e1..31ee369dc4c0 100644
--- a/nixos/modules/services/web-apps/peering-manager.nix
+++ b/nixos/modules/services/web-apps/peering-manager.nix
@@ -350,7 +350,7 @@ in
           after = [ "peering-manager.service" ];
           serviceConfig = {
             Type = "oneshot";
-            ExecStart = "${pkg}/bin/peering-manager grab_prefixes";
+            ExecStart = "${pkg}/bin/peering-manager get_irr_data";
           };
         };
 

From 76d004cde0a8831693ce1f5bbe1cede464bdc8be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 26 Jan 2026 13:03:40 +0100
Subject: [PATCH 002/336] python313Packages.asyncio-dgram: 2.2.0 -> 3.0.0

Changelog: https://github.com/jsbronder/asyncio-dgram/blob/v3.0.0/ChangeLog
---
 pkgs/development/python-modules/asyncio-dgram/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix
index 0d8f652baf71..f65912291e09 100644
--- a/pkgs/development/python-modules/asyncio-dgram/default.nix
+++ b/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -3,24 +3,24 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   pytest-asyncio,
   pytestCheckHook,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "asyncio-dgram";
-  version = "2.2.0";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jsbronder";
     repo = "asyncio-dgram";
     tag = "v${version}";
-    hash = "sha256-9aO3xFmoR74uZSzxBPRVvz0QSW15TAdWEszLBX8AUR4=";
+    hash = "sha256-08XQHx+ArduVdkK5ZYq2lL2OWF9CvdSWcNLfc7ey2wI=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [
     pytest-asyncio

From 7eab10d4130c2fbe91a8fcbf25c2969aee07aae3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 26 Jan 2026 13:05:43 +0100
Subject: [PATCH 003/336] python313Packages.asyncio-dgram: migrate to
 finalAttrs

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

diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix
index f65912291e09..eb0ae2f6528d 100644
--- a/pkgs/development/python-modules/asyncio-dgram/default.nix
+++ b/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -8,7 +8,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "asyncio-dgram";
   version = "3.0.0";
   pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jsbronder";
     repo = "asyncio-dgram";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-08XQHx+ArduVdkK5ZYq2lL2OWF9CvdSWcNLfc7ey2wI=";
   };
 
@@ -41,8 +41,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python support for higher level Datagram";
     homepage = "https://github.com/jsbronder/asyncio-dgram";
-    changelog = "https://github.com/jsbronder/asyncio-dgram/blob/v${version}/ChangeLog";
+    changelog = "https://github.com/jsbronder/asyncio-dgram/blob/v${finalAttrs.src.tag}/ChangeLog";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 23043ef3a0be40eff80050f62d2a3074425a8fbe Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Feb 2026 14:58:00 -0600
Subject: [PATCH 004/336] cxxtest: migrate to by-name

---
 .../default.nix => by-name/cx/cxxtest/package.nix}       | 9 +++------
 pkgs/top-level/all-packages.nix                          | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{development/libraries/cxxtest/default.nix => by-name/cx/cxxtest/package.nix} (88%)

diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/by-name/cx/cxxtest/package.nix
similarity index 88%
rename from pkgs/development/libraries/cxxtest/default.nix
rename to pkgs/by-name/cx/cxxtest/package.nix
index 57f809850658..4e081f25b286 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/by-name/cx/cxxtest/package.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  ply,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cxxtest";
   version = "4.4";
   format = "setuptools";
@@ -19,7 +18,7 @@ buildPythonApplication rec {
 
   sourceRoot = "${src.name}/python";
 
-  nativeCheckInputs = [ ply ];
+  nativeCheckInputs = [ python3Packages.ply ];
 
   preCheck = ''
     cd ../
@@ -41,8 +40,6 @@ buildPythonApplication rec {
     cp -r ../../cxxtest "$out/include"
   '';
 
-  dontWrapPythonPrograms = true;
-
   meta = {
     homepage = "https://github.com/CxxTest/cxxtest";
     description = "Unit testing framework for C++";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9c943df90e8..0915b709b1fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6366,8 +6366,6 @@ with pkgs;
     ssl_implementation = mbedtls_2;
   };
 
-  cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { };
-
   # Make bdb5 the default as it is the last release under the custom
   # bsd-like license
   db = db5;

From 5283690260c8ebd3b41829bdca6b7052818de18d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 11 Feb 2026 15:24:00 -0600
Subject: [PATCH 005/336] dazel: migrate to by-name

---
 .../dazel/default.nix => by-name/da/dazel/package.nix}   | 9 +++++----
 pkgs/top-level/all-packages.nix                          | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename pkgs/{development/tools/dazel/default.nix => by-name/da/dazel/package.nix} (79%)

diff --git a/pkgs/development/tools/dazel/default.nix b/pkgs/by-name/da/dazel/package.nix
similarity index 79%
rename from pkgs/development/tools/dazel/default.nix
rename to pkgs/by-name/da/dazel/package.nix
index cfc669c4feb8..8e44957875ff 100644
--- a/pkgs/development/tools/dazel/default.nix
+++ b/pkgs/by-name/da/dazel/package.nix
@@ -1,15 +1,16 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  setuptools,
 }:
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "dazel";
   version = "0.0.43";
   pyproject = true;
 
-  build-system = [ setuptools ];
+  build-system = [
+    python3Packages.setuptools
+  ];
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb7b195c2e66..8f9af2036a1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1468,8 +1468,6 @@ with pkgs;
 
   inherit (cue) writeCueValidator;
 
-  dazel = python3Packages.callPackage ../development/tools/dazel { };
-
   detect-secrets = with python3Packages; toPythonApplication detect-secrets;
 
   deterministic-host-uname = deterministic-uname.override {

From 2c39b0b82206c3c4f1614d37e63ac3045e377d6b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 11 Feb 2026 15:25:29 -0600
Subject: [PATCH 006/336] dazel: switch to finalAttrs

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

diff --git a/pkgs/by-name/da/dazel/package.nix b/pkgs/by-name/da/dazel/package.nix
index 8e44957875ff..0ee095906d00 100644
--- a/pkgs/by-name/da/dazel/package.nix
+++ b/pkgs/by-name/da/dazel/package.nix
@@ -3,7 +3,7 @@
   python3Packages,
   fetchPypi,
 }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "dazel";
   version = "0.0.43";
   pyproject = true;
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-2enQRKg4CAPGHte02io+EfiW9AmuP3Qi41vNQeChg+8=";
   };
 
@@ -25,4 +25,4 @@ python3Packages.buildPythonApplication rec {
       malt3
     ];
   };
-}
+})

From e9550f73a288b05ebf9987f3d821bd0a91efb9ac Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 24 Nov 2025 14:01:25 +0000
Subject: [PATCH 007/336] asmrepl: migrate to pkgs/by-name

Moves asmrepl from pkgs/development/interpreters/asmrepl to
pkgs/by-name/as/asmrepl following the new directory structure.
Also renames default.nix to package.nix as per by-name conventions.
---
 pkgs/{development/interpreters => by-name/as}/asmrepl/Gemfile   | 0
 .../interpreters => by-name/as}/asmrepl/Gemfile.lock            | 0
 .../{development/interpreters => by-name/as}/asmrepl/gemset.nix | 0
 .../asmrepl/default.nix => by-name/as/asmrepl/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{development/interpreters => by-name/as}/asmrepl/Gemfile (100%)
 rename pkgs/{development/interpreters => by-name/as}/asmrepl/Gemfile.lock (100%)
 rename pkgs/{development/interpreters => by-name/as}/asmrepl/gemset.nix (100%)
 rename pkgs/{development/interpreters/asmrepl/default.nix => by-name/as/asmrepl/package.nix} (100%)

diff --git a/pkgs/development/interpreters/asmrepl/Gemfile b/pkgs/by-name/as/asmrepl/Gemfile
similarity index 100%
rename from pkgs/development/interpreters/asmrepl/Gemfile
rename to pkgs/by-name/as/asmrepl/Gemfile
diff --git a/pkgs/development/interpreters/asmrepl/Gemfile.lock b/pkgs/by-name/as/asmrepl/Gemfile.lock
similarity index 100%
rename from pkgs/development/interpreters/asmrepl/Gemfile.lock
rename to pkgs/by-name/as/asmrepl/Gemfile.lock
diff --git a/pkgs/development/interpreters/asmrepl/gemset.nix b/pkgs/by-name/as/asmrepl/gemset.nix
similarity index 100%
rename from pkgs/development/interpreters/asmrepl/gemset.nix
rename to pkgs/by-name/as/asmrepl/gemset.nix
diff --git a/pkgs/development/interpreters/asmrepl/default.nix b/pkgs/by-name/as/asmrepl/package.nix
similarity index 100%
rename from pkgs/development/interpreters/asmrepl/default.nix
rename to pkgs/by-name/as/asmrepl/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a786b2e13f0..038fe38695fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1542,8 +1542,6 @@ with pkgs;
 
   apprise = with python3Packages; toPythonApplication apprise;
 
-  asmrepl = callPackage ../development/interpreters/asmrepl { };
-
   avahi-compat = callPackage ../by-name/av/avahi/package.nix {
     withLibdnssdCompat = true;
   };

From 6be281212cdeafddce4e3b80a874b29d128df9d8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 24 Nov 2025 14:15:50 +0000
Subject: [PATCH 008/336] asmrepl: update bundler dependencies

- Update Gemfile.lock with racc and rbs dependencies
- Modernize meta attribute usage (remove 'with lib')
---
 pkgs/by-name/as/asmrepl/Gemfile      |  6 ++++--
 pkgs/by-name/as/asmrepl/Gemfile.lock | 13 ++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/as/asmrepl/Gemfile b/pkgs/by-name/as/asmrepl/Gemfile
index 0b617ffb90b2..84934b784f2f 100644
--- a/pkgs/by-name/as/asmrepl/Gemfile
+++ b/pkgs/by-name/as/asmrepl/Gemfile
@@ -1,3 +1,5 @@
-source 'https://rubygems.org' do
+source 'https://rubygems.org'
   gem 'asmrepl'
-end
+  # Extra dependencies
+  gem 'racc', '~> 1.8'
+  gem 'rbs', '~> 3.9'
diff --git a/pkgs/by-name/as/asmrepl/Gemfile.lock b/pkgs/by-name/as/asmrepl/Gemfile.lock
index f845e91b6c90..f549336a9a59 100644
--- a/pkgs/by-name/as/asmrepl/Gemfile.lock
+++ b/pkgs/by-name/as/asmrepl/Gemfile.lock
@@ -1,18 +1,21 @@
-GEM
-  specs:
-
 GEM
   remote: https://rubygems.org/
   specs:
     asmrepl (1.0.3)
       fisk (~> 2)
     fisk (2.3.0)
+    logger (1.7.0)
+    racc (1.8.1)
+    rbs (3.9.5)
+      logger
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  asmrepl!
+  asmrepl
+  racc (~> 1.8)
+  rbs (~> 3.9)
 
 BUNDLED WITH
-   2.2.24
+   2.7.2

From c2f61dddda94cb6f6fde53e104ca375fb1d5b5ba Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 12 Feb 2026 10:08:44 -0600
Subject: [PATCH 009/336] asmrepl: 1.0.3 -> 1.2.0

---
 pkgs/by-name/as/asmrepl/Gemfile.lock | 10 +++---
 pkgs/by-name/as/asmrepl/gemset.nix   | 52 +++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/as/asmrepl/Gemfile.lock b/pkgs/by-name/as/asmrepl/Gemfile.lock
index f549336a9a59..1fcbecc5cfee 100644
--- a/pkgs/by-name/as/asmrepl/Gemfile.lock
+++ b/pkgs/by-name/as/asmrepl/Gemfile.lock
@@ -1,13 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    asmrepl (1.0.3)
-      fisk (~> 2)
-    fisk (2.3.0)
+    asmrepl (1.2.0)
+      fisk (~> 2.3.1)
+    fisk (2.3.2)
     logger (1.7.0)
     racc (1.8.1)
-    rbs (3.9.5)
+    rbs (3.10.3)
       logger
+      tsort
+    tsort (0.2.0)
 
 PLATFORMS
   ruby
diff --git a/pkgs/by-name/as/asmrepl/gemset.nix b/pkgs/by-name/as/asmrepl/gemset.nix
index f3455e515023..277e70efd539 100644
--- a/pkgs/by-name/as/asmrepl/gemset.nix
+++ b/pkgs/by-name/as/asmrepl/gemset.nix
@@ -5,19 +5,63 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "10d0zvkhk3ja48vvx28hfsqfrzfl66vdpmk3gcgb5viy174c72v6";
+      sha256 = "0qvkqn34ldlip2yz3kdckqmvniyydswcclwdcalcpdwnahg25xjw";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.2.0";
   };
   fisk = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mq2a7hjs9xfg514ci0xw90c33rzq1y58ywpnmhp7w767ll6wldd";
+      sha256 = "0zypl29fpqd5pqkp8j67xnq9b2dwhl8kn01fyw1kxy9l2676dlmh";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.3.2";
+  };
+  logger = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  racc = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  rbs = {
+    dependencies = [
+      "logger"
+      "tsort"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "19nsjb0wkb1zk274q0zy41hfzqraanar3jg6akak8q8134wpyqkh";
+      type = "gem";
+    };
+    version = "3.10.3";
+  };
+  tsort = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n";
+      type = "gem";
+    };
+    version = "0.2.0";
   };
 }

From 936facddd30477503b7ed6c1c978df17316a82ea Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Sun, 15 Feb 2026 23:39:41 +0100
Subject: [PATCH 010/336] prometheus-frr-exporter: fix group

---
 .../modules/services/monitoring/prometheus/exporters/frr.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/frr.nix b/nixos/modules/services/monitoring/prometheus/exporters/frr.nix
index 617ea8b42818..bbed4e18afc0 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/frr.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/frr.nix
@@ -27,10 +27,10 @@ in
     };
     group = mkOption {
       type = types.str;
-      default = "frrtty";
+      default = "frrvty";
       description = ''
         Group under which the frr exporter shall be run.
-        The exporter talks to frr using a unix socket, which is owned by frrtty group.
+        The exporter talks to frr using a unix socket, which is owned by frrvty group.
       '';
     };
     enabledCollectors = mkOption {

From 1d76938896f58994a1a86eedf3888aa555d8b225 Mon Sep 17 00:00:00 2001
From: Rafa <139969429+rafanochi@users.noreply.github.com>
Date: Tue, 24 Feb 2026 20:52:46 +0500
Subject: [PATCH 011/336] dart.flutter_vodozemac: add 0.5.0 version

---
 .../dart/package-source-builders/flutter_vodozemac/default.nix   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix
index 4c85b10dc59d..50f39438bd1e 100644
--- a/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix
@@ -19,6 +19,7 @@ let
         _0_2_2 = "sha256-Iw0AkHVjR1YmPe+C0YYBTDu5FsRk/ZpaRyBilcvqm6M=";
         _0_3_0 = "sha256-eKKrcroV2yl/FV2WmgZWFPO5MPAGz0xCvpr0fgIuGZ4=";
         _0_4_1 = "sha256-eKKrcroV2yl/FV2WmgZWFPO5MPAGz0xCvpr0fgIuGZ4=";
+        _0_5_0 = "sha256-eKKrcroV2yl/FV2WmgZWFPO5MPAGz0xCvpr0fgIuGZ4=";
       }
       .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
         Unsupported version of pub 'flutter_vodozemac': '${version}'

From 6daefb8c616a2c2a13671928d4f8e0508c359816 Mon Sep 17 00:00:00 2001
From: Aarav Gupta <aarav@spikonado.com>
Date: Sun, 8 Mar 2026 22:41:59 +0530
Subject: [PATCH 012/336] python3Packages.colcon: 0.19.0 -> 0.20.1

---
 .../colcon/0001-update-setuptools.patch             | 13 +++++++++++++
 pkgs/development/python-modules/colcon/default.nix  | 13 ++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/colcon/0001-update-setuptools.patch

diff --git a/pkgs/development/python-modules/colcon/0001-update-setuptools.patch b/pkgs/development/python-modules/colcon/0001-update-setuptools.patch
new file mode 100644
index 000000000000..3c955a3d4c7f
--- /dev/null
+++ b/pkgs/development/python-modules/colcon/0001-update-setuptools.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.cfg b/setup.cfg
+index 3f97885..3b55c34 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -38,7 +38,7 @@ install_requires =
+   pytest-cov
+   pytest-repeat
+   pytest-rerunfailures
+-  setuptools>=30.3.0,<80
++  setuptools>=30.3.0
+   # toml is also supported but deprecated
+   tomli>=1.0.0; python_version < "3.11"
+ packages = find:
diff --git a/pkgs/development/python-modules/colcon/default.nix b/pkgs/development/python-modules/colcon/default.nix
index 8c53dc78bfed..4b8592491010 100644
--- a/pkgs/development/python-modules/colcon/default.nix
+++ b/pkgs/development/python-modules/colcon/default.nix
@@ -21,16 +21,20 @@
 
 buildPythonPackage rec {
   pname = "colcon-core";
-  version = "0.19.0";
+  version = "0.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "colcon";
     repo = "colcon-core";
     tag = version;
-    hash = "sha256-R/TVHPT305PwaVSisP0TtbgjCFBwCZkXOAgkYhCKpyY=";
+    hash = "sha256-FV/G2FcnBgr7mUY/Jr+bVAdEfhHL9qAnpc92hpTfy7Y=";
   };
 
+  # Upstream tracking issue: https://github.com/ros2/ros2/issues/1738
+  # This will break some functionality of building setuptools packages using colcon, other package types should work fine
+  patches = [ ./0001-update-setuptools.patch ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -68,7 +72,10 @@ buildPythonPackage rec {
     description = "Command line tool to build sets of software packages";
     homepage = "https://github.com/colcon/colcon-core";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ guelakais ];
+    maintainers = with lib.maintainers; [
+      amronos
+      guelakais
+    ];
     mainProgram = "colcon";
   };
 }

From c07cb1bed4d6eaa904601dabdf0b6bee474fefb0 Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Sun, 15 Mar 2026 19:04:50 -0700
Subject: [PATCH 013/336] kodi: inherit underlying kodi's `meta` when wrapping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

kodi has a mainProgram:

```
nix-repl> kodi.meta.mainProgram
"kodi"
```

But when wrapping it, we'd lose its mainProgram:

```
nix-repl> (kodi.withPackages (_: [])).meta.mainProgram
error:
       … while evaluating the attribute 'meta.mainProgram'
       ...

       error: attribute 'mainProgram' missing
       at «string»:1:1:
            1| (kodi.withPackages (_: [])).meta.mainProgram
             | ^
```

This fixes that. Please let me know if there's a better pattern
to follow for inheriting meta information when wrapping. I intentionally
didn't inherit the full `meta` attribute as it has some other
information (such as `position`) that I think are better *not*
inherited.
---
 pkgs/applications/video/kodi/wrapper.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index f1c4393e01b8..84bfeb469d5c 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -50,4 +50,8 @@ buildEnv {
         }"
     done
   '';
+
+  meta = {
+    inherit (kodi.meta) mainProgram;
+  };
 }

From 015b71d7b8ffd353903cf95d2181a68e26d4f245 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Feb 2026 15:20:51 -0600
Subject: [PATCH 014/336] dcnnt: modernize derivation, switch to PEP517

---
 pkgs/by-name/dc/dcnnt/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dc/dcnnt/package.nix b/pkgs/by-name/dc/dcnnt/package.nix
index 94b8eb16446f..b65a2077cd8a 100644
--- a/pkgs/by-name/dc/dcnnt/package.nix
+++ b/pkgs/by-name/dc/dcnnt/package.nix
@@ -7,14 +7,18 @@
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "dcnnt";
   version = "0.10.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = with python3Packages; [
     pycryptodome
   ];
 

From 1a817faf1292092f6b31a51148546413d33063bb Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sat, 21 Mar 2026 11:30:40 +0100
Subject: [PATCH 015/336] python3Packages.sqlalchemy_1_4: 1.4.54 ->
 1.4.54-unstable-2025-08-16

This fixes the build of `python314Packages.sqlalchemy_1_4`.

Diff: https://github.com/sqlalchemy/sqlalchemy/compare/rel_1_4_54...1712b81a5b8d9d3abd5a85fbb089470f0bc38cdd
---
 pkgs/development/python-modules/sqlalchemy/1_4.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix
index f1c96deacb9d..15f939786f4c 100644
--- a/pkgs/development/python-modules/sqlalchemy/1_4.nix
+++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy";
-  version = "1.4.54";
+  version = "1.4.54-unstable-2025-08-16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sqlalchemy";
     repo = "sqlalchemy";
-    rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-6qAjyqMVrugABHssAQuql3z1YHTAOSm5hARJuJXJJvo=";
+    rev = "1712b81a5b8d9d3abd5a85fbb089470f0bc38cdd";
+    hash = "sha256-BqhH6CqvWQvUllCh0JAIM/K+W3KtLIRe30WGJrqafoI=";
   };
 
   postPatch = ''

From 285a2304729553b3bc3f5c9810c56b3ea6a1629e Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 21 Mar 2026 09:40:41 +0100
Subject: [PATCH 016/336] .devcontainer: update devcontainer image version to
 5-linux

Updates base image to fix issue with old yarnpkg repo key.
---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 21413b4fe79e..7ff2824dbc3a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "nixpkgs",
-  "image": "mcr.microsoft.com/devcontainers/universal:2-linux",
+  "image": "mcr.microsoft.com/devcontainers/universal:5-linux",
   "features": {
     "ghcr.io/devcontainers/features/nix:1": {
       // fails in the devcontainer sandbox, enable sandbox via config instead

From c7f733979de2a93c0708f5b4267f9379325db013 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 24 Mar 2026 12:02:28 +0100
Subject: [PATCH 017/336] fastmail-desktop: 1.1.0 -> 1.2.1

---
 pkgs/by-name/fa/fastmail-desktop/linux.nix   |  6 +++---
 pkgs/by-name/fa/fastmail-desktop/sources.nix | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fa/fastmail-desktop/linux.nix b/pkgs/by-name/fa/fastmail-desktop/linux.nix
index aab967ce85d5..ddb70a4632e4 100644
--- a/pkgs/by-name/fa/fastmail-desktop/linux.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/linux.nix
@@ -55,16 +55,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     asar extract "$out/opt/fastmail/app.asar" "$out/opt/fastmail/app.asar.unpacked"
     rm "$out/opt/fastmail/app.asar"
 
-    install -D "${appimageContents}/production.desktop" "$out/share/applications/fastmail.desktop"
+    install -Dt "$out/share/applications" "${appimageContents}/fastmail.desktop"
     substituteInPlace "$out/share/applications/fastmail.desktop" \
       --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=fastmail %U" \
-      --replace-fail "Icon=production" "Icon=fastmail" \
+      --replace-fail "Name=com.fastmail.Fastmail" "Name=Fastmail"
 
     for res in 16 24 32 48 64 128 256 512 1024; do
       resdir="''${res}x''${res}"
       mkdir -p "$out/share/icons/hicolor/$resdir/apps"
       cp -r --no-preserve=mode \
-        "${appimageContents}/usr/share/icons/hicolor/$resdir/apps/production.png" \
+        "${appimageContents}/usr/share/icons/hicolor/$resdir/apps/fastmail.png" \
         "$out/share/icons/hicolor/$resdir/apps/fastmail.png"
     done
 
diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix
index 8cd885bf99e0..374f140afcaf 100644
--- a/pkgs/by-name/fa/fastmail-desktop/sources.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix
@@ -1,19 +1,19 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2026-02-26
+# Last updated: 2026-03-23
 { fetchurl, fetchzip }:
 {
   aarch64-darwin = {
-    version = "1.1.0";
+    version = "1.2.1";
     src = fetchurl {
-      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.1.0-arm64-mac.zip";
-      hash = "sha512-z1iW4DnPKY3b1SnIvmgsA62unqMR8nLJpql0jbMuHxyAxWntAZZjpxY0GhmwmZl/WjaCn2SeXj0iYlTJTecZjQ==";
+      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.2.1-arm64-mac.zip";
+      hash = "sha512-bu6IeL8X8ogD1qSlAuApWTBTCYIk5QrjWrzjOv8fel+kqYfCIcDXP1DP1FdJwULe91zoZn4M/uDX8CoOPWa0cA==";
     };
   };
   x86_64-linux = {
-    version = "1.1.0";
+    version = "1.2.1";
     src = fetchurl {
-      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.1.0.AppImage";
-      hash = "sha512-lXvgZ61M1Ex7jJzFjfC9rYLodGojrbca/t4IOaQ7k/CDI4DyFRDkAGqkGioq7EwzbooS9zTO3fbdYmbOyODFTQ==";
+      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.2.1.AppImage";
+      hash = "sha512-xudOPNjOaumYxD7yZyjQnYhuiKqDO10cBwMdFJtVEOfHVia0jJMgdUTJx03otIBn9ijM3/1Qo6wsq1HF0A/zlQ==";
     };
   };
 }

From e6cdd1cc34a7f7ee415242a07faeb8333563a443 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 24 Mar 2026 12:04:28 +0100
Subject: [PATCH 018/336] fastmail-desktop: remove LD_LIBRARY_PATH and musl
 dependenciess

---
 pkgs/by-name/fa/fastmail-desktop/linux.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/fa/fastmail-desktop/linux.nix b/pkgs/by-name/fa/fastmail-desktop/linux.nix
index ddb70a4632e4..98f354809842 100644
--- a/pkgs/by-name/fa/fastmail-desktop/linux.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/linux.nix
@@ -4,18 +4,13 @@
   src,
   passthru,
   meta,
-  lib,
   stdenvNoCC,
   appimageTools,
   asar,
   autoPatchelfHook,
   makeWrapper,
   electron,
-  libxscrnsaver,
-  libxtst,
-  libappindicator,
   libgcc,
-  musl,
   vips,
 }:
 let
@@ -37,16 +32,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libgcc
-    musl
     vips
   ];
 
-  libPath = lib.makeLibraryPath [
-    libxscrnsaver
-    libxtst
-    libappindicator
-  ];
-
   installPhase = ''
     runHook preInstall
 
@@ -71,13 +59,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     makeWrapper "${electron}/bin/electron" "$out/bin/fastmail" \
       --add-flags "$out/opt/fastmail/app.asar.unpacked" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true --wayland-text-input-version=3}}" \
-      --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/fastmail \
       --set-default ELECTRON_IS_DEV 0 \
       --inherit-argv0
 
     runHook postInstall
   '';
 
+  # remove musl-libc dependencies before the autoPatchelfHook
+  preFixup = ''
+    rm -r "$out/opt/fastmail/app.asar.unpacked/node_modules/@img/"{sharp-linuxmusl-x64,sharp-libvips-linuxmusl-x64}
+  '';
+
   meta = meta // {
     mainProgram = "fastmail";
   };

From 23be6e35ffe28956f8198bd36acabbbfbdc7dbaf Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sat, 21 Mar 2026 10:56:46 +0100
Subject: [PATCH 019/336] python3Packages.snowflake-connector-python: 4.2.0 ->
 4.3.0

Changelog: https://github.com/snowflakedb/snowflake-connector-python/blob/v4.3.0/DESCRIPTION.md
Diff: https://github.com/snowflakedb/snowflake-connector-python/compare/v4.2.0...v4.3.0
---
 .../snowflake-connector-python/default.nix    | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index ae54d7cacaf9..d3b8e616c43d 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -1,11 +1,12 @@
 {
   lib,
+  aioboto3,
+  aiohttp,
   asn1crypto,
   buildPythonPackage,
   boto3,
   botocore,
   certifi,
-  cffi,
   charset-normalizer,
   cryptography,
   cython,
@@ -20,10 +21,12 @@
   pyarrow,
   pyjwt,
   pyopenssl,
+  pytest-asyncio,
   pytest-xdist,
   pytestCheckHook,
   pytz,
   requests,
+  responses,
   setuptools,
   sortedcontainers,
   tomlkit,
@@ -32,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "4.2.0";
+  version = "4.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snowflakedb";
     repo = "snowflake-connector-python";
     tag = "v${version}";
-    hash = "sha256-u2DIgW0W9oXSif2lIDqhlIopaXzQRS0x6tyHiYPGFLM=";
+    hash = "sha256-bJK6U5lomcPMGeKEmv+9m+uM5+3GJKKUA3dEwP/ynVo=";
   };
 
   build-system = [
@@ -49,10 +52,7 @@ buildPythonPackage rec {
 
   dependencies = [
     asn1crypto
-    boto3
-    botocore
     certifi
-    cffi
     charset-normalizer
     cryptography
     filelock
@@ -69,11 +69,14 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
-    "cffi"
     "pyopenssl"
   ];
 
   optional-dependencies = {
+    boto = [
+      boto3
+      botocore
+    ];
     pandas = [
       pandas
       pyarrow
@@ -86,10 +89,15 @@ buildPythonPackage rec {
   '';
 
   nativeCheckInputs = [
+    aioboto3
+    aiohttp
     numpy
+    pytest-asyncio
     pytest-xdist
     pytestCheckHook
-  ];
+    responses
+  ]
+  ++ lib.concatAttrValues optional-dependencies;
 
   disabledTestPaths = [
     # Tests require encrypted secrets, see
@@ -107,6 +115,21 @@ buildPythonPackage rec {
     # AssertionError: /build/source/.wiremock/wiremock-standalone.jar does not exist
     "test/unit/test_programmatic_access_token.py"
     "test/unit/test_oauth_token.py"
+    "test/unit/test_proxies.py"
+    "test/unit/aio/test_programmatic_access_token_async.py"
+    "test/unit/aio/test_oauth_token_async.py"
+    "test/unit/aio/test_proxies_async.py"
+    # aio tests that connect to the internet
+    "test/unit/aio/test_connection_async_unit.py::test_invalid_backoff_policy"
+    "test/unit/aio/test_ocsp.py"
+    "test/unit/aio/test_s3_util_async.py::test_download_retry_exceeded_error"
+    "test/unit/aio/test_s3_util_async.py::test_accelerate_in_china_endpoint"
+    "test/unit/aio/test_s3_util_async.py::test_get_header_expiry_error"
+    "test/unit/aio/test_s3_util_async.py::test_upload_expiry_error"
+    "test/unit/aio/test_s3_util_async.py::test_download_expiry_error"
+    # snowflake.connector.errors.ProgrammingError: 251008: 251008: Failed to load private key:
+    # argument 'password': Cannot convert "<class 'int'>" instance to a buffer.
+    "test/unit/aio/test_auth_keypair_async.py::test_auth_keypair"
   ];
 
   disabledTests = [
@@ -117,6 +140,8 @@ buildPythonPackage rec {
     "test_wiremock"
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   pythonImportsCheck = [
     "snowflake"
     "snowflake.connector"

From fb29b53f462cdc79ba1cd41dae513813b3caffff Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Wed, 25 Mar 2026 11:35:13 +0100
Subject: [PATCH 020/336] morewaita-icon-theme: propagate adwaita-icon-theme

---
 pkgs/by-name/mo/morewaita-icon-theme/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
index 51c986f1fdbd..82413b29852c 100644
--- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix
+++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  adwaita-icon-theme,
   gtk3,
   xdg-utils,
   nix-update-script,
@@ -26,6 +27,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     xdg-utils
   ];
 
+  propagatedBuildInputs = [
+    adwaita-icon-theme
+  ];
+
   installPhase = ''
     runHook preInstall
 

From e542067c766e40676a4d772955c5e4544820278b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 1 Apr 2026 22:30:33 +0200
Subject: [PATCH 021/336] qt6Packages.ktactilefeedback: init at
 0-unstable-2025-07-25

---
 .../libraries/ktactilefeedback/default.nix    | 65 +++++++++++++++++++
 pkgs/top-level/qt6-packages.nix               |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/libraries/ktactilefeedback/default.nix

diff --git a/pkgs/development/libraries/ktactilefeedback/default.nix b/pkgs/development/libraries/ktactilefeedback/default.nix
new file mode 100644
index 000000000000..2337b25b289b
--- /dev/null
+++ b/pkgs/development/libraries/ktactilefeedback/default.nix
@@ -0,0 +1,65 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  unstableGitUpdater,
+  cmake,
+  extra-cmake-modules,
+  qtbase,
+  qtdeclarative,
+  qtmultimedia,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ktactilefeedback";
+  version = "0-unstable-2025-07-25";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "jbbgameich";
+    repo = "ktactilefeedback";
+    rev = "da7858aaa125588d4c309f273afefff93222e8f9";
+    hash = "sha256-VEGZkA6bWuKJK6fk4u6RB5aMV8fbabD8ymm8HC/ddzg=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    extra-cmake-modules
+    qtbase
+    qtmultimedia
+  ];
+
+  # Library
+  dontWrapQtApps = true;
+
+  cmakeFlags = [
+    # Need to run these post-install, so QML import path exists
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doInstallCheck)
+  ];
+
+  doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+  installCheckTarget = "test";
+  preInstallCheck = ''
+    export QML2_IMPORT_PATH=$out/${qtbase.qtQmlPrefix}:${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix}
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Tactile feedback library for Qt";
+    homepage = "https://invent.kde.org/jbbgameich/ktactilefeedback";
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [
+      OPNA2608
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index d424a7168b75..7481d36af040 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -67,6 +67,8 @@ makeScopeWithSplicing' {
       futuresql = callPackage ../development/libraries/futuresql { };
       kquickimageedit = callPackage ../development/libraries/kquickimageedit { };
 
+      ktactilefeedback = kdePackages.callPackage ../development/libraries/ktactilefeedback { };
+
       libiodata = callPackage ../development/libraries/libiodata { };
 
       libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };

From 8fb2a33e2d758c0e00e744d3b687cbc5cb7539b3 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 1 Apr 2026 22:53:44 +0200
Subject: [PATCH 022/336] lomiri-qt6.lomiri-ui-toolkit: Add ktactilefeedback

There are no plans to port qtfeedback to Qt6, instead ktactilefeedback is used.
---
 .../lomiri/qml/lomiri-ui-toolkit/default.nix    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index 6593044e6e60..59375bf5a143 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -12,6 +12,8 @@
   gdb,
   glib,
   kdePackages,
+  # Used on Qt6
+  ktactilefeedback ? null,
   libevdev,
   lttng-ust,
   mesa,
@@ -21,6 +23,7 @@
   qmake,
   qtbase,
   qtdeclarative,
+  # Used on Qt5
   qtfeedback ? null,
   qtgraphicaleffects ? null,
   qtpim ? null,
@@ -53,11 +56,18 @@ let
     [
       qtdeclarative
     ]
+    ++ lib.optionals withQt6 [
+      # Qt5Compat.GraphicalEffects
+      qt5compat
+
+      # Tactile feedback on Qt6
+      ktactilefeedback
+    ]
     ++ lib.optionals (!withQt6) [
       # Deprecated in Qt6
       qtgraphicaleffects
 
-      # Will prolly want this in the future, but needs porting to Qt6
+      # Tactile feedback on Qt5
       qtfeedback
     ]
   );
@@ -189,12 +199,15 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withQt6 [
     # Qt5Compat.GraphicalEffects
     qt5compat
+
+    # Tactile feedback on Qt6
+    ktactilefeedback
   ]
   ++ lib.optionals (!withQt6) [
     # Deprecated in Qt6
     qtgraphicaleffects
 
-    # Will prolly want this in the future, but needs porting to Qt6
+    # Tactile feedback on Qt5
     qtfeedback
   ];
 

From 2ffdaae9b44232ac92ee625652e0214231b2d877 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 3 Apr 2026 08:30:07 -0500
Subject: [PATCH 023/336] goldberg-emu: migrate to by-name

---
 .../go}/goldberg-emu/dont-install-unsupported.patch         | 0
 .../default.nix => by-name/go/goldberg-emu/package.nix}     | 6 ++++--
 pkgs/top-level/all-packages.nix                             | 4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{applications/emulators => by-name/go}/goldberg-emu/dont-install-unsupported.patch (100%)
 rename pkgs/{applications/emulators/goldberg-emu/default.nix => by-name/go/goldberg-emu/package.nix} (97%)

diff --git a/pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch b/pkgs/by-name/go/goldberg-emu/dont-install-unsupported.patch
similarity index 100%
rename from pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch
rename to pkgs/by-name/go/goldberg-emu/dont-install-unsupported.patch
diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/by-name/go/goldberg-emu/package.nix
similarity index 97%
rename from pkgs/applications/emulators/goldberg-emu/default.nix
rename to pkgs/by-name/go/goldberg-emu/package.nix
index 99e21b7302ac..3fce293aa86f 100644
--- a/pkgs/applications/emulators/goldberg-emu/default.nix
+++ b/pkgs/by-name/go/goldberg-emu/package.nix
@@ -3,9 +3,11 @@
   stdenv,
   fetchFromGitLab,
   cmake,
-  protobuf,
+  protobuf_21,
 }:
-
+let
+  protobuf = protobuf_21;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "goldberg-emu";
   version = "0.2.5";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 033bc0eac052..a9c5d8c8c820 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1255,10 +1255,6 @@ with pkgs;
 
   gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
 
-  goldberg-emu = callPackage ../applications/emulators/goldberg-emu {
-    protobuf = protobuf_21;
-  };
-
   image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { };
 
   kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { };

From adbbd1227253bb23e45a8097b4cb9b72a1e75fc5 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 3 Apr 2026 08:30:44 -0500
Subject: [PATCH 024/336] goldberg-emu: switch from rev to tag

---
 pkgs/by-name/go/goldberg-emu/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/go/goldberg-emu/package.nix b/pkgs/by-name/go/goldberg-emu/package.nix
index 3fce293aa86f..97b43cb62644 100644
--- a/pkgs/by-name/go/goldberg-emu/package.nix
+++ b/pkgs/by-name/go/goldberg-emu/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "mr_goldberg";
     repo = "goldberg_emulator";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog=";
   };
 

From 3582fabbd1941c9ed5fa071b4188287218df59ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 09:01:34 +0000
Subject: [PATCH 025/336] lima-full: 2.0.3 -> 2.1.1

---
 pkgs/by-name/li/lima/source.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix
index 99259ed5e823..7b989f69319e 100644
--- a/pkgs/by-name/li/lima/source.nix
+++ b/pkgs/by-name/li/lima/source.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2.0.3";
+  version = "2.1.1";
 in
 {
   inherit version;
@@ -13,10 +13,10 @@ in
     owner = "lima-vm";
     repo = "lima";
     tag = "v${version}";
-    hash = "sha256-NoHNmJ6z7eZTzjl8ps3wFY2e68FcoBsu5ZhE0NXt95g=";
+    hash = "sha256-U054xA3utBcSfpyvsZi4MvgJGNa7QyAYJf9usNXpgXg=";
   };
 
-  vendorHash = "sha256-SeLYVQI+ZIbR9qVaNyF89VUvXdfv1M5iM+Cbas6e2E0=";
+  vendorHash = "sha256-C4YCuFVXkL5vS6lWZCGkEeZQgAkP55buPDGZ/wvMnAA=";
 
   meta = {
     homepage = "https://github.com/lima-vm/lima";

From e6909f5ac7b4ed569276c5a104201c589ee7b5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 4 Apr 2026 22:36:11 +0200
Subject: [PATCH 026/336] nixos/systemd-initrd: support omitting kernel
 parameter root

---
 nixos/modules/system/boot/systemd/initrd.nix | 25 +++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 2c59d224176e..fc1fbe7106f5 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -260,10 +260,12 @@ in
     };
 
     root = lib.mkOption {
-      type = lib.types.enum [
-        "fstab"
-        "gpt-auto"
-      ];
+      type = lib.types.nullOr (
+        lib.types.enum [
+          "fstab"
+          "gpt-auto"
+        ]
+      );
       default = "fstab";
       example = "gpt-auto";
       description = ''
@@ -272,6 +274,7 @@ in
         allow specifying the root file system itself this
         way. Instead, the `fstab` value is used in order to interpret
         the root file system specified with the `fileSystems` option.
+        If root shall be omitted, set this option to `null`.
       '';
     };
 
@@ -469,13 +472,13 @@ in
     ]
     ++ lib.optional cfg.package.withEfi "efivarfs";
 
-    boot.kernelParams = [
-      "root=${config.boot.initrd.systemd.root}"
-    ]
-    ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}"
-    # `systemd` mounts root in initrd as read-only unless "rw" is on the kernel command line.
-    # For NixOS activation to succeed, we need to have root writable in initrd.
-    ++ lib.optional (config.boot.initrd.systemd.root == "gpt-auto") "rw";
+    boot.kernelParams =
+      lib.optional (config.boot.initrd.systemd.root != null) "root=${config.boot.initrd.systemd.root}"
+
+      ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}"
+      # `systemd` mounts root in initrd as read-only unless "rw" is on the kernel command line.
+      # For NixOS activation to succeed, we need to have root writable in initrd.
+      ++ lib.optional (config.boot.initrd.systemd.root == "gpt-auto") "rw";
 
     boot.initrd.systemd = {
       initrdBin = [

From 00998872527220688507b26d2e8a3752aecb15d3 Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Sat, 4 Apr 2026 13:24:23 +0000
Subject: [PATCH 027/336] rocmPackages.rocprofiler-register: remove
 rocm-runtime/clr dependency

These dependencies are no longer required. This breaks a circular dependency
between clr/rocm-runtime and rocprofiler-register, clearning the way for
enabling rocprofiler-register support for those libraries.
---
 .../rocm-modules/rocprofiler-register/default.nix         | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
index a51abd2d0f37..fda008f16ab6 100644
--- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix
+++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
@@ -1,8 +1,6 @@
 {
   lib,
   stdenv,
-  rocm-runtime,
-  rocprofiler,
   numactl,
   libpciaccess,
   libxml2,
@@ -36,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     clang
-    clr
   ];
 
   # TODO(@LunNova): use system fmt&glog once upstream fixes flag to not vendor
@@ -45,9 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
     libpciaccess
     libxml2
     elfutils
-    rocm-runtime
-
-    rocprofiler.rocmtoolkit-merged
 
     python3Packages.lxml
     python3Packages.cppheaderparser
@@ -56,8 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.pandas
   ];
   cmakeFlags = [
-    "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip"
-    "-DHIP_ROOT_DIR=${clr}"
     "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
     "-DBUILD_TEST=OFF"
     "-DROCPROFILER_BUILD_TESTS=0"

From 7520f4a03e94d64973f3848157a2bd1857d41fd7 Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Sat, 4 Apr 2026 13:26:26 +0000
Subject: [PATCH 028/336] rocmPackages.rocprofiler-register: remove GPU_TARGETS

This package only contains host code and so is not built for any specific GPU,
so it does not need GPU_TARGETS. This should reduce rebuilds needed for supporting
different combinations of gpuTargets across rocmPackages.
---
 pkgs/development/rocm-modules/rocprofiler-register/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
index fda008f16ab6..ed86ebd612b4 100644
--- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix
+++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
@@ -9,9 +9,7 @@
   rocmUpdateScript,
   cmake,
   clang,
-  clr,
   python3Packages,
-  gpuTargets ? clr.gpuTargets,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.pandas
   ];
   cmakeFlags = [
-    "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
     "-DBUILD_TEST=OFF"
     "-DROCPROFILER_BUILD_TESTS=0"
     "-DROCPROFILER_BUILD_SAMPLES=0"

From d547f87a3bf27dd9f7e6da932584124c6c1416ab Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Sat, 4 Apr 2026 13:59:20 +0000
Subject: [PATCH 029/336] rocmPackages.rocprofiler-register: vendor
 dependencies

Upstream has added patches to work around the final few issues
with vendoring dependencies. These patches are already merged but
not in ROCm 7.2.1. They can be dropped whenever the related ROCm
version is tagged.
---
 .../rocprofiler-register/default.nix          | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
index ed86ebd612b4..770b29be8f46 100644
--- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix
+++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
@@ -5,11 +5,14 @@
   libpciaccess,
   libxml2,
   elfutils,
+  glog,
+  fmt,
   fetchFromGitHub,
   rocmUpdateScript,
   cmake,
   clang,
   python3Packages,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,22 +27,37 @@ stdenv.mkDerivation (finalAttrs: {
       "projects/rocprofiler-register"
       "shared"
     ];
-    fetchSubmodules = true;
-    hash = "sha256-2u5rLLT4Aif0jwAqqlIzrzh9kICJG15nZAslbiL7H9g=";
+    hash = "sha256-XhxED3LHIjxBcSVyyEC3pgg0fyKyfKtHkF7umExSboM=";
   };
   sourceRoot = "${finalAttrs.src.name}/projects/rocprofiler-register";
 
+  patches = [
+    (fetchpatch {
+      # [rocprofiler-sdk][rocprofiler-register] add CPackComponent
+      url = "https://github.com/ROCm/rocm-systems/commit/ef7253365c420ca486f074b9e9119a222e30fea0.patch";
+      hash = "sha256-dwqvZ4AaTcOk2mSnxgHp/NbhjlD8W6KVz1H5ZF4i/Tw=";
+      relative = "projects/rocprofiler-register";
+    })
+    (fetchpatch {
+      # [rocprofiler-register] Fix compilation with system fmt/glog
+      url = "https://github.com/ROCm/rocm-systems/commit/c8ad2522083c6e00539ce5c1c22df766c20084fb.patch";
+      hash = "sha256-VloRKV6kUzIfIInltx/bV1EM0FUfeQZrVAx6qgdsLyg=";
+      relative = "projects/rocprofiler-register";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     clang
   ];
 
-  # TODO(@LunNova): use system fmt&glog once upstream fixes flag to not vendor
   buildInputs = [
     numactl
     libpciaccess
     libxml2
     elfutils
+    glog
+    fmt
 
     python3Packages.lxml
     python3Packages.cppheaderparser
@@ -48,9 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.pandas
   ];
   cmakeFlags = [
-    "-DBUILD_TEST=OFF"
-    "-DROCPROFILER_BUILD_TESTS=0"
-    "-DROCPROFILER_BUILD_SAMPLES=0"
+    "-DROCPROFILER_REGISTER_BUILD_TESTS=0"
+    "-DROCPROFILER_REGISTER_BUILD_SAMPLES=0"
+    "-DROCPROFILER_REGISTER_BUILD_GLOG=OFF"
+    "-DROCPROFILER_REGISTER_BUILD_FMT=OFF"
     # Manually define CMAKE_INSTALL_<DIR>
     # See: https://github.com/NixOS/nixpkgs/pull/197838
     "-DCMAKE_INSTALL_BINDIR=bin"

From d8342e2dc8e4899ed5ecc01e956cad824aaefc8d Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Sat, 4 Apr 2026 14:00:21 +0000
Subject: [PATCH 030/336] rocmPackages.clr: enable rocprofiler-register
 integration

Now that the circular dependency has been broken, rocprofiler-register
support can be enabled.
---
 pkgs/development/rocm-modules/clr/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix
index 17bb9b3d30a6..7afe8f621f1f 100644
--- a/pkgs/development/rocm-modules/clr/default.nix
+++ b/pkgs/development/rocm-modules/clr/default.nix
@@ -17,6 +17,7 @@
   roctracer,
   rocminfo,
   rocm-smi,
+  rocprofiler-register,
   symlinkJoin,
   numactl,
   libffi,
@@ -112,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
     zstd
     zlib
+    rocprofiler-register
   ];
 
   propagatedBuildInputs = [
@@ -136,7 +138,6 @@ stdenv.mkDerivation (finalAttrs: {
     "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext"
     "-DROCM_PATH=${rocminfo}"
     "-DBUILD_ICD=ON"
-    "-DHIP_ENABLE_ROCPROFILER_REGISTER=OFF" # circular dep - may need -minimal and -full builds?
     "-DAMD_ICD_LIBRARY_DIR=${khronos-ocl-icd-loader}"
 
     # Temporarily set variables to work around upstream CMakeLists issue

From 1a78444b1fa5301e598dac2671286200781e3562 Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Sat, 4 Apr 2026 14:05:06 +0000
Subject: [PATCH 031/336] rocmPackages.rocm-runtime: enable
 rocprofiler-register integration

This should enable rocprofv3's --hsa-trace option.
---
 pkgs/development/rocm-modules/rocm-runtime/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix
index 8faf6085b49f..c6638ca6c13e 100644
--- a/pkgs/development/rocm-modules/rocm-runtime/default.nix
+++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix
@@ -8,6 +8,7 @@
   cmake,
   xxd,
   rocm-device-libs,
+  rocprofiler-register,
   elfutils,
   libdrm,
   numactl,
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     elfutils
     libdrm
     numactl
+    rocprofiler-register
   ];
 
   cmakeFlags = [

From e50f4ab5be87d87bb3f1ef7c9d0458e150c6875b Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Sat, 4 Apr 2026 17:41:27 +0000
Subject: [PATCH 032/336] elfio: 3.10 -> 3.12

---
 pkgs/by-name/el/elfio/package.nix | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/el/elfio/package.nix b/pkgs/by-name/el/elfio/package.nix
index a479c71f8ecd..5d6c06773f7e 100644
--- a/pkgs/by-name/el/elfio/package.nix
+++ b/pkgs/by-name/el/elfio/package.nix
@@ -4,24 +4,45 @@
   fetchFromGitHub,
   cmake,
   boost,
+  gtest,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "elfio";
-  version = "3.10";
+  version = "3.12";
 
   src = fetchFromGitHub {
     owner = "serge1";
     repo = "elfio";
     rev = "Release_${finalAttrs.version}";
-    sha256 = "sha256-DuZhkiHXdCplRiOy1Gsu7voVPdCbFt+4qFqlOeOeWQw=";
+    sha256 = "sha256-tDRBscs2L/3gYgLQvb1+8nNxqkr8v1xBkeDXuOqShX4=";
   };
 
+  patches = [
+    # Add missing #include <stdint.h> for gcc 15
+    (fetchpatch {
+      url = "https://github.com/serge1/ELFIO/commit/34d2c64237bb40f09879e7421db120e50e7e2923.patch";
+      hash = "sha256-HD+rOwqkuvu4lgeIHhiORNxpuowDfy94i0OgUVqbhJ8=";
+    })
+    # Replace including of <stdint.h> by <cstdint>
+    (fetchpatch {
+      url = "https://github.com/serge1/ELFIO/commit/575bfdb12cd90fa8913660295103549f151d116a.patch";
+      hash = "sha256-9N/NC5U+zs9eFKYLw/kVdrMGySWakWH7HG4fsK0mvNw=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
-  nativeCheckInputs = [ boost ];
+  nativeCheckInputs = [
+    boost
+    gtest
+  ];
 
-  cmakeFlags = [ "-DELFIO_BUILD_TESTS=ON" ];
+  cmakeFlags = [
+    "-DELFIO_BUILD_TESTS=ON"
+    "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS"
+  ];
 
   doCheck = true;
 

From 0673bfc6dd11d66b7cf2ccb233f26a2c0fcd9288 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Apr 2026 15:30:54 +0000
Subject: [PATCH 033/336] cgif: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/by-name/cg/cgif/package.nix b/pkgs/by-name/cg/cgif/package.nix
index 4cef37aae42c..50b3e62f821b 100644
--- a/pkgs/by-name/cg/cgif/package.nix
+++ b/pkgs/by-name/cg/cgif/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cgif";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "dloebl";
     repo = "cgif";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Eoq2QPDz5YYw22Ux1H9CYFN1x+/1YTYqi/rmdwf+Hk4=";
+    hash = "sha256-sZan1SLY4HGoifgGOb+uo4/q4dtxZuWAYhMbvdl/Ap8=";
   };
 
   nativeBuildInputs = [

From 8c84a28cfc0fd60c1e7e1f9e381020e72c4a3e34 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sun, 5 Apr 2026 20:40:16 -0700
Subject: [PATCH 034/336] llvmPackages_git: 23.0.0-unstable-2026-03-29 ->
 23.0.0-unstable-2026-04-05

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 345de596db00..2b05d88ab079 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,9 +28,9 @@ let
     "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
     "22.1.2".officialRelease.sha256 = "sha256-z6YcxgDd3F3JwfU5Y/wMw5MK+ZPISI3KLwHwUaraTuw=";
     "23.0.0-git".gitRelease = {
-      rev = "3e015b89e8bd9c71f6bb1cf38747d2862f5d5a3d";
-      rev-version = "23.0.0-unstable-2026-03-29";
-      sha256 = "sha256-sCyBinGy0kytpxK39OxiOrWMS3UPOHOxxwtm02vIIPk=";
+      rev = "26697f4d07eb921aebabdaa7d064c5165c70717e";
+      rev-version = "23.0.0-unstable-2026-04-05";
+      sha256 = "sha256-0TDdZRERXJzSGnKK74+L4taPs0EEKH1hsoRmrGy00Ks=";
     };
   }
   // llvmVersions;

From 4f7a3ea25850c00b1073efd0d6aece6fa1a23acd Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Mon, 23 Mar 2026 01:19:10 +0800
Subject: [PATCH 035/336] saber: 1.31.1 -> 1.33.0

---
 pkgs/by-name/sa/saber/package.nix       |   8 +-
 pkgs/by-name/sa/saber/pubspec.lock.json | 176 ++++++++++++++----------
 2 files changed, 107 insertions(+), 77 deletions(-)

diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 23394ca8c4b6..3b652bd92ead 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter338,
+  flutter341,
   fetchFromGitHub,
   gst_all_1,
   libunwind,
@@ -24,16 +24,16 @@ let
     ln -s ${zlib}/lib $out/lib
   '';
 
-  version = "1.31.1";
+  version = "1.33.0";
 
   src = fetchFromGitHub {
     owner = "saber-notes";
     repo = "saber";
     tag = "v${version}";
-    hash = "sha256-rMZNcq2Qvha0Mqq2fZwYyzp/rUh8LLtO60yXgv1EPJE=";
+    hash = "sha256-b4njSoL/l5AdFw4MlxyAferIGV7KdwbY6hQPW2A/RGE=";
   };
 in
-flutter338.buildFlutterApplication {
+flutter341.buildFlutterApplication {
   pname = "saber";
   inherit version src;
 
diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json
index 03556f57e6cd..f1988e6c296c 100644
--- a/pkgs/by-name/sa/saber/pubspec.lock.json
+++ b/pkgs/by-name/sa/saber/pubspec.lock.json
@@ -4,11 +4,11 @@
       "dependency": "direct main",
       "description": {
         "name": "abstract_sync",
-        "sha256": "f88f85bfecf2171d8756556b8d7992cf8d31d076a6d0ebbfd9f8ee559d8a18bc",
+        "sha256": "29d969627a2c3f97bca3d26f7c6ccead24b2dc2d183a196621948c7e8ef55a65",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.2"
     },
     "animated_vector": {
       "dependency": "transitive",
@@ -54,11 +54,11 @@
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.7"
+      "version": "4.0.9"
     },
     "args": {
       "dependency": "direct main",
@@ -104,11 +104,11 @@
       "dependency": "direct main",
       "description": {
         "name": "background_downloader",
-        "sha256": "2ea5322fe836c0aaf96aefd29ef1936771c71927f687cf18168dcc119666a45f",
+        "sha256": "4cb23d9ad4f5060944f38164e7b90d4bf99b57b2472a3bd4676e59b2db4afd06",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.5.2"
+      "version": "9.5.4"
     },
     "barcode": {
       "dependency": "transitive",
@@ -164,11 +164,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8",
+        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.3"
+      "version": "8.12.4"
     },
     "characters": {
       "dependency": "transitive",
@@ -280,16 +280,6 @@
       "source": "hosted",
       "version": "1.0.2"
     },
-    "csv": {
-      "dependency": "transitive",
-      "description": {
-        "name": "csv",
-        "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.0"
-    },
     "cupertino_icons": {
       "dependency": "direct main",
       "description": {
@@ -390,6 +380,16 @@
       "source": "hosted",
       "version": "1.8.1"
     },
+    "dynamic_yaru": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dynamic_yaru",
+        "sha256": "b748f4b20a29125108888bcd76432abd6abd77360bd444b399a7acd3b4137132",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.0"
+    },
     "dynamite_runtime": {
       "dependency": "transitive",
       "description": {
@@ -552,6 +552,16 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "flutter_hooks": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_hooks",
+        "sha256": "8ae1f090e5f4ef5cfa6670ce1ab5dddadd33f3533a7f9ba19d9f958aa2a89f42",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.21.3+1"
+    },
     "flutter_keyboard_visibility_linux": {
       "dependency": "transitive",
       "description": {
@@ -742,11 +752,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95",
+        "sha256": "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.2.4"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -784,11 +794,11 @@
       "dependency": "direct main",
       "description": {
         "name": "font_awesome_flutter",
-        "sha256": "b9011df3a1fa02993630b8fb83526368cf2206a711259830325bab2f1d2a4eb0",
+        "sha256": "09dcde8ab90ffae1a7d65ff2ef96fc62a17ad9d0ce7c127b317ded676b0d5935",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.12.0"
+      "version": "11.0.0"
     },
     "fuchsia_remote_debug_protocol": {
       "dependency": "transitive",
@@ -830,11 +840,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "golden_screenshot",
-        "sha256": "10716886073feaae43d1fb4f4af45aece147717d99cb8065a6052f8c306ec7e7",
+        "sha256": "c3ebae338a174bc4e6c20c19201002b839da38948e853ae3965bacb694e3b2d5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.0"
+      "version": "11.0.1"
     },
     "gsettings": {
       "dependency": "transitive",
@@ -860,11 +870,11 @@
       "dependency": "transitive",
       "description": {
         "name": "hooks",
-        "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6",
+        "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.0.2"
     },
     "html": {
       "dependency": "transitive",
@@ -910,11 +920,21 @@
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
+        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.4"
+      "version": "4.8.0"
+    },
+    "ini": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ini",
+        "sha256": "12a76c53591ffdf86d1265be3f986888a6dfeb34a85957774bc65912d989a173",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
     },
     "injector": {
       "dependency": "transitive",
@@ -986,11 +1006,11 @@
       "dependency": "transitive",
       "description": {
         "name": "json_annotation",
-        "sha256": "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.0"
+      "version": "4.11.0"
     },
     "keybinder": {
       "dependency": "direct main",
@@ -1066,21 +1086,21 @@
       "dependency": "transitive",
       "description": {
         "name": "markdown",
-        "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
+        "sha256": "ee85086ad7698b42522c6ad42fe195f1b9898e4d974a1af4576c1a3a176cada9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.0"
+      "version": "7.3.1"
     },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.18"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1146,11 +1166,11 @@
       "dependency": "transitive",
       "description": {
         "name": "native_toolchain_c",
-        "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac",
+        "sha256": "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.17.4"
+      "version": "0.17.6"
     },
     "nested": {
       "dependency": "transitive",
@@ -1315,11 +1335,11 @@
       "dependency": "transitive",
       "description": {
         "name": "packages_extensions",
-        "sha256": "1fb328695a9828c80d275ce1650a2bb5947690070de082dfa1dfac7429378daf",
+        "sha256": "a2e207f3345fc5cbea60155842e71be1c3059b427a61ed1c5d7c41f5d03264e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.1"
+      "version": "0.1.2"
     },
     "path": {
       "dependency": "direct main",
@@ -1425,11 +1445,11 @@
       "dependency": "direct main",
       "description": {
         "name": "pdf",
-        "sha256": "28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416",
+        "sha256": "e47a275b267873d5944ad5f5ff0dcc7ac2e36c02b3046a0ffac9b72fd362c44b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.11.3"
+      "version": "3.12.0"
     },
     "pdf_widget_wrapper": {
       "dependency": "transitive",
@@ -1555,11 +1575,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
+        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.0.2"
     },
     "pixel_snap": {
       "dependency": "transitive",
@@ -1615,31 +1635,31 @@
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.3"
+      "version": "6.5.0"
     },
     "power_extensions": {
       "dependency": "transitive",
       "description": {
         "name": "power_extensions",
-        "sha256": "ad0e8b2420090d996fe8b7fd32cdf02b9b924b6d4fc0fb0b559ff6aa5e24d5b0",
+        "sha256": "ad4e27d040f80bb7e566d96399b6419343d946d7c37912e1bce56c9f2b32e525",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.3"
+      "version": "0.2.4"
     },
     "printing": {
       "dependency": "direct main",
       "description": {
         "name": "printing",
-        "sha256": "482cd5a5196008f984bb43ed0e47cbfdca7373490b62f3b27b3299275bf22a93",
+        "sha256": "689170c9ddb1bda85826466ba80378aa8993486d3c959a71cd7d2d80cb606692",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.14.2"
+      "version": "5.14.3"
     },
     "process": {
       "dependency": "transitive",
@@ -1894,11 +1914,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sentry",
-        "sha256": "80b2a6667db8e0bb148ad70b2af242eb6aa8da9b56b56e72332a4221d93bc01d",
+        "sha256": "a49b4fb1cba576fe216347dc2a0e6d76076fb998e6012857db96f991c23b7b3c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.12.0"
+      "version": "9.15.0"
     },
     "sentry_dart_plugin": {
       "dependency": "direct dev",
@@ -1914,21 +1934,31 @@
       "dependency": "direct main",
       "description": {
         "name": "sentry_flutter",
-        "sha256": "df09c63e0111a9ad5c4a13a89def67327fc2028bec0f55c246d8c083d486e418",
+        "sha256": "25150030c93bd1d4b727ab61cfb09e99121c69ce90fa820bb9ca16dab433e43a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.12.0"
+      "version": "9.15.0"
     },
     "sentry_logging": {
       "dependency": "direct main",
       "description": {
         "name": "sentry_logging",
-        "sha256": "d546a7dc7734d3b61b3b09ab8fbf2026393eb72dbbede5442062080016f7a1d0",
+        "sha256": "bcc9f1375b20b4d7189a1c0b03984b7b5fb05006a80620aeba71b424b699ad6d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.12.0"
+      "version": "9.15.0"
+    },
+    "serial_csv": {
+      "dependency": "transitive",
+      "description": {
+        "name": "serial_csv",
+        "sha256": "2d62bb70cb3ce7251383fc86ea9aae1298ab1e57af6ef4e93b6a9751c5c268dd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.2"
     },
     "share_plus": {
       "dependency": "direct main",
@@ -1964,11 +1994,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f",
+        "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.20"
+      "version": "2.4.21"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -2040,21 +2070,21 @@
       "dependency": "direct main",
       "description": {
         "name": "slang",
-        "sha256": "81e277dc5e2305f53412b92afeb803620453259afe147d5cd6417700f998a7a6",
+        "sha256": "ea6702ed6b1c82065fb2de906fe34ac9298117342e3c2ea2567132efdc81bd17",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.12.1"
+      "version": "4.14.0"
     },
     "slang_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "slang_flutter",
-        "sha256": "0f0276c400660c8b67150005aa4df57643b86ce6ae9c824abee8e25f345d9abc",
+        "sha256": "dcc4e77527c91b12348fc8bdd43d3eb92d8cea37c12a23a1f9719cdc12c804c6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.12.1"
+      "version": "4.14.0"
     },
     "source_span": {
       "dependency": "transitive",
@@ -2200,11 +2230,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
+        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.9"
+      "version": "0.7.10"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2270,11 +2300,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "b1aca26728b7cc7a3af971bb6f601554a8ae9df2e0a006de8450ba06a17ad36a",
+        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.0"
+      "version": "6.4.1"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -2330,21 +2360,21 @@
       "dependency": "transitive",
       "description": {
         "name": "uuid",
-        "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
+        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.2"
+      "version": "4.5.3"
     },
     "vector_graphics": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
+        "sha256": "7076216a10d5c390315fbe536a30f1254c341e7543e6c4c8a815e591307772b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.19"
+      "version": "1.1.20"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -2360,11 +2390,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b",
+        "sha256": "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.20"
+      "version": "1.2.0"
     },
     "vector_math": {
       "dependency": "direct main",
@@ -2560,11 +2590,11 @@
       "dependency": "direct main",
       "description": {
         "name": "yaru",
-        "sha256": "859f062535a51585689f7d72904e9533f7b1df93c0fe2e860591cff8f9371162",
+        "sha256": "8c2d9602963efd52479e77f0052ceea05f491e7a31d2ca337c44901f526f8226",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.1"
+      "version": "10.0.0"
     },
     "yaru_window": {
       "dependency": "transitive",
@@ -2618,7 +2648,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.10.3 <4.0.0",
+    "dart": ">=3.11.0 <4.0.0",
     "flutter": ">=3.41.0"
   }
 }

From 7a19ba11e0a0e4c46b60e890e5a26100f048fd48 Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Tue, 24 Mar 2026 18:43:19 +0800
Subject: [PATCH 036/336] zrok: 2.0.0-rc4 -> 2.0.1

---
 pkgs/by-name/zr/zrok/package.nix | 35 +++++++++++++++++---------
 pkgs/by-name/zr/zrok/update.sh   | 42 --------------------------------
 2 files changed, 24 insertions(+), 53 deletions(-)
 delete mode 100755 pkgs/by-name/zr/zrok/update.sh

diff --git a/pkgs/by-name/zr/zrok/package.nix b/pkgs/by-name/zr/zrok/package.nix
index db8174f00b46..f39d3fc9f3dc 100644
--- a/pkgs/by-name/zr/zrok/package.nix
+++ b/pkgs/by-name/zr/zrok/package.nix
@@ -2,6 +2,10 @@
   lib,
   stdenv,
   fetchzip,
+  writeShellScript,
+  nix-update,
+  jq,
+  common-updater-scripts,
 }:
 
 let
@@ -20,17 +24,17 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-ytksYeWHLWrNeeTW0aCBw+dc0N7WtLtNpqRZ10Y3WbA=";
-      aarch64-linux = "sha256-HbO+IjAiccbyquWrvXrCFRkYKlbvJ2wlk49ydGDbGbs=";
-      armv7l-linux = "sha256-mvZz4MCe9IGdfjfFbrNhmjAidPB8e7IeOLATclTKdcw=";
-      x86_64-darwin = "sha256-mDEn3rnE7FBDlGqrd3pmOL4mplOf7WpGi4A1W1UqVok=";
-      aarch64-darwin = "sha256-yxL9zJDRWrkmizEZ5Da0Lo1YBJEBOJinsOKpOrMKMlY=";
+      x86_64-linux = "sha256-H/KISDC58ILi6oZlLY2HdgJR9ksEt+VeJem4VIFhqcY=";
+      aarch64-linux = "sha256-kfmMi2HeZG81CocOEK+n+UwfKz245Ya4C6iXT2L85pI=";
+      armv7l-linux = "sha256-AZDoQOJMBB1k9r07URj5g8249Od5P039nf3BadzCbPY=";
+      x86_64-darwin = "sha256-B2LeP1hKxifxpGD7BS0Wgd0h+Cf4teFh8ldyqrFhteU=";
+      aarch64-darwin = "sha256-c5vWvb8ZhGAnmlZB/kqErC6SEXClg6vNbJheAAmqV/E=";
     }
     .${system} or throwSystem;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zrok";
-  version = "2.0.0-rc4";
+  version = "2.0.1";
 
   src = fetchzip {
     url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz";
@@ -38,14 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
     inherit hash;
   };
 
-  passthru.updateScript = ./update.sh;
-
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin
-    cp zrok $out/bin/
-    chmod +x $out/bin/zrok
+    install -D --mode=0755 zrok2 $out/bin/zrok
     ${lib.optionalString stdenv.hostPlatform.isLinux ''
       patchelf --set-interpreter "$(< "$NIX_CC/nix-support/dynamic-linker")" "$out/bin/zrok"
     ''}
@@ -53,6 +53,19 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = writeShellScript "update-script" ''
+    ${lib.getExe nix-update} $UPDATE_NIX_ATTR_PATH --system x86_64-linux
+    latestVersion=$(nix eval --raw --file . $UPDATE_NIX_ATTR_PATH.version)
+    if [[ "$latestVersion" == "$UPDATE_NIX_OLD_VERSION" ]]; then
+      exit 0
+    fi
+    systems=$(nix eval --json -f . $UPDATE_NIX_ATTR_PATH.meta.platforms | ${lib.getExe jq} --raw-output '.[]')
+    for system in $systems; do
+      hash=$(nix store prefetch-file --unpack --json $(nix eval --raw --file . $UPDATE_NIX_ATTR_PATH.src.url --system "$system") | ${lib.getExe jq} --raw-output .hash)
+      ${lib.getExe' common-updater-scripts "update-source-version"} $UPDATE_NIX_ATTR_PATH $latestVersion $hash --system=$system --ignore-same-version --ignore-same-hash
+    done
+  '';
+
   meta = {
     description = "Geo-scale, next-generation sharing platform built on top of OpenZiti";
     homepage = "https://zrok.io";
diff --git a/pkgs/by-name/zr/zrok/update.sh b/pkgs/by-name/zr/zrok/update.sh
deleted file mode 100755
index afd9c4c5774d..000000000000
--- a/pkgs/by-name/zr/zrok/update.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnused gawk nix-prefetch
-
-set -euo pipefail
-
-ROOT="$(dirname "$(readlink -f "$0")")"
-NIX_DRV="$ROOT/package.nix"
-if [ ! -f "$NIX_DRV" ]; then
-  echo "ERROR: cannot find package.nix in $ROOT"
-  exit 1
-fi
-
-fetch_arch() {
-  VER="$1"; ARCH="$2"
-  URL="https://github.com/openziti/zrok/releases/download/v${VER}/zrok_${VER}_${ARCH}.tar.gz"
-  nix-prefetch "{ stdenv, fetchzip }:
-stdenv.mkDerivation rec {
-  pname = \"zrok\"; version = \"${VER}\";
-  src = fetchzip { url = \"$URL\"; stripRoot = false; };
-}
-"
-}
-
-replace_sha() {
-  sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV"
-}
-
-ZROK_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/openziti/zrok/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//')
-
-ZROK_LINUX_X64_SHA256=$(fetch_arch "$ZROK_VER" "linux_amd64")
-ZROK_LINUX_AARCH64_SHA256=$(fetch_arch "$ZROK_VER" "linux_arm64")
-ZROK_LINUX_ARMV7L_SHA256=$(fetch_arch "$ZROK_VER" "linux_armv7")
-ZROK_DARWIN_X64_SHA256=$(fetch_arch "$ZROK_VER" "darwin_amd64")
-ZROK_DARWIN_ARM64_SHA256=$(fetch_arch "$ZROK_VER" "darwin_arm64")
-
-sed -i "s/version = \".*\"/version = \"$ZROK_VER\"/" "$NIX_DRV"
-
-replace_sha "x86_64-linux" "$ZROK_LINUX_X64_SHA256"
-replace_sha "aarch64-linux" "$ZROK_LINUX_AARCH64_SHA256"
-replace_sha "armv7l-linux" "$ZROK_LINUX_ARMV7L_SHA256"
-replace_sha "x86_64-darwin" "$ZROK_DARWIN_X64_SHA256"
-replace_sha "aarch64-darwin" "$ZROK_DARWIN_ARM64_SHA256"

From ca9588ad53126c4d86c31168f6a5ccd0c864b318 Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Mon, 6 Apr 2026 10:48:24 +0800
Subject: [PATCH 037/336] casilda: 1.2.0 -> 1.2.2

Diff: https://gitlab.gnome.org/jpu/casilda/-/compare/1.2.0...1.2.2
---
 pkgs/by-name/ca/casilda/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/casilda/package.nix b/pkgs/by-name/ca/casilda/package.nix
index 9eb66096be3e..ecc82d21079f 100644
--- a/pkgs/by-name/ca/casilda/package.nix
+++ b/pkgs/by-name/ca/casilda/package.nix
@@ -12,13 +12,13 @@
   libepoxy,
   wayland,
   wayland-scanner,
-  wlroots_0_19,
+  wlroots_0_20,
   libxkbcommon,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "casilda";
-  version = "1.2.0";
+  version = "1.2.2";
 
   outputs = [
     "out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jpu";
     repo = "casilda";
     tag = finalAttrs.version;
-    hash = "sha256-JaWHKKNYeeW7QKB6DpGrXowvufeBZUnc9pP0ZAAo3gU=";
+    hash = "sha256-JMDS+fx0vUZnfNz5bzmTy8/4BkgMypWBp+qjorTVmK4=";
   };
 
   depsBuildBuild = [ pkg-config ];
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     wayland # for wayland-server
     libxkbcommon
-    wlroots_0_19
+    wlroots_0_20
   ];
 
   propagatedBuildInputs = [ gtk4 ];

From cb6caa4c64d7db1a3cbd4d30eb23e88b3606dc93 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 6 Apr 2026 18:27:57 -0500
Subject: [PATCH 038/336] spoof-mac: migrate to by-name

---
 .../default.nix => by-name/sp/spoof-mac/package.nix}       | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{tools/networking/spoof-mac/default.nix => by-name/sp/spoof-mac/package.nix} (85%)

diff --git a/pkgs/tools/networking/spoof-mac/default.nix b/pkgs/by-name/sp/spoof-mac/package.nix
similarity index 85%
rename from pkgs/tools/networking/spoof-mac/default.nix
rename to pkgs/by-name/sp/spoof-mac/package.nix
index d631fa0aac2f..4476393baa53 100644
--- a/pkgs/tools/networking/spoof-mac/default.nix
+++ b/pkgs/by-name/sp/spoof-mac/package.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchFromGitHub,
-  docopt,
 }:
 
-buildPythonPackage {
+python3Packages.buildPythonPackage {
   pname = "spoof-mac";
   version = "unstable-2018-01-27";
   format = "setuptools";
@@ -17,7 +16,7 @@ buildPythonPackage {
     sha256 = "sha256-Qiu0URjUyx8QDVQQUFGxPax0J80e2m4+bPJeqFoKxX8=";
   };
 
-  propagatedBuildInputs = [ docopt ];
+  propagatedBuildInputs = [ python3Packages.docopt ];
 
   # No tests
   doCheck = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c6306892b86..7573901df399 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3436,8 +3436,6 @@ with pkgs;
   spire-agent = spire.agent;
   spire-server = spire.server;
 
-  spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
-
   stirling-pdf-desktop = callPackage ../by-name/st/stirling-pdf/package.nix {
     isDesktopVariant = true;
   };

From 957f4b35eae119052c348d8137ae0b562cf5cf9c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 6 Apr 2026 18:31:08 -0500
Subject: [PATCH 039/336] spoof-mac: switch to hash, add missing version string

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

diff --git a/pkgs/by-name/sp/spoof-mac/package.nix b/pkgs/by-name/sp/spoof-mac/package.nix
index 4476393baa53..608fd420bbea 100644
--- a/pkgs/by-name/sp/spoof-mac/package.nix
+++ b/pkgs/by-name/sp/spoof-mac/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonPackage {
   pname = "spoof-mac";
-  version = "unstable-2018-01-27";
+  version = "0-unstable-2018-01-27";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "feross";
     repo = "SpoofMAC";
     rev = "2cfc796150ef48009e9b765fe733e37d82c901e0";
-    sha256 = "sha256-Qiu0URjUyx8QDVQQUFGxPax0J80e2m4+bPJeqFoKxX8=";
+    hash = "sha256-Qiu0URjUyx8QDVQQUFGxPax0J80e2m4+bPJeqFoKxX8=";
   };
 
   propagatedBuildInputs = [ python3Packages.docopt ];

From 4a59d6908cf4c991be8283917011fe4c76d51bea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Apr 2026 05:08:14 +0000
Subject: [PATCH 040/336] chatbox: 1.19.1 -> 1.20.0

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

diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix
index f9b26d324c1a..0d9448b273f4 100644
--- a/pkgs/by-name/ch/chatbox/package.nix
+++ b/pkgs/by-name/ch/chatbox/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "chatbox";
-  version = "1.19.1";
+  version = "1.20.0";
 
   src = fetchurl {
     url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
-    hash = "sha256-xR653w7jiJlSHvbDcJG5pFjbgf/jZzbyx8C+pa0cPp4=";
+    hash = "sha256-VzrAXWacrX6ldHdSw12RmElMdWmHiCsE3qPEPoJqFA0=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From 861de83e8e45a1aff9de842a507d955e4afda28c Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 27 Mar 2026 19:35:25 +0800
Subject: [PATCH 041/336] nixos/syncthing: fix unix socket guiAddress handling

---
 nixos/modules/services/networking/syncthing.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index a230d0f56ad7..dc338f783858 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -16,7 +16,7 @@ let
   settingsFormat = pkgs.formats.json { };
   cleanedConfig = converge (filterAttrsRecursive (_: v: v != null && v != { })) cfg.settings;
 
-  isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/";
+  isUnixGui = lib.strings.hasPrefix "unix://" cfg.guiAddress;
 
   # Syncthing supports serving the GUI over Unix sockets. If that happens, the
   # API is served over the Unix socket as well.  This function returns the correct
@@ -30,7 +30,7 @@ let
     # note that the dot in front of `${path}` is the hostname, which is
     # required.
     then
-      "--unix-socket ${cfg.guiAddress} http://.${path}"
+      "--unix-socket ${lib.strings.removePrefix "unix://" cfg.guiAddress} http://.${path}"
     # no adjustments are needed if cfg.guiAddress is a network address
     else
       "${cfg.guiAddress}${path}";
@@ -290,7 +290,7 @@ let
               )"
               for id in ''${stale_${conf_type}_ids}; do
                 >&2 echo "Deleting stale device: $id"
-                curl -X DELETE "${s.baseAddress}/$id"
+                curl -X DELETE ${s.baseAddress}/$id
               done
             ''
           ))
@@ -774,6 +774,7 @@ in
       guiAddress = mkOption {
         type = types.str;
         default = "127.0.0.1:8384";
+        apply = x: if lib.strings.hasPrefix "/" x then "unix://${x}" else x;
         description = ''
           The address to serve the web interface at.
         '';
@@ -1000,7 +1001,7 @@ in
               args = lib.escapeShellArgs (
                 (lib.cli.toCommandLineGNU { } {
                   "no-browser" = true;
-                  "gui-address" = (if isUnixGui then "unix://" else "") + cfg.guiAddress;
+                  "gui-address" = cfg.guiAddress;
                   "config" = cfg.configDir;
                   "data" = cfg.databaseDir;
                 })
@@ -1008,6 +1009,7 @@ in
               );
             in
             "${lib.getExe cfg.package} ${args}";
+          RuntimeDirectory = "syncthing";
           MemoryDenyWriteExecute = true;
           NoNewPrivileges = true;
           PrivateDevices = true;

From 6708130feb4f98429da27ef7727f95b94062757a Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Tue, 7 Apr 2026 15:50:19 +0800
Subject: [PATCH 042/336] nixosTests.syncthing-folders: cover unix socket usage

---
 nixos/tests/syncthing/folders.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/syncthing/folders.nix b/nixos/tests/syncthing/folders.nix
index 0e5850ed7632..46b4b4488e44 100644
--- a/nixos/tests/syncthing/folders.nix
+++ b/nixos/tests/syncthing/folders.nix
@@ -26,6 +26,7 @@ in
           openDefaultPorts = true;
           cert = "${idA}/cert.pem";
           key = "${idA}/key.pem";
+          guiAddress = "unix:///run/syncthing/syncthing.sock";
           settings = {
             devices.b.id = lib.fileContents "${idB}/id";
             devices.c.id = lib.fileContents "${idC}/id";

From 1b61c5b3b9ed3249d7464423b9d2110ce5cae2b6 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 7 Apr 2026 11:35:21 +0200
Subject: [PATCH 043/336] draupnir: 2.9.0 -> 3.0.0

https://github.com/the-draupnir-project/Draupnir/releases/tag/v3.0.0
---
 pkgs/by-name/dr/draupnir/package.nix | 48 +++++++++++-----------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 8fc178985773..a02eef927117 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -2,67 +2,53 @@
   lib,
   fetchFromGitHub,
   makeBinaryWrapper,
-  nodejs_22,
+  nodejs_24,
   matrix-sdk-crypto-nodejs,
   python3,
   sqlite,
   srcOnly,
   removeReferencesTo,
-  fetchYarnDeps,
+  buildNpmPackage,
   stdenv,
   cctools,
   nixosTests,
-  yarnBuildHook,
-  yarnConfigHook,
   nix-update-script,
 }:
 let
-  nodeSources = srcOnly nodejs_22;
+  nodeSources = srcOnly nodejs_24;
 in
 
-stdenv.mkDerivation (finalAttrs: {
+buildNpmPackage (finalAttrs: {
   pname = "draupnir";
-  version = "2.9.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j5UEW9JpIHhFWGMEwrPE1v0hdFAw5Z4CImRYEm56I4k=";
+    hash = "sha256-WrMYak6ztIy3KqjcVuN2OmIy1uxlIVNvHPGw7e3LRw0=";
   };
 
   nativeBuildInputs = [
     makeBinaryWrapper
     sqlite
     python3
-    yarnConfigHook
-    yarnBuildHook
-    nodejs_22
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool;
 
-  offlineCache = fetchYarnDeps {
-    inherit (finalAttrs) src;
-    hash = "sha256-Ck6Ba/qDlEW5jqKUX8tyB0QbiVXU8+ND2tvhftmYktY=";
-  };
+  npmDepsHash = "sha256-CnSeg7sGFzPD+VQl8sWXtiBfuSdeieNhDrLFjWlHcUs=";
 
   preBuild = ''
-    # install proper version info
-    echo "${finalAttrs.version}-nix" > version.txt
+    # install proper version and branch info
+    echo "${finalAttrs.version}-nix" > apps/draupnir/version.txt
+    echo "main" > apps/draupnir/branch.txt
 
-    # makes network requests
-    sed -i 's/corepack //g' package.json
-  '';
-
-  postBuild = ''
-    yarn --offline run copy-assets
+    # we already set the version and branch above
+    substituteInPlace apps/draupnir/package.json \
+      --replace-fail " && npm run describe-version && npm run describe-branch" ""
   '';
 
   postInstall = ''
-    # Re-install only production dependencies
-    yarn install --frozen-lockfile --force --production --offline --non-interactive \
-      --ignore-engines --ignore-platform --ignore-scripts --no-progress
-
     # Replace matrix-sdk-crypto-nodejs with nixpkgs version
     nodeCryptoPath="node_modules/@matrix-org/matrix-sdk-crypto-nodejs"
     rm -rf "$nodeCryptoPath"
@@ -83,12 +69,14 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/lib/node_modules/draupnir
     mkdir $out/bin
     # Install outputs
-    mv ./lib ./version.txt ./node_modules ./package.json $out/lib/node_modules/draupnir
+    mv ./node_modules ./packages ./apps/draupnir/dist ./apps/draupnir/version.txt ./apps/draupnir/package.json $out/lib/node_modules/draupnir
+    # Fix dangling symlink pointing to relative path ../apps/draupnir
+    rm $out/lib/node_modules/draupnir/node_modules/draupnir
 
     # Create wrapper executable
-    makeWrapper ${lib.getExe nodejs_22} $out/bin/draupnir \
+    makeWrapper ${lib.getExe nodejs_24} $out/bin/draupnir \
       --add-flags "--enable-source-maps" \
-      --add-flags "$out/lib/node_modules/draupnir/lib/index.js"
+      --add-flags "$out/lib/node_modules/draupnir/dist/index.js"
 
   '';
 

From 67e6de7939e27b92a7b87fbfc58aea135936c5cf Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Wed, 8 Apr 2026 10:31:38 +0200
Subject: [PATCH 044/336] htop: Fix static build

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

diff --git a/pkgs/by-name/ht/htop/package.nix b/pkgs/by-name/ht/htop/package.nix
index 55a8c08f49be..c0f3deb92df4 100644
--- a/pkgs/by-name/ht/htop/package.nix
+++ b/pkgs/by-name/ht/htop/package.nix
@@ -8,7 +8,7 @@
   ncurses,
   libcap,
   libnl,
-  sensorsSupport ? stdenv.hostPlatform.isLinux,
+  sensorsSupport ? (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic),
   lm_sensors,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
   systemdLibs,

From fc00e7451b1ce76b57696bb0608b36956bdc9e07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 00:06:12 +0000
Subject: [PATCH 045/336] n8n: 2.14.2 -> 2.15.0

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

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 7168f00a8e3a..00fc217462bc 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -25,20 +25,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "2.14.2";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-nWV3DFDkBlfDdoOxwYB0HSrTyKpTt70YxAQYUPartkE=";
+    hash = "sha256-TOIJqLa68ibry9LSqMkHrJJ+v9t2bK2ybNPUDdiJ66Q=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-0SnPF3CgIja3M1ubLrwyFcx7vY0eHz9DEgn/gDLXN80=";
+    hash = "sha256-YGplNNvIOIY1BthWmejAzucXujq8AkgPJus774GmWCA=";
   };
 
   nativeBuildInputs = [

From a6dde30645aa4a2cd56478842bb0110bb14c33e1 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 5 Apr 2026 23:54:06 -0700
Subject: [PATCH 046/336] armagetronad: fix build with newer protobuf, update
 sty, allow overrides

---
 pkgs/by-name/ar/armagetronad-dedicated/package.nix | 12 ++++++++----
 pkgs/by-name/ar/armagetronad/package.nix           |  9 +++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ar/armagetronad-dedicated/package.nix b/pkgs/by-name/ar/armagetronad-dedicated/package.nix
index 67aa20cb7210..7444b0319c9c 100644
--- a/pkgs/by-name/ar/armagetronad-dedicated/package.nix
+++ b/pkgs/by-name/ar/armagetronad-dedicated/package.nix
@@ -1,7 +1,11 @@
 {
   armagetronad,
-}:
+  ...
+}@args:
 
-armagetronad.override {
-  dedicatedServer = true;
-}
+armagetronad.override (
+  {
+    dedicatedServer = true;
+  }
+  // args
+)
diff --git a/pkgs/by-name/ar/armagetronad/package.nix b/pkgs/by-name/ar/armagetronad/package.nix
index 1b54395c93b2..2568aedbcc11 100644
--- a/pkgs/by-name/ar/armagetronad/package.nix
+++ b/pkgs/by-name/ar/armagetronad/package.nix
@@ -30,6 +30,7 @@
   gnugrep,
   nixosTests,
   dedicatedServer ? false,
+  ...
 }:
 
 let
@@ -71,8 +72,8 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads
       ${unstableVersionMajor} =
         let
-          rev = "3675f21cd5be4932a7a168b321576e0b09e64aaf";
-          hash = "sha256-d2vPFAyx6LhEIxtEUdhrlqqYeCY0NnETlq7TVvX5vVo=";
+          rev = "ec0dbb09ce081be2879acf67bebcd2a2987fd0a4";
+          hash = "sha256-8fH0Q0N2bKCO0t+lOs8EamThpiial2CfEcVP3cZbHX0=";
         in
         dedicatedServer: {
           version = "${unstableVersionMajor}-${lib.substring 0 8 rev}";
@@ -104,8 +105,8 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/hack-0.2.8-sty+ct+ap/?ref_type=heads
       "${latestVersionMajor}-sty+ct+ap" =
         let
-          rev = "22fdbee08ca301c09ae4dee7210ccef02536670d";
-          hash = "sha256-F+nnQxI2TTTa+gJYWjQPFjd8tQLCh/dEu/oTV0ie8BI=";
+          rev = "b74df624eae13e919b4b04f9b18043bce9d04431";
+          hash = "sha256-tjEcgyYxaGgHiIH8y9xYM7HEpgZa7DEWIVqK8r0dmaY=";
         in
         dedicatedServer: {
           version = "${latestVersionMajor}-sty+ct+ap-${lib.substring 0 8 rev}";

From d6db0831ab1dd367210438650d7630824e6b0a05 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Thu, 9 Apr 2026 22:18:38 +0200
Subject: [PATCH 047/336] epson-escpr2: remove shawn8901 as maintainer

---
 pkgs/by-name/ep/epson-escpr2/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix
index 8b8fde26a5e9..c6b8c5103101 100644
--- a/pkgs/by-name/ep/epson-escpr2/package.nix
+++ b/pkgs/by-name/ep/epson-escpr2/package.nix
@@ -53,7 +53,6 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       ma9e
       ma27
-      shawn8901
     ];
     platforms = lib.platforms.linux;
   };

From 1b48f0ea51bf9fe580904fb59277e28bd54ac1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 9 Apr 2026 12:14:38 -0700
Subject: [PATCH 048/336] birdfont: fix build failure

---
 pkgs/tools/misc/birdfont/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index e9e5f6efb85d..6d975e365b6d 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/pkgs/tools/misc/birdfont/default.nix
@@ -60,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs .
   '';
 
+  # workaround gcc >= 14 incompatibilities
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17 -Wno-error=incompatible-pointer-types";
+
   buildPhase = "./build.py";
 
   installPhase = "./install.py";

From 3a2e5330884bb8bb5855208f946e4939e0c5b75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 9 Apr 2026 12:24:39 -0700
Subject: [PATCH 049/336] birdfont: adopt

---
 pkgs/tools/misc/birdfont/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index 6d975e365b6d..534e3e588864 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/pkgs/tools/misc/birdfont/default.nix
@@ -73,6 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format";
     homepage = "https://birdfont.org";
     license = lib.licenses.gpl3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ drawbu ];
   };
 })

From cd7d6b34535713f5dd737f784a739956ef9abe12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 9 Apr 2026 12:32:16 -0700
Subject: [PATCH 050/336] birdfont: modernize

---
 pkgs/tools/misc/birdfont/default.nix | 53 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index 534e3e588864..390b042e5a8e 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/pkgs/tools/misc/birdfont/default.nix
@@ -1,24 +1,24 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  python3,
-  xmlbird,
+  autoPatchelfHook,
   cairo,
+  fetchFromGitHub,
   gdk-pixbuf,
-  libgee,
   glib,
-  gtk3,
-  webkitgtk_4_1,
-  libnotify,
-  sqlite,
-  vala,
   gobject-introspection,
   gsettings-desktop-schemas,
-  wrapGAppsHook3,
-  autoPatchelfHook,
+  gtk3,
+  lib,
+  libgee,
+  libnotify,
   nix-update-script,
+  pkg-config,
+  python3,
+  sqlite,
+  stdenv,
+  vala,
+  webkitgtk_4_1,
+  wrapGAppsHook3,
+  xmlbird,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,33 +29,33 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "johanmattssonm";
     repo = "birdfont";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-7xVjY/yH7pMlUBpQc5Gb4t4My24Mx5KkARVp2KSr+Iw=";
+    hash = "sha256-7xVjY/yH7pMlUBpQc5Gb4t4My24Mx5KkARVp2KSr+Iw=";
   };
 
   nativeBuildInputs = [
-    python3
-    pkg-config
-    vala
-    gobject-introspection
-    wrapGAppsHook3
     autoPatchelfHook
+    gobject-introspection
+    pkg-config
+    python3
+    vala
+    wrapGAppsHook3
   ];
   buildInputs = [
-    xmlbird
-    libgee
     cairo
     gdk-pixbuf
     glib
+    gsettings-desktop-schemas
     gtk3
-    webkitgtk_4_1
+    libgee
     libnotify
     sqlite
-    gsettings-desktop-schemas
+    webkitgtk_4_1
+    xmlbird
   ];
 
   postPatch = ''
     substituteInPlace install.py \
-      --replace 'platform.version()' '"Nix"'
+      --replace-fail 'platform.version()' '"Nix"'
 
     patchShebangs .
   '';
@@ -72,7 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format";
     homepage = "https://birdfont.org";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "birdfont";
     maintainers = with lib.maintainers; [ drawbu ];
   };
 })

From f9c6f9ee9772d728eec853cb9c88a1a6bf4a7515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 9 Apr 2026 14:36:35 -0700
Subject: [PATCH 051/336] xmlbird: adopt

---
 pkgs/tools/misc/birdfont/xmlbird.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix
index 83a219bc6487..b12c41398889 100644
--- a/pkgs/tools/misc/birdfont/xmlbird.nix
+++ b/pkgs/tools/misc/birdfont/xmlbird.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     description = "XML parser for Vala and C programs";
     homepage = "https://birdfont.org/xmlbird.php";
     license = lib.licenses.lgpl3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ drawbu ];
   };
 }

From f5ac2f9fa860f434bb96c5b4c290e9b9894d90cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 22:29:11 +0000
Subject: [PATCH 052/336] python3Packages.rapidocr: 3.7.0 -> 3.8.0

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

diff --git a/pkgs/development/python-modules/rapidocr/default.nix b/pkgs/development/python-modules/rapidocr/default.nix
index ee9a50217d65..2a2256069e57 100644
--- a/pkgs/development/python-modules/rapidocr/default.nix
+++ b/pkgs/development/python-modules/rapidocr/default.nix
@@ -23,13 +23,13 @@
   requests,
 }:
 let
-  version = "3.7.0";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "RapidAI";
     repo = "RapidOCR";
     tag = "v${version}";
-    hash = "sha256-wFAW0KRNC31cqJ8f1/dBZDLSkOBdB5AFpPzO85g3rHA=";
+    hash = "sha256-KOnZbbNgv6Ca9tAFSZ0AZbugG28U0tZKeIw3/ML3eAc=";
   };
 
   models =

From 93e2d702a35f1f254b03608a139f4fd81b718a49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 13:19:53 +0000
Subject: [PATCH 053/336] pcm: 202509 -> 202604

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

diff --git a/pkgs/by-name/pc/pcm/package.nix b/pkgs/by-name/pc/pcm/package.nix
index c6df46483e45..dac98e54b648 100644
--- a/pkgs/by-name/pc/pcm/package.nix
+++ b/pkgs/by-name/pc/pcm/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pcm";
-  version = "202509";
+  version = "202604";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "pcm";
     rev = finalAttrs.version;
-    hash = "sha256-RIpyh4JN1/ePoSLQPyB3pgx6ifBcpJK+1d9YQcGZed4=";
+    hash = "sha256-TWE/5rsCCfoKDAy9i9YDRiUXVnqAX7I08Oq6QgCbzaY=";
   };
 
   nativeBuildInputs = [ cmake ];

From 51a23844dd2702658219883a55f299bfeecd344f Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Fri, 10 Apr 2026 10:28:52 -0700
Subject: [PATCH 054/336] =?UTF-8?q?rocmPackages.composable=5Fkernel:=20use?=
 =?UTF-8?q?=20jemalloc=20at=20build=20time=20to=20speed=20up=20build=20by?=
 =?UTF-8?q?=20=E2=89=887%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/rocm-modules/composable_kernel/base.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix
index 9f1353ac7e05..1d56a0caa9db 100644
--- a/pkgs/development/rocm-modules/composable_kernel/base.nix
+++ b/pkgs/development/rocm-modules/composable_kernel/base.nix
@@ -11,6 +11,7 @@
   hipify,
   gitMinimal,
   gtest,
+  jemalloc,
   zstd,
   buildTests ? false,
   buildExamples ? false,
@@ -87,6 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   enableParallelBuilding = true;
   env.ROCM_PATH = clr;
+  # Speed up build by ~7% with jemalloc (template torture test workload means allocation heavy clang invocations)
+  env.LD_PRELOAD = "${jemalloc}/lib/libjemalloc.so";
+  env.MALLOC_CONF = "background_thread:true,metadata_thp:auto,dirty_decay_ms:10000,muzzy_decay_ms:10000";
 
   cmakeFlags = [
     (lib.cmakeBool "MIOPEN_REQ_LIBS_ONLY" miOpenReqLibsOnly)

From 59ffef8450bce36066f2045a1621cce05aede2ed Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 27 Jul 2025 01:27:55 +0200
Subject: [PATCH 055/336] github-desktop: add dtomvan as a maintainer

In response to https://github.com/NixOS/nixpkgs/pull/428716
---
 pkgs/by-name/gi/github-desktop/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix
index 3ac3f6182756..6a00f32c2dbe 100644
--- a/pkgs/by-name/gi/github-desktop/package.nix
+++ b/pkgs/by-name/gi/github-desktop/package.nix
@@ -101,7 +101,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://desktop.github.com/";
     license = lib.licenses.mit;
     mainProgram = "github-desktop";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ dtomvan ];
     platforms = lib.platforms.linux;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };

From 11db3eeb36a02d88317764002405419d60c988a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 9 Apr 2026 14:39:33 -0700
Subject: [PATCH 056/336] xmlbird: modernize

---
 pkgs/tools/misc/birdfont/xmlbird.nix | 30 +++++++++++++++-------------
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix
index b12c41398889..b8b668ffcc40 100644
--- a/pkgs/tools/misc/birdfont/xmlbird.nix
+++ b/pkgs/tools/misc/birdfont/xmlbird.nix
@@ -1,38 +1,40 @@
 {
-  lib,
-  stdenv,
   fetchurl,
-  python3,
-  pkg-config,
-  vala,
   glib,
   gobject-introspection,
+  lib,
+  pkg-config,
+  python3,
+  stdenv,
+  vala,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xmlbird";
   version = "1.2.15";
 
   src = fetchurl {
-    url = "https://birdfont.org/${pname}-releases/lib${pname}-${version}.tar.xz";
-    sha256 = "sha256-8GX4ijF+AxaGGFlSxRPOAoUezRG6592jOrifz/mWTRM=";
+    url = "https://birdfont.org/xmlbird-releases/libxmlbird-${finalAttrs.version}.tar.xz";
+    hash = "sha256-8GX4ijF+AxaGGFlSxRPOAoUezRG6592jOrifz/mWTRM=";
   };
 
   nativeBuildInputs = [
-    python3
-    pkg-config
-    vala
     gobject-introspection
+    pkg-config
+    python3
+    vala
   ];
 
   buildInputs = [ glib ];
 
   postPatch = ''
     substituteInPlace configure \
-      --replace 'platform.dist()[0]' '"nix"'
+      --replace-fail 'platform.version()' '"Nix"'
     patchShebangs .
   '';
 
+  configureFlags = [ "--cc=${stdenv.cc.targetPrefix}cc" ];
+
   buildPhase = "./build.py";
 
   installPhase = "./install.py";
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "XML parser for Vala and C programs";
     homepage = "https://birdfont.org/xmlbird.php";
-    license = lib.licenses.lgpl3;
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ drawbu ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a492c9241374..03cb72eb933a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1995,7 +1995,7 @@ with pkgs;
   binlore = callPackage ../development/tools/analysis/binlore { };
 
   birdfont = callPackage ../tools/misc/birdfont { };
-  xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; };
+  xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { };
 
   bmrsa = callPackage ../tools/security/bmrsa/11.nix { };
 

From d7b13db5771ca50b76e1a2b7645e29982775d187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 9 Apr 2026 14:32:31 -0700
Subject: [PATCH 057/336] birdfont,xmlbird: move to by-name

---
 .../birdfont/default.nix => by-name/bi/birdfont/package.nix}   | 0
 .../birdfont/xmlbird.nix => by-name/xm/xmlbird/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                | 3 ---
 3 files changed, 3 deletions(-)
 rename pkgs/{tools/misc/birdfont/default.nix => by-name/bi/birdfont/package.nix} (100%)
 rename pkgs/{tools/misc/birdfont/xmlbird.nix => by-name/xm/xmlbird/package.nix} (100%)

diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/by-name/bi/birdfont/package.nix
similarity index 100%
rename from pkgs/tools/misc/birdfont/default.nix
rename to pkgs/by-name/bi/birdfont/package.nix
diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/by-name/xm/xmlbird/package.nix
similarity index 100%
rename from pkgs/tools/misc/birdfont/xmlbird.nix
rename to pkgs/by-name/xm/xmlbird/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03cb72eb933a..ec298f9c8449 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1994,9 +1994,6 @@ with pkgs;
 
   binlore = callPackage ../development/tools/analysis/binlore { };
 
-  birdfont = callPackage ../tools/misc/birdfont { };
-  xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { };
-
   bmrsa = callPackage ../tools/security/bmrsa/11.nix { };
 
   anystyle-cli = callPackage ../tools/misc/anystyle-cli { };

From bce91a286cbedf86a6de5201d32c5c35514a0941 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Fri, 10 Apr 2026 12:05:42 -0700
Subject: [PATCH 058/336] domino-chain: fix build with boost 1.89

---
 pkgs/by-name/do/domino-chain/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/do/domino-chain/package.nix b/pkgs/by-name/do/domino-chain/package.nix
index 4d0ced53f0f1..d3398b782f39 100644
--- a/pkgs/by-name/do/domino-chain/package.nix
+++ b/pkgs/by-name/do/domino-chain/package.nix
@@ -38,6 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-warn /usr/share/fonts/truetype/freefont/ ${freefont_ttf}/share/fonts/truetype/
     substituteInPlace src/domino-chain/screen.cpp \
       --replace-fail /usr/share/fonts/truetype/freefont/ ${freefont_ttf}/share/fonts/truetype/
+    substituteInPlace Makefile \
+      --replace-fail "LIBS += -lboost_system\$(BOOST_TAGS)" ""
   '';
 
   nativeBuildInputs = [

From 3af48616d727ba0eb86da6f005374e1bffbe8707 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 19:43:09 +0000
Subject: [PATCH 059/336] uutils-util-linux: 0.0.1-unstable-2026-04-01 ->
 0.0.1-unstable-2026-04-10

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

diff --git a/pkgs/by-name/uu/uutils-util-linux/package.nix b/pkgs/by-name/uu/uutils-util-linux/package.nix
index 4329c0550222..80c7405dee0b 100644
--- a/pkgs/by-name/uu/uutils-util-linux/package.nix
+++ b/pkgs/by-name/uu/uutils-util-linux/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-util-linux";
-  version = "0.0.1-unstable-2026-04-01";
+  version = "0.0.1-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "util-linux";
-    rev = "610a351d6c9072f69cc1f98278d070eab16d82e3";
-    hash = "sha256-+SUv/rOegmonEl8eNOHSUmEUEoOirrywe4gH08849mU=";
+    rev = "1906c2a2aaae1ea13a8c8ea58759bae6a762e9f8";
+    hash = "sha256-sQz/ynjYtgb2OcRBxOPgw2fWUBbKCP6FQYrA0ml4Ghc=";
   };
 
   postPatch = ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"cut"' '"${lib.getExe' coreutils "cut"}"'
   '';
 
-  cargoHash = "sha256-sjhfMzeTDe1ap7W8kVSxTkp90v1v2MulfKzRJAvzn4I=";
+  cargoHash = "sha256-9AT9i3Q+C07GpaQmuepkbnhKG/pbsFWXTmWXIhtL8+E=";
 
   nativeBuildInputs = [
     pkg-config

From ceb175c332260a35bc04bd65a5ab92da5b69945f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 19:44:51 +0000
Subject: [PATCH 060/336] uutils-procps: 0.0.1-unstable-2026-03-28 ->
 0.0.1-unstable-2026-04-10

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

diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix
index 5c055b8ef208..b6fe22006c83 100644
--- a/pkgs/by-name/uu/uutils-procps/package.nix
+++ b/pkgs/by-name/uu/uutils-procps/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-procps";
-  version = "0.0.1-unstable-2026-03-28";
+  version = "0.0.1-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "procps";
-    rev = "5c471226274a402533c197ac129b4867389968c8";
-    hash = "sha256-2X9r02Gda3Qq97PdztoXoBx9RZe67kCgBNMBNCadzjU=";
+    rev = "a6321bdbcb3c1810581cba24a2e7329c7781dd87";
+    hash = "sha256-QYeb7Kw2UzJTpKFv+5vnUjq+QpSkQa2Ch6AITXh1qXs=";
   };
 
-  cargoHash = "sha256-LpsBis5L4hKteI+KIBdCTcpAXIoOH0XE0DvtF2cY/nQ=";
+  cargoHash = "sha256-tYeUQxFkTQdQ9aOeEi77FoQIpxY1OiLZIMZTK/dxf7o=";
 
   cargoBuildFlags = [ "--workspace" ];
 

From 00b5080cb7e5b84538a36031f6777ed77e66973e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 19:59:10 +0000
Subject: [PATCH 061/336] goeland: 0.22.1 -> 0.23.0

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

diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix
index 32cdce4c077b..d1d16d4a4835 100644
--- a/pkgs/by-name/go/goeland/package.nix
+++ b/pkgs/by-name/go/goeland/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "goeland";
-  version = "0.22.1";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "slurdge";
     repo = "goeland";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-7npQ04o2GvbOJt1zS7W+VFs38OnNG8VS7Qs7jM79yBg=";
+    sha256 = "sha256-s1h7kZGnDrF9gd9MP+TTsvtUj9goMVjlOB4AhCXuUXc=";
   };
 
-  vendorHash = "sha256-OLgE9PU1/swoHZZG82zAEB1XygZjpK0wrqoGG/4Akvw=";
+  vendorHash = "sha256-gz1NoEaPfRTyDDDgvWbpnwIpYS1jJRnOPNibVrXqgG0=";
 
   ldflags = [
     "-s"

From ee9322ed6affcb0c50792a22ab7e4d0e0ebaa8f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 20:14:58 +0000
Subject: [PATCH 062/336] xxh: 0.8.14 -> 0.8.16

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

diff --git a/pkgs/by-name/xx/xxh/package.nix b/pkgs/by-name/xx/xxh/package.nix
index 466b14ab2dac..bcb03a7938ef 100644
--- a/pkgs/by-name/xx/xxh/package.nix
+++ b/pkgs/by-name/xx/xxh/package.nix
@@ -8,14 +8,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "xxh";
-  version = "0.8.14";
+  version = "0.8.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xxh";
     repo = "xxh";
     tag = finalAttrs.version;
-    hash = "sha256-Y1yTn0lZemQgWsW9wlW+aNndyTXGo46PCbCl0TGYspQ=";
+    hash = "sha256-9kFstE0XNkj026NHhxGM+Ccm8GT7Tr7p4oY4O89zWCU=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 27c09a7f0aaa74b308fc7c96f31b5f16ca46efc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 20:44:58 +0000
Subject: [PATCH 063/336] certigo: 1.17.1 -> 1.18.0

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

diff --git a/pkgs/by-name/ce/certigo/package.nix b/pkgs/by-name/ce/certigo/package.nix
index 645e7cfce5e5..8b48559cb5be 100644
--- a/pkgs/by-name/ce/certigo/package.nix
+++ b/pkgs/by-name/ce/certigo/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "certigo";
-  version = "1.17.1";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "square";
     repo = "certigo";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-dn2GqEiSzlcqNPoAZhPESRsl3LOUBlaPs59rUjf2c5k=";
+    sha256 = "sha256-U+VbtY34lxLBHWI1BjkPxzSS6q41R9DQkGvDvSDX9WY=";
   };
 
-  vendorHash = "sha256-hBuR6a0gBhuYICbuiHxJdbDr4hLF4mQvIcMr5FHfOu8=";
+  vendorHash = "sha256-5DpgOb0YxZ/os23y+siCB73dUwutxXIW5RlCZqdbxao=";
 
   meta = {
     description = "Utility to examine and validate certificates in a variety of formats";

From 7d318c0508537260e11727bbbaabb865de953476 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 21:23:45 +0000
Subject: [PATCH 064/336] libretro.opera: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-10

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

diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix
index aacaf03af8ff..9b1d5daa9d19 100644
--- a/pkgs/applications/emulators/libretro/cores/opera.nix
+++ b/pkgs/applications/emulators/libretro/cores/opera.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "opera";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "opera-libretro";
-    rev = "889e52a07cd93074577bf1b2ea260a2beae7ff7b";
-    hash = "sha256-bsSrkYzkUgUxDz0798aB5etJ0er+RtlcdoJY12gB+WY=";
+    rev = "4c4ca6bf741c40715723a8b8dae4b6187ff6ac30";
+    hash = "sha256-AcuqEuK3bz+WJ0r723+w6Y9WGuNs04zUOWlQ3aMXk/U=";
   };
 
   makefile = "Makefile";

From edae3a213ba469f63cf51b65a4d32af57fcb4e54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 22:34:07 +0000
Subject: [PATCH 065/336] filebeat8: 8.19.13 -> 8.19.14

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

diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index 72db913dcf73..3d36d5e8a399 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "filebeat";
-  version = "8.19.13";
+  version = "8.19.14";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "beats";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KUbGtQW0GsMmEQPQA5DJtxMt+5pNs0LdQHr66e8sW/I=";
+    hash = "sha256-rNXT8GVL5M/Hx0XA3oksbW1w+tt9FhobZlg2tCQxroc=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
 
-  vendorHash = "sha256-eZuqIOLNMnFBkZocYP1OCtny5DOPl+k2Hym51rqVQPA=";
+  vendorHash = "sha256-4jLLZxnjV8QnHh/FtBWD0OcvcdqEMSJxFeRjURZPAVo=";
 
   subPackages = [ "filebeat" ];
 

From 8ec2fb0281778042d0f54a3f3b62ddd7270edbb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 23:27:47 +0000
Subject: [PATCH 066/336] shellhub-agent: 0.24.0 -> 0.24.1

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

diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index e05a51661f0d..0bb83d0d563c 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -12,18 +12,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "shellhub-agent";
-  version = "0.24.0";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-NV2VA/rquf0TwTAsaAA6TIHp1BwD+5jE8uOZg7tW/kI=";
+    hash = "sha256-3WzB7a8RJlsiKDSpuXgXenfa1q5XG5baI57qrFS0kw8=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-dloFaS/BUnyd9kHB0d2vsibkgFlQwTBkgRBOiBbq2ZY=";
+  vendorHash = "sha256-idfUmP2LFcnjmGpA/17phpYtGBiTC/cXjlDd/dkZ1i0=";
 
   ldflags = [
     "-s"

From f6bb2f78160082bfde9da49ad44cd0ee726935af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 23:43:08 +0000
Subject: [PATCH 067/336] parsedmarc: 9.5.5 -> 9.6.0

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

diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix
index 8f46b42d8546..32d457b1596f 100644
--- a/pkgs/development/python-modules/parsedmarc/default.nix
+++ b/pkgs/development/python-modules/parsedmarc/default.nix
@@ -49,14 +49,14 @@ let
 in
 buildPythonPackage rec {
   pname = "parsedmarc";
-  version = "9.5.5";
+  version = "9.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "domainaware";
     repo = "parsedmarc";
     tag = version;
-    hash = "sha256-iJkXtSkHImVOWvuZuWOsUTXPtXNXYbp5umjpPFmuQvo=";
+    hash = "sha256-ez7QMFsSvJzxhfCPA4G6oGQhqAzcgKBTJMiMogIJvNg=";
   };
 
   postPatch = ''

From b6f90b0d833d81c3f8827ba9064e465069a8dc73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 00:30:27 +0000
Subject: [PATCH 068/336] sqlcmd: 1.9.0 -> 1.10.0

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

diff --git a/pkgs/by-name/sq/sqlcmd/package.nix b/pkgs/by-name/sq/sqlcmd/package.nix
index f65a8b90e58c..4e596dec3af8 100644
--- a/pkgs/by-name/sq/sqlcmd/package.nix
+++ b/pkgs/by-name/sq/sqlcmd/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sqlcmd";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     repo = "go-sqlcmd";
     owner = "microsoft";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-9De00wIuSgg7Z1LCsj3tODImyQJxYFINtqt6PSvrK/Y=";
+    sha256 = "sha256-FZJiIC8rhZGE0nLY81GUHVXouvhNbx5gj+Xy2z8uxjw=";
   };
 
-  vendorHash = "sha256-3VORKnBt+HUiFMszw19wiGOUra0K72R5M6OPhPZs+yw=";
+  vendorHash = "sha256-y2AuRgi8o2ttGkBI/rUEtMbcoIj/BvpVdSVamDbaCpo=";
   proxyVendor = true;
 
   ldflags = [

From f8ce33f97829d023760c1969f92a2a255c93779a Mon Sep 17 00:00:00 2001
From: Gus <58223632+thegu5@users.noreply.github.com>
Date: Mon, 23 Mar 2026 01:38:49 -0400
Subject: [PATCH 069/336] seanime: 3.5.0 -> 3.5.2, refactor

---
 .../default-disable-update-check.patch        | 10 +--
 pkgs/by-name/se/seanime/package.nix           | 62 +++++++++----------
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/se/seanime/default-disable-update-check.patch b/pkgs/by-name/se/seanime/default-disable-update-check.patch
index a7dbad448dd2..dd727ef8c54a 100644
--- a/pkgs/by-name/se/seanime/default-disable-update-check.patch
+++ b/pkgs/by-name/se/seanime/default-disable-update-check.patch
@@ -1,8 +1,8 @@
-diff --git a/src/lib/server/settings.ts b/src/lib/server/settings.ts
-index c28f466..4555e90 100644
---- a/src/lib/server/settings.ts
-+++ b/src/lib/server/settings.ts
-@@ -65,7 +65,7 @@ export const settingsSchema = z.object({
+diff --git a/seanime-web/src/lib/server/settings.ts b/seanime-web/src/lib/server/settings.ts
+index 2d80eb8..9fcd986 100644
+--- a/seanime-web/src/lib/server/settings.ts
++++ b/seanime-web/src/lib/server/settings.ts
+@@ -66,7 +66,7 @@ export const settingsSchema = z.object({
      transmissionPassword: z.string().optional().default(""),
      hideAudienceScore: z.boolean().optional().default(false),
      autoUpdateProgress: z.boolean().optional().default(false),
diff --git a/pkgs/by-name/se/seanime/package.nix b/pkgs/by-name/se/seanime/package.nix
index 584aff3d7d66..0a20a6f5ba44 100644
--- a/pkgs/by-name/se/seanime/package.nix
+++ b/pkgs/by-name/se/seanime/package.nix
@@ -1,54 +1,49 @@
 {
   lib,
   fetchFromGitHub,
-  buildGo126Module,
-  buildNpmPackage,
+  buildGoModule,
   ffmpeg,
+  nodejs,
+  npmHooks,
+  fetchNpmDeps,
+  nix-update-script,
 }:
-let
-  version = "3.5.0";
+buildGoModule (finalAttrs: {
+  pname = "seanime";
+  version = "3.5.2";
+
   src = fetchFromGitHub {
     owner = "5rahim";
     repo = "seanime";
-    rev = "v${version}";
-    hash = "sha256-5A2gg0ZFy9JP42I6fh9dcVUkS7P+0aH7arT4gdjAYHM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ejXWQPUROIzu6RlUJIaKaiJfPb59kupQDhqWU83EqP4=";
   };
 
-  seanime-web = buildNpmPackage {
-    pname = "seanime-web";
+  nativeBuildInputs = [
+    nodejs
+    npmHooks.npmConfigHook
+  ];
 
-    inherit src version;
-
-    sourceRoot = "${src.name}/seanime-web";
-
-    patches = [ ./default-disable-update-check.patch ];
-
-    npmDepsHash = "sha256-kO5k4B5mKoIfhhujNM0jw+/ErVwxm9/nZ5eBTWnA7HQ=";
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out
-      cp -r out $out/web
-
-      runHook postInstall
-    '';
+  env = {
+    npmRoot = "seanime-web";
+    npmDeps = fetchNpmDeps {
+      src = "${finalAttrs.src}/seanime-web";
+      hash = "sha256-fWlK2h0RQF9GnEogXW3bwM01RCCDVij/9S2sn2BA3S4=";
+    };
   };
-in
-buildGo126Module {
-  pname = "seanime";
 
-  inherit src version;
-
-  vendorHash = "sha256-jdGkrU4WGgqkWN0FIaxVhtYfFnS+/ZnAY6dWB+gOmNQ=";
+  patches = [ ./default-disable-update-check.patch ];
 
   preBuild = ''
-    cp -r ${seanime-web}/web .
+    npm run build --prefix seanime-web
+    cp -r seanime-web/out web
 
     # .github scripts redeclare main
     rm -rf .github
   '';
 
+  vendorHash = "sha256-TN9shH4B7XVDIa541+7MHTNQs1IKPRJW1dn8tmES5jg=";
+
   subPackages = [ "." ];
 
   doCheck = false; # broken in clean environments
@@ -58,6 +53,7 @@ buildGo126Module {
     "-w"
   ];
 
+  # for transcoding
   makeWrapperArgs = [
     "--prefix PATH : ${
       lib.makeBinPath [
@@ -66,6 +62,8 @@ buildGo126Module {
     }"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Open-source media server for anime and manga";
     homepage = "https://seanime.app";
@@ -74,4 +72,4 @@ buildGo126Module {
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ thegu5 ];
   };
-}
+})

From 6750952b5fa6eea93036d3f1ce7398369061bd61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 02:56:54 +0000
Subject: [PATCH 070/336] rustical: 0.12.10 -> 0.12.11

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

diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix
index dfbe0fa93939..f478c6f6c06f 100644
--- a/pkgs/by-name/ru/rustical/package.nix
+++ b/pkgs/by-name/ru/rustical/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustical";
-  version = "0.12.10";
+  version = "0.12.11";
 
   src = fetchFromGitHub {
     owner = "lennart-k";
     repo = "rustical";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GWXxpiyqW6K7jM2HEqpWLOuifPJXjDJLk/n+sK6wGBI=";
+    hash = "sha256-KxECcpXjfqmirJBE1Rzh+KbngXACVUf2DTaKy7+XOSA=";
   };
 
-  cargoHash = "sha256-NECpU+ttF7CsX0L2yFGs23HFStm+yiptsctszRXRZ7w=";
+  cargoHash = "sha256-uP1lZarcwQhBKyASQIiNUs053EuxJy112P2e3hy2uZY=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

From 0fca351507047fea4afc6dec834e6126a6fe4293 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 02:59:16 +0000
Subject: [PATCH 071/336] openmm: 8.5.0 -> 8.5.1

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

diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix
index b106fc5b291e..cf6c70d3dbad 100644
--- a/pkgs/by-name/op/openmm/package.nix
+++ b/pkgs/by-name/op/openmm/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmm";
-  version = "8.5.0";
+  version = "8.5.1";
 
   src = fetchFromGitHub {
     owner = "openmm";
     repo = "openmm";
     rev = finalAttrs.version;
-    hash = "sha256-NH9rPAlXpWBqYD9g6z9P0Y3Q51GgOPJUbrQ4GxvtPiA=";
+    hash = "sha256-YGoQGOP6Use4ivhxlWfKMpEjpm5ovFH1Qf0yVK5jr48=";
   };
 
   # "This test is stochastic and may occasionally fail". It does.

From 551cb1912a3a2f53d1f4e70ee0db38bd77db3055 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 03:01:00 +0000
Subject: [PATCH 072/336] python3Packages.openmm: 8.5.0 -> 8.5.1

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

diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix
index b106fc5b291e..cf6c70d3dbad 100644
--- a/pkgs/by-name/op/openmm/package.nix
+++ b/pkgs/by-name/op/openmm/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmm";
-  version = "8.5.0";
+  version = "8.5.1";
 
   src = fetchFromGitHub {
     owner = "openmm";
     repo = "openmm";
     rev = finalAttrs.version;
-    hash = "sha256-NH9rPAlXpWBqYD9g6z9P0Y3Q51GgOPJUbrQ4GxvtPiA=";
+    hash = "sha256-YGoQGOP6Use4ivhxlWfKMpEjpm5ovFH1Qf0yVK5jr48=";
   };
 
   # "This test is stochastic and may occasionally fail". It does.

From 395b84b0a4a866986aa4cf84f4604b43e646a420 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 03:12:53 +0000
Subject: [PATCH 073/336] kubernetes-helmPlugins.helm-diff: 3.15.4 -> 3.15.5

---
 .../networking/cluster/helm/plugins/helm-diff.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
index 3fc34b25341f..24836dcc489f 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "helm-diff";
-  version = "3.15.4";
+  version = "3.15.5";
 
   src = fetchFromGitHub {
     owner = "databus23";
     repo = "helm-diff";
     rev = "v${version}";
-    hash = "sha256-FZd1QW2/SHMrOS1/Ecin9SDuPjLKJ3C2kF7s8zB1zqw=";
+    hash = "sha256-ti247vkYPW6PH0DNkgdH99MyUy2uc2n+zHgpNET/cgU=";
   };
 
-  vendorHash = "sha256-P4fxAl3C2CzbIH7U38vHDxcuhSe3GLs1nck3t6IIw48=";
+  vendorHash = "sha256-b479InQ1ZoOtRgY1cyKeDDoGrOIg0aPqNfDrrY1E4tQ=";
 
   ldflags = [
     "-s"

From d068d80167df0b184f6b8ddcaaa9917314c52afa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 03:38:04 +0000
Subject: [PATCH 074/336] tombi: 0.9.13 -> 0.9.16

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

diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index 43f2481de14d..d93ba13fc77b 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -9,19 +9,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "0.9.13";
+  version = "0.9.16";
 
   src = fetchFromGitHub {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UOojaKqBXFWkQ3ZzWBRt5Lz4mTEHP/0NWT0ezlEPScA=";
+    hash = "sha256-cnhxvzX456kQdywpl2VCWIAvqnZGz1WwNxPJQEMyouo=";
   };
 
   # Tests relies on the presence of network
   doCheck = false;
   cargoBuildFlags = [ "--package tombi-cli" ];
-  cargoHash = "sha256-dJL20p9Uz12EwfKTKwc3ScuwH7wP0jHcg2Nf8itqdFk=";
+  cargoHash = "sha256-lXN/tXYUJgQhSKyEgHswf91cUR9eH4T3/92gjI3yR1Y=";
 
   postPatch = ''
     substituteInPlace Cargo.toml \

From a3a9b7c71895d097d13484bf2af33285fc4841ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 03:46:01 +0000
Subject: [PATCH 075/336] fishPlugins.exercism-cli-fish-wrapper:
 0-unstable-2026-02-23 -> 0-unstable-2026-04-06

---
 pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix
index 63f604d0d3bb..a19d9556bd42 100644
--- a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix
+++ b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix
@@ -6,13 +6,13 @@
 }:
 buildFishPlugin {
   pname = "exercism-cli-fish-wrapper";
-  version = "0-unstable-2026-02-23";
+  version = "0-unstable-2026-04-06";
 
   src = fetchFromGitHub {
     owner = "glennj";
     repo = "exercism-cli-fish-wrapper";
-    rev = "e81fe4cfd74864628e6244ef17d60ecfc1e5bcb0";
-    hash = "sha256-bBAK3Ka0X1ilWIQjNkDA7fLht2jQfMWSIY/Fw4VVXbw=";
+    rev = "948357dbc5ed00054e9ec6aae48084ce56efa76e";
+    hash = "sha256-bbOZmSz6UWSNk0R5TYcuJFNZq0JQlGGRBO8bUabN+zQ=";
   };
 
   passthru.updateScript = unstableGitUpdater { };

From 6c530595f6f1ea4d245e3475b3846e6b1cf0c62b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 03:50:47 +0000
Subject: [PATCH 076/336] dosage-tracker: 2.1.5 -> 2.1.6

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

diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix
index babaf2cca466..7e3613bc9ada 100644
--- a/pkgs/by-name/do/dosage-tracker/package.nix
+++ b/pkgs/by-name/do/dosage-tracker/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dosage";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "diegopvlk";
     repo = "Dosage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-opaQx42USA9OHRsPHukhBrdLPN2cD/T9QE9plZrBETo=";
+    hash = "sha256-Dd7q/txbgvlpKi7/sTvxyo9DarZ19BUCYRaO37zK/tU=";
   };
 
   # https://github.com/NixOS/nixpkgs/issues/318830

From f676753706a985c3a1f994a463295666c589adc0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 04:04:51 +0000
Subject: [PATCH 077/336] ansible-navigator: 26.1.3 -> 26.4.0

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

diff --git a/pkgs/by-name/an/ansible-navigator/package.nix b/pkgs/by-name/an/ansible-navigator/package.nix
index 731eb6e88b1c..bfb85e2c32c8 100644
--- a/pkgs/by-name/an/ansible-navigator/package.nix
+++ b/pkgs/by-name/an/ansible-navigator/package.nix
@@ -8,13 +8,13 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ansible-navigator";
-  version = "26.1.3";
+  version = "26.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "ansible_navigator";
-    hash = "sha256-WWbx4/BARcmDnCZDt7v2uCCyZUNlS8Ur8HYiCf5A/vE=";
+    hash = "sha256-FpDFWyNnlt28wAG6OgJjwvK+UMCEDyH4P9fQ+t5J8FQ=";
   };
 
   build-system = with python3Packages; [

From 9624ef5a2e95a464455733f73d2b1c9822aef299 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 04:10:38 +0000
Subject: [PATCH 078/336] python3Packages.apycula: 0.31 -> 0.32

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

diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix
index 7ec2359dd375..f32d05c9f332 100644
--- a/pkgs/development/python-modules/apycula/default.nix
+++ b/pkgs/development/python-modules/apycula/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "apycula";
-  version = "0.31";
+  version = "0.32";
   pyproject = true;
 
   # The Pypi archive contains necessary files generated with proprietary tools.
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-77pr4HbS2adFeEI3Q3KzcCfJMi4UomOtKnuGAxobxF0=";
+    hash = "sha256-DWSVcIXkv6g6Zf+8SrZKQUrtOD5RKu01Xl/lo8Ov5n8=";
   };
 
   build-system = [ setuptools-scm ];

From 347c38c949bc4e23166d03108ac78a444fe2854f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 04:32:30 +0000
Subject: [PATCH 079/336] python3Packages.sklearn2pmml: 0.129.2 -> 0.130.0

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

diff --git a/pkgs/development/python-modules/sklearn2pmml/default.nix b/pkgs/development/python-modules/sklearn2pmml/default.nix
index 6e364097f442..93e1e83c9485 100644
--- a/pkgs/development/python-modules/sklearn2pmml/default.nix
+++ b/pkgs/development/python-modules/sklearn2pmml/default.nix
@@ -33,14 +33,14 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "sklearn2pmml";
-  version = "0.129.2";
+  version = "0.130.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jpmml";
     repo = "sklearn2pmml";
     tag = finalAttrs.version;
-    hash = "sha256-xntm+AUwylJuMhTAYi6o2tIxlzzeo8lkwtSvgeuQpQU=";
+    hash = "sha256-u+fuOiJ0YTyxVZkKhBhxn0gUHbLRQ69WwSX2GwhYaHU=";
   };
 
   postPatch = ''

From 44cae4b72824506ced9821083049e3cb236cccda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 05:02:31 +0000
Subject: [PATCH 080/336] ente-web: 1.3.24 -> 1.3.32

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

diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix
index 85fd279a90d8..4c467a2d7510 100644
--- a/pkgs/by-name/en/ente-web/package.nix
+++ b/pkgs/by-name/en/ente-web/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-web-${enteApp}";
-  version = "1.3.24";
+  version = "1.3.32";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     tag = "photos-v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-fM/a5V5Depkeu8hIzaYJr/0w0Mt/zM9/b+76W7ggUfw=";
+    hash = "sha256-Lwa45QqqyvFgHJ4IiJm2tJy5CdPI5XO3wCzXTeNCTq4=";
   };
   sourceRoot = "${finalAttrs.src.name}/web";
 
@@ -48,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: {
       sourceRoot
       cargoRoot
       ;
-    hash = "sha256-ftb0h5MOHyQ2iec6iE7/WdHXgrviLCy8oIqFXv5OTq8=";
+    hash = "sha256-/FkAxi9KpW/Z6sdo7gfxvCmaAe0JzjubScrcGjbLD88=";
   };
   cargoRoot = "packages/wasm";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/web/yarn.lock";
-    hash = "sha256-NhpSwesQ9B5gEeBQVjEEAKO4A68wfmBoQ3ga/baieNE=";
+    hash = "sha256-bWOwIa7SD0z2StoUg9HlQGTBq2xXltLgQ2ft8umjg/Y=";
   };
 
   nativeBuildInputs = [

From 566977e07c6cacb8438e4eda3c2283710a30dc9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 08:05:09 +0000
Subject: [PATCH 081/336] quickjs-ng: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix
index f67c544f6489..206f6012bb0c 100644
--- a/pkgs/by-name/qu/quickjs-ng/package.nix
+++ b/pkgs/by-name/qu/quickjs-ng/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quickjs-ng";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "quickjs-ng";
     repo = "quickjs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t1GvD1iBRfJwzZHoLxMbE2Gh1Ow8v0ZASxCVnOT7ST4=";
+    hash = "sha256-kQDaDCljI+NcElufZZAmSGMbI2wyiQC6Lp4CyHW0aBY=";
   };
 
   outputs = [

From ae6880608184866b0dbb9f4d149657d498074df0 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 11 Apr 2026 10:58:53 +0200
Subject: [PATCH 082/336] inspircd: 4.10.0 -> 4.10.1

https://docs.inspircd.org/4/change-log/#inspircd-4101
---
 pkgs/by-name/in/inspircd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index 5e04d15af550..24700a8f185c 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -151,13 +151,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "inspircd";
-  version = "4.10.0";
+  version = "4.10.1";
 
   src = fetchFromGitHub {
     owner = "inspircd";
     repo = "inspircd";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-VmMfGpX6TcCuXuJmTptE51TL8cwavceDcOBeW0ipC4o=";
+    sha256 = "sha256-5KQcVa/ktA3mil7fuBUj/98bAY5CsrJzSSqRB9Zk0Kk=";
   };
 
   outputs = [

From 6b47267b2b8cb978c81324b36cb8c38ed463a97d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 10:58:24 +0000
Subject: [PATCH 083/336] museum: 1.3.28 -> 1.3.32

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

diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix
index fb1edc169d41..88b6b5b986be 100644
--- a/pkgs/by-name/mu/museum/package.nix
+++ b/pkgs/by-name/mu/museum/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "museum";
-  version = "1.3.28";
+  version = "1.3.32";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "server" ];
     tag = "photos-v${finalAttrs.version}";
-    hash = "sha256-No4raRi4QVpoQUVcZE2RMQsCGPHikagHyx6mvsxsV8k=";
+    hash = "sha256-67u4KsVVZntt8Iu49GMj2aCpRupyeBaws6/XqBQuEJg=";
   };
 
-  vendorHash = "sha256-KGwrXQdGbA5+Nn20s7a7U45t3D7i8Ti9en+nR16vzDs=";
+  vendorHash = "sha256-qrcfNacMR2hwdtezwYrYTPpr1ALCwZktSW8UiyzGXjQ=";
 
   sourceRoot = "${finalAttrs.src.name}/server";
 

From 6fd614c54f1779db8d34d5bcf549dae949b58fa4 Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Sat, 11 Apr 2026 12:59:40 +0200
Subject: [PATCH 084/336] rio: 0.3.1 -> 0.3.4

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

diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index d1ffe646e6c0..9e9174659829 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -50,16 +50,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rio";
-  version = "0.3.1";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RJRWcwqrmlK398lAh8LIkUj595ESKEyNwkC+V2hoKAE=";
+    hash = "sha256-UjyngfN7wNok/3gQG0mqbs22Su48LgGVVEVoyjsR7Q4=";
   };
 
-  cargoHash = "sha256-gqUWK97xPrPpKkRsPA6oaZVJWKiq+l1I8WsHufVSjbo=";
+  cargoHash = "sha256-uj1uKP9p7UWSLoYo2GbzcWev+ZX2sHeLT2kfUmNg8bg=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From 99430236f77a5711c9f7d71cb60e75fac4e567f5 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 11 Apr 2026 11:03:55 +0000
Subject: [PATCH 085/336] mupdf: 1.27.0 -> 1.27.2

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

diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 0e14f518e7ba..1a411f35f5f6 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -72,12 +72,12 @@ let
   });
 in
 stdenv.mkDerivation rec {
-  version = "1.27.0";
+  version = "1.27.2";
   pname = "mupdf";
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
-    hash = "sha256-riRCQW3kmRgtN6UmxvorrMejvtWoiNETygSERITf58Y=";
+    hash = "sha256-VThnsTUwPcTCWrZ8XyNNjpAKDjbmboSE2ZrcBf4ehzc=";
   };
 
   patches = [

From 6f8920ea4656734fbb6490907774a58c448a5167 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 12:57:40 +0000
Subject: [PATCH 086/336] sptlrx: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/sp/sptlrx/package.nix b/pkgs/by-name/sp/sptlrx/package.nix
index bda99f002fb7..29c551661a85 100644
--- a/pkgs/by-name/sp/sptlrx/package.nix
+++ b/pkgs/by-name/sp/sptlrx/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "sptlrx";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "raitonoberu";
     repo = "sptlrx";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-X1nDvhW8F4UDWIeP0W6EtwB+0Ytf/d76oB/SJV9/neg=";
+    hash = "sha256-QbF1yMzGGvxEUIMeQ6sI3ykXYW9R/2gFSRkrASbhiJ0=";
   };
 
   vendorHash = "sha256-2QbGrQwFA+YeoVt4se2silLYbg7cQGY/fCTQb2bXWAM=";

From 7fe1b2df2739d84fe81383acae303769c43ba22b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 13:32:45 +0000
Subject: [PATCH 087/336] go-ios: 1.0.206 -> 1.0.207

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

diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix
index 919fb3ecfb2e..e076c4a1e53b 100644
--- a/pkgs/by-name/go/go-ios/package.nix
+++ b/pkgs/by-name/go/go-ios/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-ios";
-  version = "1.0.206";
+  version = "1.0.207";
 
   src = fetchFromGitHub {
     owner = "danielpaulus";
     repo = "go-ios";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-/dQknNs+fLBJvfiDOaGc26a+bRo8NdhT1B/QPxJmmro=";
+    sha256 = "sha256-2GjUrt1F8MrPOITCsuWHHsi/85pfzbLeY+WbPfLYDY4=";
   };
 
   proxyVendor = true;

From fa98e57f86fa5d139683d630b27da89dc5c02c19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 13:43:58 +0000
Subject: [PATCH 088/336] grafanaPlugins.grafana-opensearch-datasource: 2.24.0
 -> 2.33.0

---
 .../plugins/grafana-opensearch-datasource/default.nix  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
index 1f66ac6ed142..ce5a4fda5677 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
@@ -2,12 +2,12 @@
 
 grafanaPlugin {
   pname = "grafana-opensearch-datasource";
-  version = "2.24.0";
+  version = "2.33.0";
   zipHash = {
-    x86_64-linux = "sha256-ZxlHl08pSqnVKZvVph5Bqjki7ukrV3UScJFRwW4y97o=";
-    aarch64-linux = "sha256-ZwPq3Xz4Rcm2JiAZnZ0D/Z6SamlCnj0/PgXeT6rrxcQ=";
-    x86_64-darwin = "sha256-HMifdRPl8RNb+m/eFaXATNRgDYLMG1UA6N/rWHMTR04=";
-    aarch64-darwin = "sha256-MLVyOeVZ42zJjLpOnGSa5ogGNa7rlcA4qjASCVeA3eU=";
+    x86_64-linux = "sha256-oxPw/cQ/AYTHB4Z/hdt3Jqn3XXnx+bo3uAq6qS7hd6g=";
+    aarch64-linux = "sha256-0bF2ebVF26iPIKs+oICeaBwm6K8TZGqTP6ONR+yDFvY=";
+    x86_64-darwin = "sha256-yGJLaNCAmdIN1uuzh/v+adda6IRmcCH+mpbxno8qK9k=";
+    aarch64-darwin = "sha256-Kxgq9HYXPW3+uEzJPy0kKDFCXrSFpCgZQ+whqx4XtJ8=";
   };
   meta = {
     description = "Empowers you to seamlessly integrate JSON data into Grafana";

From fc5b6c35691705df21e8d453fff6d87ab755dbd8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 14:04:10 +0000
Subject: [PATCH 089/336] vscode-extensions.vytautassurvila.csharp-ls: 0.0.30
 -> 0.0.31

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c3e846d32159..07a7a4b86b23 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5205,8 +5205,8 @@ let
         mktplcRef = {
           name = "csharp-ls";
           publisher = "vytautassurvila";
-          version = "0.0.30";
-          hash = "sha256-BVSazrQxVm4yYBVdtFP3Aojl06xI2msFXIGw64LeePY=";
+          version = "0.0.31";
+          hash = "sha256-d2vHhM+/hzT/JdFzu2WtJiWY2BHGk8SicleHxwm8ciY=";
         };
         meta = {
           changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md";

From ef30ce0571478d2fb00c19510d0a49867d611bf9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 14:24:03 +0000
Subject: [PATCH 090/336] python3Packages.git-find-repos: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/git-find-repos/default.nix b/pkgs/development/python-modules/git-find-repos/default.nix
index d97d153ee6c1..e34c406d302b 100644
--- a/pkgs/development/python-modules/git-find-repos/default.nix
+++ b/pkgs/development/python-modules/git-find-repos/default.nix
@@ -6,14 +6,14 @@
 }:
 buildPythonPackage rec {
   pname = "git-find-repos";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "acroz";
     repo = "git-find-repos";
     rev = version;
-    sha256 = "sha256-4TuZlt6XH4//DBHPuIMl/i3Tp6Uft62dGCTAuZ2rseE=";
+    sha256 = "sha256-+MiCMgIakpJaWWdN2grerlPbPAnfIXuclvRw8XQ1YiI=";
   };
 
   build-system = [ setuptools-scm ];

From 267f1c712e8ddad0fcd61b71a4f21c34cd5d12d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 14:29:01 +0000
Subject: [PATCH 091/336] highscore-mupen64plus: 0-unstable-2026-01-05 ->
 0-unstable-2026-04-10

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

diff --git a/pkgs/by-name/hi/highscore-mupen64plus/package.nix b/pkgs/by-name/hi/highscore-mupen64plus/package.nix
index 8ec714a8f5f8..326b0005d161 100644
--- a/pkgs/by-name/hi/highscore-mupen64plus/package.nix
+++ b/pkgs/by-name/hi/highscore-mupen64plus/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-mupen64plus";
-  version = "0-unstable-2026-01-05";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "mupen64plus-highscore";
-    rev = "84f913ed4433f37b8a990cace2f9e1cfb641e2dc";
-    hash = "sha256-Afrb7WUw5QeST/NRM06UIyUTzxvrGqayFneaXjAw6aM=";
+    rev = "867c94907cd47f4843f3c8bddd371166c460ba8b";
+    hash = "sha256-hnDhyYcKkKh0mvksAOJOLYnyp5gNCk38dxMBT/1ItLQ=";
   };
 
   postPatch = ''

From bd9809cb194247287d270021cbd07db946150c04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 16:06:16 +0000
Subject: [PATCH 092/336] grafanaPlugins.volkovlabs-form-panel: 6.3.1 -> 6.3.2

---
 .../grafana/plugins/volkovlabs-form-panel/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
index b8df247fa933..ffd593d22b7f 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-form-panel";
-  version = "6.3.1";
-  zipHash = "sha256-HuzhTWey/6xLu6GPXGnN4/D3rs7yJ2sPGzO8PPuZmNA=";
+  version = "6.3.2";
+  zipHash = "sha256-RuwZaAqSwMvWN15jz0+r7DuZyrE52zYD8EBffFTQNEg=";
   meta = {
     description = "Plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard";
     license = lib.licenses.asl20;

From b9c92a83a9733f8072662be9ac96dc430eba875a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 16:09:27 +0000
Subject: [PATCH 093/336] grafanaPlugins.grafana-lokiexplore-app: 2.0.1 ->
 2.0.3

---
 .../grafana/plugins/grafana-lokiexplore-app/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
index 0ec1089779bc..2d3b5d87eb89 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-lokiexplore-app";
-  version = "2.0.1";
-  zipHash = "sha256-b4RhxdUFKi4VVHhEJKa09qwmIebGUK77p5aq+QG/Iqg=";
+  version = "2.0.3";
+  zipHash = "sha256-K57ynUi6kRZIMaZD9rMa7aToue75fHAQBFPJLF1cy3o=";
   meta = {
     description = "Browse Loki logs without the need for writing complex queries";
     license = lib.licenses.agpl3Only;

From 129064c380b6ef2f3a5cf7658fa3967b0508d816 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 16:12:19 +0000
Subject: [PATCH 094/336] solanum: 0-unstable-2026-03-25 ->
 0-unstable-2026-04-09

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

diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix
index 942af46837d7..32f48513a0d5 100644
--- a/pkgs/by-name/so/solanum/package.nix
+++ b/pkgs/by-name/so/solanum/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "solanum";
-  version = "0-unstable-2026-03-25";
+  version = "0-unstable-2026-04-09";
 
   src = fetchFromGitHub {
     owner = "solanum-ircd";
     repo = "solanum";
-    rev = "d8d710c7bc052c3e24f76ca7a63da3a6ba6af8ea";
-    hash = "sha256-QnnxRRDou67/PorQ8YzVbQo2E3DF/f+cpR+hVecmyD0=";
+    rev = "54286cf59235c8688104ee20d4e1d74fe8934317";
+    hash = "sha256-0som1lYheX/GVbqwEXwpIWonYKYqFwpAfcRRojlHlmc=";
   };
 
   postPatch = ''

From db609f68ff1bb27f03022feea2667775e8f396a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 16:13:05 +0000
Subject: [PATCH 095/336] libretro.yabause: 0-unstable-2025-12-20 ->
 0-unstable-2026-04-10

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

diff --git a/pkgs/applications/emulators/libretro/cores/yabause.nix b/pkgs/applications/emulators/libretro/cores/yabause.nix
index 7b6539f8e470..9f12cffb3c67 100644
--- a/pkgs/applications/emulators/libretro/cores/yabause.nix
+++ b/pkgs/applications/emulators/libretro/cores/yabause.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "yabause";
-  version = "0-unstable-2025-12-20";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "yabause";
-    rev = "65af22e96beb6d9b0b9a50a81a39c86a6d604c1c";
-    hash = "sha256-LafC48f1m6pRWhXmfN+D+5r9qCNm1v9uLJVq5Wa5naE=";
+    rev = "76faf7c601359bafc41785325d686644000a7ba9";
+    hash = "sha256-UHmUsqAK+As6qfvhto2aOsW9A/lZMypfn2NxFui2x8c=";
   };
 
   makefile = "Makefile";

From fcf234898e4d5761d3e37b0c14e01b9ebf3bd3ff Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 11 Apr 2026 18:14:24 +0200
Subject: [PATCH 096/336] rofi: remove workaround for missing root user

root is now available in the build sandbox and the check phase is working.
---
 pkgs/by-name/ro/rofi-unwrapped/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/ro/rofi-unwrapped/package.nix b/pkgs/by-name/ro/rofi-unwrapped/package.nix
index c47e3a2bef96..2f7b2405609d 100644
--- a/pkgs/by-name/ro/rofi-unwrapped/package.nix
+++ b/pkgs/by-name/ro/rofi-unwrapped/package.nix
@@ -47,10 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   preConfigure = ''
     patchShebangs "script"
-
-    # root not present in build /etc/passwd
-    substituteInPlace test/helper-expand.c \
-      --replace-fail "~root" "~nobody"
   '';
 
   depsBuildBuild = [
@@ -100,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "xcb" x11Support)
   ];
 
-  doCheck = false;
+  doCheck = true;
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 910b6afc38db9970e24eab51fa033e5afc1cf27d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 18:29:27 +0000
Subject: [PATCH 097/336] python3Packages.mhcgnomes: 3.19.0 -> 3.31.1

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

diff --git a/pkgs/development/python-modules/mhcgnomes/default.nix b/pkgs/development/python-modules/mhcgnomes/default.nix
index 7024be45ec02..8bb6f97d5631 100644
--- a/pkgs/development/python-modules/mhcgnomes/default.nix
+++ b/pkgs/development/python-modules/mhcgnomes/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mhcgnomes";
-  version = "3.19.0";
+  version = "3.31.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pirl-unc";
     repo = "mhcgnomes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Z5Xmo3yXsFr2u2BUVc5YJZc7gjcBSkpfWy2VuXK8qEc=";
+    hash = "sha256-SP7hE0tJXBeJ8+NJbz1e8ZpPgVimIE25BgEPyKZ1nLg=";
   };
 
   build-system = [

From 54dfa0a78d5bec8cd95cd150d31bbf042916f61f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 18:45:14 +0000
Subject: [PATCH 098/336] tenv: 4.9.3 -> 4.10.1

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

diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
index fe73a4121271..83e94f625c6d 100644
--- a/pkgs/by-name/te/tenv/package.nix
+++ b/pkgs/by-name/te/tenv/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tenv";
-  version = "4.9.3";
+  version = "4.10.1";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gaz2zGYYYCo3iDAiA3gVg2BYgeZrZMHcALbBHE0pRvM=";
+    hash = "sha256-Z28ZPRLFV14/4BWwCp7AU70T226nE4z2dUC29jyZYMo=";
   };
 
-  vendorHash = "sha256-DtcOAdkd9JrfGKwkHixx2Qgjij7u7MVr96oNpPqTz14=";
+  vendorHash = "sha256-hodj4wBHjIGOJJlEClRIb1RavkNniEqFDvyS3Z7Abf0=";
 
   excludedPackages = [ "tools" ];
 

From 0bb40e8e610996805a094038710ef29257582adc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 18:48:20 +0000
Subject: [PATCH 099/336] roslyn-ls: 5.6.0-2.26163.11 -> 5.7.0-1.26203.6

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

diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index 1887fb394869..de0a6fff87ef 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": "5.6.0-2.26151.2",
-    "hash": "sha256-J1h9PsPivgmHxcG2sFccStRazssjmO9q8a92bZbnDew=",
-    "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.6.0-2.26151.2/microsoft.codeanalysis.analyzers.5.6.0-2.26151.2.nupkg"
+    "version": "5.6.0-2.26172.2",
+    "hash": "sha256-CJcnDRGIt7//SJLOSXLHoOnGs3QtLGqgpDyNPbjELm8=",
+    "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.6.0-2.26172.2/microsoft.codeanalysis.analyzers.5.6.0-2.26172.2.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-    "version": "5.6.0-2.26160.112",
-    "hash": "sha256-ZYIA/XYvgS+wttCu5Gb46cLpTcjHvJC1R4VDxyCuXA0=",
-    "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.6.0-2.26160.112/microsoft.codeanalysis.bannedapianalyzers.5.6.0-2.26160.112.nupkg"
+    "version": "5.7.0-1.26202.104",
+    "hash": "sha256-p7ybIuiw34dJb1IehSN4v+II42tznBbYYAtVMiKUTbo=",
+    "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.7.0-1.26202.104/microsoft.codeanalysis.bannedapianalyzers.5.7.0-1.26202.104.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
@@ -103,9 +103,9 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
-    "version": "5.6.0-2.26160.112",
-    "hash": "sha256-dcUvJ9J88Z4jGNmO4RZbqtzAYPCix1ooyv7a/q8MK6c=",
-    "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.6.0-2.26160.112/microsoft.codeanalysis.publicapianalyzers.5.6.0-2.26160.112.nupkg"
+    "version": "5.7.0-1.26202.104",
+    "hash": "sha256-JUov6s7HgwbliMPxy86J7ok+LfEcFZooVQBiedCSUeo=",
+    "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.7.0-1.26202.104/microsoft.codeanalysis.publicapianalyzers.5.7.0-1.26202.104.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -121,15 +121,15 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "10.0.0-beta.26160.1",
-    "hash": "sha256-HxAuMFWDuwU7Gl8zXDc6TzyKosD25jAX14obzPWlFnA=",
-    "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/10.0.0-beta.26160.1/microsoft.dotnet.arcade.sdk.10.0.0-beta.26160.1.nupkg"
+    "version": "10.0.0-beta.26201.4",
+    "hash": "sha256-A1H87Y8Tvf8+cnKj3a59TFi2utka8e9R1j6p9JbOpzs=",
+    "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/10.0.0-beta.26201.4/microsoft.dotnet.arcade.sdk.10.0.0-beta.26201.4.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "10.0.0-beta.26160.1",
-    "hash": "sha256-jnGEiC6HTUSRQ9ckKLY1hGni8/awfq3gdzY74U8mjXM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26160.1/microsoft.dotnet.xlifftasks.10.0.0-beta.26160.1.nupkg"
+    "version": "10.0.0-beta.26201.4",
+    "hash": "sha256-4UIzFVmuDPIxECOBsAolrCCTb5Mzk5baYHDvGYFh/sc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26201.4/microsoft.dotnet.xlifftasks.10.0.0-beta.26201.4.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -433,9 +433,9 @@
   },
   {
     "pname": "Roslyn.Diagnostics.Analyzers",
-    "version": "5.6.0-2.26160.112",
-    "hash": "sha256-GLfrXlVVIHDH3+qRdvGI///L9M932GL19KVWXUw6xFE=",
-    "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.6.0-2.26160.112/roslyn.diagnostics.analyzers.5.6.0-2.26160.112.nupkg"
+    "version": "5.7.0-1.26202.104",
+    "hash": "sha256-GO3HaDDOCK+PT4/yoQuj1vXvgGzGmgV2ksBbdP51zW0=",
+    "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.7.0-1.26202.104/roslyn.diagnostics.analyzers.5.7.0-1.26202.104.nupkg"
   },
   {
     "pname": "SQLitePCLRaw.bundle_green",
@@ -499,9 +499,9 @@
   },
   {
     "pname": "System.CommandLine",
-    "version": "3.0.0-preview.3.26160.112",
-    "hash": "sha256-LDm/H50j+VkuGPGo0epbZuOzQuVX3G7YcgIcpX8ipB0=",
-    "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-preview.3.26160.112/system.commandline.3.0.0-preview.3.26160.112.nupkg"
+    "version": "3.0.0-preview.4.26202.104",
+    "hash": "sha256-Kuh7UZ+fg4mJWismeSS6PNKGFgSYruYOVY7agur6xe8=",
+    "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-preview.4.26202.104/system.commandline.3.0.0-preview.4.26202.104.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 285b7e2c4d18..71fa566c4c49 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: {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.131.79-prerelease";
+  vsVersion = "2.134.7-prerelease";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${finalAttrs.vsVersion}";
-    hash = "sha256-Jxfnb52ebOIL4rw99leN+2axQ+Y2eoq/37YmN5vuCK4=";
+    hash = "sha256-FzD5KQu5Ij+WBfXib1STBdXZvzvozey1cGghMHFWwvQ=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.6.0-2.26163.11";
+  version = "5.7.0-1.26203.6";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;

From 71a6f7d771dc4f465170189c057dfba35ac2667d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 19:49:53 +0000
Subject: [PATCH 100/336] cubeb: 0-unstable-2026-03-25 -> 0-unstable-2026-04-06

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

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 3881d45dd5e4..d23d91f68f0d 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cubeb";
-  version = "0-unstable-2026-03-25";
+  version = "0-unstable-2026-04-06";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cubeb";
-    rev = "774182f2c1b6d5e0d8ce975f2ed9f58fab7f1da2";
-    hash = "sha256-Wh/yKAritCLg0FGbM4i+iorgOZvmFysLlDxpuZH7NjI=";
+    rev = "626d7d9f906e9f3cfb70be9e58af0f5a5f399a74";
+    hash = "sha256-qo3gVlYGxKef7RVGngFDKuSODoVbSCaFZwoKY4RDaAk=";
   };
 
   outputs = [

From 984b62c475023aec361a5e2f46e3c7d04faaa4fd Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 27 Jul 2025 01:27:55 +0200
Subject: [PATCH 101/336] github-desktop: package from source

Co-authored-by: Ulysses Zhan <UlyssesZhan@gmail.com>
---
 pkgs/by-name/gi/github-desktop/package.nix | 211 +++++++++++++--------
 1 file changed, 137 insertions(+), 74 deletions(-)

diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix
index 6a00f32c2dbe..06e539a1257f 100644
--- a/pkgs/by-name/gi/github-desktop/package.nix
+++ b/pkgs/by-name/gi/github-desktop/package.nix
@@ -1,108 +1,171 @@
 {
-  stdenvNoCC,
   lib,
-  fetchurl,
-  autoPatchelfHook,
-  buildPackages,
+  stdenv,
+  copyDesktopItems,
+  desktopToDarwinBundle,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  makeBinaryWrapper,
+  makeDesktopItem,
+  yarnBuildHook,
+  yarnConfigHook,
+
+  electron,
+  git,
+  git-lfs,
+  node-gyp,
+  nodejs,
+  pkg-config,
+  python3,
+  typescript,
+  zip,
+
   gnome-keyring,
   libsecret,
-  git,
   curl,
-  nss,
-  nspr,
-  libxdamage,
-  libx11,
-  libdrm,
-  alsa-lib,
-  cups,
-  libgbm,
-  systemdLibs,
-  openssl,
-  libglvnd,
 }:
 
 let
-  rcversion = "1";
+  inherit (stdenv.hostPlatform.node) arch platform;
 in
-stdenvNoCC.mkDerivation (finalAttrs: {
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "github-desktop";
   version = "3.4.13";
 
-  src =
-    let
-      urls = {
-        "x86_64-linux" = {
-          url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux${rcversion}/GitHubDesktop-linux-amd64-${finalAttrs.version}-linux${rcversion}.deb";
-          hash = "sha256-i1V3dhx5AMrCiWtfvB2I9a6ki2zncUNyYr4qZqs42Yc=";
-        };
-        "aarch64-linux" = {
-          url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux${rcversion}/GitHubDesktop-linux-arm64-${finalAttrs.version}-linux${rcversion}.deb";
-          hash = "sha256-SN4qtEI4q/AAgfUaBiM5eWyCK5Kr77CrTHsIAmvEceU=";
-        };
-      };
-    in
-    fetchurl
-      urls."${stdenvNoCC.hostPlatform.system}"
-        or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
+  src = fetchFromGitHub {
+    owner = "desktop";
+    repo = "desktop";
+    tag = "release-${finalAttrs.version}";
+    hash = "sha256-srXX49sXJnxa/7GQzP1pdJ77qeZbK1Ge8OPfrq3s5m8=";
+    fetchSubmodules = true;
+    postCheckout = "git -C $out rev-parse HEAD > $out/.gitrev";
+  };
 
-  nativeBuildInputs = [
-    autoPatchelfHook
-    # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
-    # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
-    (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
-  ];
+  yarnBuildScript = "build:prod";
 
   buildInputs = [
     gnome-keyring
-    libxdamage
-    libx11
     libsecret
-    git
     curl
-    nss
-    nspr
-    libdrm
-    alsa-lib
-    cups
-    libgbm
-    openssl
   ];
 
-  unpackPhase = ''
-    runHook preUnpack
-    mkdir -p $TMP/github-desktop $out/{opt,bin}
-    cp $src $TMP/github-desktop.deb
-    ar vx github-desktop.deb
-    tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/github-desktop/
-    runHook postUnpack
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeBinaryWrapper
+    yarnBuildHook
+    yarnConfigHook
+
+    git
+    nodejs
+    node-gyp
+    pkg-config
+    python3
+    # desktop-notifications build doesn't pick up tsc from node_modules for some reason
+    typescript
+    zip
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    npm_config_nodedir = electron.headers;
+  };
+
+  cacheRoot = fetchYarnDeps {
+    name = "${finalAttrs.pname}-cache-root";
+    yarnLock = finalAttrs.src + "/yarn.lock";
+    hash = "sha256-PhjMY4bAt+Prx8tmgGCZ7fhAyKhOUudrJO9K8yr7F18=";
+  };
+
+  cacheApp = fetchYarnDeps {
+    name = "${finalAttrs.pname}-cache-app";
+    yarnLock = finalAttrs.src + "/app/yarn.lock";
+    hash = "sha256-eW3G4saTbjRUexgg+n0z4EU1YtAgvSoW+uU0rNZZ1l0=";
+  };
+
+  dontYarnInstallDeps = true;
+
+  postConfigure = ''
+    yarnOfflineCache="$cacheRoot" runHook yarnConfigHook
+
+    pushd app
+    yarnOfflineCache="$cacheApp" runHook yarnConfigHook
+    popd
+
+    yarn --cwd app/node_modules/desktop-notifications run install
+
+    # use git from nixpkgs instead of an automatically downloaded one by dugite
+    makeWrapper ${lib.getExe git} app/node_modules/dugite/git/bin/git \
+      --prefix PATH : ${lib.makeBinPath [ git-lfs ]}
+
+
+    for native in fs-admin keytar desktop-trampoline windows-argv-parser; do
+      yarn --offline --cwd app/node_modules/$native build
+    done
+
+    yarn compile:script
+
+    touch electron
+    zip -0Xqr electron-v${electron.version}-${platform}-${arch}.zip electron
+    rm electron
+
+    substituteInPlace script/build.ts \
+      --replace-fail "return packager({" "return packager({electronZipDir:\"$(pwd)\",electronVersion: \"${electron.version}\","
   '';
 
+  preBuild = ''
+    export CIRCLE_SHA1="$(cat .gitrev)"
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "github-desktop";
+      desktopName = "GitHub Desktop";
+      comment = "Focus on what matters instead of fighting with Git";
+      exec = "github-desktop %u";
+      icon = "github-desktop";
+      mimeTypes = [
+        "x-scheme-handler/x-github-client"
+        "x-scheme-handler/x-github-desktop-auth"
+        "x-scheme-handler/x-github-desktop-dev-auth"
+      ];
+      terminal = false;
+    })
+  ];
+
   installPhase = ''
     runHook preInstall
-    cp -R $TMP/github-desktop/usr/share $out/
-    cp -R $TMP/github-desktop/usr/lib/github-desktop/* $out/opt/
-    ln -sf $out/opt/github-desktop $out/bin/github-desktop
+
+    mkdir -p $out/share/github-desktop
+
+    # transpose [name][size] into [size][name]
+    for icon in app/static/logos/*.png; do
+      size="$(basename "$icon" .png)"
+      install -Dm444 "$icon" -T "$out/share/icons/hicolor/$size/github-desktop.png"
+    done
+
+    cp -r dist/*/resources $out/share/github-desktop
+
+    makeWrapper ${lib.getExe electron} $out/bin/github-desktop \
+      --add-flag $out/share/github-desktop/resources/app \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --inherit-argv0
+
+    mkdir -p $out/share/icons/hicolor/512x512/apps
+    ln -s $out/share/github-desktop/resources/app/static/icon-logo.png $out/share/icons/hicolor/512x512/apps/github-desktop.png
+
     runHook postInstall
   '';
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true}}"
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}
-    )
-  '';
-
-  runtimeDependencies = [
-    systemdLibs
-  ];
-
   meta = {
     description = "GUI for managing Git and GitHub";
-    homepage = "https://desktop.github.com/";
+    homepage = "https://desktop.github.com";
+    changelog = "https://desktop.github.com/release-notes";
+    downloadPage = "https://desktop.github.com/download";
     license = lib.licenses.mit;
     mainProgram = "github-desktop";
     maintainers = with lib.maintainers; [ dtomvan ];
-    platforms = lib.platforms.linux;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    inherit (electron.meta) platforms;
   };
 })

From 4304e214d08f35aa2304030762bc99bfb9a65998 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 27 Jul 2025 01:27:55 +0200
Subject: [PATCH 102/336] github-desktop: 3.4.13 -> 3.5.7

---
 pkgs/by-name/gi/github-desktop/package.nix | 31 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix
index 06e539a1257f..13789c630c27 100644
--- a/pkgs/by-name/gi/github-desktop/package.nix
+++ b/pkgs/by-name/gi/github-desktop/package.nix
@@ -27,17 +27,19 @@
 
 let
   inherit (stdenv.hostPlatform.node) arch platform;
+  cacheRootHash = "sha256-mR5geiPPAv+oK1efT3pMfnUT1keOxB8Ge1yiq4hLtj0=";
+  cacheAppHash = "sha256-y8brlXwBur2RqJD8xlpA9ivg09xIDBuAtolhyzYkRx4=";
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "github-desktop";
-  version = "3.4.13";
+  version = "3.5.7";
 
   src = fetchFromGitHub {
     owner = "desktop";
     repo = "desktop";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-srXX49sXJnxa/7GQzP1pdJ77qeZbK1Ge8OPfrq3s5m8=";
+    hash = "sha256-H6FPMp+Y3PmRtuaOVX+8Yd3a5JA+zvLeGeLp99X1+y0=";
     fetchSubmodules = true;
     postCheckout = "git -C $out rev-parse HEAD > $out/.gitrev";
   };
@@ -75,13 +77,13 @@ stdenv.mkDerivation (finalAttrs: {
   cacheRoot = fetchYarnDeps {
     name = "${finalAttrs.pname}-cache-root";
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-PhjMY4bAt+Prx8tmgGCZ7fhAyKhOUudrJO9K8yr7F18=";
+    hash = cacheRootHash;
   };
 
   cacheApp = fetchYarnDeps {
     name = "${finalAttrs.pname}-cache-app";
     yarnLock = finalAttrs.src + "/app/yarn.lock";
-    hash = "sha256-eW3G4saTbjRUexgg+n0z4EU1YtAgvSoW+uU0rNZZ1l0=";
+    hash = cacheAppHash;
   };
 
   dontYarnInstallDeps = true;
@@ -100,10 +102,27 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix PATH : ${lib.makeBinPath [ git-lfs ]}
 
 
-    for native in fs-admin keytar desktop-trampoline windows-argv-parser; do
-      yarn --offline --cwd app/node_modules/$native build
+    # exception: printenvz needs `node-gyp` configure first for some reason
+    pushd node_modules/printenvz
+    node node_modules/.bin/node-gyp configure
+    popd
+
+    declare -a natives=(
+      app/node_modules/fs-admin
+      app/node_modules/keytar
+      app/node_modules/desktop-trampoline
+      app/node_modules/windows-argv-parser
+      node_modules/printenvz
+    )
+    for native in "''${natives[@]}"; do
+      yarn --offline --cwd $native build
     done
 
+    # exception: desktop-trampoline doesn't include `node-gyp rebuild` in its build script anymore
+    pushd app/node_modules/desktop-trampoline
+    node-gyp rebuild
+    popd
+
     yarn compile:script
 
     touch electron

From 93a1818f1be1ea45b0a53cbdb1f212424214a1ce Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 2 Aug 2025 15:03:27 +0200
Subject: [PATCH 103/336] github-desktop: add update script

---
 pkgs/by-name/gi/github-desktop/package.nix    | 17 ++++++++++++
 .../gi/github-desktop/update-yarn-caches.sh   | 27 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100755 pkgs/by-name/gi/github-desktop/update-yarn-caches.sh

diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix
index 13789c630c27..da9ad0ae1bdc 100644
--- a/pkgs/by-name/gi/github-desktop/package.nix
+++ b/pkgs/by-name/gi/github-desktop/package.nix
@@ -23,6 +23,9 @@
   gnome-keyring,
   libsecret,
   curl,
+
+  _experimental-update-script-combinators,
+  nix-update-script,
 }:
 
 let
@@ -177,6 +180,20 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru = {
+    inherit (finalAttrs) cacheRoot cacheApp;
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script {
+        extraArgs = [
+          "--version-regex"
+          ''^release-(\d\.\d\.\d)$''
+        ];
+      })
+      # TODO: in the future, use `nix-update --custom-dep`.
+      ./update-yarn-caches.sh
+    ];
+  };
+
   meta = {
     description = "GUI for managing Git and GitHub";
     homepage = "https://desktop.github.com";
diff --git a/pkgs/by-name/gi/github-desktop/update-yarn-caches.sh b/pkgs/by-name/gi/github-desktop/update-yarn-caches.sh
new file mode 100755
index 000000000000..21909d82c06e
--- /dev/null
+++ b/pkgs/by-name/gi/github-desktop/update-yarn-caches.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix gnused common-updater-scripts
+
+set -euxo pipefail
+
+cd "$(dirname $0)"
+
+setKV() {
+  sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" package.nix
+}
+
+for cache in cacheApp cacheRoot; do
+  hashKey="${cache}Hash"
+  setKV "$hashKey" sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
+
+  pushd ../../../..
+  set +e
+  newHash="$(nix-build --no-out-link -A github-desktop.$cache 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')"
+  set -e
+  popd
+
+  if [ -z "$newHash" ]; then
+    echo Failed to update hash for $cache
+    exit 1
+  fi
+  setKV "$hashKey" "$newHash"
+done

From 05704014a18dd377c94bb4c8447d3e03dbd2539e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 20:27:12 +0000
Subject: [PATCH 104/336] decktape: 3.15.0 -> 3.16.0

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

diff --git a/pkgs/by-name/de/decktape/package.nix b/pkgs/by-name/de/decktape/package.nix
index c0c5e5129a93..d81746b58333 100644
--- a/pkgs/by-name/de/decktape/package.nix
+++ b/pkgs/by-name/de/decktape/package.nix
@@ -6,16 +6,16 @@
 }:
 buildNpmPackage rec {
   pname = "decktape";
-  version = "3.15.0";
+  version = "3.16.0";
 
   src = fetchFromGitHub {
     owner = "astefanutti";
     repo = "decktape";
     rev = "v${version}";
-    hash = "sha256-SsdjqkMEVD0pVgIZ9Upmrz/1KOWcb1KUy/v/xTCVGc0=";
+    hash = "sha256-hriWwH7/YKCwdDhXwqoOmjOJX3Dk4aKMnCBJKepUTzg=";
   };
 
-  npmDepsHash = "sha256-Z5fLGMvxVhM8nW81PQ5ZFPHK6m2uoYUv0A4XsTa3Z2Y=";
+  npmDepsHash = "sha256-wnT6kRiYanwi8G9ZtBmqxAFctJEyyi0XlwaOXTjvlA8=";
   npmPackFlags = [ "--ignore-scripts" ];
 
   dontNpmBuild = true;

From 0ab25e4a61368204bb65893e8dfcbbab06cf7502 Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@protonmail.com>
Date: Sat, 11 Apr 2026 23:11:25 +0200
Subject: [PATCH 105/336] python3Packages.pynfsclient: switch to Pennyw0rth
 Fork

---
 .../python-modules/pynfsclient/default.nix    | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/pynfsclient/default.nix b/pkgs/development/python-modules/pynfsclient/default.nix
index 11b0d47f2939..6b5a2a455a2c 100644
--- a/pkgs/development/python-modules/pynfsclient/default.nix
+++ b/pkgs/development/python-modules/pynfsclient/default.nix
@@ -1,30 +1,22 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonAtLeast,
+  fetchFromGitHub,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pynfsclient";
-  version = "0.1.5";
+  version = "1.0.6";
   pyproject = true;
 
-  disabled = pythonAtLeast "3.13";
-
-  src = fetchPypi {
-    pname = "pyNfsClient";
-    inherit version;
-    hash = "sha256-xgZL08NlMCpSkALQwklh7Xq16bK2Sm2hAynbrIWsgaU=";
+  src = fetchFromGitHub {
+    owner = "Pennyw0rth";
+    repo = "NfsClient";
+    rev = "v${version}";
+    hash = "sha256-9PV/RpK/rOI9jpTDy0FmkXY2Cf54vve6j1kM5dcZgV8=";
   };
 
-  postPatch = ''
-    # HISTORY.md is missing
-    substituteInPlace setup.py \
-      --replace-fail "HISTORY.md" "README.rst"
-  '';
-
   build-system = [ setuptools ];
 
   # Module has no tests
@@ -33,9 +25,13 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "pyNfsClient" ];
 
   meta = {
-    description = "Pure python NFS client";
-    homepage = "https://pypi.org/project/pyNfsClient/";
+    description = "Pure python library to simulate NFS client";
+    homepage = "https://github.com/Pennyw0rth/NfsClient";
+    changelog = "https://github.com/Pennyw0rth/NfsClient/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ fab ];
+    maintainers = with lib.maintainers; [
+      fab
+      letgamer
+    ];
   };
 }

From 6f97cdfea647399f07797d291105931d4a45d2a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 21:42:57 +0000
Subject: [PATCH 106/336] vscode-extensions.sas.sas-lsp: 1.18.0 -> 1.19.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c3e846d32159..a18b22376dd2 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4076,8 +4076,8 @@ let
         mktplcRef = {
           name = "sas-lsp";
           publisher = "SAS";
-          version = "1.18.0";
-          hash = "sha256-OP0UUANqoQoxr+10/NkwveEULKWFrDn/dmEg0CHMZp0=";
+          version = "1.19.1";
+          hash = "sha256-aVtMiSbPLs6zIdcD0TopIAVKvJksSdTy9ND+jGw/G0A=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog";

From e70353bbcc767798158621625089c88e8c6fb7cd Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Thu, 9 Apr 2026 14:02:20 +0000
Subject: [PATCH 107/336] radcli: fix hash

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

diff --git a/pkgs/by-name/ra/radcli/package.nix b/pkgs/by-name/ra/radcli/package.nix
index f60a527e42bc..42ec2653ec4a 100644
--- a/pkgs/by-name/ra/radcli/package.nix
+++ b/pkgs/by-name/ra/radcli/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "radcli";
     repo = "radcli";
     tag = finalAttrs.version;
-    hash = "sha256-PpPKNH9gDE9FewDCeBCog3p5C6FBBYBPVnhahVHYKnA=";
+    hash = "sha256-Q+rcNhYmQpEE5LYC/zvbh4RIxx2g9djuWmrSUdh00+c=";
   };
 
   postUnpack = ''

From 6416786e324801f52af809f9e3a042a3135c451e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 11 Apr 2026 17:10:56 +0000
Subject: [PATCH 108/336] python3Packages.chromadb: 1.5.5 -> 1.5.7

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

diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index 25f2b15209b1..000a11787feb 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -68,19 +68,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "chromadb";
-  version = "1.5.5";
+  version = "1.5.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chroma-core";
     repo = "chroma";
     tag = finalAttrs.version;
-    hash = "sha256-Y/M7awTi2AJTh4xRY0MIfnC9ygy62fG7X3W9QUxW2XE=";
+    hash = "sha256-JrkfLwEL7iTL9P/4UDM4hFQtRL1JYH47dgZ1d+Mphqw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-yx5OMZSWRAP732lRypap79vr2I72aT+TWooo+5e0wDQ=";
+    hash = "sha256-Szy2mSTriMwMViVTbI+0XaizcQBKh1Ncipf84moDREI=";
   };
 
   # Can't use fetchFromGitHub as the build expects a zipfile
@@ -102,7 +102,12 @@ buildPythonPackage (finalAttrs: {
                        "anonymized_telemetry: bool = False"
     ''
     # error: queries overflow the depth limit!
+    # https://github.com/chroma-core/chroma/issues/6891
+    # https://github.com/chroma-core/chroma/issues/6892
+    # https://github.com/chroma-core/chroma/issues/6687
     + ''
+      sed -i '1i #![recursion_limit = "256"]' rust/blockstore/src/lib.rs
+      sed -i '1i #![recursion_limit = "256"]' rust/index/src/lib.rs
       sed -i '1i #![recursion_limit = "256"]' rust/segment/src/lib.rs
     '';
 

From e7785c6a639092171f3c1de68fe3c57c2bcbf87d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 22:54:24 +0000
Subject: [PATCH 109/336] updatecli: 0.115.0 -> 0.116.0

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

diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix
index 8f574346f95a..06da056b38c0 100644
--- a/pkgs/by-name/up/updatecli/package.nix
+++ b/pkgs/by-name/up/updatecli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "updatecli";
-  version = "0.115.0";
+  version = "0.116.0";
 
   src = fetchFromGitHub {
     owner = "updatecli";
     repo = "updatecli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-TUFOtMABC8Ut9EHhEveyLK9UTDxRS5Yz6znj4lhHfCU=";
+    hash = "sha256-34XXA8cBifuPC4Sls34D4kFkMOv9+1oYV3ZqPrWF1zY=";
   };
 
-  vendorHash = "sha256-z1nACmowcOerHWSI2SDRlombb8coYsrDTYaHY9eFPMQ=";
+  vendorHash = "sha256-UK6KC/NsEy08mK2tikpAN+H4C61cyHGzqqeoz5kylEg=";
 
   # tests require network access
   doCheck = false;

From f78a90941e2aabbd96f1a0dfd5f50fef16a9da1b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 12 Apr 2026 11:15:10 +1000
Subject: [PATCH 110/336] .github/labeler.yml, ci/OWNERS: update and sync linux
 kernel paths

---
 .github/labeler.yml | 6 ++++++
 ci/OWNERS           | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 522492fd174f..f0a8e854b026 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -270,8 +270,14 @@
   - any:
       - changed-files:
           - any-glob-to-any-file:
+              - doc/packages/linux.section.md
+              - lib/kernel.nix
+              - nixos/doc/manual/configuration/linux-kernel.chapter.md
+              - nixos/modules/system/boot/kernel.nix
+              - nixos/tests/kernel-generic/**/*
               - pkgs/build-support/kernel/**/*
               - pkgs/os-specific/linux/kernel/**/*
+              - pkgs/top-level/linux-kernels.nix
 
 "6.topic: lib":
   - any:
diff --git a/ci/OWNERS b/ci/OWNERS
index 374afcd510af..b8fc4ecf920c 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -303,8 +303,14 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/by-name/es/esphome @mweinelt
 
 # Linux kernel
-/pkgs/top-level/linux-kernels.nix @NixOS/linux-kernel
+/doc/packages/linux.section.md @NixOS/linux-kernel
+/lib/kernel.nix @NixOS/linux-kernel
+/nixos/doc/manual/configuration/linux-kernel.chapter.md @NixOS/linux-kernel
+/nixos/modules/system/boot/kernel.nix @NixOS/linux-kernel
+/nixos/tests/kernel-generic/ @NixOS/linux-kernel
+/pkgs/build-support/kernel/ @NixOS/linux-kernel
 /pkgs/os-specific/linux/kernel/ @NixOS/linux-kernel
+/pkgs/top-level/linux-kernels.nix @NixOS/linux-kernel
 
 # Network Time Daemons
 /pkgs/by-name/ch/chrony @thoughtpolice

From ac879ed66aded829b58092a0ecffeaa51fa625b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 01:40:21 +0000
Subject: [PATCH 111/336] feishu-cli: 1.15.0 -> 1.18.1

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

diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix
index 1531a00bd101..3c574c001cfd 100644
--- a/pkgs/by-name/fe/feishu-cli/package.nix
+++ b/pkgs/by-name/fe/feishu-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "feishu-cli";
-  version = "1.15.0";
+  version = "1.18.1";
 
   src = fetchFromGitHub {
     owner = "riba2534";
     repo = "feishu-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8GIEa2P3s3sF0o4SyAjLxgHNFi5+4F19T+EsJ1d1Oik=";
+    hash = "sha256-LYhBwXkkYtc9uNXOMn/lRiCInSSy0tCf0vGsuFDuJJI=";
   };
 
   vendorHash = "sha256-MZv772U+3+Fcanaiuhz+OCqfIsYyCG7B4iZOnEftbi8=";

From e5709d4fe5da18e1c449f58a62b4ecdc09e5af2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 02:30:01 +0000
Subject: [PATCH 112/336] vault-unseal: 0.7.2 -> 1.0.0

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

diff --git a/pkgs/by-name/va/vault-unseal/package.nix b/pkgs/by-name/va/vault-unseal/package.nix
index d086e3176cd2..0975150c6f27 100644
--- a/pkgs/by-name/va/vault-unseal/package.nix
+++ b/pkgs/by-name/va/vault-unseal/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.7.2";
+  version = "1.0.0";
 in
 buildGoModule {
   pname = "vault-unseal";
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "lrstanley";
     repo = "vault-unseal";
     rev = "v${version}";
-    hash = "sha256-xv33wx/JjvpL9ryyWeZde+a6UPWqYXQcsAxOzmHFAyo=";
+    hash = "sha256-czfG7DsA6O2n8BlzEEvNtu0Dg277qBnLAdVUZLo6+8w=";
   };
 
-  vendorHash = "sha256-hhTJB1g35vB5dLOEY7V7V5ma7Zzyq2bo9kk3gpEcEsY=";
+  vendorHash = "sha256-ma3xbnWH87b1X5fdOjigzsj5gEfhbjyTLoIDyp9eY80=";
 
   meta = {
     changelog = "https://github.com/lrstanley/vault-unseal/releases/tag/v${version}";

From 4c498dfcb65fdbc61b4b0db379ae2ce53ce8d073 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 02:40:38 +0000
Subject: [PATCH 113/336] wego: 2.3 -> 2.4

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

diff --git a/pkgs/by-name/we/wego/package.nix b/pkgs/by-name/we/wego/package.nix
index a47c8d67bac1..934e1ad8a152 100644
--- a/pkgs/by-name/we/wego/package.nix
+++ b/pkgs/by-name/we/wego/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "wego";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "schachmat";
     repo = "wego";
     rev = finalAttrs.version;
-    sha256 = "sha256-YGUll0Wi/oulNMXSrSFeAVe+aGpyFeyXRZTW4ngC3Zk=";
+    sha256 = "sha256-RKVVOgM6eEWTHYb++AVTTjPLm/4R9SHFly4boRw9Ktw=";
   };
 
-  vendorHash = "sha256-aXrXw/7ZtSZXIKDMZuWPV2zAf0e0lU0QCBhua7tHGEY=";
+  vendorHash = "sha256-PSl0bGzyG9XBZPi8+YzLNq3JEm7QtmfX0272xOgtbek=";
 
   meta = {
     homepage = "https://github.com/schachmat/wego";

From b32e88696cf56f7c81dba19cd3924ee97885b300 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 02:51:41 +0000
Subject: [PATCH 114/336] libretro-shaders-slang: 0-unstable-2026-04-03 ->
 0-unstable-2026-04-10

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

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 88a8dc9193ef..1de11e79ce75 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2026-04-03";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "f1b85fef8c82ae05bf24a2bda8eb2730b3b7023e";
-    hash = "sha256-wAsU07lEjr9rFfW1WrnzflEriGwr/vzKpE9OM2zsPJA=";
+    rev = "3e8578d3341c08647470542010b2daf8e7218fa9";
+    hash = "sha256-n9R9lff3AaIEE397kOZxG5fE+/jvCYqkBeUL7MKGkZU=";
   };
 
   dontConfigure = true;

From 8fee2c5fe6b682a159d020305a161ab278c3673c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 02:55:24 +0000
Subject: [PATCH 115/336] gefyra: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix
index febfc6194dfe..5e18be3f7040 100644
--- a/pkgs/by-name/ge/gefyra/package.nix
+++ b/pkgs/by-name/ge/gefyra/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gefyra";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchzip {
     url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip";
-    hash = "sha256-PBwAVdTa1DL7KwAFhei1AcTdPyrcaCsyo6zif+UwJPk=";
+    hash = "sha256-XS+vtwb6UIJK7f3R3QLoyX9+P4n79Fh+v7odiot7Yic=";
     stripRoot = false;
   };
 

From 591827b59b22ce7df55ddac50e25abdf2c241b0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 03:58:01 +0000
Subject: [PATCH 116/336] python3Packages.edk2-pytool-library: 0.23.12 ->
 0.23.13

---
 .../python-modules/edk2-pytool-library/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index b433505cda2a..9ef51271e140 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "edk2-pytool-library";
-  version = "0.23.12";
+  version = "0.23.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tianocore";
     repo = "edk2-pytool-library";
     tag = "v${version}";
-    hash = "sha256-31gDJKiNJ6CGIJYItMj8VzQkHQdmWFiDrpiC1ntIrVE=";
+    hash = "sha256-kXDdUKOs5+1LKqVnGAd1G6pD4IZkAsuNfJPDWj/ffkg=";
   };
 
   build-system = [

From 2ee0812e7948c7438fe8b9f9a4395f8269783efb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 04:30:25 +0000
Subject: [PATCH 117/336] talm: 0.22.4 -> 0.23.1

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

diff --git a/pkgs/by-name/ta/talm/package.nix b/pkgs/by-name/ta/talm/package.nix
index 3d331423c1c3..496a24c3c9e0 100644
--- a/pkgs/by-name/ta/talm/package.nix
+++ b/pkgs/by-name/ta/talm/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "talm";
-  version = "0.22.4";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "cozystack";
     repo = "talm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9CUr49uKvVwjU9rJpt0Y4BNtBUQiJxNcU8YMlNhyd/g=";
+    hash = "sha256-bxyYDCWQJZ+MrfV30Q3xBMggGU+F7Hs486g3BhQlDtI=";
   };
 
   vendorHash = "sha256-jDp1WVETDbCtSq+v0BrIiTqoR2cnmI7JXdy5ydnt5wA=";

From cdba47a019297abff244ae216c03c720b366d692 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 04:52:27 +0000
Subject: [PATCH 118/336] longcat: 0.0.13 -> 0.0.16

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

diff --git a/pkgs/by-name/lo/longcat/package.nix b/pkgs/by-name/lo/longcat/package.nix
index 68b0cf191656..6588dad4481a 100644
--- a/pkgs/by-name/lo/longcat/package.nix
+++ b/pkgs/by-name/lo/longcat/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.0.13";
+  version = "0.0.16";
 in
 buildGoModule {
   pname = "longcat";
@@ -16,10 +16,10 @@ buildGoModule {
     owner = "mattn";
     repo = "longcat";
     tag = "v${version}";
-    hash = "sha256-QKtK7v2+Q5/jZrH1m6u9mwgwMQoaLv3pIRc+hYQn4k0=";
+    hash = "sha256-lI+gykqXWI32TEtvdj9+Lq6iSx7I1iSzP1cYROIZLGM=";
   };
 
-  vendorHash = "sha256-ka58YOoyBKLX8Z9ak2+rERXsY3rPUaOanfIFErCJCdE=";
+  vendorHash = "sha256-VcNhzQyhd7gDvlrz7Lh2QRUkMjZj40s2hanNP6gsnMs=";
 
   passthru.updateScript = nix-update-script { };
 

From 1d79f6ca9e8b60a22ed4fe99ed857156e1d19a81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 07:06:52 +0000
Subject: [PATCH 119/336] fcitx5-array: 0.9.6 -> 1.0.0

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

diff --git a/pkgs/by-name/fc/fcitx5-array/package.nix b/pkgs/by-name/fc/fcitx5-array/package.nix
index 873b5faad5c3..d3993d83e984 100644
--- a/pkgs/by-name/fc/fcitx5-array/package.nix
+++ b/pkgs/by-name/fc/fcitx5-array/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fcitx5-array";
-  version = "0.9.6";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "ray2501";
     repo = "fcitx5-array";
     tag = finalAttrs.version;
-    hash = "sha256-YDFT/CawFiPN3kXzHMpenCzWMJSA1dFUhVe22EDfnU8=";
+    hash = "sha256-IIsmldCqXgVJZXS0GcxxYiwpuqPw0GdABvk94q850pQ=";
   };
 
   nativeBuildInputs = [

From 16684c97179d82d6dbb353bc091acb4838aad34c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 00:39:25 +0000
Subject: [PATCH 120/336] python3Packages.beets: 2.8.0 -> 2.9.0

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

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 0206b6e48488..37f7ee3783cb 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -27,7 +27,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonAtLeast,
   fetchFromGitHub,
 
   # build-system
@@ -113,16 +112,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "beets";
-  version = "2.8.0";
+  version = "2.9.0";
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "beets";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8sYoy11eocn7UDeTuaPqOxXZLdUqkabU4DMNLBD5Xp4=";
+    hash = "sha256-dJhWKZwhKXyFQVO9xt2v/NSa7bSg0e78zga/t9dlTyE=";
   };
   pyproject = true;
-  # Waiting for https://github.com/beetbox/beets/pull/6267
-  disabled = pythonAtLeast "3.14";
 
   patches = extraPatches;
 
@@ -181,6 +178,7 @@ buildPythonPackage (finalAttrs: {
   ];
 
   nativeCheckInputs = [
+    ffmpeg
     pytestCheckHook
     pytest-cov-stub
     pytest-flask
@@ -273,13 +271,12 @@ buildPythonPackage (finalAttrs: {
         bareasc = { };
         beatport.propagatedBuildInputs = [ requests-oauthlib ];
         bench.testPaths = [ ];
-        bpd.testPaths = [ ];
+        bpd = { };
         bpm.testPaths = [ ];
         bpsync.testPaths = [ ];
         bucket = { };
         chroma = {
           propagatedBuildInputs = [ pyacoustid ];
-          testPaths = [ ];
           wrapperBins = [
             chromaprint
           ];

From 433e7ee085e985766ac1aef82420d1aa8f9c2c55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 08:09:15 +0000
Subject: [PATCH 121/336] rime-moegirl: 20260315 -> 20260412

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

diff --git a/pkgs/by-name/ri/rime-moegirl/package.nix b/pkgs/by-name/ri/rime-moegirl/package.nix
index d2e1852f6fd6..f26eb9155949 100644
--- a/pkgs/by-name/ri/rime-moegirl/package.nix
+++ b/pkgs/by-name/ri/rime-moegirl/package.nix
@@ -5,10 +5,10 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rime-moegirl";
-  version = "20260315";
+  version = "20260412";
   src = fetchurl {
     url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml";
-    hash = "sha256-iNRDQsDg8G58mSkDnzoGUVfWX3YezIWVwl5CJMKB+wE=";
+    hash = "sha256-qIFkaDdivE7tOQmk0TpNB8wov5iazegX7eJjMB+lFe0=";
   };
 
   dontUnpack = true;

From d1388c72fa92c061b27f021079f2501d2ce7f486 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 08:13:42 +0000
Subject: [PATCH 122/336] python3Packages.elevenlabs: 2.41.0 -> 2.42.0

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

diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index ee2a9a47d34f..b31dab477a32 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "elevenlabs";
-  version = "2.41.0";
+  version = "2.42.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Kykhwy2JxEKWxO/lRmMxB/P0jnaxBfmpJDz4+g1oBrQ=";
+    hash = "sha256-HLKaT+781V889MO471T1Hj+ED7k3SGPtwt9NIA/bmWQ=";
   };
 
   build-system = [ poetry-core ];

From f2024defdf778e515fef080b49eea1344eabc3f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 08:33:46 +0000
Subject: [PATCH 123/336] python3Packages.rocketchat-api: 3.4.0 -> 3.5.0

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

diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix
index 86f3423a6a13..7ff29f6201b4 100644
--- a/pkgs/development/python-modules/rocketchat-api/default.nix
+++ b/pkgs/development/python-modules/rocketchat-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "rocketchat-api";
-  version = "3.4.0";
+  version = "3.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jadolg";
     repo = "rocketchat_API";
     tag = version;
-    hash = "sha256-DA4CBgtcg0TOLm5HrDxbyQK/qOfgwIFw86Yk1s4pBFM=";
+    hash = "sha256-IbynNQLRgVCY2I9rZ3S4annJ0ogiuRKLHJ2P9qvpj4o=";
   };
 
   build-system = [

From b2a1bd0533d9c3c2674c61634613fc626477fdc5 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 12 Apr 2026 11:50:34 +0300
Subject: [PATCH 124/336] sourcegit: 2025.34 -> 2026.07

---
 pkgs/by-name/so/sourcegit/deps.json   | 202 +++++++++++++++-----------
 pkgs/by-name/so/sourcegit/package.nix |   9 +-
 2 files changed, 126 insertions(+), 85 deletions(-)

diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json
index d82e2904706e..280b9727d440 100644
--- a/pkgs/by-name/so/sourcegit/deps.json
+++ b/pkgs/by-name/so/sourcegit/deps.json
@@ -1,8 +1,13 @@
 [
   {
     "pname": "Avalonia",
-    "version": "11.3.5",
-    "hash": "sha256-gW1t+B32H9aVC+ogE5X+4bwjsmbdOcyH83T8Br7IDuY="
+    "version": "11.0.0",
+    "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.3.12",
+    "hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -10,54 +15,59 @@
     "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
   },
   {
-    "pname": "Avalonia.AvaloniaEdit",
-    "version": "11.3.0",
-    "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.28",
+    "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="
   },
   {
     "pname": "Avalonia.BuildServices",
-    "version": "0.0.31",
-    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
+    "version": "11.3.2",
+    "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.5",
-    "hash": "sha256-umZ6rfL9Qw1/jWpAiMyPu8f6i8ah4u3iR6uJVS6IUfw="
+    "version": "11.3.12",
+    "hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.3.5",
-    "hash": "sha256-JgMIQ2aFgLkLcL/auPUwQTlmPlurree5HXfLYGGP3o8="
+    "version": "11.3.12",
+    "hash": "sha256-xuAL5FOvonyaY9CwEhjtMnurPcA0lYe0dyLLK0GEzd8="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.5",
-    "hash": "sha256-SJyN+znfG/GUYkw3yNFMxd0Y7Hc9QvckRHPRc/QpkvM="
+    "version": "11.3.12",
+    "hash": "sha256-IY6TkpVh0GiCkKbestdwH8KEJ0Embxy+JYe7lww0xBA="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.5",
-    "hash": "sha256-7GORVuABhwQymfvSclY6ZGtRN6yXaKs1FKuXuR3ZXmo="
+    "version": "11.3.12",
+    "hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA="
   },
   {
     "pname": "Avalonia.Fonts.Inter",
-    "version": "11.3.5",
-    "hash": "sha256-bBqFtDwB9C6cNlrrr2gnqv1YpNVAlEXjmLiv86CrU/o="
+    "version": "11.3.12",
+    "hash": "sha256-yr4/zpUbmQuVzdupV5v87qNO24sPOVhnnJ1SeiLxMx8="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.5",
-    "hash": "sha256-Kq5rZkiQWayrMRD90ex24zxESHTxof0PX8IvA+RutAc="
+    "version": "11.3.12",
+    "hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.5",
-    "hash": "sha256-EIpaS2XtO/1Dx0XVSf9XapKMUHmVSXwK/rwgeioPCDo="
+    "version": "11.3.12",
+    "hash": "sha256-1ujLmYaL1zTgtlsNerBDtTuoaJX7c7HukNLJIalrB4Q="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.5",
-    "hash": "sha256-1bAKPdK+ftcdfdiUkwasmpjf3ai07T81PkRjKWFyNf8="
+    "version": "11.0.0",
+    "hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.3.12",
+    "hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU="
   },
   {
     "pname": "Avalonia.Skia",
@@ -66,43 +76,38 @@
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.5",
-    "hash": "sha256-DW2ectX/V583KqirUetmFioMNsuUa0ai2k5WKObFMO4="
+    "version": "11.3.12",
+    "hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.3.5",
-    "hash": "sha256-BXf+iZxBEO2pFeAiN0bJNOndFJE+L573qZFiLqRRWG8="
+    "version": "11.3.12",
+    "hash": "sha256-4TTsW7zLF0Z9C1lzPsPfekHpHrSx7RB7I63j/cKUX8U="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.5",
-    "hash": "sha256-hkEJC/2usaYDDdIeVKuWfORd+tlg39+xf/2Eiflvb8I="
+    "version": "11.3.12",
+    "hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.5",
-    "hash": "sha256-SNAx4QaNyrhE0BLWhHFtdsB35a5T9qfIQhdMC1YUrzA="
+    "version": "11.3.12",
+    "hash": "sha256-haIKvJ1SD17+EUJHILoFJMy+WJJtXr9I+ZYMFtwEuTc="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.5",
-    "hash": "sha256-v85I2pFMOixIANKCngr2/HyTflYxiSihe08q6Z4513Q="
-  },
-  {
-    "pname": "AvaloniaEdit.TextMate",
-    "version": "11.3.0",
-    "hash": "sha256-VyXRytKE0aaWirvfr5Hm5uJm8Ckbu/+4wnTjmomgM5s="
+    "version": "11.3.12",
+    "hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w="
   },
   {
     "pname": "Azure.AI.OpenAI",
-    "version": "2.3.0-beta.2",
-    "hash": "sha256-kAl8ylr8ghuXsGNFrzVS5e12xOrsmT9VieSVgmKJCyY="
+    "version": "2.9.0-beta.1",
+    "hash": "sha256-jMUgCg0s4kTPB5m7nG9Mc1P5oOEIF4tmgCAG5Z+TVe0="
   },
   {
     "pname": "Azure.Core",
-    "version": "1.47.3",
-    "hash": "sha256-fWyfqF1lpnap4cF3l9J0fYtZbxIqm6UFsuJgN+/hwW4="
+    "version": "1.51.1",
+    "hash": "sha256-aNwDKJfkYC/QFaP8tCrwG+hFp+ubK6kUvEu4KhpgPTc="
   },
   {
     "pname": "BitMiracle.LibTiff.NET",
@@ -146,18 +151,18 @@
   },
   {
     "pname": "LiveChartsCore",
-    "version": "2.0.0-rc5.4",
-    "hash": "sha256-Qw1Iyld75RXpvGJn/EQvd+f4Jh1SVAoqjjl/I0ctyWw="
+    "version": "2.0.0-rc6.1",
+    "hash": "sha256-bz71i+8phXf8H/MG+DhF0m7RsNw2TLtPjREI55V4Mos="
   },
   {
     "pname": "LiveChartsCore.SkiaSharpView",
-    "version": "2.0.0-rc5.4",
-    "hash": "sha256-hlFYZu25Z2iTgoIL9cczN4BYYHzSXvzC7593e52x914="
+    "version": "2.0.0-rc6.1",
+    "hash": "sha256-ftkvP9ow2jSxOXQsGSDUDp232iY+cLEcwW4u1Bj+qN8="
   },
   {
     "pname": "LiveChartsCore.SkiaSharpView.Avalonia",
-    "version": "2.0.0-rc5.4",
-    "hash": "sha256-U7Ihj5fs0/DJLerdcPu33xRHCh5K6JY3pPpLiBoV2vw="
+    "version": "2.0.0-rc6.1",
+    "hash": "sha256-OWvyQ72JtajDlN1BDXHyTYP/U0TKnogNDOWCOCqpk6M="
   },
   {
     "pname": "MicroCom.Runtime",
@@ -166,33 +171,78 @@
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "8.0.0",
-    "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
+    "version": "10.0.2",
+    "hash": "sha256-3lrCf7HOpbkZkQx4/JSpKi8Rl+hp9NAaRi9dp6xqMaQ="
+  },
+  {
+    "pname": "Microsoft.Build.Tasks.Git",
+    "version": "1.1.1",
+    "hash": "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "10.0.2",
+    "hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
+    "version": "10.0.2",
+    "hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
+    "version": "10.0.2",
+    "hash": "sha256-Aob6wq51LdquE7SkkxtCzcuHBKWrJcb3Ebi/dU3aqA4="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "10.0.2",
+    "hash": "sha256-tibCkkT9WliU2E/i0ufx7/Va6H6QZX4hR/1oUp8ecgQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "10.0.2",
+    "hash": "sha256-mkeKUXepn4bfEdZFXdURmNEFdGiHQdpcxnm6joG+pUA="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.3",
-    "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
+    "version": "10.0.2",
+    "hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "10.0.2",
+    "hash": "sha256-12AfUEDdta/pmZUyEyqSUfOk0YoA7JOfGmIYnZQ//qk="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "10.0.2",
+    "hash": "sha256-8Ccrjjv9cFVf9RyCc7GS/Byt8+DXdSNea0UX3A5BEdA="
+  },
+  {
+    "pname": "Microsoft.SourceLink.Common",
+    "version": "1.1.1",
+    "hash": "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY="
+  },
+  {
+    "pname": "Microsoft.SourceLink.GitHub",
+    "version": "1.1.1",
+    "hash": "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU="
   },
   {
     "pname": "Onigwrap",
-    "version": "1.0.8",
-    "hash": "sha256-lH9nH74cPMQnWKO8mwgg+nX4iMUXuh7McfeRL9asQIY="
+    "version": "1.0.10",
+    "hash": "sha256-x1TJeOdANiWDdwgN+GsFznHMgPUnq/6iSN0BlIt0QJM="
   },
   {
     "pname": "OpenAI",
-    "version": "2.3.0",
-    "hash": "sha256-nIpYfGvE8FaEnE2y+98CAoLoz3+MWo+2eyb3Rgh7qgY="
+    "version": "2.9.1",
+    "hash": "sha256-gYBNaOe49S0VyZxv8Cb1tOcRAvZEn7SwYMAvq7TrZ0w="
   },
   {
     "pname": "Pfim",
-    "version": "0.11.3",
-    "hash": "sha256-SNngIsloTjRymY64AGw+agXeG4U3kIgE+Pk8NqxMBO8="
+    "version": "0.11.4",
+    "hash": "sha256-84mFvufgL1XS1fRTGBpR4zVB4E7/cj2pI9G0k+l7q7M="
   },
   {
     "pname": "SkiaSharp",
@@ -226,38 +276,28 @@
   },
   {
     "pname": "System.ClientModel",
-    "version": "1.5.1",
-    "hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
+    "version": "1.9.0",
+    "hash": "sha256-8/feim+EOvZj0MU+ghFz257QzNUN+ila9p7eCAOCpug="
   },
   {
-    "pname": "System.ClientModel",
-    "version": "1.6.1",
-    "hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0="
-  },
-  {
-    "pname": "System.IO.Pipelines",
-    "version": "8.0.0",
-    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+    "pname": "System.ComponentModel.Annotations",
+    "version": "4.5.0",
+    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
   },
   {
     "pname": "System.Memory.Data",
-    "version": "8.0.1",
-    "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg="
-  },
-  {
-    "pname": "System.Text.Json",
-    "version": "8.0.5",
-    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
+    "version": "10.0.1",
+    "hash": "sha256-C4AaCiuS1BLljZq+3VUTJyHRA6IFPIO0gWZKw2hbt5o="
   },
   {
     "pname": "TextMateSharp",
-    "version": "1.0.70",
-    "hash": "sha256-fzmSGU8fT/J6W+Yx/qgUqPEiC1Og9ctUyQGDleOggrM="
+    "version": "2.0.2",
+    "hash": "sha256-u8D8zWJNdmzGRzumt0bRrRyrQCXEYiVC5wpNl6cL3WA="
   },
   {
     "pname": "TextMateSharp.Grammars",
-    "version": "1.0.70",
-    "hash": "sha256-AAH3SXLyIUIfJgdPhwIRPZhdcxdNhis2ODLd9mh1PuE="
+    "version": "2.0.2",
+    "hash": "sha256-DVmf3XRQiLzPBxtoeVYEU2RiD4VhxQwVwzL2S4gtUF4="
   },
   {
     "pname": "Tmds.DBus.Protocol",
diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix
index c172e11f4501..62ed91cab6ff 100644
--- a/pkgs/by-name/so/sourcegit/package.nix
+++ b/pkgs/by-name/so/sourcegit/package.nix
@@ -22,19 +22,20 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "sourcegit";
-  version = "2025.34";
+  version = "2026.07";
 
   src = fetchFromGitHub {
     owner = "sourcegit-scm";
     repo = "sourcegit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-O7HzbrcQGgP3mRSfqLxoHPswVW99S9chb7ZWBeEelsY=";
+    hash = "sha256-g7V3EbbI8kIy2CW3sof5sdSPp4u7ZbuawqSp63OlV44=";
+    fetchSubmodules = true;
   };
 
   patches = [ ./fix-darwin-git-path.patch ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_9_0;
-  dotnet-runtime = dotnetCorePackages.runtime_9_0;
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
+  dotnet-runtime = dotnetCorePackages.runtime_10_0;
 
   nugetDeps = ./deps.json;
 

From 51261e3310e51375970894e819f03034fc162af6 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Thu, 9 Apr 2026 20:40:30 +1000
Subject: [PATCH 125/336] simgear: darwin support

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

diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix
index e70558ddbea6..c7c0682e52fb 100644
--- a/pkgs/by-name/si/simgear/package.nix
+++ b/pkgs/by-name/si/simgear/package.nix
@@ -14,7 +14,7 @@
   libxmu,
   libGLU,
   libGL,
-  boost179,
+  boost,
   zlib,
   libjpeg,
   freealut,
@@ -44,6 +44,18 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     plib
+    boost
+    zlib
+    libjpeg
+    freealut
+    openscenegraph
+    openal
+    expat
+    apr
+    curl
+    xz
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libglut
     xorgproto
     libx11
@@ -55,16 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxmu
     libGLU
     libGL
-    boost179
-    zlib
-    libjpeg
-    freealut
-    openscenegraph
-    openal
-    expat
-    apr
-    curl
-    xz
   ];
 
   propagatedBuildInputs = [ c-ares ];
@@ -73,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simulation construction toolkit";
     homepage = "https://wiki.flightgear.org/SimGear";
     maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     license = lib.licenses.lgpl2;
   };
 })

From d51714f72b47c3fa097ec0efaa223556538a3441 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Thu, 9 Apr 2026 20:40:30 +1000
Subject: [PATCH 126/336] flightgear: darwin support

---
 .../flightgear/openscenegraph-flightgear.nix  |  5 +-
 pkgs/by-name/fl/flightgear/package.nix        | 51 ++++++++++++-------
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
index 858d1f0907d7..7cbbb965b2de 100644
--- a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
+++ b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
@@ -78,7 +78,10 @@ stdenv.mkDerivation {
     })
   ];
 
-  cmakeFlags = [ "-DBUILD_OSG_APPLICATIONS=OFF" ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_OSG_APPLICATIONS" false)
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin (lib.cmakeFeature "OSG_WINDOWING_SYSTEM" "Cocoa");
 
   meta = {
     description = "3D graphics toolkit";
diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index 8ab1960ae548..514705cf3d3a 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -20,6 +20,7 @@
   libxmu,
   libxt,
   simgear,
+  xz,
   zlib,
   boost,
   cmake,
@@ -72,15 +73,29 @@ stdenv.mkDerivation rec {
     qt5.wrapQtAppsHook
   ];
   buildInputs = [
-    libglut
     freealut
+    libjpeg
+    openal
+    plib
+    (simgear.override { openscenegraph = openscenegraph; })
+    zlib
+    boost
+    libpng
+    fltk_1_3
+    apr
+    qt5.qtbase
+    qt5.qtquickcontrols2
+    glew
+    qt5.qtdeclarative
+    curl
+    openscenegraph
+    xz
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libglut
     libGLU
     libGL
     libice
-    libjpeg
-    openal
-    openscenegraph
-    plib
     libsm
     libunwind
     libx11
@@ -89,25 +104,27 @@ stdenv.mkDerivation rec {
     libxi
     libxmu
     libxt
-    (simgear.override { openscenegraph = openscenegraph; })
-    zlib
-    boost
-    libpng
     udev
-    fltk_1_3
-    apr
-    qt5.qtbase
-    qt5.qtquickcontrols2
-    glew
-    qt5.qtdeclarative
-    curl
   ];
 
+  cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin (
+    lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "11.0"
+  );
+
   qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ];
 
   postInstall = ''
     # Remove redundant AppImage artifacts
     rm -rf "$out/appdir"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # The bundle copies OSG dylib dangling symlinks
+    rm -rf "$out/FlightGear.app/Contents/Frameworks"
+    # Place app bundle where macOS expects it
+    mkdir -p "$out/Applications"
+    mv "$out/FlightGear.app" "$out/Applications/"
+    # Provide fgfs in bin/ for CLI use, pointing into the bundle
+    ln -s "$out/Applications/FlightGear.app/Contents/MacOS/FlightGear" "$out/bin/fgfs"
   '';
 
   passthru.updateScript = nix-update-script { };
@@ -118,7 +135,7 @@ stdenv.mkDerivation rec {
       raskin
       kirillrdy
     ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     hydraPlatforms = [ ]; # disabled from hydra because it's so big
     license = lib.licenses.gpl2Plus;
     mainProgram = "fgfs";

From 169751bdf6a1ffd2a69528bde032798c2e3debd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 10:14:59 +0000
Subject: [PATCH 127/336] nu_scripts: 0-unstable-2026-03-12 ->
 0-unstable-2026-04-11

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

diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index 8d1fe9e9473f..70c867ee72e7 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2026-03-12";
+  version = "0-unstable-2026-04-11";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "196d94338d382561e7bacb29948ffcfa5ff1b2a1";
-    hash = "sha256-5FKqphXxVSgqGXbqOL3aiZEGFSr5SMjMVIWzB0dA/+I=";
+    rev = "341154f469b0fbb5bc5b69e591ba97ebf0e58fdb";
+    hash = "sha256-94u6d6WyyyamUn4a4p8O9Ujl9R56p1JxthuS03B4auw=";
   };
 
   installPhase = ''

From a819c988247cfafd84678edfeabf54114166c0bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 10:18:44 +0000
Subject: [PATCH 128/336] blockbench: 5.1.2 -> 5.1.3

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

diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix
index 75a7338486a4..cdf69b209b90 100644
--- a/pkgs/by-name/bl/blockbench/package.nix
+++ b/pkgs/by-name/bl/blockbench/package.nix
@@ -12,13 +12,13 @@
 
 buildNpmPackage rec {
   pname = "blockbench";
-  version = "5.1.2";
+  version = "5.1.3";
 
   src = fetchFromGitHub {
     owner = "JannisX11";
     repo = "blockbench";
     tag = "v${version}";
-    hash = "sha256-fU38Exv83cKaPFA26zmwYZlkscCbAEz/7Gch5j/qHjk=";
+    hash = "sha256-aGGvYIYQ3fw1fk5NUwJsMkq2YSugQD94xfy52LvHOKc=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ buildNpmPackage rec {
     copyDesktopItems
   ];
 
-  npmDepsHash = "sha256-0FdPTyoVNrsx0LJYcpfZPKZwUKzyJaU6XNnm2bY9F/s=";
+  npmDepsHash = "sha256-RmUUdHSVrZYc4F1Qtkbvn/2oKspM/3SnCuT3McKlMn0=";
   makeCacheWritable = true;
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

From c5dbcb3b9f382c30cc69f7037d97c9fde4c11e1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 11:04:23 +0000
Subject: [PATCH 129/336] radicale: 3.7.0 -> 3.7.1

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

diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index 192d487dca99..66eaea43c56c 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "radicale";
-  version = "3.7.0";
+  version = "3.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9mcYyiBljH9iwO/YgavCnR7VbqSYFy4IP3YtYjFbCS8=";
+    hash = "sha256-Zwu0xRXSeHmAS9c4TCArBPcE/lMdxn/OxxnmcDvtU/Q=";
   };
 
   build-system = with python3.pkgs; [

From 2c1c0baf5b6ef1a6d3643b0e4e39944dab33be3e Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@protonmail.com>
Date: Sun, 12 Apr 2026 13:30:23 +0200
Subject: [PATCH 130/336] python3Packages.certihound: init at 0.3.0

---
 .../python-modules/certihound/default.nix     | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/certihound/default.nix

diff --git a/pkgs/development/python-modules/certihound/default.nix b/pkgs/development/python-modules/certihound/default.nix
new file mode 100644
index 000000000000..31651ecbbb75
--- /dev/null
+++ b/pkgs/development/python-modules/certihound/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  ldap3,
+  impacket,
+  cryptography,
+  pydantic,
+  click,
+  rich,
+}:
+
+buildPythonPackage rec {
+  pname = "certihound";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-ERJ5fbYikhKLwchSIBe5s4KF/1HsXZ1O00QnYXAe+ps=";
+  };
+
+  dependencies = [
+    ldap3
+    impacket
+    cryptography
+    pydantic
+    click
+    rich
+  ];
+
+  # Tests are stripped in pypi
+  doCheck = false;
+
+  pythonImportsCheck = [ "certihound" ];
+
+  meta = {
+    homepage = "https://github.com/0x0Trace/Certihound";
+    description = "Active Directory Certificate Services (ADCS) enumeration library with BloodHound CE v6 export support";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ letgamer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 91208e3b4e53..6f8c0dc1306d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2609,6 +2609,8 @@ self: super: with self; {
 
   certifi = callPackage ../development/python-modules/certifi { };
 
+  certihound = callPackage ../development/python-modules/certihound { };
+
   certipy = callPackage ../development/python-modules/certipy { };
 
   certipy-ad = callPackage ../development/python-modules/certipy-ad { };

From 8c73b72f0d52f1b2262b7b31a1fec1b2c5d08852 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 12:05:11 +0000
Subject: [PATCH 131/336] qlementine-icons: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/by-name/ql/qlementine-icons/package.nix b/pkgs/by-name/ql/qlementine-icons/package.nix
index d70bb06baf67..a90ff3ce6b61 100644
--- a/pkgs/by-name/ql/qlementine-icons/package.nix
+++ b/pkgs/by-name/ql/qlementine-icons/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "qlementine-icons";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "oclero";
     repo = "qlementine-icons";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-29XiD3t+KKEe8KRs5LwTN11gEFBJt/Ws6geq6bdH8KA=";
+    hash = "sha256-dnKl245hLBfENAh0ICQ/OX+3KDC2RE3t7uboiUc1XGY=";
   };
 
   nativeBuildInputs = [ cmake ];

From b69cfd6c1668b5ea88df60af9d3030f2a0cd6f0a Mon Sep 17 00:00:00 2001
From: Joel Pepper <pepper@bronze-deer.de>
Date: Sun, 12 Apr 2026 14:34:47 +0200
Subject: [PATCH 132/336] snowflake-cli: 3.11.0 -> 3.13.1

---
 .../generate-json-schema-kwargs.patch         | 15 ++++
 pkgs/by-name/sn/snowflake-cli/package.nix     | 80 +++++++++++++++++--
 2 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/sn/snowflake-cli/generate-json-schema-kwargs.patch

diff --git a/pkgs/by-name/sn/snowflake-cli/generate-json-schema-kwargs.patch b/pkgs/by-name/sn/snowflake-cli/generate-json-schema-kwargs.patch
new file mode 100644
index 000000000000..bc5b47f52b64
--- /dev/null
+++ b/pkgs/by-name/sn/snowflake-cli/generate-json-schema-kwargs.patch
@@ -0,0 +1,15 @@
+snowflake-cli is subclassing pydantic's GenerateJsonSchema without passing on unrecognized kwargs to the superclass, this broke when nixpkgs's pydanctic moved to 2.12 which added "union_format" as new input arg
+Due to various flaws in the python ecosystem nixpkgs cannot reuse uv or other python lockfiles and has to approximate dependencies. This patch decouples the code more from minor changes between pydantic versions
+--- a/src/snowflake/cli/_app/dev/docs/project_definition_generate_json_schema.py
++++ b/src/snowflake/cli/_app/dev/docs/project_definition_generate_json_schema.py
+@@ -38,8 +38,8 @@ class ProjectDefinitionProperty:
+
+
+ class ProjectDefinitionGenerateJsonSchema(GenerateJsonSchema):
+-    def __init__(self, by_alias: bool = False, ref_template: str = ""):
+-        super().__init__(by_alias, "{model}")
++    def __init__(self, by_alias: bool = False, ref_template: str = "",**kwargs):
++        super().__init__(by_alias, "{model}",**kwargs)
+         self._remapped_definitions: Dict[str, Any] = {}
+
+     def generate(self, schema, mode="validation"):
diff --git a/pkgs/by-name/sn/snowflake-cli/package.nix b/pkgs/by-name/sn/snowflake-cli/package.nix
index 46c8d10c5fd0..f7f6495c1888 100644
--- a/pkgs/by-name/sn/snowflake-cli/package.nix
+++ b/pkgs/by-name/sn/snowflake-cli/package.nix
@@ -8,20 +8,22 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "snowflake-cli";
-  version = "3.11.0";
+  version = "3.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snowflakedb";
     repo = "snowflake-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dJc5q3vE1G6oJq9V4JSPaSyODxKDyhprIwBo39Nu/bA=";
+    hash = "sha256-2cZ9tRcQ/sWHkkSXMZ9pXP4zM3OsNbKr2kR/Ob/F9Hk=";
   };
 
   build-system = with python3Packages; [
-    hatch-vcs
     hatchling
-    pip
+  ];
+
+  patches = [
+    ./generate-json-schema-kwargs.patch
   ];
 
   nativeBuildInputs = [ installShellFiles ];
@@ -43,6 +45,14 @@ python3Packages.buildPythonApplication (finalAttrs: {
     prompt-toolkit
     snowflake-core
     snowflake-connector-python
+    # Upstream code is using `pip` as a python module in some Snowpark-related
+    # plugins, when there is a need to build a dependency closure from packages
+    # on PyPi.
+    # Example:
+    # https://github.com/snowflakedb/snowflake-cli/blob/1caafee58fd1a8ae6d8788c33b86f637c263a29e/src/snowflake/cli/_plugins/snowpark/package_utils.py#L223
+    # It's invoking `pip` as `python -m pip`, so `pip` needs to be in
+    # dependencies.
+    pip
   ];
 
   nativeCheckInputs = with python3Packages; [
@@ -75,11 +85,71 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "test_if_bundling_dependencies_resolves_requirements" # impure?
     "test_silent_output_help" # Snapshot needs update? Diff between received and snapshot is the word 'TABLE' moving down a line
     "test_new_connection_can_be_added_as_default" # Snapshot needs update? Diff between received and snapshot is an empty line
+
+    # These snapshots seem to be broken
+    "test_command_with_global_options"
+    "test_command_without_any_options"
+    "test_command_with_connection_options"
+
+  ]
+  # Looks like these tests do not work with the sandbox on Darwin
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_allow_comments_at_source_url"
+    "test_mixed_recursion"
+    "test_parse_source_invalid_url"
+    "test_parse_source_url"
+    "test_recursion_from_url"
+    "test_source_missing_url"
   ];
 
   disabledTestPaths = [
     "tests/app/test_version_check.py"
     "tests/nativeapp/test_sf_sql_facade.py"
+    # Tests don't work as of v3.12.0
+    # They either break sandbox by requiring network access or have outdated snapshots
+    "tests/api/commands/test_snow_typer.py::test_enabled_command_is_visible"
+    "tests/api/commands/test_snow_typer.py::test_enabled_command_is_not_visible" # snapshot
+    "tests/auth/test_auth.py::test_rotate" # snapshot
+    "tests/auth/test_auth.py::test_rotate_only_public_key_set" # snapshot
+    "tests/auth/test_auth.py::test_rotate_other_public_key_set_options[KEY-KEY]" # snapshot
+    "tests/auth/test_auth.py::test_rotate_other_public_key_set_options[None-KEY]" # snapshot
+    "tests/auth/test_auth.py::test_rotate_with_password" # snapshot
+    "tests/auth/test_auth.py::test_setup" # snapshot
+    "tests/auth/test_auth.py::test_setup_connection_already_exists" # snapshot
+    "tests/auth/test_auth.py::test_setup_error_if_any_public_key_is_set" # snapshot
+    "tests/auth/test_auth.py::test_setup_overwrite_connection" # snapshot
+    "tests/auth/test_auth.py::test_setup_with_password" # snapshot
+    "tests/stage/test_stage.py::test_stage_create_encryption"
+    "tests/test_connection.py::test_connection_can_be_added_with_existing_paths_in_arguments"
+    "tests/test_connection.py::test_connection_can_be_added_with_existing_paths_in_prompt[10]"
+    "tests/test_connection.py::test_connection_can_be_added_with_existing_paths_in_prompt[9]"
+    "tests/test_connection.py::test_connection_remove_all"
+    "tests/test_connection.py::test_connection_remove_one"
+    "tests/test_connection.py::test_connection_remove_some" # snapshot
+    "tests/test_connection.py::test_fails_if_existing_connection"
+    "tests/test_connection.py::test_file_paths_have_to_exist_when_given_in_arguments[-k]" # sandbox
+    "tests/test_connection.py::test_file_paths_have_to_exist_when_given_in_arguments[-t]"
+    "tests/test_connection.py::test_file_paths_have_to_exist_when_given_in_prompt[10]"
+    "tests/test_connection.py::test_generate_jwt_with_passphrase[]" # snapshot
+    "tests/test_connection.py::test_if_password_callback_is_called_only_once_from_arguments"
+    "tests/test_connection.py::test_if_password_callback_is_called_only_once_from_prompt"
+    "tests/test_connection.py::test_if_whitespaces_are_stripped_from_connection_name"
+    "tests/test_connection.py::test_new_connection_add_prompt_handles_default_values" # snapshot
+    "tests/test_connection.py::test_new_connection_add_prompt_handles_prompt_override"
+    "tests/test_connection.py::test_new_connection_can_be_added"
+    "tests/test_connection.py::test_new_connection_is_added_to_connections_toml"
+    "tests/test_connection.py::test_new_connection_with_jwt_auth"
+    "tests/test_connection.py::test_port_has_cannot_be_float"
+    "tests/test_connection.py::test_port_has_cannot_be_string"
+    "tests/test_connection.py::test_second_connection_not_update_default_connection"
+    "tests/test_connection.py::test_session_and_master_tokens"
+    "tests/test_connection.py::test_token_file_path_tokens"
+    "tests/test_docs_generation_output.py::test_flags_have_default_values" # snapshot
+    "tests/test_config.py::test_too_wide_permissions_on_custom_config_file_causes_warning" # trying to chmod files inside read-only source or trying to get into a tmp dir
+    "tests/test_config.py::test_no_error_when_init_from_non_default_config" # bad chmod in tmp
+    "tests/test_init.py::test_init_default_values"
+    "tests/test_init.py::test_rename_project"
+    "tests/test_init.py::test_variables_flags"
   ];
 
   pythonRelaxDeps = true;
@@ -112,7 +182,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   '';
 
   meta = {
-    changelog = "https://github.com/snowflakedb/snowflake-cli/blob/main/RELEASE-NOTES.md";
+    changelog = "https://github.com/snowflakedb/snowflake-cli/blob/${finalAttrs.src.tag}/RELEASE-NOTES.md";
     homepage = "https://docs.snowflake.com/en/developer-guide/snowflake-cli-v2/index";
     description = "Command-line tool explicitly designed for developer-centric workloads in addition to SQL operations";
     license = lib.licenses.asl20;

From ec7504335125e698b92caf660106508e52fac8ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 13:13:57 +0000
Subject: [PATCH 133/336] coc-rust-analyzer: 0-unstable-2026-04-01 ->
 0-unstable-2026-04-09

---
 pkgs/by-name/co/coc-rust-analyzer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix
index d704fcd754d8..38154824f603 100644
--- a/pkgs/by-name/co/coc-rust-analyzer/package.nix
+++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage {
   pname = "coc-rust-analyzer";
-  version = "0-unstable-2026-04-01";
+  version = "0-unstable-2026-04-09";
 
   src = fetchFromGitHub {
     owner = "fannheyward";
     repo = "coc-rust-analyzer";
-    rev = "569c6c56e815ae29ad7873b472ebb750c19d0d38";
-    hash = "sha256-4IZhCQl+iKChGaT0ghn5MnB+h6U5DJSa7YgPDoObiBg=";
+    rev = "561aea31f1e263c8386ab7e09b7ffa95e64cd351";
+    hash = "sha256-Ee/5nkPdQBXwt5jQOMN+2/nHRwk33HigeY/L0NpTLAY=";
   };
 
-  npmDepsHash = "sha256-B/EBAhwEEqLgGshK3Fw7nG7Mv9kk0v4ClLglLhooYBM=";
+  npmDepsHash = "sha256-+3eXdiM0Nll7V6EnDXq88rBjRkPN6GLFASdJ3fMXbq4=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 

From bc38febc42278a4570f08c6f1d2467eddeb6498f Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@protonmail.com>
Date: Sun, 12 Apr 2026 15:44:34 +0200
Subject: [PATCH 134/336] linode-cli: removed deprecated terminaltables
 dependency

---
 pkgs/by-name/li/linode-cli/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/li/linode-cli/package.nix b/pkgs/by-name/li/linode-cli/package.nix
index 532f4c9cb1d8..dfcc29871575 100644
--- a/pkgs/by-name/li/linode-cli/package.nix
+++ b/pkgs/by-name/li/linode-cli/package.nix
@@ -55,7 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     python3Packages.linode-metadata
     python3Packages.pyyaml
     python3Packages.requests
-    python3Packages.terminaltables
     python3Packages.rich
     python3Packages.openapi3
     python3Packages.packaging

From 5d62335e5a0b922263a86140e9aede76f6434182 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 14:15:24 +0000
Subject: [PATCH 135/336] prometheus-node-exporter: 1.11.0 -> 1.11.1

---
 pkgs/by-name/pr/prometheus-node-exporter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
index da4dde42567d..335fe85380bb 100644
--- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "node_exporter";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "node_exporter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cZ7MGh80LIPTrTzgR6W+gl6BUc7ss60mjocwm1BMXC0=";
+    hash = "sha256-AoW4JO9V/sZDjonNT+Ar8saX/rlb1lB/+Vmu5qGtTlA=";
   };
 
   vendorHash = "sha256-qTuzF4xeF0riOedwaUR4x/U6Jb0j+GIwUfUfstp2Cao=";

From 3646f370db7099968e4460db6f1607b81eda283d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 14:50:18 +0000
Subject: [PATCH 136/336] cliamp: 1.34.0 -> 1.35.0

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

diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix
index a84bc540338a..c5aa91058ee1 100644
--- a/pkgs/by-name/cl/cliamp/package.nix
+++ b/pkgs/by-name/cl/cliamp/package.nix
@@ -16,16 +16,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cliamp";
-  version = "1.34.0";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "bjarneo";
     repo = "cliamp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0WT3DRII4o58KFK+7UW0QgrJwrJwmPkKmTQeVXmtoZ0=";
+    hash = "sha256-8Att+SEJd2MdAgQ8SM49S4c4fM7t0/f/kHl6a+DbO2U=";
   };
 
-  vendorHash = "sha256-+uh+4ZYvnlKmRSIvZFlnfBPqU0CFFe/Op1Gr9hjIr4U=";
+  vendorHash = "sha256-sS0tjZoZ81Jwn/KJnJD01fTA4z0HxEYYM89Ta398MP0=";
 
   nativeBuildInputs = [
     pkg-config

From b6391da51aab189934d4396a861792a05caeb378 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 14:52:40 +0000
Subject: [PATCH 137/336] apidog: 2.8.23 -> 2.8.24

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

diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix
index 356c4a4bbeaf..b0b73272c95c 100644
--- a/pkgs/by-name/ap/apidog/package.nix
+++ b/pkgs/by-name/ap/apidog/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "apidog";
-  version = "2.8.23";
+  version = "2.8.24";
 
   src = fetchurl {
     url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
-    hash = "sha256-N3ULCrYJilcc3R102ndXjKH3g/km7WcEMdi+NL8nmqA=";
+    hash = "sha256-gGhA++wfgURhibGF2tXAmH0orX2VSUiJsAo3wAu6t1g=";
   };
 
   appimageContents = appimageTools.extract {

From d73789314a326c3ef4788f443e22a22d345bd510 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 15:19:20 +0000
Subject: [PATCH 138/336] libretro.beetle-pce: 0-unstable-2025-06-22 ->
 0-unstable-2026-04-11

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

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce.nix
index bac547cb0458..be90baaa2af6 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pce";
-  version = "0-unstable-2025-06-22";
+  version = "0-unstable-2026-04-11";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-libretro";
-    rev = "9a301c0773c53702a882bbaa42ee9cbc6d523787";
-    hash = "sha256-RS5omi6LthQy8fFfouSEpYtaeD7QDlRENm0YuqHzUc0=";
+    rev = "ae99235c2139c176c1a8d0fde2957bf701d3cab0";
+    hash = "sha256-3bxKLWivTpCmAPYqu5r7AuwvREXRCndq6JQ4hgd18YU=";
   };
 
   makefile = "Makefile";

From a4c8ee22d570d7c56075799ef2ff652374a04aab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 15:28:46 +0000
Subject: [PATCH 139/336] ukmm: 0.15.0 -> 0.17.0

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

diff --git a/pkgs/by-name/uk/ukmm/package.nix b/pkgs/by-name/uk/ukmm/package.nix
index 7bfc0796afef..3be31bfcedad 100644
--- a/pkgs/by-name/uk/ukmm/package.nix
+++ b/pkgs/by-name/uk/ukmm/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ukmm";
-  version = "0.15.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "NiceneNerd";
     repo = "ukmm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NZN+T2N+N+oxrjBRvVbRWbB2KY5im9SN7gPHzfvovl8=";
+    hash = "sha256-nCyaPEa5wYRii9ehFwsLw390AcbjlrdKdGqxKhuk7CQ=";
   };
 
-  cargoHash = "sha256-eDYCF+bYh0T/SSrQKjCqZvSd28CSxvGkpHgmBCHLoig=";
+  cargoHash = "sha256-BzgFzEKsVCvNHaBv0fKgt3lGgDxwi560AkIrk4pSWHA=";
 
   nativeBuildInputs = [
     cmake

From 8a53f0196aebd71cc61d708702fa09c2b1a1288d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 16:23:08 +0000
Subject: [PATCH 140/336] vscode-extensions.teabyii.ayu: 1.1.11 -> 1.1.12

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index a00e2bad5927..8978420c823d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4632,8 +4632,8 @@ let
         mktplcRef = {
           name = "ayu";
           publisher = "teabyii";
-          version = "1.1.11";
-          sha256 = "sha256-0gfevhXxrZC2rpWIaZM7aNfZrh/KIjoDWkZreeVU+EI=";
+          version = "1.1.12";
+          sha256 = "sha256-pwLvik3GRMLyr6GeTmZh1MrkgH1MgbyoembNmQxg4I0=";
         };
         meta = {
           description = "Simple theme with bright colors and comes in three versions — dark, light and mirage for all day long comfortable work";

From 11c097c1ff4b909ef04176c8405c14e6bb314107 Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Sun, 12 Apr 2026 18:27:06 +0200
Subject: [PATCH 141/336] pythonPackages.certipy: relax beautifulsoup4

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

diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix
index 3b40d72e20dc..20af5e0aa293 100644
--- a/pkgs/development/python-modules/certipy-ad/default.nix
+++ b/pkgs/development/python-modules/certipy-ad/default.nix
@@ -39,6 +39,7 @@ buildPythonPackage (finalAttrs: {
     "ldap3"
     "pycryptodome"
     "pyopenssl"
+    "beautifulsoup4"
   ];
 
   build-system = [ setuptools ];

From 525c398bd838b86a8f8d85767a5ee1e6cde31f4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 16:27:44 +0000
Subject: [PATCH 142/336] fresh-editor: 0.2.21 -> 0.2.23

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

diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix
index 0049fd656899..8a87d81b52e2 100644
--- a/pkgs/by-name/fr/fresh-editor/package.nix
+++ b/pkgs/by-name/fr/fresh-editor/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fresh";
-  version = "0.2.21";
+  version = "0.2.23";
 
   src = fetchFromGitHub {
     owner = "sinelaw";
     repo = "fresh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-du5YCDPqrGsbajT676Zs2oPvJPPAFseTkd3bXNNg64M=";
+    hash = "sha256-yF17RnuUWj8hmVbYlAjXLgYQluKnxinEfFPSm+LqDgM=";
   };
 
-  cargoHash = "sha256-UDbW8R8XNbif+beReQsCrCqtpUw8DhDMIAlZBKqUWaQ=";
+  cargoHash = "sha256-G5cJBLhlSGp7KWOAnk+HEB+iGnZfnkHY9iqMSfaof3Y=";
 
   nativeBuildInputs = [
     gzip

From df4ce0a827ed3d3b26fb8562668f23a9fd23f298 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 16:43:51 +0000
Subject: [PATCH 143/336] python3Packages.textual-image: 0.8.5 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix
index d0ebe9408c30..c8adb256106d 100644
--- a/pkgs/development/python-modules/textual-image/default.nix
+++ b/pkgs/development/python-modules/textual-image/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "textual-image";
-  version = "0.8.5";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lnqs";
     repo = "textual-image";
     tag = "v${version}";
-    hash = "sha256-gkLsM02oQ2H4UUhezbcmaOa2FQfzvFRsa0gd07eNucw=";
+    hash = "sha256-nWP4pxFcsjDA/SIrKXHjufiQaxHGgPpC1ZIti+TW+f0=";
   };
 
   buildInputs = [ setuptools ];

From 27effc2ab62a31ec6d03bc113c524dc3d48c6492 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 16:47:35 +0000
Subject: [PATCH 144/336] easyeda2kicad: 0.8.0 -> 1.0.1

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

diff --git a/pkgs/by-name/ea/easyeda2kicad/package.nix b/pkgs/by-name/ea/easyeda2kicad/package.nix
index 561d3adc4a6b..5f5335710d43 100644
--- a/pkgs/by-name/ea/easyeda2kicad/package.nix
+++ b/pkgs/by-name/ea/easyeda2kicad/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "easyeda2kicad";
-  version = "0.8.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-p4G+bRB29uBohqQpI3PrkwyZId5McJ1t2Ru26hBPSks=";
+    hash = "sha256-EipI+vo7kY5zAYXJc900IYOSi4oNviRDbRPVi5ApDoQ=";
   };
 
   build-system = with python3Packages; [

From 23f0f8cacf3d8d6b8beb09ce7f994ed39b51d68d Mon Sep 17 00:00:00 2001
From: Jonathan GAYVALLET <jonathan.mael.gayvallet@gmail.com>
Date: Sun, 12 Apr 2026 03:26:25 +0200
Subject: [PATCH 145/336] dockerTools: fix failing `etc` test case

---
 pkgs/build-support/docker/examples.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index d2ff74ded00b..fbfec4467b3d 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -803,6 +803,10 @@ rec {
           }
         )
       );
+      etcCmd = pkgs.writeScript "etc-cmd" ''
+        #!${pkgs.busybox}/bin/sh
+        ${pkgs.busybox}/bin/cat /etc/some-config-file
+      '';
     in
     pkgs.dockerTools.streamLayeredImage {
       name = "etc";
@@ -812,10 +816,7 @@ rec {
         mkdir -p /etc
         ${nixosCore.config.system.build.etcActivationCommands}
       '';
-      config.Cmd = pkgs.writeScript "etc-cmd" ''
-        #!${pkgs.busybox}/bin/sh
-        ${pkgs.busybox}/bin/cat /etc/some-config-file
-      '';
+      config.Cmd = [ etcCmd ];
     };
 
   # Example export of the bash image

From ec42c4aa6f224da6c7ef89c4f8c795c7d932316f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 16:57:04 +0000
Subject: [PATCH 146/336] dotenvx: 1.59.1 -> 1.61.0

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

diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 6e0ba140cff9..04dab004f602 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.59.1";
+  version = "1.61.0";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${version}";
-    hash = "sha256-P1k1cd6DfxGom2VKPKkNqhfs0h89QHQW19ZtePlutJk=";
+    hash = "sha256-Ph/L+OOoO3UMc8FmZSNSLNqyMSAnxyXL+jFV3WkAfMw=";
   };
 
-  npmDepsHash = "sha256-OUggLKCzvgH158HSavEJBKtVs2EsddHDs/1q7H/5pPY=";
+  npmDepsHash = "sha256-7Ei3roqBrwtdko6qdD88ljRw3MzkgonMyT7fFQDdSpo=";
 
   dontNpmBuild = true;
 

From 1575fffe38bf916e5d747251db663db898836091 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 17:13:39 +0000
Subject: [PATCH 147/336] nexttrace: 1.6.1 -> 1.6.2

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

diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix
index 388eaa798da0..185db073aabe 100644
--- a/pkgs/by-name/ne/nexttrace/package.nix
+++ b/pkgs/by-name/ne/nexttrace/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "nexttrace";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "nxtrace";
     repo = "NTrace-core";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-EKsOPE5EGkUtgNIf60ojvMJfZwtSwDzVDDEeKPBLWhY=";
+    sha256 = "sha256-SJjWDnbHXuokNFErMdnwxzBRgIyfuxmZ5j3IisgG93I=";
   };
-  vendorHash = "sha256-fUM2mWbol1lM6moygeCFiGHyYZfaVzz6edZM6zoGrSg=";
+  vendorHash = "sha256-4MunvXclgbjnd4ZHLey79GFOH9gDbzqXx1UViUEGL9k=";
 
   buildInputs = [ libpcap ];
 

From 16410a38545a469d2da9d938af10d52cc094f4fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 17:15:38 +0000
Subject: [PATCH 148/336] cotp: 1.9.7 -> 1.9.9

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

diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix
index e004e285a20f..4b87e24a683f 100644
--- a/pkgs/by-name/co/cotp/package.nix
+++ b/pkgs/by-name/co/cotp/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cotp";
-  version = "1.9.7";
+  version = "1.9.9";
 
   src = fetchFromGitHub {
     owner = "replydev";
     repo = "cotp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-N3UPeEc3xPIRHt1lOwd8c7e61jZk3PPo3sC/7BQBosY=";
+    hash = "sha256-P7QeT3q//nmv11i0pELfTCC/wi9jHqbYClqSvvkvqwA=";
   };
 
-  cargoHash = "sha256-3IJV7X3G12+ca723sDhOn4SN9CeqKPzGs59IQBYS5QY=";
+  cargoHash = "sha256-PhUHFLl0yr/eWy2A+zp+gTNlW+zbruCqQLkHA6Ivf04=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ];
 

From 77fe85fa7c49a5359502372c572b9b78246b5ed8 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 12 Apr 2026 19:30:22 +0200
Subject: [PATCH 149/336] iotas: 2026.4 -> 2026.5

diff: https://gitlab.gnome.org/World/iotas/-/compare/2026.4...2026.5?from_project_id=20110
---
 pkgs/by-name/io/iotas/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/io/iotas/package.nix b/pkgs/by-name/io/iotas/package.nix
index db9e9ff6cd6a..1fd10730345e 100644
--- a/pkgs/by-name/io/iotas/package.nix
+++ b/pkgs/by-name/io/iotas/package.nix
@@ -20,7 +20,7 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "iotas";
-  version = "2026.4";
+  version = "2026.5";
   pyproject = false;
 
   src = fetchFromGitLab {
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     owner = "World";
     repo = "iotas";
     tag = finalAttrs.version;
-    hash = "sha256-PLKKV6FNYvhvb1Kp2tYu7jXkzxfN/W0C618o5+/tenY=";
+    hash = "sha256-HTwhlbTc+s7eZVMLA/fYrhwwrmfDkdExARoJghLchls=";
   };
 
   nativeBuildInputs = [

From 41f18dfebdfb60e4e56dfbdaf9deebed17c4b707 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 12 Apr 2026 19:36:23 +0200
Subject: [PATCH 150/336] gaphor: 3.2.0 -> 3.3.0

changelog: https://github.com/gaphor/gaphor/releases/tag/3.3.0

diff: https://github.com/gaphor/gaphor/compare/3.2.0...3.3.0
---
 pkgs/by-name/ga/gaphor/fix-dulwich-api.patch | 29 --------------------
 pkgs/by-name/ga/gaphor/package.nix           | 10 ++-----
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/by-name/ga/gaphor/fix-dulwich-api.patch

diff --git a/pkgs/by-name/ga/gaphor/fix-dulwich-api.patch b/pkgs/by-name/ga/gaphor/fix-dulwich-api.patch
deleted file mode 100644
index 8af56ca1aa8e..000000000000
--- a/pkgs/by-name/ga/gaphor/fix-dulwich-api.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7f4f7fcd97acef841e046191d98c900b61b78c17 Mon Sep 17 00:00:00 2001
-From: Dan Yeaw <dan@yeaw.me>
-Date: Sat, 4 Apr 2026 15:46:25 -0400
-Subject: [PATCH] Fix dulwich porcelain API
-
----
- gaphor/storage/tests/fixtures.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/gaphor/storage/tests/fixtures.py b/gaphor/storage/tests/fixtures.py
-index d071e4556f..4dd0c60bf1 100644
---- a/gaphor/storage/tests/fixtures.py
-+++ b/gaphor/storage/tests/fixtures.py
-@@ -16,11 +16,13 @@ def commit_all(message):
-     main_ref = commit_all("Initial commit")
- 
-     porcelain.branch_create(repo, "branch")
--    porcelain.checkout_branch(repo, "branch")
-+    porcelain.switch(repo, "branch")
-     filename.write_text(their_text, encoding="utf-8")
-     branch_oid = commit_all("Branch commit")
- 
--    porcelain.checkout_branch(repo, main_ref)
-+    # OID + detach=True: works when default branch is not "main" (e.g. older
-+    # Dulwich uses "master"); "git merge" still runs on HEAD.
-+    porcelain.switch(repo, main_ref, detach=True)
-     filename.write_text(our_text, encoding="utf-8")
-     commit_all("Second commit")
- 
diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix
index 6922fc74d7b8..c7fbcfed9c7e 100644
--- a/pkgs/by-name/ga/gaphor/package.nix
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -13,22 +13,16 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gaphor";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gaphor";
     repo = "gaphor";
     tag = finalAttrs.version;
-    hash = "sha256-0Z0RFQrN2g0beV2konZBfMroeNtbT+sPRsWlRvQFYBk=";
+    hash = "sha256-bgcri0mgFKz4jtGJSWtlStS3f4FzYH+ZPE1BsK+S1DI=";
   };
 
-  patches = [
-    # from https://github.com/gaphor/gaphor/pull/4236
-    # please remove after next update
-    ./fix-dulwich-api.patch
-  ];
-
   pythonRelaxDeps = [
     "pydot"
     "pygobject"

From 693aa3b72d216b71865977cb447297186d52a5f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 17:41:06 +0000
Subject: [PATCH 151/336] grafanaPlugins.volkovlabs-variable-panel: 5.1.1 ->
 5.1.2

---
 .../grafana/plugins/volkovlabs-variable-panel/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
index dabca7dd0e95..0b1dc3a3bb0e 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-variable-panel";
-  version = "5.1.1";
-  zipHash = "sha256-lLzOCgOh4a/Ee6QO5gJkJkHoPzylk9Y3vilXBtvn5G8=";
+  version = "5.1.2";
+  zipHash = "sha256-cYDnrTSYjZV/2/q4/ztq8khaSkAeXu6fRasfT1bMzrw=";
   meta = {
     description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard";
     license = lib.licenses.asl20;

From 795b04adb7cf0d3d36e80d10745ff657c5b81d58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 18:09:39 +0000
Subject: [PATCH 152/336] bilibili: 1.17.5-2 -> 1.17.6-1

---
 pkgs/by-name/bi/bilibili/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix
index ec8e1e803d50..3a2554096ac3 100644
--- a/pkgs/by-name/bi/bilibili/sources.nix
+++ b/pkgs/by-name/bi/bilibili/sources.nix
@@ -1,6 +1,6 @@
 # Generated by ./update.sh - do not update manually!
 {
-  version = "1.17.5-2";
-  arm64-hash = "sha256-4I/Kb+kfO73doOw10+knRqNpwlKWAzOWBrh1akggALk=";
-  x86_64-hash = "sha256-ZqxqCsSpU71nS5+o+S1nscEFC+7wLgLzdpa6qLUUPYI=";
+  version = "1.17.6-1";
+  arm64-hash = "sha256-QAqxs8Jyu4kA8Zmox0GJ8KoPS/L5z3TTtP6JDk62zjk=";
+  x86_64-hash = "sha256-Lit/eIudO0V1USoP0VWHbR5QHCT+7RyX9omYM4PoCeQ=";
 }

From 5084388d89b318442631c425514e34f93f026a57 Mon Sep 17 00:00:00 2001
From: MilesCranmer <miles.cranmer@gmail.com>
Date: Fri, 7 Jun 2024 00:53:37 +0100
Subject: [PATCH 153/336] julia: build from source for aarch64-darwin

Co-authored-by: Tom McLaughlin <tom@codedown.io>
Co-authored-by: George Huebner <george@feyor.sh>
---
 pkgs/development/compilers/julia/default.nix  | 19 ++++--
 pkgs/development/compilers/julia/generic.nix  | 30 ++++++++-
 .../julia/patches/1.12/0001-zlib-rpath.patch  | 25 ++++++++
 .../1.12/0002-lbt-blas-detection.patch        | 63 +++++++++++++++++++
 pkgs/development/julia-modules/default.nix    |  5 ++
 5 files changed, 136 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/compilers/julia/patches/1.12/0001-zlib-rpath.patch
 create mode 100644 pkgs/development/compilers/julia/patches/1.12/0002-lbt-blas-detection.patch

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 5ad4a58189f5..c087b25153f9 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -1,4 +1,6 @@
 {
+  stdenv,
+  lib,
   callPackage,
   fetchpatch2,
   gcc14Stdenv,
@@ -89,10 +91,19 @@ in
       (import ./generic.nix {
         version = "1.12.6";
         hash = "sha256-cR86qNbsXJAEWT6489U+NWTNdZrLqK1K2ulnr8IDMsw=";
+        patches = lib.optionals stdenv.hostPlatform.isDarwin [
+          ./patches/1.12/0001-zlib-rpath.patch
+          ./patches/1.12/0002-lbt-blas-detection.patch
+        ];
       })
-      {
-        stdenv = gcc14Stdenv;
-        gfortran = gfortran14;
-      }
+      (
+        if stdenv.cc.isGNU then
+          {
+            stdenv = gcc14Stdenv;
+            gfortran = gfortran14;
+          }
+        else
+          { }
+      )
   );
 }
diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix
index 0eb5c787f4d3..42d84d54fcaa 100644
--- a/pkgs/development/compilers/julia/generic.nix
+++ b/pkgs/development/compilers/julia/generic.nix
@@ -19,6 +19,10 @@
   libxml2,
   zlib,
   buildPackages,
+  darwin,
+  unzip,
+  ncurses,
+  curl,
 }:
 
 let
@@ -68,6 +72,13 @@ stdenv.mkDerivation rec {
     perl
     gnum4
     openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+    darwin.DarwinTools
+    darwin.sigtool
+    darwin.autoSignDarwinBinariesHook
+    unzip
   ];
 
   buildInputs = [
@@ -98,6 +109,11 @@ stdenv.mkDerivation rec {
                      'cd $(dir $<) && $(TAR) -zxf $< && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" openssl-$(OPENSSL_VER)/Configure'
   '';
 
+  preBuild = lib.optionalString (lib.versionAtLeast version "1.11") ''
+    # terminfo dirs normally inaccessible in build sandbox
+    export TERMINFO="${ncurses.out}/share/terminfo/";
+  '';
+
   makeFlags = [
     "prefix=$(out)"
     "USE_BINARYBUILDER=0"
@@ -111,14 +127,23 @@ stdenv.mkDerivation rec {
   ];
 
   # remove forbidden reference to $TMPDIR
-  preFixup = ''
+  preFixup = lib.optionalString stdenv.hostPlatform.isElf ''
     for file in libcurl.so libgmpxx.so libmpfr.so; do
       patchelf --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir} "$out/lib/julia/$file"
     done
   '';
 
+  # Code signing is done as part of the build process, but that
+  # doesn't quite work so we re-sign it here.
+  postFixup = lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+    codesign -s - --force --entitlements ./contrib/mac/app/Entitlements.plist $out/bin/julia
+  '';
+
   # tests are flaky for aarch64-linux on hydra
-  doInstallCheck = if (lib.versionOlder version "1.10") then !stdenv.hostPlatform.isAarch64 else true;
+  # some tests not working on aarch64-darwin for unrelated reasons
+  doInstallCheck =
+    stdenv.hostPlatform.isLinux
+    && (lib.versionAtLeast version "1.10" || !stdenv.hostPlatform.isAarch64);
 
   preInstallCheck = ''
     export JULIA_TEST_USE_MULTIPLE_WORKERS="true"
@@ -164,6 +189,7 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
+      "aarch64-darwin"
     ];
   };
 }
diff --git a/pkgs/development/compilers/julia/patches/1.12/0001-zlib-rpath.patch b/pkgs/development/compilers/julia/patches/1.12/0001-zlib-rpath.patch
new file mode 100644
index 000000000000..e105c5ef3c0e
--- /dev/null
+++ b/pkgs/development/compilers/julia/patches/1.12/0001-zlib-rpath.patch
@@ -0,0 +1,25 @@
+From 512188bcee5104687a203a7e57242e79a9e05472 Mon Sep 17 00:00:00 2001
+From: George Huebner <george@feyor.sh>
+Date: Fri, 16 Jan 2026 09:53:02 -0600
+Subject: [PATCH] fix zlib linking issue
+
+---
+ deps/llvm.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/llvm.mk b/deps/llvm.mk
+index 09dd4f187d..ccd27760b6 100644
+--- a/deps/llvm.mk
++++ b/deps/llvm.mk
+@@ -70,7 +70,7 @@ LLVM_EXPERIMENTAL_TARGETS :=
+ LLVM_CFLAGS :=
+ LLVM_CXXFLAGS :=
+ LLVM_CPPFLAGS :=
+-LLVM_LDFLAGS :=
++LLVM_LDFLAGS := "-L$(build_shlibdir)" -rpath "$(build_shlibdir)" # hacky way to force zlib to be found when linking against libLLVM and sysroot is set
+ LLVM_CMAKE :=
+ 
+ LLVM_CMAKE += -DLLVM_ENABLE_PROJECTS="$(LLVM_ENABLE_PROJECTS)"
+-- 
+2.52.0
+
diff --git a/pkgs/development/compilers/julia/patches/1.12/0002-lbt-blas-detection.patch b/pkgs/development/compilers/julia/patches/1.12/0002-lbt-blas-detection.patch
new file mode 100644
index 000000000000..8b9b7c4dcee1
--- /dev/null
+++ b/pkgs/development/compilers/julia/patches/1.12/0002-lbt-blas-detection.patch
@@ -0,0 +1,63 @@
+From 703ab0a26202358f28e6de584d6ecde96f585264 Mon Sep 17 00:00:00 2001
+From: George Huebner <george@feyor.sh>
+Date: Tue, 28 Oct 2025 18:04:55 -0500
+Subject: [PATCH] fix LBT blas detection on darwin
+
+---
+ deps/blastrampoline.mk             |  7 +++++++
+ deps/patches/lbt-suffix-hint.patch | 25 +++++++++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+ create mode 100644 deps/patches/lbt-suffix-hint.patch
+
+diff --git a/deps/blastrampoline.mk b/deps/blastrampoline.mk
+index cfa28a4d8b..53f6d1e4bd 100644
+--- a/deps/blastrampoline.mk
++++ b/deps/blastrampoline.mk
+@@ -18,6 +18,13 @@ $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-compiled: $(BUILDDIR)/$(BLASTRAMPOLI
+ 	cd $(dir $@)/src && $(MAKE) $(BLASTRAMPOLINE_BUILD_OPTS)
+ 	echo 1 > $@
+ 
++$(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/lbt-suffix-hint.patch.applied: $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/source-extracted
++	cd $(dir $@) && \
++		patch -p1 -f < $(SRCDIR)/patches/lbt-suffix-hint.patch
++	echo 1 > $@
++
++$(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-compiled: $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/lbt-suffix-hint.patch.applied
++
+ define BLASTRAMPOLINE_INSTALL
+ 	$(MAKE) -C $(BLASTRAMPOLINE_BUILD_ROOT) install $(BLASTRAMPOLINE_BUILD_OPTS) DESTDIR="$2"
+ endef
+diff --git a/deps/patches/lbt-suffix-hint.patch b/deps/patches/lbt-suffix-hint.patch
+new file mode 100644
+index 0000000000..d5b5a43c13
+--- /dev/null
++++ b/deps/patches/lbt-suffix-hint.patch
+@@ -0,0 +1,25 @@
++From 70c929f9182f0c93d60cc68b439f119da80994aa Mon Sep 17 00:00:00 2001
++From: George Huebner <george@feyor.sh>
++Date: Tue, 28 Oct 2025 17:59:35 -0500
++Subject: [PATCH] correctly identify BLAS as ILP64 on darwin
++
++---
++ src/autodetection.c | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/src/autodetection.c b/src/autodetection.c
++index 86ee124..6a4e1cb 100644
++--- a/src/autodetection.c
+++++ b/src/autodetection.c
++@@ -61,6 +61,8 @@ const char * autodetect_symbol_suffix(void * handle, const char * suffix_hint) {
++     const char * suffixes[] = {
++         // Possibly-NULL suffix that we should search over
++         suffix_hint,
+++         
+++        "64_",
++ 
++         // First, search for LP64-mangling suffixes, so that when we are loading libs from an
++         // CLI environment, (where suffix hints are not easy) we want to give the most stable
++-- 
++2.50.1
++
+-- 
+2.50.1
+
diff --git a/pkgs/development/julia-modules/default.nix b/pkgs/development/julia-modules/default.nix
index 1c6d33326f53..5cd490c543be 100644
--- a/pkgs/development/julia-modules/default.nix
+++ b/pkgs/development/julia-modules/default.nix
@@ -7,6 +7,7 @@
   makeWrapper,
   python3,
   runCommand,
+  writableTmpDirAsHomeHook,
   writeTextFile,
 
   # Artifacts dependencies
@@ -222,6 +223,10 @@ let
             ]
           ))
         ];
+
+        nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+          writableTmpDirAsHomeHook
+        ];
       }
       ''
         python ${./python}/extract_artifacts.py \

From 8ff3f614c8d94cb3a8dc027152712bd6fef526d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 18:16:48 +0000
Subject: [PATCH 154/336] python3Packages.coqpit: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix
index fa4774f5ac7f..8cd8d141d90d 100644
--- a/pkgs/development/python-modules/coqpit/default.nix
+++ b/pkgs/development/python-modules/coqpit/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "coqpit-config";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "idiap";
     repo = "coqui-ai-coqpit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lverGecVRwhpdtX5463O6+CMJGye8VXj3JJZ+VhKcn8=";
+    hash = "sha256-9tIx36wWC9JfbnSF8/TZtHRyiXn77ItNXLq9vDopdS4=";
   };
 
   build-system = [ hatchling ];

From 556d69a161ebf5f3d7e067593f60dc9f49f83238 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 18:24:47 +0000
Subject: [PATCH 155/336] pkgsite: 0-unstable-2026-04-02 ->
 0-unstable-2026-04-10

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

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index bd89a0e4015f..3dea9563709f 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2026-04-02";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "2d0d60d0e456af02dfc52d79053d5a3a20fb11ff";
-    hash = "sha256-mHTARhEwD7li9xJQdnjDesgZ4DE34N35oBJIqvo4aUY=";
+    rev = "70e5087371296e2632232f4a3a795f124c73baf3";
+    hash = "sha256-URPLE5ZHXpMuB3yLObMCOD5PR14KAbOBsc+aGQKubaA=";
   };
 
-  vendorHash = "sha256-Dzizb692xTyCmaGpIoXU9OJ0//K+0QQ04vc4Dsnh34Q=";
+  vendorHash = "sha256-BbCCOgx6Tis2e07nSftdIi7cv8cHIXlsZl5Qk4fsWh8=";
 
   subPackages = [ "cmd/pkgsite" ];
 

From 8bf079b97841efde1baff697d6a7777cdd40575f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sun, 12 Apr 2026 14:36:04 -0400
Subject: [PATCH 156/336] alt-tab-macos: 10.4.0 -> 10.11.0

---
 pkgs/by-name/al/alt-tab-macos/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix
index b70c74a9f021..807ec4895027 100644
--- a/pkgs/by-name/al/alt-tab-macos/package.nix
+++ b/pkgs/by-name/al/alt-tab-macos/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alt-tab-macos";
-  version = "10.4.0";
+  version = "10.11.0";
 
   src = fetchurl {
     url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
-    hash = "sha256-CbeQi50EbGP+GoXLN/M8iLJ65RI6awXjDoPzEB8Pb38=";
+    hash = "sha256-LLEmcZEC0DaMdp9a5e1wF74oahGvHQpzpKDnbkPqNto=";
   };
 
   sourceRoot = ".";

From 8c4a563166c453bb40e8055837d8518edebeea6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 18:45:39 +0000
Subject: [PATCH 157/336] seconlay: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-10

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

diff --git a/pkgs/by-name/se/seconlay/package.nix b/pkgs/by-name/se/seconlay/package.nix
index 4d2573da5526..325350466809 100644
--- a/pkgs/by-name/se/seconlay/package.nix
+++ b/pkgs/by-name/se/seconlay/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "seconlay";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitLab {
     group = "alasca.cloud";
     owner = "scl";
     repo = "scl-management";
-    rev = "635ea8b3e326680aefc4b096b14b626769d4a180";
-    hash = "sha256-y1cDKneAmoyp3H0zVyWXafXjp33c3M2kaDCp8Rvh6BA=";
+    rev = "3bf6a5c1a1be4d1ca8f6e38f8d5e909fd4026a29";
+    hash = "sha256-bLHYNt/1aICzMFaMPZQkrLDl3nrwLz1nRj8wERb/h0Q=";
   };
 
   cargoHash = "sha256-uVccOT0DCHet52Oer3mGzFd/zs9rp4IZCvl5o/JMJgQ=";

From 54e017393240a419ba948afdc12724edb22429a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 18:47:01 +0000
Subject: [PATCH 158/336] renode-unstable: 1.16.1-unstable-2026-04-03 ->
 1.16.1-unstable-2026-04-12

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

diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index f4a0c0ec0394..15c6772e4c73 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -14,13 +14,13 @@ let
 in
 renode.overrideAttrs (old: rec {
   pname = "renode-unstable";
-  version = "1.16.1-unstable-2026-04-03";
+  version = "1.16.1-unstable-2026-04-12";
 
   src = fetchFromGitHub {
     owner = "renode";
     repo = "renode";
-    rev = "a5e76fbb6f3b2a15e6b1e3bfe021fdc2619f773a";
-    hash = "sha256-FCeZ/6Dp/IgFgaKu589rMAOk0NIisR4uJyCKcuSsM90=";
+    rev = "1ad93ffd5b0f2d67ff04f593de6318d12379d897";
+    hash = "sha256-MOCjxn4VB9uaq5UkHbZiGOdJDetUP816lnuPN0kXjTM=";
     fetchSubmodules = true;
   };
 

From d8a4c4c0ce208cf6d9a51324ae50bd8e668f8fd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 19:04:23 +0000
Subject: [PATCH 159/336] prometheus-influxdb-exporter: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix b/pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix
index 299d9f1e403c..c382319158cc 100644
--- a/pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "influxdb_exporter";
-  version = "0.12.0";
+  version = "0.12.1";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "influxdb_exporter";
-    hash = "sha256-O3cH7fX29tr/rhsovoYnmTL6CE+sZQKGNj4mq1IV/5U=";
+    hash = "sha256-qsZZoBXhh6lfYqh2uuIyOKGyL8u8IK8Gqgmm7cXzQdw=";
   };
 
-  vendorHash = "sha256-RCf52lHpF4alljH/CNhCg+zgfvlYbO5WT2rFX63fyyo=";
+  vendorHash = "sha256-NhodCQVFa/5jxhfdFRe2vxuw8dlSKipfxbzD6NF/Q5w=";
 
   ldflags = [
     "-s"

From 1e899f1972ecada32108eed16eadce33fb39af63 Mon Sep 17 00:00:00 2001
From: Michal Nazarewicz <mina86@mina86.com>
Date: Tue, 7 Apr 2026 17:54:40 +0200
Subject: [PATCH 160/336] =?UTF-8?q?urxvt-tabbedex:=2022.32=20=E2=86=92=202?=
 =?UTF-8?q?6.16.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Release notes:
* https://github.com/mina86/urxvt-tabbedex/releases/tag/v26.16.1
* https://github.com/mina86/urxvt-tabbedex/releases/tag/v26.16
* https://github.com/mina86/urxvt-tabbedex/releases/tag/v26.15
* https://github.com/mina86/urxvt-tabbedex/releases/tag/v26.09

TL;DR: Spurious border which can appear in some cases has been fixed,
window sizing has been improved, and `tabbed.tabbedex-rs-prefix` is no
longer respected (all resources must now use `tabbedex` as prefix).
---
 .../rxvt-unicode-plugins/urxvt-tabbedex/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
index 64053ef9f3af..3eca87ac0da7 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "urxvt-tabbedex";
-  version = "22.32";
+  version = "26.16.1";
 
   src = fetchFromGitHub {
     owner = "mina86";
     repo = "urxvt-tabbedex";
     rev = "v${version}";
-    sha256 = "sha256-4+4iPFoy1j5xjXRM5kBauhff44Y7/ik/+ZLZ1prc+Xo=";
+    sha256 = "sha256-e/t7AnP7nXkkazK6Oe6mw2Adf5wxR31/nFKeSaCpy/4";
   };
 
   nativeBuildInputs = [ perl ];

From f7afb1dc30fbf9ad7026a9f137eebbadc4e94ba4 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 12 Apr 2026 11:58:16 +0100
Subject: [PATCH 161/336] sdformat: init at 0.2.0

---
 pkgs/by-name/sd/sdformat/package.nix          | 49 +++++++++++++++++++
 .../sdformat/remove-hardcoded-lsblk-path.diff | 39 +++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 pkgs/by-name/sd/sdformat/package.nix
 create mode 100644 pkgs/by-name/sd/sdformat/remove-hardcoded-lsblk-path.diff

diff --git a/pkgs/by-name/sd/sdformat/package.nix b/pkgs/by-name/sd/sdformat/package.nix
new file mode 100644
index 000000000000..1c84dcf5950a
--- /dev/null
+++ b/pkgs/by-name/sd/sdformat/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  util-linuxMinimal,
+  installShellFiles,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sdformat";
+  version = "0.2.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "profi200";
+    repo = "sdFormatLinux";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-AoAhP1dr+hQSnOpZC0oHt0j3fUVNVhD+3jWm6iMfskk=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  patches = [ ./remove-hardcoded-lsblk-path.diff ];
+
+  strictDeps = true;
+
+  makeFlags = [
+    "TARGET=${finalAttrs.pname}"
+    "LSBLK_PATH=${lib.getExe' util-linuxMinimal "lsblk"}"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    installBin ${finalAttrs.pname}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Format your SD card the way the SD Association intended";
+    homepage = "https://github.com/profi200/sdFormatLinux";
+    license = lib.licenses.mit;
+    mainProgram = finalAttrs.pname;
+    maintainers = with lib.maintainers; [ thiagokokada ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/sd/sdformat/remove-hardcoded-lsblk-path.diff b/pkgs/by-name/sd/sdformat/remove-hardcoded-lsblk-path.diff
new file mode 100644
index 000000000000..22d786ae9fb7
--- /dev/null
+++ b/pkgs/by-name/sd/sdformat/remove-hardcoded-lsblk-path.diff
@@ -0,0 +1,39 @@
+diff --git i/Makefile w/Makefile
+index c45b32b..258189c 100644
+--- i/Makefile
++++ w/Makefile
+@@ -5,7 +5,8 @@ TARGET   := $(notdir $(CURDIR))
+ BUILD    := build
+ INCLUDES := include
+ SOURCES  := source
+-DEFINES  := -D_FORTIFY_SOURCE=2
++LSBLK_PATH ?= /usr/bin/lsblk
++DEFINES  := -D_FORTIFY_SOURCE=2 -DLSBLK_PATH=\"$(LSBLK_PATH)\"
+ 
+ 
+ # Compiler settings
+diff --git i/source/blockdev.cpp w/source/blockdev.cpp
+index a179604..b4de5ef 100644
+--- i/source/blockdev.cpp
++++ w/source/blockdev.cpp
+@@ -7,6 +7,7 @@
+ #include <errno.h>
+ #include <fcntl.h>     // open()...
+ #include <linux/fs.h>  // BLKGETSIZE64...
++#include <limits.h>    // PATH_MAX
+ #include <sys/ioctl.h> // ioctl()...
+ #include <sys/stat.h>  // S_IRUSR, S_IWUSR...
+ #include <unistd.h>    // write(), close()...
+@@ -21,8 +22,10 @@
+ static int checkDevice(const char *const path)
+ {
+ 	int res = EINVAL; // By default assume the given path is not a suitable device.
+-	char cmd[64] = "/usr/bin/lsblk -dnr -oTYPE,HOTPLUG,PHY-SEC ";
+-	strncpy(&cmd[43], path, sizeof(cmd) - 43);
++	const char cmdPrefix[] = LSBLK_PATH " -dnr -oTYPE,HOTPLUG,PHY-SEC ";
++	char cmd[sizeof(cmdPrefix) + PATH_MAX];
++	memcpy(cmd, cmdPrefix, sizeof(cmdPrefix) - 1);
++	strncpy(&cmd[sizeof(cmdPrefix) - 1], path, sizeof(cmd) - sizeof(cmdPrefix));
+ 	cmd[sizeof(cmd) - 1] = '\0';
+ 	FILE *const p = ::popen(cmd, "r");
+ 	if(p == nullptr)

From 1e7184f71ce667bc81d554ef0559975055faa1fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 19:37:49 +0000
Subject: [PATCH 162/336] kubecolor: 0.5.3 -> 0.6.0

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

diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix
index 410e41c0905a..b56665058b86 100644
--- a/pkgs/by-name/ku/kubecolor/package.nix
+++ b/pkgs/by-name/ku/kubecolor/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubecolor";
-  version = "0.5.3";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "kubecolor";
     repo = "kubecolor";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-F/ws7KevH0mGtSqp+iHyWpNccIBdF5gIoZfmLJ5H4YM=";
+    sha256 = "sha256-1eLt75w/l6AQDDUMhKIvWnaQox87r5M3c30AtpNyZFw=";
   };
 
-  vendorHash = "sha256-QenYTQTNXaBvzpyVHOCx3lEheiWZMfulEfzB+ll+q+4=";
+  vendorHash = "sha256-oTeDByJ81eWCCsIHyuScQS+lhE9cHqiATIlw2UdUZNo=";
 
   ldflags = [
     "-s"

From 45f86eec6fa2d00563eb6ce7a561a8565acd3552 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 19:51:14 +0000
Subject: [PATCH 163/336] open-policy-agent: 1.15.1 -> 1.15.2

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

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index ec506f9f55b8..b7280feec43c 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -14,13 +14,13 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.15.1";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TUFVyrRX0eqXCY+wOYA9yAFTzsupBO4d7bHmQXRRGDE=";
+    hash = "sha256-QgAMnVnTsHA1BcKgAhCgvOXDwkYqSFy7EVDqV/wCbhw=";
   };
 
   vendorHash = "sha256-l2HrTap6qZeKOvvCY6d+issQT2pL6TPU0pIdDN8vfVc=";

From 9240373d7d04c645abf7b849b00b1d4ce26ca218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 19:53:08 +0000
Subject: [PATCH 164/336] androidStudioPackages.canary: 2025.3.4.3 ->
 2025.3.4.4

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 5d7533f5e414..9884c28b95d3 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -26,9 +26,9 @@ let
     url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.5/android-studio-panda3-rc1-linux.tar.gz";
   };
   latestVersion = {
-    version = "2025.3.4.3"; # "Android Studio Panda 4 | 2025.3.4 Canary 3"
-    sha256Hash = "sha256-8fqHdU6IPuRmcJeCZQOqUPgfild9k98sLnN77dl2Hs8=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.3/android-studio-panda4-canary3-linux.tar.gz";
+    version = "2025.3.4.4"; # "Android Studio Panda 4 | 2025.3.4 Canary 4"
+    sha256Hash = "sha256-sPGJuOm5T7EZV5hhOJsZc7P8CTXyv9A6k82hM1GZGpY=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.4/android-studio-panda4-canary4-linux.tar.gz";
   };
 in
 {

From adccbb0bcf813bf3526c9680da7373d9541b0ada Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 19:56:48 +0000
Subject: [PATCH 165/336] flowblade: 2.24 -> 2.24.1

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

diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix
index df53fde8f4f9..7e128f711181 100644
--- a/pkgs/by-name/fl/flowblade/package.nix
+++ b/pkgs/by-name/fl/flowblade/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flowblade";
-  version = "2.24";
+  version = "2.24.1";
 
   src = fetchFromGitHub {
     owner = "jliljebl";
     repo = "flowblade";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-scUmE7wnelgpkaxh5tsNU6EVC9BbHR39embqk3enlIM=";
+    sha256 = "sha256-N9mWQoVOkgKDW0sp8+zEKk5h/+/D/O270i3peRbOs9w=";
   };
 
   buildInputs = [

From 1b73d57a6a28f91bb031fb59e1da98cc76e8b08c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 20:08:56 +0000
Subject: [PATCH 166/336] python3Packages.manifestoo-core: 1.15 -> 1.15.1

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

diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix
index d661ee0f3436..98c2cff2cbba 100644
--- a/pkgs/development/python-modules/manifestoo-core/default.nix
+++ b/pkgs/development/python-modules/manifestoo-core/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "manifestoo-core";
-  version = "1.15";
+  version = "1.15.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "manifestoo_core";
-    hash = "sha256-ArQpif3RD6b4oSPe5UjE7KkbtcDlWizALZD5ncq7jBo=";
+    hash = "sha256-QvdquUEwaHIX94m0/FVJ41/mmmQZz9Nj3F9ZepWgIFM=";
   };
 
   nativeBuildInputs = [ hatch-vcs ];

From ec5cd4a2ce057cd7a9f34977af811eb577a9370d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 20:09:34 +0000
Subject: [PATCH 167/336] vscode-extensions.ms-vsliveshare.vsliveshare: 1.1.119
 -> 1.1.122

---
 .../vscode/extensions/ms-vsliveshare.vsliveshare/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
index d734acc1ea4f..b72aa226fffd 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vsliveshare";
     publisher = "ms-vsliveshare";
-    version = "1.1.119";
-    hash = "sha256-s7GCJvlMCcZ+OOwdSh82moU7BlQLz1hVPMwZ9MYtahM=";
+    version = "1.1.122";
+    hash = "sha256-XD8iLG8HA9u5Y4CKQKLnmeAN4IFf1LGDvhTKuroxkHg=";
   };
 
   postPatch = ''

From cc4c73ecfa36cf3beb900603b8efaafd3441af3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 20:43:03 +0000
Subject: [PATCH 168/336] cargo-crev: 0.26.5 -> 0.27.1

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

diff --git a/pkgs/by-name/ca/cargo-crev/package.nix b/pkgs/by-name/ca/cargo-crev/package.nix
index 482439f20d24..f22bd825cc20 100644
--- a/pkgs/by-name/ca/cargo-crev/package.nix
+++ b/pkgs/by-name/ca/cargo-crev/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-crev";
-  version = "0.26.5";
+  version = "0.27.1";
 
   src = fetchFromGitHub {
     owner = "crev-dev";
     repo = "cargo-crev";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-P6i2RvosI36rrg52kUcdrb5y4Fg0ms/mH5hcOWNgSik=";
+    sha256 = "sha256-ezMpxYrJJ2zqEwCaDu2DFMwd6d/nfPVO6z2Lm4elIYE=";
   };
 
-  cargoHash = "sha256-ZlcKnSVpMxQqstbr/VkR/iT1B0wR5qnh5VLpNpYsTRw=";
+  cargoHash = "sha256-CYvvwgDZ+yAr7kLGEVZLVx7+sZUc5vu85AT5xLJBSbQ=";
 
   preCheck = ''
     export HOME=$(mktemp -d)

From 219c4e5b4a0ebe1057664fbcf5ac3fe4ca5c46bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 20:45:59 +0000
Subject: [PATCH 169/336] cargo-binstall: 1.17.9 -> 1.18.0

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

diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index cd43ed4857f6..be3cc7f5bc2a 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-binstall";
-  version = "1.17.9";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GTyMnbPHB7+E8IEdUd7bHBmCTcMI6UqYBysGqzDs8MA=";
+    hash = "sha256-005RXO9Ah8JA36n27CehwgOOij2d3S3BfmRaaYYqpeg=";
   };
 
-  cargoHash = "sha256-38KqQcpOtSkV0eYQsXRdte8Pzabv2nU0ipxqzQFHgtg=";
+  cargoHash = "sha256-bulcxmiQAt0WugUlXLFDjLlZi9q2/jFhZ/AuGbXF2K0=";
 
   nativeBuildInputs = [
     pkg-config

From 0786ca530cca0778f83ee7bc04ace3f483a75cf1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 21:16:17 +0000
Subject: [PATCH 170/336] qownnotes: 26.4.4 -> 26.4.11

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

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index dc97f0714e35..e83a87ecd7bf 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "26.4.4";
+  version = "26.4.11";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Sp1ICvsmTlq8cqF3mrkfyAx/tZwLLZIqmQqMQ1gt8uo=";
+    hash = "sha256-5V5fBxDlTjuj0RxxR4QcBlFmiSAWpRUxIZjpRzdDVJo=";
   };
 
   nativeBuildInputs = [

From 465c4687aaf467ed3eac1273072de3c23b9a668d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 21:31:57 +0000
Subject: [PATCH 171/336] vscode-extensions.james-yu.latex-workshop: 10.13.1 ->
 10.14.1

---
 .../vscode/extensions/james-yu.latex-workshop/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
index f67b77f25dcc..0fff354b20da 100644
--- a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "latex-workshop";
     publisher = "James-Yu";
-    version = "10.13.1";
-    hash = "sha256-UyujvtuS0dok5xC4w1lGCwDxOSr58t1/YQ5Mpe6yNPM=";
+    version = "10.14.1";
+    hash = "sha256-lsbiKzZTlkq/9K7ptLg0kHAd4i5OyNh2pLGGYUOJS9A=";
   };
   meta = {
     changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";

From 46ffa52dc7ed75fe0438560b1c396d15b4ed4695 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 21:54:15 +0000
Subject: [PATCH 172/336] python3Packages.django-weasyprint: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/development/python-modules/django-weasyprint/default.nix b/pkgs/development/python-modules/django-weasyprint/default.nix
index f496f7948286..682ececb7df3 100644
--- a/pkgs/development/python-modules/django-weasyprint/default.nix
+++ b/pkgs/development/python-modules/django-weasyprint/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "django-weasyprint";
-  version = "2.4.0";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fdemmer";
     repo = "django-weasyprint";
     tag = "v${version}";
-    hash = "sha256-eSh1p+5MyYb6GIEgSdlFxPzVCenlkwSCTkTzgKjezIg=";
+    hash = "sha256-EwTEBIqAZGmtSXkSLZgNPCKA98IrymsUEaCHc1uQ2XE=";
   };
 
   build-system = [

From 6caea797e6e60e696c290c5633d17042579902f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 21:55:02 +0000
Subject: [PATCH 173/336] minify: 2.24.11 -> 2.24.12

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

diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix
index 584caf4cdd67..c0d4a0fa7002 100644
--- a/pkgs/by-name/mi/minify/package.nix
+++ b/pkgs/by-name/mi/minify/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "minify";
-  version = "2.24.11";
+  version = "2.24.12";
 
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = "minify";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-AroyZI6bF4nPdGk01pd0hueoVH4690+aWN9MZCz5FJY=";
+    hash = "sha256-ZOe3CcYn3DSa4skgXe63F9gwX8qrX3RBSkqvuzJtN+o=";
   };
 
   vendorHash = "sha256-gH9HiNYAARImEdA4TESg8BXuedhs3Priv7dgZwcnrHU=";

From 8e55aea6ee2ca353eedf2311aad7d92f58264ed9 Mon Sep 17 00:00:00 2001
From: Samuel Ainsworth <skainsworth@gmail.com>
Date: Tue, 10 Mar 2026 20:33:31 -0400
Subject: [PATCH 174/336] cuda_nvcc: fix host_defines.h __noinline__ conflict
 under clang
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

host_defines.h redefines __noinline__ as __attribute__((noinline)).
When clang compiles CUDA code against libstdc++ >=12, which uses
__attribute__((__noinline__)), the macro causes the invalid expansion
__attribute__((__attribute__((noinline)))). Clang natively understands
__noinline__ as an attribute, so the macro is unnecessary — skip it
when clang is the compiler.
---
 .../development/cuda-modules/packages/cuda_nvcc.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
index 07fe457cc53f..404811ffa2f5 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
@@ -213,6 +213,19 @@ buildRedist (finalAttrs: {
             "__func__(float cospif(const float a))" \
             "__func__(float cospif(const float a) throw())"
       ''
+      # Fix clang CUDA compilation: host_defines.h redefines __noinline__ as
+      # __attribute__((noinline)), which conflicts with libstdc++ >=12 using
+      # __attribute__((__noinline__)) — the macro expands to
+      # __attribute__((__attribute__((noinline)))) which is invalid.
+      # Clang natively understands __noinline__ as an attribute so the macro
+      # is unnecessary. Skip it when clang is the compiler.
+      + lib.optionalString (cudaOlder "13.0") ''
+        nixLog "Patching host_defines.h to skip __noinline__ macro under clang"
+        substituteInPlace "''${!outputInclude:?}/include/crt/host_defines.h" \
+          --replace-fail \
+            '#if defined(__CUDACC__) || defined(__CUDA_ARCH__) || defined(__CUDA_LIBDEVICE__)' \
+            '#if (defined(__CUDACC__) || defined(__CUDA_ARCH__) || defined(__CUDA_LIBDEVICE__)) && !defined(__clang__)'
+      ''
     );
 
   brokenAssertions = [

From d19350471c103c7c8111c9f2fe65902e327fd284 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 13 Apr 2026 00:08:53 +0200
Subject: [PATCH 175/336] mojoshader: move env variable into env for
 structuredAttrs

---
 pkgs/by-name/mo/mojoshader/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mo/mojoshader/package.nix b/pkgs/by-name/mo/mojoshader/package.nix
index ecf3dd311254..3c5e42cad066 100644
--- a/pkgs/by-name/mo/mojoshader/package.nix
+++ b/pkgs/by-name/mo/mojoshader/package.nix
@@ -40,7 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
     fakeGit # https://github.com/icculus/mojoshader/blob/abdc80360c1d4560ab8f356035dcd53ae6e9b87f/CMakeLists.txt#L41-L68
   ];
 
-  NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-I${dxvk_2}/include/dxvk";
+  env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+    NIX_CFLAGS_COMPILE = "-I${dxvk_2}/include/dxvk";
+  };
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))

From ac4b29b9f4f0f85b50e5132c66edbf96810346c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 22:23:10 +0000
Subject: [PATCH 176/336] copier: 9.14.1 -> 9.14.3

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

diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
index d847937a3af8..7087383d8e06 100644
--- a/pkgs/development/python-modules/copier/default.nix
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "copier";
-  version = "9.14.1";
+  version = "9.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
     '';
-    hash = "sha256-9+GV+y6vgzsEkqIX3lJXJdwFrBxcKbTO1H6LtykIRac=";
+    hash = "sha256-wRYqpdMsxm2AHaLpdhsdkC6oDZP2a3VXJx/pNNrQieM=";
   };
 
   env.POETRY_DYNAMIC_VERSIONING_BYPASS = version;

From 5f69fa740a33fdc231a3b6a892959b5da5bc3bdc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 22:40:45 +0000
Subject: [PATCH 177/336] rocketchat-desktop: 4.13.0 -> 4.14.0

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

diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix
index f1a0d6952860..ff8b89b8a7d9 100644
--- a/pkgs/by-name/ro/rocketchat-desktop/package.nix
+++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocketchat-desktop";
-  version = "4.13.0";
+  version = "4.14.0";
 
   src = fetchFromGitHub {
     owner = "RocketChat";
     repo = "Rocket.Chat.Electron";
     tag = finalAttrs.version;
-    hash = "sha256-u2bGCtF+PBYUsYUytgJfhDVXlCwEeQCon5iRecvspEI=";
+    hash = "sha256-5p0WmTKHqiRtNeWxJuBUKVHc2DHtAGMyBsXq9SpytWA=";
   };
 
   # This might need to be updated between releases.
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-OevWuXmLlDPENVpc7L5mCY+iguqtrEeoFBHmD8YAxeY=";
+    hash = "sha256-Y6wdGp8Q5DW3f7pIrcE3ElKHFHYPxcAQFiM4R1cSYUA=";
   };
 
   nativeBuildInputs = [

From 0cc192e5c28b032ddc21c2572bf1d757a5787ce8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 12 Apr 2026 23:54:07 +0200
Subject: [PATCH 178/336] python3Packages.textual-image: modernize

- remove comments
---
 .../python-modules/textual-image/default.nix      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix
index c8adb256106d..01b11583d3e6 100644
--- a/pkgs/development/python-modules/textual-image/default.nix
+++ b/pkgs/development/python-modules/textual-image/default.nix
@@ -2,19 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-
-  # dependencies
   rich,
-
-  # tests
   pillow,
   pytestCheckHook,
   syrupy,
-
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "textual-image";
   version = "0.11.0";
   pyproject = true;
@@ -22,11 +17,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lnqs";
     repo = "textual-image";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-nWP4pxFcsjDA/SIrKXHjufiQaxHGgPpC1ZIti+TW+f0=";
   };
 
-  buildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   dependencies = [
     pillow
@@ -45,8 +40,8 @@ buildPythonPackage rec {
   meta = {
     description = "Render images in the terminal with Textual and rich";
     homepage = "https://github.com/lnqs/textual-image/";
-    changelog = "https://github.com/lnqs/textual-image/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/lnqs/textual-image/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.lgpl3;
     maintainers = with lib.maintainers; [ gaelj ];
   };
-}
+})

From a74cedeb0f37db012602d9a2ade1139306c00aeb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 22:51:09 +0000
Subject: [PATCH 179/336] libretro.vba-m: 0-unstable-2024-10-21 ->
 0-unstable-2026-04-10

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

diff --git a/pkgs/applications/emulators/libretro/cores/vba-m.nix b/pkgs/applications/emulators/libretro/cores/vba-m.nix
index 7beabad5155d..f5b26fe8b8e8 100644
--- a/pkgs/applications/emulators/libretro/cores/vba-m.nix
+++ b/pkgs/applications/emulators/libretro/cores/vba-m.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "vbam";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "vbam-libretro";
-    rev = "60b48a3a4a46562f29120c1868a54778b40b60a2";
-    hash = "sha256-UbXSHdKfa91MpcYityo+aILbI0DfkLqZh8YfGcRx/BI=";
+    rev = "e8b2875d6cad10fc3c7c9f57bb5f1acc324d7c10";
+    hash = "sha256-tq2MxjPwVPkZotaZAKxmiz7Zjws22E8tK+FPcS+uujk=";
   };
 
   makefile = "Makefile";

From 22ea82c45143eee8b15498dca7d4d4bc9e7a72fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 23:17:29 +0000
Subject: [PATCH 180/336] blackmagic-desktop-video: 15.3.1 -> 16.0

---
 pkgs/by-name/bl/blackmagic-desktop-video/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
index a4dbb8b53717..3d5bd27e9b69 100644
--- a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
+++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
@@ -14,7 +14,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "blackmagic-desktop-video";
-  version = "15.3.1";
+  version = "16.0";
 
   buildInputs = [
     autoPatchelfHook
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
       {
         outputHashMode = "recursive";
         outputHashAlgo = "sha256";
-        outputHash = "sha256-4Y7bmN08fZ9hRsyFKP4cfGb4fggLY9bdm32+UTIGiTs=";
+        outputHash = "sha256-AdJiPG0kJBk3SH633kwLbS36LjFeFAwzYTrfEjkvup4=";
 
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 

From 421f79c3bb77c13836ebb3313b338e4d92f54e15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 23:44:48 +0000
Subject: [PATCH 181/336] dokieli: 0-unstable-2026-03-25 ->
 0-unstable-2026-04-13

---
 pkgs/by-name/do/dokieli/missing-hashes.json | 30 ++++++++++-----------
 pkgs/by-name/do/dokieli/package.nix         |  8 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/do/dokieli/missing-hashes.json b/pkgs/by-name/do/dokieli/missing-hashes.json
index eb73dcb5f662..9b0ac522e2ec 100644
--- a/pkgs/by-name/do/dokieli/missing-hashes.json
+++ b/pkgs/by-name/do/dokieli/missing-hashes.json
@@ -1,19 +1,19 @@
 {
-  "@rolldown/binding-android-arm64@npm:1.0.0-rc.9": "1777af709a7dee1cf188aa8248f915b9a8e33ebf08e542dad502bbc71d2b4da454cdb27099177606e8b180df406273abcd45d52774ce4e27cf2a439b84d52683",
-  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.9": "7c5a281f86d91ba3d18d079e8b67b4bb6cc9f0d414b13be2f0c4e9d4b821e8a16045c1324244841be48b94bb5312cb61295f9bf97808553614c6d5eddeb7a64a",
-  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.9": "eec443021e7fc115a8378f3d664df84db7cd6e97b1741d663efdd7c68340d7e61558241031ea5434ef9ca1dfa66c1a4a480177e194cfd38925de876c157efb85",
-  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.9": "51c5863b592936299620c9200e704880ebd38b6f1ce4c4ba944558162913a8d7891c24982e85a484838fa80b025737dbd4042f94e2a25a2d927379ad572c1631",
-  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.9": "d5b5391a590a9d3f0a792d78be5eaef4595c6bc25704caf28c7cc2b01853322d807bae922deabb1f2c2a197ac48dbf97b9ef4aef0212e8830a1f3c1d70af3608",
-  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.9": "504c4d38e115f77fb44aa9ac56948e8d870021a5f4153af5b91fc5823b468f0268a9d451b11f7dea9aab47bc5fa07a014eecf34ad0baeb12eec46282aa8b4a22",
-  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.9": "e3ebfeb46b68eca14fd36177d8e40edd5a3e8634f2b00a55531a88fa467ddc46a9a9d650e3b085b85b7a8377ad5223ebdf5b226507f3ac150528758eab70ed29",
-  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.9": "e240025464e6bf73aaff02e9412937948b6b944eee24a26ed578956e0ab7c6b00da5300e35650c1fbd5c37dee3cc8ad66c9ac3c1e036e17ea33b3cbca58f1356",
-  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.9": "50e631b2efcdc93573311bc8ce8d1319bee3212c1872929d2b3752bf0be0896100f271aae829d3aafa9413b24ef47edf4a0fea48ee8dfa8386edbb23381dcd93",
-  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.9": "8d59328c46ac1250c7666f2d723ec30be3119553c60e22656d08391c2a217c938f906906b6662da1984666643ba00ad7d43899041380fe6a7f5072f5e1cc4b97",
-  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.9": "cd27570608123a824d4c779cca3cee1e93ac3a8318e030a881bb72d80a6ff3b9a22add1f550c13fd7472407aea02cda2cfbd04016975f88474826848bf463b0e",
-  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.9": "0bb2f5ab0e2a461ac0f05e1efafaf4145702479792afc7b5229c92da18d0544fd63189fd15f6bca71a511d07131b231665933470ceceec7db67c628e2c43a152",
-  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.9": "7208c5618e61b484d1272650c68d8908ac0a1b35ce365ef78f0b4290afa171055b24a15585c2a62d95abf1e6298e4aa3d08b71db6656415b8e7d2fdf37fd8b24",
-  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.9": "f2605a92b218d088c20b0a2e71a8f47a5d5b5b04ed2edcafc59d692974cf62984228350eee176e94ea605b4326363c0962a8e97e2de34c926447c38ed6a73636",
-  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.9": "091a4d27b9675b61dd598aa6ee827c5a2959b532ae52a0ac73aafd167567328a53fb38f2c0d556f8f78625c275f86d54491134fceefa9e43cb796c6af982fb75",
+  "@rolldown/binding-android-arm64@npm:1.0.0-rc.15": "0c78d6321d2dedc0c6ed4b5541328f6c04e8530a3c294b477cd9741e2af7c8377a51474f0171c85ecf63bff5c8bb31ee586f40f13fa265a869247ec3d6293204",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.15": "598b8cb87d8ba8df4e880e0d6903f7f4f32b3e7b2804429cb3ccc47a69b8e7b852b2e3115a8c3a882d14979909f9464e8da55c2c52a52cb18a81df7e8a1aa654",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.15": "92fdfa58a8d9edaec4c1766c38c34f657715d2c8faec141590812d11ba6a6ce52530e55a6a2515fcd2ec6287e50187a458f06ca3c6813130cb9869a99c9f6f29",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.15": "04e8288accf007c82e8bbe75af62d4ed570bddd7b25a178506fcf97daa0907cf6f85ea095be5826095242ac1a4923196059f53a9e8fdd0e3c34d9ed1c00d64ae",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.15": "4cd7452e4fe4433b730585bcbaf210efc50621bca5906204179ffe80748bea187398d4091dae64079f0c7ebfea1987f0b1c045ff60209ab0f60be9e04eccbef7",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.15": "fbddea791134b45a94aa5aea640a177d6feacd81a44f9ee3615da3daa824dc2a193ced6e8f2a0bb0676fca7b224525513b451cd8f78b379d7b1983fe6a0360ff",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.15": "b325fa98753bf41100c5d95145f30ce92b5f69f6989973306344b1644fb21633454aa216f28355c74d0e7bd5885bb6d2c80d0f96dcc2b869ca7e63d8b22dbe91",
+  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.15": "0bff0d2724912079dcedfbc0a86dbad8e3e376d2d619cf36917964701b9ae5a39afa5ff49d3cb5b2c3e17437c559314cf8e17433ad3bfb4b64229d9c8bf1ebca",
+  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.15": "6718fd91ead389f3bdefe22fd0344b490d3f9350697e4aa35a0fb55957aa1b127d26aaecf9bc2d49f1dfde62d9d4717cf5dfb7d93ce3b871372ef9c6cb7a1b1a",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.15": "cb7628e1a7398ab5fd07dc79a38c73a27524d45adc989b5d906ea37e23b7692123d607d07fb9fda35485d6caba545ae41c561b9632aefa0bff76997208f83eae",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.15": "f59fb354b8cac55d123f6f3fe7bf8210402f97ed4be3f3a883c6c544ce1b825e36154f479d45f6e9f23c1fcd8861e9f3873dc24278631db871d263db3bea5580",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.15": "b6c220a48ace9c381d238dce2caaa8453da1d3fe9312bab7babf127a500bdec2bbe30bd381f9945af79c30fe9ca0185108b86ef311fc83ecb83ef24f7a587902",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.15": "9cd39e02ad5f43fc45901d074df10c0e3532d9077a6e334e431de60f90555c15e5445d1b5156c10df49d28839f9f15d5d808666bc8e70ab065bb9af3b8567e7a",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.15": "cfc32a72e8a3900f356b0b359520df3f18ac79379a273a4c53b00b1555123dcfd8204cf9976762664898b0c6c949c0edd4be850ae254d2e84a40fcb8352858eb",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.15": "f0bd2876247f0834f135c1ae150b7d5626d54ff399b4a6193626dc46a0eca22374a43c64afdf3eff8e8e9cf1f20df826bcd9fd4219df3fece03972b8ae080e20",
   "lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d",
   "lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06",
   "lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e",
diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix
index 008686575811..2ad85464c592 100644
--- a/pkgs/by-name/do/dokieli/package.nix
+++ b/pkgs/by-name/do/dokieli/package.nix
@@ -16,19 +16,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dokieli";
-  version = "0-unstable-2026-03-25";
+  version = "0-unstable-2026-04-13";
 
   src = fetchFromGitHub {
     owner = "dokieli";
     repo = "dokieli";
-    rev = "d684e852325b2247b831b179efed5d96c211f864";
-    hash = "sha256-Af8KsH1tqPDuOUEaHRN3ULJwGWgZc5JgFT99sGKkkec=";
+    rev = "6f574408bc914347c3ba27869e61225fabbe6272";
+    hash = "sha256-PSDsV5Gg+JT9qwMBiRkyv/ZiZY9qvqhRuKjEiPMuQDU=";
   };
 
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-bUXAYeTJqz11Rl7vaNPNRBTqjLdSr0FrEQBAFLd9oEs=";
+    hash = "sha256-bO3yEh+P8al/oXXjqNOMOpXc0ggc17Wc00WtahniilE=";
   };
 
   buildPhase = ''

From 4ba0d409e73ec0fa15bbf9178c8c10a500ebdb14 Mon Sep 17 00:00:00 2001
From: azban <me@azban.net>
Date: Sun, 12 Apr 2026 18:16:59 -0600
Subject: [PATCH 182/336] juju: 3.6.12 -> 3.6.21

Resolves https://github.com/NixOS/nixpkgs/issues/508879
Resolves https://nvd.nist.gov/vuln/detail/CVE-2026-5412
---
 pkgs/by-name/ju/juju/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index b6d72baa2a26..04cd4b723f5d 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "juju";
-  version = "3.6.12";
+  version = "3.6.21";
 
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-c47+BmknMWoZr5xFGkR0Y8m7aNBm26441qOAsrHhUk8=";
+    hash = "sha256-Gvrzk3xaMtEpOxMBMH17Aam14eymISYmuokdEyGGgCY=";
   };
 
-  vendorHash = "sha256-v460n6UnaXrimyYCmSgVmWlvkhRn6mYBm1KbH4fMxqM=";
+  vendorHash = "sha256-Aod6k9etHDEW5WtetlA15MB0ZfaVFLbIK0Ud4gy/MuY=";
 
   subPackages = [
     "cmd/juju"

From 063871bb06371ef85b06561026d068602dabb4ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 00:18:27 +0000
Subject: [PATCH 183/336] wtfis: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix
index 1f68e40fa030..35c8d9939567 100644
--- a/pkgs/by-name/wt/wtfis/package.nix
+++ b/pkgs/by-name/wt/wtfis/package.nix
@@ -6,12 +6,12 @@
 
 let
   pname = "wtfis";
-  version = "0.14.0";
+  version = "0.15.0";
   src = fetchFromGitHub {
     owner = "pirxthepilot";
     repo = "wtfis";
     tag = "v${version}";
-    hash = "sha256-XFitQY30hK3byVevqndSAkG08ztwY1BIpJEYhY3PzTs=";
+    hash = "sha256-2e8T2R33xOX4XZ3Lsk95kI9ea245eTWrxA1RPi2PqEI=";
   };
 in
 python3.pkgs.buildPythonApplication {

From cbe0413f0c00be8b8b016b8d3e8259a0bf70e5d5 Mon Sep 17 00:00:00 2001
From: Marcos Benevides <marcos.schonfinkel@gmail.com>
Date: Sun, 12 Apr 2026 20:28:14 -0400
Subject: [PATCH 184/336] lfe: fix install phase, make sure we get the binaries
 in the right place

---
 pkgs/development/interpreters/lfe/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/lfe/default.nix b/pkgs/development/interpreters/lfe/default.nix
index 33ad3d90bae0..1ec1f7a31f73 100644
--- a/pkgs/development/interpreters/lfe/default.nix
+++ b/pkgs/development/interpreters/lfe/default.nix
@@ -68,18 +68,23 @@ else
 
     beamDeps = [ proper ];
 
-    makeFlags = [
-      "-e"
-      "MANDB=''"
-      "PREFIX=$$out"
-    ];
-
     # override buildRebar3's install to let the builder use make install
-    installPhase = "";
+    installPhase = ''
+      runHook preInstall
+      make -e MANDB= PREFIX=$out install
+      runHook postInstall
+    '';
 
     doCheck = true;
     checkTarget = "travis";
 
+    doInstallCheck = true;
+    installCheckPhase = ''
+      runHook preInstallCheck
+      test -e $out/bin/lfe
+      runHook postInstallCheck
+    '';
+
     postFixup = ''
       # LFE binaries are shell scripts which run erl and lfe.
       # Add some stuff to PATH so the scripts can run without problems.

From 23d7be2248a34bed2d29d9997a812c3f08ea10ce Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Wed, 7 Jan 2026 20:41:26 +1100
Subject: [PATCH 185/336] tests/openssh: move order-dependent test to top

When working on nixosTests.openssh, I keep forgetting that there is
order-dependence, despite me adding a comment about this in commit
41911ed so let's solve ordering
once-and-for-all but making the order-dependent machine
predictably-first.
---
 nixos/tests/openssh.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 97ed224b5afb..fca192c15fc7 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -90,9 +90,11 @@ in
         ];
       };
 
-    server-lazy-socket = {
+    # IP addresses are allocated according to the alphabetical order of the machine name, and since tests rely on the IP address of this machine, let's name it so it's order (and thus address) is predictable.
+    aaa-server-lazy-socket = {
       virtualisation.vlans = [
         1
+        # Allocate another VLAN so we can exercise listening on a non-standard address.
         2
       ];
       services.openssh = {
@@ -302,7 +304,7 @@ in
 
     server_lazy.wait_for_unit("sshd.socket", timeout=60)
     server_localhost_only_lazy.wait_for_unit("sshd.socket", timeout=60)
-    server_lazy_socket.wait_for_unit("sshd.socket", timeout=60)
+    aaa_server_lazy_socket.wait_for_unit("sshd.socket", timeout=60)
 
     # sshd-keygen is a oneshot unit, so just wait for multi-user.target, which
     # pulls it in.
@@ -340,14 +342,14 @@ in
             timeout=30
         )
 
-    with subtest("socket activation on a non-standard port"):
+    with subtest("socket activation on a non-standard address and port"):
         client.succeed(
             "cat ${snakeOilPrivateKey} > privkey.snakeoil"
         )
         client.succeed("chmod 600 privkey.snakeoil")
         # The final segment in this IP is allocated according to the alphabetical order of machines in this test.
         client.succeed(
-            "ssh -p 2222 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.2.5 true",
+            "ssh -p 2222 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.2.1 true",
             timeout=30
         )
 

From 41c383338e1881994bf517b4c66aacb30a2410f7 Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Wed, 7 Jan 2026 20:50:50 +1100
Subject: [PATCH 186/336] nixos/sshd: add enableRecommendedAlgorithms option

Prior to this commit, NixOS enabled a set of curated algorithms.

This commit allows users to opt-out of this curation, and instead use
the upstream algorithms. This also allows users to set
Ciphers/KexAlgorithms/Macs themselves without lib.mkForce (and thus
wield NixOS modules to build the list).

Tests have been added to ensure test this new option works.
---
 .../manual/release-notes/rl-2605.section.md   |   2 +
 .../modules/services/networking/ssh/sshd.nix  | 118 +++++++++++++-----
 nixos/tests/openssh.nix                       |  52 +++++++-
 3 files changed, 134 insertions(+), 38 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index b855729692f6..e7c7d13e1c0a 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -342,6 +342,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
 
 - `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled.  This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix.
 
+- `services.openssh.enableRecommendedAlgorithms` has been added to allow users to opt out of NixOS's curated set of recommended algorithms. This set to true by default, and thus is not a breaking change. Users may want to set this to false if they prefer upstream's default algorithms. See <https://github.com/NixOS/nixpkgs/pull/471330>.
+
 - IPVLAN interfaces can now be configured through the `networking.ipvlans` option in the networking module.
 
 - `services.caddy` now supports setting `httpPort` and `httpsPort` and opening them in the firewall via `openFirewall`.
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index b87e5ccad65f..9736387fd57a 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -412,6 +412,16 @@ in
         '';
       };
 
+      enableRecommendedAlgorithms = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = ''
+          Use algorithms curated and recommended by NixOS.
+
+          Set to false to use upstream's default algorithms.
+        '';
+      };
+
       authorizedKeysFiles = lib.mkOption {
         type = lib.types.listOf lib.types.str;
         default = [ ];
@@ -571,37 +581,64 @@ in
               };
               KexAlgorithms = lib.mkOption {
                 type = lib.types.nullOr (lib.types.listOf lib.types.str);
-                default = [
-                  "mlkem768x25519-sha256"
-                  "sntrup761x25519-sha512"
-                  "sntrup761x25519-sha512@openssh.com"
-                  "curve25519-sha256"
-                  "curve25519-sha256@libssh.org"
-                  "diffie-hellman-group-exchange-sha256"
-                ];
+                default =
+                  if config.services.openssh.enableRecommendedAlgorithms then
+                    [
+                      "mlkem768x25519-sha256"
+                      "sntrup761x25519-sha512"
+                      "sntrup761x25519-sha512@openssh.com"
+                      "curve25519-sha256"
+                      "curve25519-sha256@libssh.org"
+                      "diffie-hellman-group-exchange-sha256"
+                    ]
+                  else
+                    null;
+                defaultText = ''
+                  if config.services.openssh.enableRecommendedAlgorithms then
+                    [
+                      "mlkem768x25519-sha256"
+                      "sntrup761x25519-sha512"
+                      "sntrup761x25519-sha512@openssh.com"
+                      "curve25519-sha256"
+                      "curve25519-sha256@libssh.org"
+                      "diffie-hellman-group-exchange-sha256"
+                    ]
+                  else
+                    null;
+                '';
                 description = ''
                   Allowed key exchange algorithms
 
-                  Uses the lower bound recommended in both
-                  <https://stribika.github.io/2015/01/04/secure-secure-shell.html>
-                  and
-                  <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67>
+                  Defaults to a curated set of algorithms.
+                  Set enableRecommendedAlgorithms to false to use upstream's defaults.
                 '';
               };
               Macs = lib.mkOption {
                 type = lib.types.nullOr (lib.types.listOf lib.types.str);
-                default = [
-                  "hmac-sha2-512-etm@openssh.com"
-                  "hmac-sha2-256-etm@openssh.com"
-                  "umac-128-etm@openssh.com"
-                ];
+                default =
+                  if config.services.openssh.enableRecommendedAlgorithms then
+                    [
+                      "hmac-sha2-512-etm@openssh.com"
+                      "hmac-sha2-256-etm@openssh.com"
+                      "umac-128-etm@openssh.com"
+                    ]
+                  else
+                    null;
+                defaultText = ''
+                  if config.services.openssh.enableRecommendedAlgorithms then
+                    [
+                      "hmac-sha2-512-etm@openssh.com"
+                      "hmac-sha2-256-etm@openssh.com"
+                      "umac-128-etm@openssh.com"
+                    ]
+                  else
+                    null;
+                '';
                 description = ''
                   Allowed MACs
 
-                  Defaults to recommended settings from both
-                  <https://stribika.github.io/2015/01/04/secure-secure-shell.html>
-                  and
-                  <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67>
+                  Defaults to a curated set of algorithms.
+                  Set enableRecommendedAlgorithms to false to use upstream's defaults.
                 '';
               };
               StrictModes = lib.mkOption {
@@ -613,21 +650,36 @@ in
               };
               Ciphers = lib.mkOption {
                 type = lib.types.nullOr (lib.types.listOf lib.types.str);
-                default = [
-                  "chacha20-poly1305@openssh.com"
-                  "aes256-gcm@openssh.com"
-                  "aes128-gcm@openssh.com"
-                  "aes256-ctr"
-                  "aes192-ctr"
-                  "aes128-ctr"
-                ];
+                default =
+                  if config.services.openssh.enableRecommendedAlgorithms then
+                    [
+                      "chacha20-poly1305@openssh.com"
+                      "aes256-gcm@openssh.com"
+                      "aes128-gcm@openssh.com"
+                      "aes256-ctr"
+                      "aes192-ctr"
+                      "aes128-ctr"
+                    ]
+                  else
+                    null;
+                defaultText = ''
+                  if config.services.openssh.enableRecommendedAlgorithms then
+                    [
+                      "chacha20-poly1305@openssh.com"
+                      "aes256-gcm@openssh.com"
+                      "aes128-gcm@openssh.com"
+                      "aes256-ctr"
+                      "aes192-ctr"
+                      "aes128-ctr"
+                    ]
+                  else
+                    null;
+                '';
                 description = ''
                   Allowed ciphers
 
-                  Defaults to recommended settings from both
-                  <https://stribika.github.io/2015/01/04/secure-secure-shell.html>
-                  and
-                  <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67>
+                  Defaults to a curated set of algorithms.
+                  Set enableRecommendedAlgorithms to false to use upstream's defaults.
                 '';
               };
               AllowUsers = lib.mkOption {
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index fca192c15fc7..c6b2f6d707d6 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -193,12 +193,32 @@ in
               path = "/etc/ssh/ssh_host_ed25519_key";
             }
           ];
+          # The NixOS-curated algorithms require OpenSSL, and so since this test is against an OpenSSH-without-OpenSSL, we have to use the default algorithms, which adapt to not having OpenSSL.
+          enableRecommendedAlgorithms = false;
+        };
+        users.users.root.openssh.authorizedKeys.keys = [
+          snakeOilEd25519PublicKey
+        ];
+      };
+
+    server-default-algorithms =
+      { ... }:
+      {
+        services.openssh = {
+          enable = true;
+          enableRecommendedAlgorithms = false;
+        };
+        users.users.root.openssh.authorizedKeys.keys = [
+          snakeOilEd25519PublicKey
+        ];
+      };
+
+    server-null-algorithms =
+      { ... }:
+      {
+        services.openssh = {
+          enable = true;
           settings = {
-            # Since this test is against an OpenSSH-without-OpenSSL,
-            # we have to override NixOS's defaults ciphers (which require OpenSSL)
-            # and instead set these to null, which will mean OpenSSH uses its defaults.
-            # Expectedly, OpenSSH's defaults don't require OpenSSL when it's compiled
-            # without OpenSSL.
             Ciphers = null;
             KexAlgorithms = null;
             Macs = null;
@@ -294,10 +314,12 @@ in
 
     server.wait_for_unit("sshd", timeout=60)
     server_allowed_users.wait_for_unit("sshd", timeout=60)
+    server_default_algorithms.wait_for_unit("sshd", timeout=60)
     server_localhost_only.wait_for_unit("sshd", timeout=60)
     server_match_rule.wait_for_unit("sshd", timeout=60)
     server_no_openssl.wait_for_unit("sshd", timeout=60)
     server_no_pam.wait_for_unit("sshd", timeout=60)
+    server_null_algorithms.wait_for_unit("sshd", timeout=60)
     server_null_pam.wait_for_unit("sshd", timeout=60)
     server_null_pam.fail("journalctl -u sshd.service | grep 'Unsupported option UsePAM'")
     server_sftp.wait_for_unit("sshd", timeout=60)
@@ -402,6 +424,26 @@ in
             timeout=30
         )
 
+    with subtest("null-algorithms"):
+        client.succeed(
+            "cat ${snakeOilEd25519PrivateKey} > privkey.snakeoil"
+        )
+        client.succeed("chmod 600 privkey.snakeoil")
+        client.succeed(
+            "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-null-algorithms true",
+            timeout=30
+        )
+
+    with subtest("no-openssl"):
+        client.succeed(
+            "cat ${snakeOilEd25519PrivateKey} > privkey.snakeoil"
+        )
+        client.succeed("chmod 600 privkey.snakeoil")
+        client.succeed(
+            "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-default-algorithms true",
+            timeout=30
+        )
+
     with subtest("no-pam"):
         client.succeed(
             "cat ${snakeOilPrivateKey} > privkey.snakeoil"

From 5458dd7b4e8efd4f16fbbf4043a11c89c4791ffd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 01:23:59 +0000
Subject: [PATCH 187/336] 
 home-assistant-custom-lovelace-modules.swipe-navigation: 1.15.8 -> 1.16.0

---
 .../custom-lovelace-modules/swipe-navigation/package.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix
index aeae930139d3..7a823ec9bf6f 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "swipe-navigation";
-  version = "1.15.8";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "zanna-37";
     repo = "hass-swipe-navigation";
     tag = "v${version}";
-    hash = "sha256-jc/dTs1CdrjTSHSnBn2RPESgj3YFjFSg+nPJClKRPj4=";
+    hash = "sha256-a2ZbMQgFi4bJPnZeSB60THFd46O/K4QERCmZQMjC0ZI=";
   };
 
-  npmDepsHash = "sha256-uuNX2xizoS3eowN/edUuT3EvzzLq7GzGw0uIDxAT0pY=";
+  npmDepsHash = "sha256-vQnYQ7iKSotbdresqXMNUJALMVPYxk0FtZxAhJTQ8pc=";
 
   buildPhase = ''
     runHook preBuild

From 8c8664e5847a41d6a61bbf7f8749558a928a91d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 01:32:20 +0000
Subject: [PATCH 188/336] cherry-studio: 1.8.4 -> 1.9.1

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

diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 0d9c30858ca1..87b79a3b9452 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.8.4";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TLV4N9WYuTD24UY+2lYmxRLO2jtdvuXyIOeH5mXb1V0=";
+    hash = "sha256-gk/sTkBr7PKBGS96bYVUXGpZuoaech4/0npB+NSstTA=";
   };
 
   postPatch = ''
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-qryToH1tytLSwPORkLBCCn3m/Xsl+vift9WF3Pn8oGg=";
+    hash = "sha256-DidMffZQEdYSERZZgDpQ8DqV773iBju89Pa0Z1Gz3I8=";
   };
 
   nativeBuildInputs = [

From e547b0255a656d048de6a460f9a4eb273e6976f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 01:52:23 +0000
Subject: [PATCH 189/336] python3Packages.microsoft-kiota-abstractions: 1.9.10
 -> 1.10.1

---
 .../python-modules/microsoft-kiota-abstractions/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
index dc9024c51cae..a3912c2405ab 100644
--- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-abstractions";
-  version = "1.9.10";
+  version = "1.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-abstractions-v${version}";
-    hash = "sha256-J9OLxZ3vQpChhfwjXzrGF691zco/bKv51FG20VFieN0=";
+    hash = "sha256-KBCjVNZDPMh0wxWm8UVLsrfl2AYp3rKMjAT5c8F7+64=";
   };
 
   sourceRoot = "${src.name}/packages/abstractions/";

From f21739e2f9925d0c023238a6619e98a821aa3aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Apr 2026 19:09:03 -0700
Subject: [PATCH 190/336] vaultwarden: 1.35.4 -> 1.35.6

Diff: https://github.com/dani-garcia/vaultwarden/compare/1.35.4...1.35.6

Changelog: https://github.com/dani-garcia/vaultwarden/releases/tag/1.35.6
---
 pkgs/by-name/va/vaultwarden/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix
index 7e6808d5fa5d..734613e0a079 100644
--- a/pkgs/by-name/va/vaultwarden/package.nix
+++ b/pkgs/by-name/va/vaultwarden/package.nix
@@ -19,16 +19,16 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vaultwarden";
-  version = "1.35.4";
+  version = "1.35.6";
 
   src = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "vaultwarden";
     tag = finalAttrs.version;
-    hash = "sha256-NphgKTlyVsH42TEGU8unhL798jTQMkS5JyNckKhk8YM=";
+    hash = "sha256-Q5D/tDE7rC9/iIaD0WlGr2AaoCdAEJQs++8uOdYgRXo=";
   };
 
-  cargoHash = "sha256-PkFxHhFrdVB/hfSoT6j87K4IEknl+ZO1omGHrXBWEMg=";
+  cargoHash = "sha256-LSmzR3X04i2dmPwj1ivPm/YeNtxGhfwsEXG93iVvhrI=";
 
   # used for "Server Installed" version in admin panel
   env.VW_VERSION = finalAttrs.version;

From cbbd72092a3b67b0406d234adb89d2914cbaa2ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 02:26:48 +0000
Subject: [PATCH 191/336] python3Packages.adlfs: 2026.2.0 -> 2026.4.0

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

diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix
index 63379df0f0f3..58bc5e9164f4 100644
--- a/pkgs/development/python-modules/adlfs/default.nix
+++ b/pkgs/development/python-modules/adlfs/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "adlfs";
-  version = "2026.2.0";
+  version = "2026.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "adlfs";
     tag = finalAttrs.version;
-    hash = "sha256-wpj0MTpP5fBKTWA7sy4eRQo084pc+oNZgHVieC5NL2A=";
+    hash = "sha256-lqEyREVMdo59NhDZVdOb+w2bf5JVDg/nQHYhC+hKglo=";
   };
 
   build-system = [

From 69923695368f2fb25c1676327447b0893dc13ee6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 02:27:41 +0000
Subject: [PATCH 192/336] llama-cpp: 8733 -> 8770

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index ee304e3febeb..1d55ec4165a8 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -78,7 +78,7 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "8733";
+  version = "8770";
 
   outputs = [
     "out"
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-hHySLday/Kz0jNPLxbDxZXL/1O2VOBPG7fNaBLkD6tc=";
+    hash = "sha256-f2LQzQkv5UymRzqtdbgmVTlA8gdpwXu7H7pRyKGzlzk=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -121,7 +121,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ++ [ openssl ];
 
   npmRoot = "tools/server/webui";
-  npmDepsHash = "sha256-eeftjKt0FuS0Dybez+Iz9VTVMA4/oQVh+3VoIqvhVMw=";
+  npmDepsHash = "sha256-RAFtsbBGBjteCt5yXhrmHL39rIDJMCFBETgzId2eRRk=";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src patches;

From 0183d57188dc3b84dd10d7856dc23c4f21bf2405 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 02:36:26 +0000
Subject: [PATCH 193/336] stackql: 0.10.383 -> 0.10.421

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

diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix
index 98fe217104e1..3bf963480ca9 100644
--- a/pkgs/by-name/st/stackql/package.nix
+++ b/pkgs/by-name/st/stackql/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "stackql";
-  version = "0.10.383";
+  version = "0.10.421";
 
   src = fetchFromGitHub {
     owner = "stackql";
     repo = "stackql";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ISbK7O3nupV0BgpneuI3B5xPxGDzwMaNy8wFgZPGKtE=";
+    hash = "sha256-POHOGkjnf9zwg4mUpd0dyQXQvSitjwB+6wieVvI8DaE=";
   };
 
-  vendorHash = "sha256-xIiBkearGbIUVHs1G+DSvf2y4qjHI5dU37GwapMTtRk=";
+  vendorHash = "sha256-go1i5xFt3AE+K37+uZz9sjjsgD521fZ7/nPu26531Q8=";
 
   ldflags = [
     "-s"

From b0a385a761fbf8acfa72097722cbfa0254b24be4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 02:42:11 +0000
Subject: [PATCH 194/336] tun2proxy: 0.7.19 -> 0.7.20

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

diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix
index 40f205111f98..24f56d2752b8 100644
--- a/pkgs/by-name/tu/tun2proxy/package.nix
+++ b/pkgs/by-name/tu/tun2proxy/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tun2proxy";
-  version = "0.7.19";
+  version = "0.7.20";
 
   src = fetchCrate {
     pname = "tun2proxy";
     inherit (finalAttrs) version;
-    hash = "sha256-mg1GGtWCjxSPhlb0pjFNPVTblZWfUXQa3643T9siD20=";
+    hash = "sha256-nc12hjKOUGuxkNsbTMkHYv4HSLGwemx2VKv18u0rvn8=";
   };
 
-  cargoHash = "sha256-ZoLy3iknPUq2OmXQUomVVWij+mexixB6eDvGhrlsWDk=";
+  cargoHash = "sha256-iK5lUu6HWaNMA0I+sIpUr5pNwI05szctxzW6cPSyH3g=";
 
   env.GIT_HASH = "000000000000000000000000000000000000000000000000000";
 

From 26c921630420591a4d819b6d9fce3356bdef20fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 03:06:24 +0000
Subject: [PATCH 195/336] nushell: 0.111.0 -> 0.112.1

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

diff --git a/pkgs/by-name/nu/nushell/package.nix b/pkgs/by-name/nu/nushell/package.nix
index 923b5481191a..2555ec7ad100 100644
--- a/pkgs/by-name/nu/nushell/package.nix
+++ b/pkgs/by-name/nu/nushell/package.nix
@@ -24,16 +24,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # NOTE: when updating this to a new non-patch version, please also try to
   # update the plugins. Plugins only work if they are compiled for the same
   # major/minor version.
-  version = "0.111.0";
+  version = "0.112.1";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nushell";
     tag = finalAttrs.version;
-    hash = "sha256-/jS75aVUCLWDq3zw8yv2pUjUneyYSngfELuKfDQtqqA=";
+    hash = "sha256-y0EfP95XEVvse0xaSWK5Yr748tTVYRG7Bx+Qf5JrlYY=";
   };
 
-  cargoHash = "sha256-7hXmBNvNRdO4pXfF7RNcPrB7BmKL/BWqjQoz6pB4P2A=";
+  cargoHash = "sha256-Y/yaWj2akccehFVxrGHrsjzZd02L8qE9KoSSwzAeEwg=";
 
   nativeBuildInputs = [
     pkg-config

From 32d63f904e4ddc3573ab6874263bd76b450cc8dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 03:27:05 +0000
Subject: [PATCH 196/336] grafanaPlugins.frser-sqlite-datasource: 4.0.1 ->
 4.0.2

---
 .../grafana/plugins/frser-sqlite-datasource/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
index 9f2eb3166a9f..12a1053d3dae 100644
--- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "frser-sqlite-datasource";
-  version = "4.0.1";
-  zipHash = "sha256-hjjhNZlez8SXvpy91D/mtJHavH8oiLKgt/4a2vnI4fU=";
+  version = "4.0.2";
+  zipHash = "sha256-soRmlYBhFhUoQmSGJC6mMP+UH7nqKzBTVItOk2WFggs=";
   meta = {
     description = "Use a SQLite database as a data source in Grafana";
     license = lib.licenses.asl20;

From 0af53ba82da4e2b8d2f5e3838c32e59186cd6485 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 04:54:43 +0000
Subject: [PATCH 197/336] searxng: 0-unstable-2026-04-05 ->
 0-unstable-2026-04-11

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

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index 867d9dd1379d..03830fcc199a 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -13,14 +13,14 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2026-04-05";
+    version = "0-unstable-2026-04-11";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "474b0a55b0cb09a3bb6e18d5579836058b075584";
-      hash = "sha256-xRI9JpF/Kx0DNZeGS1CW25j7DVq0fs6tlrGSjcl6k1Y=";
+      rev = "9e08a6771f196a2d47803e9fcdc6994fa6457509";
+      hash = "sha256-I9ghd2mWlujfldeh5LXLSSh5X6CsHu5zlzL8JCcREqk=";
     };
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];

From f9826b3c639e5bd3fac3085e36af26f6006469ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 05:29:15 +0000
Subject: [PATCH 198/336] serie: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 03c133028e14..aac622dd99fb 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "serie";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tNMNbxPuWNXfBdQglq6PekJV93AdhO+zqAA+dyNqdcQ=";
+    hash = "sha256-/w/LKU2ObPjoO7RQ5HehCAqWv3Hfu7a+6Rk+rPx5MSM=";
   };
 
-  cargoHash = "sha256-UWrnhczknl/F5gSA9S4W+Ub5zzB7XuQ358d7XVXRjjQ=";
+  cargoHash = "sha256-JeK2UIlG4MmOxGPxy2HbFTgpi14/zyibuFQyrQooItg=";
 
   nativeCheckInputs = [ gitMinimal ];
 

From 3c3a7088fb2f8faac07687c068f4e8f122d15295 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 05:41:57 +0000
Subject: [PATCH 199/336] proton-pass-cli: 1.9.0 -> 1.10.0

---
 pkgs/by-name/pr/proton-pass-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix
index cbd430e0e3dc..e95f16194fcd 100644
--- a/pkgs/by-name/pr/proton-pass-cli/package.nix
+++ b/pkgs/by-name/pr/proton-pass-cli/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proton-pass-cli";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
 
@@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64";
-        hash = "sha256-mLYtw8ON2B+RUXVkD10VyI03d3yrdwFFz8giDb/PiNg=";
+        hash = "sha256-tOHXJl4R27rtuXlsqAQ8XFpOJ7Pc1IEcnla85Myn7N0=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
-        hash = "sha256-dg7jNFrzuIeXKN3wV3nj92acwP1lqE3QHsuiosjrvLw=";
+        hash = "sha256-zJQfWhiNk/noQbrhnxgEqGHZwccsyV2FX3sEOpUGTYQ=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
-        hash = "sha256-C9nWUikfaCfroVwz4C9K9dNMUpP6kbpHuuHMRTch5aU=";
+        hash = "sha256-usmOErL5BeZ2s4VrShr4fYcO5ibBBaBJuk3oPtjf884=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
-        hash = "sha256-m3HllX9YAmavVbkAyJ5h69QCcH2i4Ux+p17e0/VGovQ=";
+        hash = "sha256-lkB4I5Srj+r+pLvd2HEch/NPFfHvhVfgu6RC7yh/njY=";
       };
     };
     updateScript = writeShellScript "update-proton-pass-cli" ''

From 33241219884dd5a539e872b70acfa1c308ad0c27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 05:50:14 +0000
Subject: [PATCH 200/336] python3Packages.nominatim-api: 5.3.0 -> 5.3.1

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

diff --git a/pkgs/by-name/no/nominatim/nominatim-api.nix b/pkgs/by-name/no/nominatim/nominatim-api.nix
index 0280d402f82b..6ae83eec07eb 100644
--- a/pkgs/by-name/no/nominatim/nominatim-api.nix
+++ b/pkgs/by-name/no/nominatim/nominatim-api.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "nominatim";
-  version = "5.3.0";
+  version = "5.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
     tag = "v${version}";
-    hash = "sha256-cICDzsEJ2yRi8PaQpjfVC9ZI3KeQPiqGu4U1nTxxBvk=";
+    hash = "sha256-3WU8n121JbFFZTntcKG6t0x2mC1AzI97q/fMe/UTGTs=";
   };
 
   postPatch = ''

From b975b60bef87715638f95d25dd0570be4901d527 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 05:51:37 +0000
Subject: [PATCH 201/336] wasmtime: 43.0.0 -> 43.0.1

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

diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix
index 5200b7c99978..73ca5330e8f2 100644
--- a/pkgs/by-name/wa/wasmtime/package.nix
+++ b/pkgs/by-name/wa/wasmtime/package.nix
@@ -13,20 +13,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasmtime";
-  version = "43.0.0";
+  version = "43.0.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasmtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zCU3CtqbqagSWQZULvTxCRwK709ZfyL9PGtjJpNAYQE=";
+    hash = "sha256-KnsnR9SJoAfKsEIwKRy+AKEdDFQMBfIwISJpEef8kFo=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-WJz7J9FHGRqni889o2omkC1K+rwZ8iM6SarT1nd1p0Q=";
+  cargoHash = "sha256-nfO16qAYL2NXaV9S1HTPIH+pyYLjWCo2I1EONJf7W74=";
   cargoBuildFlags = [
     "--package"
     "wasmtime-cli"

From e975a9293a5c983f62b1d396a4b59a0f67475fe2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 06:07:33 +0000
Subject: [PATCH 202/336] gauge-unwrapped: 1.6.29 -> 1.6.30

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

diff --git a/pkgs/by-name/ga/gauge-unwrapped/package.nix b/pkgs/by-name/ga/gauge-unwrapped/package.nix
index db7335577ee3..7c466c165d38 100644
--- a/pkgs/by-name/ga/gauge-unwrapped/package.nix
+++ b/pkgs/by-name/ga/gauge-unwrapped/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "gauge";
-  version = "1.6.29";
+  version = "1.6.30";
 
   patches = [
     # adds a check which adds an error message when trying to
@@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
     owner = "getgauge";
     repo = "gauge";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mZmIxss0W5eufz7EzchjVxdXpM/npbIBWls5C3KYVbY=";
+    hash = "sha256-tAS2FVg1TCWyRlEMDcepC+riYxzIOTh2sHBbHL+TrsU=";
   };
 
-  vendorHash = "sha256-nZPRjCzYSdtx6Q4VGdTunfK9+4X14l3gXwMLJc855JY=";
+  vendorHash = "sha256-pCnf8wtj44eubq03noZs7MGxzssWFFn3AhL1v0icLa8=";
 
   excludedPackages = [
     "build"

From fcb8241fade6a448634815c878dbe5043f0fa900 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 06:15:08 +0000
Subject: [PATCH 203/336] lazyhetzner: 1.1.1 -> 1.2.0

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

diff --git a/pkgs/by-name/la/lazyhetzner/package.nix b/pkgs/by-name/la/lazyhetzner/package.nix
index fb7e20ce1003..03ab775dbc4d 100644
--- a/pkgs/by-name/la/lazyhetzner/package.nix
+++ b/pkgs/by-name/la/lazyhetzner/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lazyhetzner";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "grammeaway";
     repo = "lazyhetzner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QFtlcio3yVyltoTqYH8RJknx/tKpn6dNu1WwnLLJY/A=";
+    hash = "sha256-G7IfB/tnhPKf/tG0b2HKUshc4x+AySiHlJZNSlOJr2I=";
 
     leaveDotGit = true;
     postFetch = ''

From 2abc0a9047617ca44724c31089ac25e4563d753e Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Mon, 13 Apr 2026 08:22:33 +0200
Subject: [PATCH 204/336] home-assistant-custom-components.mitsubishi: ignore
 pymitsubishi version requirement

---
 .../home-assistant/custom-components/mitsubishi/package.nix     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
index 9777ef932b99..050a1b771cd3 100644
--- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
@@ -24,6 +24,8 @@ buildHomeAssistantComponent rec {
     pymitsubishi
   ];
 
+  ignoreVersionRequirement = [ "pymitsubishi" ];
+
   nativeCheckInputs = [
     pytest-cov-stub
     pytestCheckHook

From f243a23777735602de42dfc110e4ae6c7d448294 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 06:46:01 +0000
Subject: [PATCH 205/336] nzbhydra2: 8.5.3 -> 8.5.4

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

diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
index dcb4014ce633..a55fc21b5ee5 100644
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@@ -35,13 +35,13 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "nzbhydra2";
-  version = "8.5.3";
+  version = "8.5.4";
 
   src = fetchFromGitHub {
     owner = "theotherp";
     repo = "nzbhydra2";
     tag = "v${version}";
-    hash = "sha256-yaXHbm2gBvmmST4Rurn7s4a1F7GSKfuYhswIDl8bTMA=";
+    hash = "sha256-chP++0ve734wOO7qNy4f+4KyYgBWlkzjaMJiueW4LkM=";
   };
 
   mvnHash = "sha256-dodZT40zNqfaPd8VxfNYY10VrFNlL4xESDdTrgcFaaY=";

From 8dffd3b19c046afa7c89792f21ecc56c5adcb6a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 09:01:27 +0200
Subject: [PATCH 206/336] python3Packages.tencentcloud-sdk-python: 3.1.75 ->
 3.1.76

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.75...3.1.76

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.76/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 57c4df9eb4d2..a15d64ebe8ee 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.75";
+  version = "3.1.76";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-O/heoxVZybJYZF3qFcuKXgbncClfKK21WpXGqtwxw58=";
+    hash = "sha256-21BXGAPXCyRHTqPSUjvWWbrEbxAqqeSZavqIZ6sax3Q=";
   };
 
   build-system = [ setuptools ];

From 69ad71b86ac4d63e7e8e1846f6bfedb28081f76d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 09:01:50 +0200
Subject: [PATCH 207/336] python3Packages.publicsuffixlist: 1.0.2.20260411 ->
 1.0.2.20260412

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20260412-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index c8ee8154e42f..383cdc6b6ffd 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "publicsuffixlist";
-  version = "1.0.2.20260411";
+  version = "1.0.2.20260412";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-24VElVHBxL7czt72+iDuHxw8V+ivpcOTx0wNDdmcPWM=";
+    hash = "sha256-wRQDRrKd86CZZ4bVBQXZKeeb25EQ+rUHWT+P5hEItnE=";
   };
 
   postPatch = ''

From 1b80c482c1dba8008e881de6696c579af40edc35 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Apr 2026 11:05:38 +0200
Subject: [PATCH 208/336] python3Packages.iamdata: 0.1.202604101 ->
 0.1.202604111

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202604101...v0.1.202604111

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

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 1963012fec26..751877b466e1 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202604101";
+  version = "0.1.202604111";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YA6q5BMQ+71Jn54KEqAqt7LMg+t36f56paDtMYQcHGc=";
+    hash = "sha256-5SgvH8KUIjGdngQwhgAHZmWNP9upTtM24fYntstF1rY=";
   };
 
   __darwinAllowLocalNetworking = true;

From 20e1f7625b37fd1582065bdd7c8dd9a27340fd5f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 09:02:20 +0200
Subject: [PATCH 209/336] python3Packages.iamdata: 0.1.202604111 ->
 0.1.202604131

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202604111...v0.1.202604131

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

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 751877b466e1..e3dbdda8e4a5 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202604111";
+  version = "0.1.202604131";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5SgvH8KUIjGdngQwhgAHZmWNP9upTtM24fYntstF1rY=";
+    hash = "sha256-NFEhmbq0vAn0mZtdVnzyU8TWz3FaYbodFz6wMKOdjTk=";
   };
 
   __darwinAllowLocalNetworking = true;

From ddd2d118e9fd0444cc129fb310d1149a80f1d1c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 07:08:56 +0000
Subject: [PATCH 210/336] libretro.twenty-fortyeight: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-10

---
 .../emulators/libretro/cores/twenty-fortyeight.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix b/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix
index af41c0b0ef4d..352f9c8ff282 100644
--- a/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix
+++ b/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "2048";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-2048";
-    rev = "1892de39d80ec37e1fac79729cd91917b21f1349";
-    hash = "sha256-lNcDdkiWiXhvwwpzMnceTDY+mJl1JTZfGCY+WIOvrP8=";
+    rev = "c90437d3c3913999624deca3fb55ecfa632b72c4";
+    hash = "sha256-dE3PanK+rpf01R4aoD3KMwVhEVvmmVS2klVPQUGTUC0=";
   };
 
   meta = {

From 10d1334ec69a21c1b0cc044c457fed728cae500f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 09:13:28 +0200
Subject: [PATCH 211/336] python3Packages.microsoft-kiota-abstractions: migrate
 to finalAttrs

---
 .../microsoft-kiota-abstractions/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
index a3912c2405ab..5badc3aa4ced 100644
--- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
@@ -12,7 +12,7 @@
   gitUpdater,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "microsoft-kiota-abstractions";
   version = "1.10.1";
   pyproject = true;
@@ -20,11 +20,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
-    tag = "microsoft-kiota-abstractions-v${version}";
+    tag = "microsoft-kiota-abstractions-v${finalAttrs.version}";
     hash = "sha256-KBCjVNZDPMh0wxWm8UVLsrfl2AYp3rKMjAT5c8F7+64=";
   };
 
-  sourceRoot = "${src.name}/packages/abstractions/";
+  sourceRoot = "${finalAttrs.src.name}/packages/abstractions/";
 
   build-system = [ poetry-core ];
 
@@ -57,8 +57,8 @@ buildPythonPackage rec {
   meta = {
     description = "Abstractions library for Kiota generated Python clients";
     homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/abstractions/";
-    changelog = "https://github.com/microsoft/kiota-python/releases/tag/${src.tag}";
+    changelog = "https://github.com/microsoft/kiota-python/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 1db487ee6f8e88aed3ddd611348b708b8bd48578 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 09:19:05 +0200
Subject: [PATCH 212/336] python3Packages.claude-agent-sdk: 0.1.56 -> 0.1.58

Diff: https://github.com/anthropics/claude-agent-sdk-python/compare/v0.1.56...v0.1.58

Changelog: https://github.com/anthropics/claude-agent-sdk-python/blob/v0.1.58/CHANGELOG.md
---
 pkgs/development/python-modules/claude-agent-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix
index 1e7387e84dfe..059e74dce539 100644
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "claude-agent-sdk";
-  version = "0.1.56";
+  version = "0.1.58";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "claude-agent-sdk-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lpgRTDaGJGFnhs60we+YqBurvMi/dmC5Y80RfJP8NS0=";
+    hash = "sha256-Xpl6/9+e1MFjCG/5fCzubAFIfLejdMPnTLmNmwglEy4=";
   };
 
   build-system = [ hatchling ];

From 4efedc535c93e052e1866f27a84e4fd5fbd6f687 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 09:25:25 +0200
Subject: [PATCH 213/336] python3Packages.aioopenexchangerates: 0.6.21 -> 0.7.0

Changelog: https://github.com/MartinHjelmare/aioopenexchangerates/blob/v0.7.0/CHANGELOG.md
---
 .../python-modules/aioopenexchangerates/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix
index 12ecf2f9b239..510309a98570 100644
--- a/pkgs/development/python-modules/aioopenexchangerates/default.nix
+++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix
@@ -5,27 +5,27 @@
   buildPythonPackage,
   fetchFromGitHub,
   mashumaro,
-  poetry-core,
   pytest-aiohttp,
   pytest-cov-stub,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "aioopenexchangerates";
-  version = "0.6.21";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MartinHjelmare";
     repo = "aioopenexchangerates";
     tag = "v${version}";
-    hash = "sha256-yPi2k1ajW+X78dF3OJTdGR3h8mzNfYCsW0P8baKUjoA=";
+    hash = "sha256-pNjpeoXBlz2bdUeEsOlW7RJmbKTZGuBVTLHymGHwAiY=";
   };
 
   pythonRelaxDeps = [ "pydantic" ];
 
-  build-system = [ poetry-core ];
+  build-system = [ setuptools ];
 
   dependencies = [
     aiohttp
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Library for the Openexchangerates API";
     homepage = "https://github.com/MartinHjelmare/aioopenexchangerates";
     changelog = "https://github.com/MartinHjelmare/aioopenexchangerates/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }

From 2975f3bf8fa611d0a7d4ba3d407b16fecb753030 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 09:26:33 +0200
Subject: [PATCH 214/336] python3Packages.aioopenexchangerates: migrate to
 finalAttrs

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

diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix
index 510309a98570..e19043d9043e 100644
--- a/pkgs/development/python-modules/aioopenexchangerates/default.nix
+++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix
@@ -11,7 +11,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "aioopenexchangerates";
   version = "0.7.0";
   pyproject = true;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MartinHjelmare";
     repo = "aioopenexchangerates";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-pNjpeoXBlz2bdUeEsOlW7RJmbKTZGuBVTLHymGHwAiY=";
   };
 
@@ -44,8 +44,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library for the Openexchangerates API";
     homepage = "https://github.com/MartinHjelmare/aioopenexchangerates";
-    changelog = "https://github.com/MartinHjelmare/aioopenexchangerates/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/MartinHjelmare/aioopenexchangerates/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From ec64070f7f45b81197ce245e7ca5545eb965280a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 09:31:20 +0200
Subject: [PATCH 215/336] python3Packages.nominatim: migrate to finalAttrs

---
 pkgs/by-name/no/nominatim/nominatim-api.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/no/nominatim/nominatim-api.nix b/pkgs/by-name/no/nominatim/nominatim-api.nix
index 6ae83eec07eb..762257db1d96 100644
--- a/pkgs/by-name/no/nominatim/nominatim-api.nix
+++ b/pkgs/by-name/no/nominatim/nominatim-api.nix
@@ -12,7 +12,7 @@
   sqlalchemy,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "nominatim";
   version = "5.3.1";
   pyproject = true;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-3WU8n121JbFFZTntcKG6t0x2mC1AzI97q/fMe/UTGTs=";
   };
 
@@ -34,9 +34,7 @@ buildPythonPackage rec {
     cd packaging/nominatim-api
   '';
 
-  build-system = [
-    hatchling
-  ];
+  build-system = [ hatchling ];
 
   dependencies = [
     async-timeout
@@ -61,4 +59,4 @@ buildPythonPackage rec {
       ngi
     ];
   };
-}
+})

From 1e645638fbcb684091ee8555a3d51e67186bc179 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 12 Apr 2026 10:19:49 +0300
Subject: [PATCH 216/336] python3Packages.beets-alternatives: fix a test
 failing with beets 2.9.0

---
 .../python-modules/beets-alternatives/default.nix    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/beets-alternatives/default.nix b/pkgs/development/python-modules/beets-alternatives/default.nix
index 3cfc70696255..ec30ac64bade 100644
--- a/pkgs/development/python-modules/beets-alternatives/default.nix
+++ b/pkgs/development/python-modules/beets-alternatives/default.nix
@@ -32,6 +32,18 @@ buildPythonPackage rec {
     hash = "sha256-leZYXf6Oo/jAKbnJbP+rTnuRsh9P1BQXYAbthMNT60A=";
   };
 
+  patches = [
+    # Fixes a failing test, see:
+    # https://github.com/geigerzaehler/beets-alternatives/issues/212
+    (fetchpatch {
+      url = "https://github.com/geigerzaehler/beets-alternatives/commit/8b75974636897aabcf2ca75fb0987f7beb68f50f.patch";
+      hash = "sha256-lIJwuf3UklcJM4m7CO2+aNpPekHXuC5rpPVjK+kb+FQ=";
+      includes = [
+        "test/cli_test.py"
+      ];
+    })
+  ];
+
   build-system = [
     hatchling
   ];

From 9704065dabed871b833b5678cb86878ed60fad63 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 12 Apr 2026 12:07:53 +0300
Subject: [PATCH 217/336] python3Packages.beetcamp: 0.24.1 -> 0.24.2

Diff: https://github.com/snejus/beetcamp/compare/0.24.1...0.24.2
---
 pkgs/development/python-modules/beetcamp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/beetcamp/default.nix b/pkgs/development/python-modules/beetcamp/default.nix
index b279660c821c..3b8e97d9234a 100644
--- a/pkgs/development/python-modules/beetcamp/default.nix
+++ b/pkgs/development/python-modules/beetcamp/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "beetcamp";
-  version = "0.24.1";
+  version = "0.24.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snejus";
     repo = "beetcamp";
     tag = finalAttrs.version;
-    hash = "sha256-Oe5pZ4gYgqBHuzt9LBe4G14+RYXrNL+L5GIGMMflyMI=";
+    hash = "sha256-AMHj7rsPAxUUvVg6vri2NnkO9+5NAVwGrWLvNvOtlLs=";
   };
 
   patches = [

From 4e0ae8e893d257219815c7a9ec89e5bac31c2cd2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 5 Jan 2026 15:36:07 +0100
Subject: [PATCH 218/336] python313Packages.gitpython: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix
index 31d79fc7167e..d49ad4f323c9 100644
--- a/pkgs/development/python-modules/gitpython/default.nix
+++ b/pkgs/development/python-modules/gitpython/default.nix
@@ -8,7 +8,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gitpython";
   version = "3.1.46";
   pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gitpython-developers";
     repo = "GitPython";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-ymuJlxGEmWwvmVFYiIW23k5Gl2h09ugFLPosnUWg5S0=";
   };
 
@@ -41,8 +41,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python Git Library";
     homepage = "https://github.com/gitpython-developers/GitPython";
-    changelog = "https://github.com/gitpython-developers/GitPython/blob/${src.tag}/doc/source/changes.rst";
+    changelog = "https://github.com/gitpython-developers/GitPython/blob/${finalAttrs.src.tag}/doc/source/changes.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 82a11027ac61cd4f5dba058f97c3bc0a261ef5e7 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 13 Apr 2026 10:12:33 +0200
Subject: [PATCH 219/336] glpi-agent: 1.16 -> 1.17

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

diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix
index 21a04c5825a0..8a23e9f21d2b 100644
--- a/pkgs/by-name/gl/glpi-agent/package.nix
+++ b/pkgs/by-name/gl/glpi-agent/package.nix
@@ -16,13 +16,13 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "glpi-agent";
-  version = "1.16";
+  version = "1.17";
 
   src = fetchFromGitHub {
     owner = "glpi-project";
     repo = "glpi-agent";
     tag = version;
-    hash = "sha256-JocNClbFH6fSZJDAVQCPaRvHrkLboNbQVTpyHjOV7go=";
+    hash = "sha256-ug3/ullvEn98UUg4fzDQl5PjVFlbgbaIiz0tuWz9XeA=";
   };
 
   postPatch = ''

From 577b32b084a372c19629804835076e8446781593 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 11 Apr 2026 18:44:20 +0200
Subject: [PATCH 220/336] treewide: remove nobody/nogroup from examples

The nobody/nogroup pair of should only ever be used by NFS to map remote
uid/guids that are missing locally. Every other use is an abuse and
generally a security concern.

Specifically, they're NOT some special user/group that can be used to
run programs without giving them any privileges. In fact, the opposite
is true: the more programs you run as nobody/nogroup the more valuable
files and resources become accessible to "nobody" and consequently
exposed to a potentially compromised program.

This removes mentions of nobody/nogroup from documentation and examples.
---
 nixos/modules/hardware/cpu/x86-msr.nix        |  4 +-
 .../modules/services/networking/nftables.nix  |  3 +-
 nixos/modules/services/networking/ocserv.nix  |  4 +-
 .../services/web-servers/mighttpd2.nix        |  6 +-
 .../modules/virtualisation/oci-containers.nix |  2 +-
 pkgs/build-support/docker/default.nix         |  1 -
 pkgs/build-support/docker/examples.nix        | 86 +++++++++----------
 7 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/nixos/modules/hardware/cpu/x86-msr.nix b/nixos/modules/hardware/cpu/x86-msr.nix
index 9d8216f16d9d..60c5f5fe8ca9 100644
--- a/nixos/modules/hardware/cpu/x86-msr.nix
+++ b/nixos/modules/hardware/cpu/x86-msr.nix
@@ -45,13 +45,13 @@ in
       owner = mkOption {
         type = str;
         default = "root";
-        example = "nobody";
+        example = "alice";
         description = "Owner ${set}";
       };
       group = mkOption {
         type = str;
         default = defaultGroup;
-        example = "nobody";
+        example = "users";
         description = "Group ${set}";
       };
       mode = mkOption {
diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
index 40718c879ccf..5a6671d1ccf3 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@@ -111,7 +111,8 @@ in
       type = lib.types.lines;
       default = "";
       example = lib.literalExpression ''
-        sed 's/skgid meadow/skgid nogroup/g' -i ruleset.conf
+        # replace users/groups that don't exist in the test
+        sed 's/skgid meadow/skgid root/g' -i ruleset.conf
       '';
       description = ''
         This script gets run before the ruleset is checked. It can be used to
diff --git a/nixos/modules/services/networking/ocserv.nix b/nixos/modules/services/networking/ocserv.nix
index 6c403a9b3427..8433faef86a7 100644
--- a/nixos/modules/services/networking/ocserv.nix
+++ b/nixos/modules/services/networking/ocserv.nix
@@ -34,8 +34,8 @@ in
         auth = "plain[passwd=./sample.passwd]"
         tcp-port = 443
         udp-port = 443
-        run-as-user = nobody
-        run-as-group = nogroup
+        run-as-user = ocserv
+        run-as-group = ocserv
         socket-file = /run/ocserv-socket
         server-cert = certs/server-cert.pem
         server-key = certs/server-key.pem
diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix
index 09f5f847f74a..7211016f2e85 100644
--- a/nixos/modules/services/web-servers/mighttpd2.nix
+++ b/nixos/modules/services/web-servers/mighttpd2.nix
@@ -24,10 +24,8 @@ in
         # IP address or "*"
         Host: *
         Debug_Mode: Yes # Yes or No
-        # If available, "nobody" is much more secure for User:.
-        User: root
-        # If available, "nobody" is much more secure for Group:.
-        Group: root
+        User: mighttpd2
+        Group: mighttpd2
         Pid_File: /run/mighty.pid
         Logging: Yes # Yes or No
         Log_File: /var/log/mighty # The directory must be writable by User:
diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index cf1076b4d99a..b7dde1126933 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -197,7 +197,7 @@ let
             Override the username or UID (and optionally groupname or GID) used
             in the container.
           '';
-          example = "nobody:nogroup";
+          example = "alice:users";
         };
 
         volumes = mkOption {
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index ccc6709160ba..92e003c64afb 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -121,7 +121,6 @@ rec {
     inherit
       buildImage
       buildLayeredImage
-      fakeNss
       pullImage
       shadowSetup
       buildImageWithNixDb
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index d2ff74ded00b..6f7568f492c2 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -11,7 +11,6 @@
   pkgs,
   buildImage,
   buildLayeredImage,
-  fakeNss,
   pullImage,
   shadowSetup,
   buildImageWithNixDb,
@@ -27,11 +26,37 @@ let
   };
   evalMinimalConfig = module: nixosLib.evalModules { modules = [ module ]; };
 
+  nonRootShadowSetup =
+    {
+      user,
+      uid,
+      gid ? uid,
+    }:
+    with pkgs;
+    [
+      (writeTextDir "etc/shadow" ''
+        root:!x:::::::
+        ${user}:!:::::::
+      '')
+      (writeTextDir "etc/passwd" ''
+        root:x:0:0::/root:${runtimeShell}
+        ${user}:x:${toString uid}:${toString gid}::/home/${user}:
+      '')
+      (writeTextDir "etc/group" ''
+        root:x:0:
+        ${user}:x:${toString gid}:
+      '')
+      (writeTextDir "etc/gshadow" ''
+        root:x::
+        ${user}:x::
+      '')
+    ];
+
   nginxArguments =
     let
       nginxPort = "80";
       nginxConf = pkgs.writeText "nginx.conf" ''
-        user nobody nobody;
+        user nginx nginx;
         daemon off;
         error_log /dev/stdout info;
         pid /dev/null;
@@ -55,9 +80,12 @@ let
       name = "nginx-container";
       tag = "latest";
       contents = [
-        fakeNss
         pkgs.nginx
-      ];
+      ]
+      ++ nonRootShadowSetup {
+        uid = 999;
+        user = "nginx";
+      };
 
       extraCommands = ''
         mkdir -p tmp/nginx_client_body
@@ -596,46 +624,18 @@ rec {
   };
 
   # buildLayeredImage with non-root user
-  bashLayeredWithUser =
-    let
-      nonRootShadowSetup =
-        {
-          user,
-          uid,
-          gid ? uid,
-        }:
-        with pkgs;
-        [
-          (writeTextDir "etc/shadow" ''
-            root:!x:::::::
-            ${user}:!:::::::
-          '')
-          (writeTextDir "etc/passwd" ''
-            root:x:0:0::/root:${runtimeShell}
-            ${user}:x:${toString uid}:${toString gid}::/home/${user}:
-          '')
-          (writeTextDir "etc/group" ''
-            root:x:0:
-            ${user}:x:${toString gid}:
-          '')
-          (writeTextDir "etc/gshadow" ''
-            root:x::
-            ${user}:x::
-          '')
-        ];
-    in
-    pkgs.dockerTools.buildLayeredImage {
-      name = "bash-layered-with-user";
-      tag = "latest";
-      contents = [
-        pkgs.bash
-        pkgs.coreutils
-      ]
-      ++ nonRootShadowSetup {
-        uid = 999;
-        user = "somebody";
-      };
+  bashLayeredWithUser = pkgs.dockerTools.buildLayeredImage {
+    name = "bash-layered-with-user";
+    tag = "latest";
+    contents = [
+      pkgs.bash
+      pkgs.coreutils
+    ]
+    ++ nonRootShadowSetup {
+      uid = 999;
+      user = "somebody";
     };
+  };
 
   # basic example, with cross compilation
   cross =

From 4d90b8bb6c1540de08f374bf9732868e3b926c51 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 11 Apr 2026 18:54:30 +0200
Subject: [PATCH 221/336] nixos/tests/wpa_supplicant: do not use nobody

---
 nixos/tests/wpa_supplicant.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix
index 8b3321822b03..a16547712769 100644
--- a/nixos/tests/wpa_supplicant.nix
+++ b/nixos/tests/wpa_supplicant.nix
@@ -273,6 +273,11 @@ in
       # add a virtual wlan interface
       boot.kernelModules = [ "mac80211_hwsim" ];
 
+      users.users.alice = {
+        isNormalUser = true;
+        group = "users";
+      };
+
       # wireless client
       networking.wireless = {
         enable = lib.mkOverride 0 true;
@@ -283,7 +288,7 @@ in
     };
 
     testScript = ''
-      wpa_cli = "sudo -u nobody -g wpa_supplicant wpa_cli"
+      wpa_cli = "sudo -u alice -g wpa_supplicant wpa_cli"
 
       with subtest("Daemon is running and accepting connections"):
           machine.wait_for_unit("wpa_supplicant-wlan1.service")

From 1f35c7befee1c2372b2237ab4bdbf8f9df680702 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 11 Apr 2026 20:47:45 +0200
Subject: [PATCH 222/336] povray: do not use nobody/nogroup

Instead of patching the user to nobody, point HOME to TMPDIR, so the
configure script discovers the build user on its own.
---
 pkgs/by-name/po/povray/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/povray/package.nix b/pkgs/by-name/po/povray/package.nix
index a1b284a9a339..a2744bfdd56f 100644
--- a/pkgs/by-name/po/povray/package.nix
+++ b/pkgs/by-name/po/povray/package.nix
@@ -51,10 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
     cd unix
     ./prebuild.sh
     cd ..
+    export HOME=$TMPDIR
     sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in}
     sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in}
-    sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in}
-    sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in}
   '';
 
   # https://github.com/POV-Ray/povray/issues/460

From b8b939cdcca154895f718f65c33d9abfa1add3a4 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 12 Apr 2026 15:05:05 +0200
Subject: [PATCH 223/336] fetchfossil: do not use nobody

Set the admin to the current user instead of nobody.

Note: this doesn't seem to affect the output hash.
---
 pkgs/build-support/fetchfossil/builder.sh          | 2 +-
 pkgs/build-support/fetchfossil/nix-prefetch-fossil | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh
index 43462834b19e..0b66a129c3d8 100644
--- a/pkgs/build-support/fetchfossil/builder.sh
+++ b/pkgs/build-support/fetchfossil/builder.sh
@@ -6,7 +6,7 @@ echo "Cloning Fossil $url [$rev] into $out"
 export HOME=$(pwd)
 
 # We must explicitly set the admin user for the clone to something reasonable.
-fossil clone -A nobody "$url" fossil-clone.fossil
+fossil clone -A $(whoami) "$url" fossil-clone.fossil
 
 mkdir fossil-clone
 WORKDIR=$(pwd)
diff --git a/pkgs/build-support/fetchfossil/nix-prefetch-fossil b/pkgs/build-support/fetchfossil/nix-prefetch-fossil
index 0e1ce4d9c060..32762f86425f 100755
--- a/pkgs/build-support/fetchfossil/nix-prefetch-fossil
+++ b/pkgs/build-support/fetchfossil/nix-prefetch-fossil
@@ -77,7 +77,7 @@ export HOME="$tmpPath"
 echo "Fetching Fossil repository $url at revision $rev..." >&2
 
 # Clone the repository
-fossil clone -A nobody "$url" "$tmpPath/fossil-clone.fossil" >&2
+fossil clone -A $(whoami) "$url" "$tmpPath/fossil-clone.fossil" >&2
 
 # Create directory for checkout
 checkoutDir="$tmpPath/checkout"

From 3a63e649ca1cc16cd149521722a3202cf2513180 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 08:40:58 +0000
Subject: [PATCH 224/336] kiro-cli: 1.29.3 -> 1.29.8

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

diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix
index 7158edd10086..a4e0a5aed895 100644
--- a/pkgs/by-name/ki/kiro-cli/package.nix
+++ b/pkgs/by-name/ki/kiro-cli/package.nix
@@ -14,23 +14,23 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "kiro-cli";
-  version = "1.29.3";
+  version = "1.29.8";
 
   src =
     let
       darwinDmg = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
-        hash = "sha256-JjdZfkcWZhnGaVvTwgm1GdenM3OLhfVRYpuZ9Y/t/+E=";
+        hash = "sha256-fop1/P/MCCsz+SspvQLDDWn8e+Pry4iX6nAlcrilsmY=";
       };
     in
     {
       x86_64-linux = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz";
-        hash = "sha256-DD3eQ9lpV+M0d40AxnLP6dOw/fvdeuAcPWwpUMonuNk=";
+        hash = "sha256-oyLrb5fKyCusKGsijISxpqOWUJOM+TYqhYqX5kf1S4s=";
       };
       aarch64-linux = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
-        hash = "sha256-3c3zSSZNwY13Vr2k4raKaTp05XX4gh5LrAAvMU22UMM=";
+        hash = "sha256-UVpodniFUVlbL1NKuqmkdV4oY65wnD+FwGOKOycRRTA=";
       };
       x86_64-darwin = darwinDmg;
       aarch64-darwin = darwinDmg;

From 744084a69e28b42259ccb5a1f57445eb6978a14c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 08:45:28 +0000
Subject: [PATCH 225/336] air: 1.65.0 -> 1.65.1

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

diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix
index 894b43160725..0d7f385d5cf4 100644
--- a/pkgs/by-name/ai/air/package.nix
+++ b/pkgs/by-name/ai/air/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "air";
-  version = "1.65.0";
+  version = "1.65.1";
 
   src = fetchFromGitHub {
     owner = "air-verse";
     repo = "air";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pqvnX/PiipZM8jLBN6zN/yVnuCCk+aTII5AH0N4nHEM=";
+    hash = "sha256-omyWDW5bE+HfXQ2EQZKthB9t+jBEFcPSVtPss5qeoMI=";
   };
 
   vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw=";

From c7b840ca599968a0cf7b9fafc08539d9046faf96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 08:45:57 +0000
Subject: [PATCH 226/336] files-cli: 2.15.257 -> 2.15.264

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

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index f99dffe5e6c0..06263c18c7c8 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "files-cli";
-  version = "2.15.257";
+  version = "2.15.264";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ym9rmgs5TO24+rgtNyCD+r7Spxo5y0WK+ly3AVLwj2g=";
+    hash = "sha256-yfcGyGdCeRkMQS21B7vZPVRVvphhKVqUSN1Sw7CnhwM=";
   };
 
-  vendorHash = "sha256-iOAyeIA0eyE9sPoR2EM7477WcIH5GkPdCKs14oL52uE=";
+  vendorHash = "sha256-p6awrajP5n+QJLwMDMGd8U1yPwS9EP0dAhkQJF+ppzI=";
 
   ldflags = [
     "-s"

From 3b3ed2c2f7c0aff1883095c6257e42eb3d49e00d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 08:54:54 +0000
Subject: [PATCH 227/336] python3Packages.unifi-discovery: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix
index a508f25d1b33..7f1c1696901b 100644
--- a/pkgs/development/python-modules/unifi-discovery/default.nix
+++ b/pkgs/development/python-modules/unifi-discovery/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "unifi-discovery";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "unifi-discovery";
     tag = "v${version}";
-    hash = "sha256-/SsgBiCEfMYi3DccYKBZGoYX4egGW+bBIA/D73FaneE=";
+    hash = "sha256-pn8WRsYGbBy4EwQ1DufY2WbbVM65dM4h8ZReG+qkr6k=";
   };
 
   build-system = [ poetry-core ];

From f89111d314ec7a43f1a2c88f4e34f4bdc2777b92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 09:46:02 +0000
Subject: [PATCH 228/336] tcping-rs: 1.2.24 -> 1.2.26

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

diff --git a/pkgs/by-name/tc/tcping-rs/package.nix b/pkgs/by-name/tc/tcping-rs/package.nix
index 715ec913de2d..df108e82e57f 100644
--- a/pkgs/by-name/tc/tcping-rs/package.nix
+++ b/pkgs/by-name/tc/tcping-rs/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tcping-rs";
-  version = "1.2.24";
+  version = "1.2.26";
 
   src = fetchFromGitHub {
     owner = "lvillis";
     repo = "tcping-rs";
     tag = finalAttrs.version;
-    hash = "sha256-gsTZls5guqtDk8x+3q4nFYGwhr+TAV5iE9kiZgbmzCI=";
+    hash = "sha256-qcvoV57t36c230p7KRec9CBIb+F+dVeGU4EVs0DrREM=";
   };
 
-  cargoHash = "sha256-m/juo6+SPFAxQ7E2JgTkv47kxn4LhwfI4UGSDzHAXMc=";
+  cargoHash = "sha256-Y+Hv4oWHTzC/8DQ6/wQ3QLtDy/rqQs+89x312cYOpKY=";
 
   checkFlags = [
     # This test requires external network access

From f0412cc83f6fb1c3e9bd1e99d9842c3b9e9b570c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 11:48:18 +0200
Subject: [PATCH 229/336] python3Packages.unifi-discovery: migrate to
 finalAttrs

---
 .../python-modules/unifi-discovery/default.nix         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix
index 7f1c1696901b..693155141219 100644
--- a/pkgs/development/python-modules/unifi-discovery/default.nix
+++ b/pkgs/development/python-modules/unifi-discovery/default.nix
@@ -11,7 +11,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "unifi-discovery";
   version = "1.4.0";
   pyproject = true;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "unifi-discovery";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-pn8WRsYGbBy4EwQ1DufY2WbbVM65dM4h8ZReG+qkr6k=";
   };
 
@@ -44,9 +44,9 @@ buildPythonPackage rec {
   meta = {
     description = "Module to discover Unifi devices";
     homepage = "https://github.com/bdraco/unifi-discovery";
-    changelog = "https://github.com/bdraco/unifi-discovery/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    changelog = "https://github.com/bdraco/unifi-discovery/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 051da568320af663533b070b3affe2b775114752 Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Mon, 13 Apr 2026 09:41:08 +0000
Subject: [PATCH 230/336] buildVcode: replace glibc.bin with getconf

---
 pkgs/applications/editors/vscode/generic.nix | 29 ++++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index b2686a9df4e6..7f1b627c5ef0 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -3,9 +3,9 @@
   lib,
   coreutils,
   gawk,
+  getconf,
   gnugrep,
   gnused,
-  glibc,
   jq,
   copyDesktopItems,
   makeDesktopItem,
@@ -354,18 +354,23 @@ stdenv.mkDerivation (
               "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdbusmenu ]}"
           }
         --prefix PATH : ${
-          lib.makeBinPath [
-            # for moving files to trash
-            glib
+          lib.makeBinPath (
+            [
+              # for moving files to trash
+              glib
 
-            # for launcher and bundled helper scripts
-            gawk
-            glibc.bin
-            gnugrep
-            gnused
-            coreutils
-            which
-          ]
+              # for launcher and bundled helper scripts
+              gawk
+              gnugrep
+              gnused
+              coreutils
+              which
+            ]
+            # provides `getconf` for ps-fallback script that only runs on Linux
+            # https://github.com/microsoft/vscode/blob/97c807618b413805fde466739ba14f77a1f12307/src/vs/base/node/ps.sh#L2
+            # https://github.com/microsoft/vscode/blob/97c807618b413805fde466739ba14f77a1f12307/src/vs/base/node/ps.ts#L203-L217
+            ++ lib.optional stdenv.hostPlatform.isLinux getconf
+          )
         }
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}"
         --add-flags ${lib.escapeShellArg commandLineArgs}

From 939c3c57ae1f70c8829bcf1406cd9fd67af9f00a Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Mon, 13 Apr 2026 10:52:36 +0100
Subject: [PATCH 231/336] nzbhydra2: add meta.changelog

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

diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
index dcb4014ce633..1389f80158ca 100644
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@@ -90,6 +90,7 @@ maven.buildMavenPackage rec {
   meta = {
     description = "Usenet meta search";
     homepage = "https://github.com/theotherp/nzbhydra2";
+    changelog = "https://github.com/theotherp/nzbhydra2/releases/tag/v${version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       matteopacini

From c515a64c2478cf96e61b879c2fbfbc4eb431eb83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 10:00:04 +0000
Subject: [PATCH 232/336] shaka-packager: 3.7.1 -> 3.7.2

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

diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix
index 44eb296226a2..b4f01d912c02 100644
--- a/pkgs/by-name/sh/shaka-packager/package.nix
+++ b/pkgs/by-name/sh/shaka-packager/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shaka-packager";
-  version = "3.7.1";
+  version = "3.7.2";
 
   src = fetchFromGitHub {
     owner = "shaka-project";
     repo = "shaka-packager";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z98DXYa/M0SvohNxFWXPJGBSPWJzrz8oFUBO5DajknE=";
+    hash = "sha256-E493sleVbsuytneK51lxuQnaEzvAEJwAXYmsxcaOXSs=";
   };
 
   nativeBuildInputs = [

From 42795842703c774aa4614d5b28d56d3d019adc93 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 13 Apr 2026 11:05:04 +0100
Subject: [PATCH 233/336] lasuite-docs{,-frontend,-collaboration-server}: 4.8.5
 -> 4.8.6

ChangeLog: https://github.com/suitenumerique/docs/releases/tag/v4.8.6
---
 .../la/lasuite-docs-collaboration-server/package.nix        | 6 +++---
 pkgs/by-name/la/lasuite-docs-frontend/package.nix           | 6 +++---
 pkgs/by-name/la/lasuite-docs/package.nix                    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
index bc8be01f4a84..d3c52ca18a2f 100644
--- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
+++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
@@ -13,20 +13,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lasuite-docs-collaboration-server";
-  version = "4.8.5";
+  version = "4.8.6";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zXV3gXUgN28a2J48EwS6RrYxkIgoj0IJ5lPTxvexYdA=";
+    hash = "sha256-8xMHHyj9qUdrd5dFYVlN2bi7EVjcEqoBBxIifC8xk3k=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/frontend";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
-    hash = "sha256-3irVoASl77ZU6+WIe5O+HY7QSggeK9lxQwwEYzgwl+o=";
+    hash = "sha256-4jaKWepa3+SxEVS+gF5QrOeJaOpS8vzFXZyN9SxClUE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix
index aecb39d3ea96..c667a4de583a 100644
--- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix
+++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix
@@ -12,20 +12,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lasuite-docs-frontend";
-  version = "4.8.5";
+  version = "4.8.6";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zXV3gXUgN28a2J48EwS6RrYxkIgoj0IJ5lPTxvexYdA=";
+    hash = "sha256-8xMHHyj9qUdrd5dFYVlN2bi7EVjcEqoBBxIifC8xk3k=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/frontend";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
-    hash = "sha256-3irVoASl77ZU6+WIe5O+HY7QSggeK9lxQwwEYzgwl+o=";
+    hash = "sha256-4jaKWepa3+SxEVS+gF5QrOeJaOpS8vzFXZyN9SxClUE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix
index 82abaab29f28..e6fe05f405ee 100644
--- a/pkgs/by-name/la/lasuite-docs/package.nix
+++ b/pkgs/by-name/la/lasuite-docs/package.nix
@@ -11,12 +11,12 @@
   yarnConfigHook,
 }:
 let
-  version = "4.8.5";
+  version = "4.8.6";
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${version}";
-    hash = "sha256-zXV3gXUgN28a2J48EwS6RrYxkIgoj0IJ5lPTxvexYdA=";
+    hash = "sha256-8xMHHyj9qUdrd5dFYVlN2bi7EVjcEqoBBxIifC8xk3k=";
   };
 
   mail-templates = stdenv.mkDerivation {

From c754ee1b356753af364b928f6c1d41ab239ee4eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 10:27:07 +0000
Subject: [PATCH 234/336] jsonschema-cli: 0.45.0 -> 0.46.0

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

diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix
index 65817362a240..91c508cb1f5c 100644
--- a/pkgs/by-name/js/jsonschema-cli/package.nix
+++ b/pkgs/by-name/js/jsonschema-cli/package.nix
@@ -9,15 +9,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jsonschema-cli";
-  version = "0.45.0";
+  version = "0.46.0";
 
   src = fetchCrate {
     pname = "jsonschema-cli";
     inherit (finalAttrs) version;
-    hash = "sha256-9pz07T7i7pxNNOV/YGbneIA45VG9uBzhI+ygwknW07Q=";
+    hash = "sha256-tpapiI6FYHEgmI0XY5KZNNsZxKxkEN4BIJaNQXsMIJI=";
   };
 
-  cargoHash = "sha256-EiLXX0wZi9v8vsMxCeg8/XMfWH9FckuNjqPpLEUK5lc=";
+  cargoHash = "sha256-1Wih2VwK3hzdjuoAZI/1j0jPwWwL4l4y4rQRX0VV4Sc=";
 
   preCheck = ''
     export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt

From a1458aa056876683692f9595fdc75777e416473c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 10:36:45 +0000
Subject: [PATCH 235/336] cnspec: 13.3.3 -> 13.4.1

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

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 62a3285c2696..3da84146f582 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "cnspec";
-  version = "13.3.3";
+  version = "13.4.1";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yCxry1f5CEF51WSgrYN1m9F8YpVjtt+UNZG978nPXbY=";
+    hash = "sha256-3Uo2x30K7b7NA5OGP8YYlcoEJmFhlkL7t7ohvzUlmYI=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-wgebRTa1ox+LUzxlYLb3pqcLEF/uUushZ1Oq2mvRGCk=";
+  vendorHash = "sha256-7XwLkvG0LYL0pIbjMs78wMSqbXR5SScPAgjRxYsPwlA=";
 
   subPackages = [ "apps/cnspec" ];
 

From 8926c73f508a53ad64ff37b7282063c77679f68b Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Mon, 13 Apr 2026 10:53:48 +0000
Subject: [PATCH 236/336] ci/eval/compare: Expose attrdiff by kernel and
 platform

---
 .github/workflows/eval.yml              | 16 ++++-
 ci/eval/compare/default.nix             | 44 +++++++++++++-
 ci/eval/compare/test.nix                | 78 +++++++++++++++++++++++++
 ci/eval/compare/utils.nix               | 44 ++++++++++++++
 ci/github-script/check-target-branch.js | 10 ++++
 5 files changed, 189 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 022bc62236ec..2ea3c91eef61 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -312,6 +312,12 @@ jobs:
           script: |
             const { readFile } = require('node:fs/promises')
             const changed = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8'))
+            const removedByKernel = Object.fromEntries(
+              Object.entries(changed.attrdiffByKernel ?? {}).map(([kernel, diff]) => [
+                kernel,
+                diff.removed.length,
+              ]),
+            )
             const description =
               'Package: ' + [
                 `added ${changed.attrdiff.added.length}`,
@@ -321,7 +327,15 @@ jobs:
               ' — Rebuild: ' + [
                 `linux ${changed.rebuildCountByKernel.linux}`,
                 `darwin ${changed.rebuildCountByKernel.darwin}`
-              ].join(', ')
+              ].join(', ') +
+              (
+                Object.values(removedByKernel).some((count) => count > 0)
+                  ? ' — Removed: ' + [
+                      `linux ${removedByKernel.linux ?? 0}`,
+                      `darwin ${removedByKernel.darwin ?? 0}`
+                    ].join(', ')
+                  : ''
+              )
 
             const { serverUrl, repo, runId, payload } = context
             const target_url =
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 1717911f5c52..2ed6c577ecb4 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -74,9 +74,38 @@ let
         {
           attrdiff: {
             added: ["package1"],
-            changed: ["package2", "package3"],
+            changed: ["package2", "package3", "package4"],
             removed: ["package4"],
           },
+          attrdiffByKernel: {
+            darwin: {
+              added: [],
+              changed: ["package2", "package4"],
+              removed: ["package4"],
+            },
+            linux: {
+              added: ["package1"],
+              changed: ["package3", "package4"],
+              removed: [],
+            },
+          },
+          attrdiffByPlatform: {
+            aarch64-darwin: {
+              added: [],
+              changed: ["package2"],
+              removed: ["package4"],
+            },
+            aarch64-linux: {
+              added: ["package1"],
+              changed: ["package3"],
+              removed: [],
+            },
+            x86_64-linux: {
+              added: [],
+              changed: ["package4"],
+              removed: [],
+            },
+          },
           labels: {
             "10.rebuild-darwin: 1-10": true,
             "10.rebuild-linux: 1-10": true
@@ -113,6 +142,8 @@ let
   inherit (import ./utils.nix { inherit lib; })
     groupByKernel
     convertToPackagePlatformAttrs
+    groupAttrdiffByKernel
+    groupAttrdiffByPlatform
     groupByPlatform
     extractPackageNames
     getLabels
@@ -127,6 +158,15 @@ let
 
   changed-paths =
     let
+      attrdiff = lib.mapAttrs (_: extractPackageNames) {
+        inherit (diffAttrs) added changed removed;
+      };
+      attrdiffByPlatform = groupAttrdiffByPlatform {
+        inherit (diffAttrs) added changed removed;
+      };
+      attrdiffByKernel = groupAttrdiffByKernel {
+        inherit (diffAttrs) added changed removed;
+      };
       rebuildsByPlatform = groupByPlatform rebuildsPackagePlatformAttrs;
       rebuildsByKernel = groupByKernel rebuildsPackagePlatformAttrs;
       rebuildCountByKernel = lib.mapAttrs (
@@ -135,7 +175,7 @@ let
     in
     writeText "changed-paths.json" (
       builtins.toJSON {
-        attrdiff = lib.mapAttrs (_: extractPackageNames) { inherit (diffAttrs) added changed removed; };
+        inherit attrdiff attrdiffByKernel attrdiffByPlatform;
         inherit
           rebuildsByPlatform
           rebuildsByKernel
diff --git a/ci/eval/compare/test.nix b/ci/eval/compare/test.nix
index aaaff6ec9581..1b4c6f15bede 100644
--- a/ci/eval/compare/test.nix
+++ b/ci/eval/compare/test.nix
@@ -7,6 +7,7 @@
 }:
 let
   fun = import ./maintainers.nix { inherit lib; };
+  utils = import ./utils.nix { inherit lib; };
 
   mockPkgs =
     {
@@ -226,6 +227,83 @@ let
         ];
       };
     };
+    testGroupAttrdiffByPlatform = {
+      expr = utils.groupAttrdiffByPlatform {
+        added = [
+          "new-tool.aarch64-linux"
+          "new-tool.x86_64-darwin"
+        ];
+        changed = [
+          "updated-tool.x86_64-darwin"
+          "shared-tool.x86_64-darwin"
+        ];
+        removed = [
+          "removed-tool.aarch64-darwin"
+          "shared-tool.aarch64-darwin"
+        ];
+      };
+      expected = {
+        aarch64-darwin = {
+          added = [ ];
+          changed = [ ];
+          removed = [
+            "removed-tool"
+            "shared-tool"
+          ];
+        };
+        aarch64-linux = {
+          added = [ "new-tool" ];
+          changed = [ ];
+          removed = [ ];
+        };
+        x86_64-darwin = {
+          added = [ "new-tool" ];
+          changed = [
+            "shared-tool"
+            "updated-tool"
+          ];
+          removed = [ ];
+        };
+      };
+    };
+    testGroupAttrdiffByKernel = {
+      expr =
+        let
+          grouped = utils.groupAttrdiffByKernel {
+            added = [
+              "new-tool.aarch64-linux"
+              "new-tool.x86_64-darwin"
+            ];
+            changed = [
+              "updated-tool.x86_64-darwin"
+              "shared-tool.x86_64-darwin"
+            ];
+            removed = [
+              "removed-tool.aarch64-darwin"
+              "shared-tool.aarch64-darwin"
+            ];
+          };
+        in
+        lib.mapAttrs (_: diff: lib.mapAttrs (_: lib.sort lib.lessThan) diff) grouped;
+      expected = {
+        darwin = {
+          added = [ "new-tool" ];
+          changed = [
+            "shared-tool"
+            "updated-tool"
+          ];
+          removed = [
+            "removed-tool"
+            "shared-tool"
+          ];
+        };
+        linux = {
+          added = [ "new-tool" ];
+          changed = [ ];
+          removed = [ ];
+        };
+      };
+    };
   };
 in
 {
diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix
index 969622ee16f1..dc7f4b651db7 100644
--- a/ci/eval/compare/utils.nix
+++ b/ci/eval/compare/utils.nix
@@ -150,6 +150,50 @@ rec {
     in
     lib.genAttrs [ "linux" "darwin" ] filterKernel;
 
+  /*
+    Group an attrdiff-style mapping by a derived key such as platform or kernel.
+
+    Turns
+      {
+        added = [ "new-tool.aarch64-linux" "new-tool.x86_64-darwin" ];
+        changed = [ "updated-tool.x86_64-darwin" "shared-tool.x86_64-darwin" ];
+        removed = [ "removed-tool.aarch64-darwin" "shared-tool.aarch64-darwin" ];
+      }
+    into
+      {
+        aarch64-darwin = {
+          added = [ ];
+          changed = [ ];
+          removed = [ "removed-tool" "shared-tool" ];
+        };
+        aarch64-linux = {
+          added = [ "new-tool" ];
+          changed = [ ];
+          removed = [ ];
+        };
+        x86_64-darwin = {
+          added = [ "new-tool" ];
+          changed = [ "shared-tool" "updated-tool" ];
+          removed = [ ];
+        };
+      }
+    when used with `groupByPlatform`.
+  */
+  groupAttrdiffBy =
+    grouper: attrdiff:
+    let
+      groupedByKind = lib.mapAttrs (
+        _: packagePlatformPaths:
+        grouper (convertToPackagePlatformAttrs (uniqueStrings packagePlatformPaths))
+      ) attrdiff;
+      groups = uniqueStrings (lib.flatten (map builtins.attrNames (lib.attrValues groupedByKind)));
+    in
+    lib.genAttrs groups (group: lib.mapAttrs (_: byGroup: byGroup.${group} or [ ]) groupedByKind);
+
+  groupAttrdiffByPlatform = groupAttrdiffBy groupByPlatform;
+
+  groupAttrdiffByKernel = groupAttrdiffBy groupByKernel;
+
   /*
     Maps an attrs of `kernel - rebuild counts` mappings to an attrs of labels
 
diff --git a/ci/github-script/check-target-branch.js b/ci/github-script/check-target-branch.js
index 46101adcf200..9b47a946b889 100644
--- a/ci/github-script/check-target-branch.js
+++ b/ci/github-script/check-target-branch.js
@@ -25,6 +25,16 @@ async function checkTargetBranch({ github, context, core, dry }) {
    *   changed: string[],
    *   removed: string[],
    *  },
+   *  attrdiffByKernel: Record<string, {
+   *   added: string[],
+   *   changed: string[],
+   *   removed: string[],
+   *  }>,
+   *  attrdiffByPlatform: Record<string, {
+   *   added: string[],
+   *   changed: string[],
+   *   removed: string[],
+   *  }>,
    *  labels: Record<string, boolean>,
    *  rebuildCountByKernel: Record<string, number>,
    *  rebuildsByKernel: Record<string, string[]>,

From 0b225d39b3d785427c9d221c7fc20dffeb9abdd0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 12:42:30 +0200
Subject: [PATCH 237/336] python3Pakcages.pynfsclient: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/pynfsclient/default.nix b/pkgs/development/python-modules/pynfsclient/default.nix
index 6b5a2a455a2c..68e528c95d01 100644
--- a/pkgs/development/python-modules/pynfsclient/default.nix
+++ b/pkgs/development/python-modules/pynfsclient/default.nix
@@ -5,7 +5,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pynfsclient";
   version = "1.0.6";
   pyproject = true;
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Pennyw0rth";
     repo = "NfsClient";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-9PV/RpK/rOI9jpTDy0FmkXY2Cf54vve6j1kM5dcZgV8=";
   };
 
@@ -27,11 +27,11 @@ buildPythonPackage rec {
   meta = {
     description = "Pure python library to simulate NFS client";
     homepage = "https://github.com/Pennyw0rth/NfsClient";
-    changelog = "https://github.com/Pennyw0rth/NfsClient/releases/tag/v${version}";
+    changelog = "https://github.com/Pennyw0rth/NfsClient/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab
       letgamer
     ];
   };
-}
+})

From 32a3e446b9fdc7673576f556e39ce7eaaf8942a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 10:56:31 +0000
Subject: [PATCH 238/336] python3Packages.reconplogger: 4.18.1 -> 5.0.0

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

diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix
index 100550fea61f..35e95c4d98ef 100644
--- a/pkgs/development/python-modules/reconplogger/default.nix
+++ b/pkgs/development/python-modules/reconplogger/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "reconplogger";
-  version = "4.18.1";
+  version = "5.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "omni-us";
     repo = "reconplogger";
     tag = "v${version}";
-    hash = "sha256-kYNidF1sTC6WulX3HXMUm+TFJWvHgZj86Asmi6uIKRs=";
+    hash = "sha256-/+nPLji8iGTBpWTCR83JRfxMltMYjP62KrB+HRTQQE8=";
   };
 
   build-system = [ setuptools ];

From 3e017e9576695942df00f5c3758912da8cf67190 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 12:59:15 +0200
Subject: [PATCH 239/336] python3Packages.certihound: add build-system

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

diff --git a/pkgs/development/python-modules/certihound/default.nix b/pkgs/development/python-modules/certihound/default.nix
index 31651ecbbb75..404fa9e42c18 100644
--- a/pkgs/development/python-modules/certihound/default.nix
+++ b/pkgs/development/python-modules/certihound/default.nix
@@ -8,6 +8,7 @@
   pydantic,
   click,
   rich,
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -20,6 +21,8 @@ buildPythonPackage rec {
     hash = "sha256-ERJ5fbYikhKLwchSIBe5s4KF/1HsXZ1O00QnYXAe+ps=";
   };
 
+  build-system = [ setuptools ];
+
   dependencies = [
     ldap3
     impacket

From b887779f249114e1448f530ad3328e58071210ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 13:00:08 +0200
Subject: [PATCH 240/336] python3Packages.certihound: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/certihound/default.nix b/pkgs/development/python-modules/certihound/default.nix
index 404fa9e42c18..a403d6a70200 100644
--- a/pkgs/development/python-modules/certihound/default.nix
+++ b/pkgs/development/python-modules/certihound/default.nix
@@ -11,13 +11,13 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "certihound";
   version = "0.3.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-ERJ5fbYikhKLwchSIBe5s4KF/1HsXZ1O00QnYXAe+ps=";
   };
 
@@ -43,4 +43,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ letgamer ];
   };
-}
+})

From 5dae3e65178bda2e65dfb166f5ca080d6034274c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 13:09:20 +0200
Subject: [PATCH 241/336] python3Packages.reconplogger: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix
index 35e95c4d98ef..a016e303bfb8 100644
--- a/pkgs/development/python-modules/reconplogger/default.nix
+++ b/pkgs/development/python-modules/reconplogger/default.nix
@@ -11,7 +11,7 @@
   testfixtures,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "reconplogger";
   version = "5.0.0";
   pyproject = true;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omni-us";
     repo = "reconplogger";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/+nPLji8iGTBpWTCR83JRfxMltMYjP62KrB+HRTQQE8=";
   };
 
@@ -52,4 +52,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 1ba5ed924cf6c30dea893b598d22b99b1d2d491d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 11:15:07 +0000
Subject: [PATCH 242/336] elephant: 2.20.3 -> 2.21.0

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

diff --git a/pkgs/by-name/el/elephant/package.nix b/pkgs/by-name/el/elephant/package.nix
index 1629406617d5..f7a9ffff6435 100644
--- a/pkgs/by-name/el/elephant/package.nix
+++ b/pkgs/by-name/el/elephant/package.nix
@@ -74,13 +74,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "elephant";
-  version = "2.20.3";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "abenz1267";
     repo = "elephant";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5PLTPbnbtK0iDbsB9yFeHr5y/pv6/XzoVm/CDeXXt/c=";
+    hash = "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A=";
   };
 
   vendorHash = "sha256-EWXZ+9/QDRpidpVHBcfJgp0xoc3YtRsiC/UTk1R+FSY=";

From 80ebf8a36289d88807e60bbe4b19b6b7d0f6b775 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 11:43:07 +0000
Subject: [PATCH 243/336] python3Packages.pytools: 2025.2.5 -> 2026.1

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

diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index 592b266b3ecd..f0e2706896b5 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "pytools";
-  version = "2025.2.5";
+  version = "2026.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-p/U1BkTUbZjunH5ntLQWkzCKoPXpsYjY8GlLJ9yU46I=";
+    hash = "sha256-e2Q4yl7N7e5C4WyMtwLCrlYqmPsmLawaOwGxIcw0vtU=";
   };
 
   build-system = [ hatchling ];

From e3c1b1e1cd65cc22c21f16b2e58331a9786c43e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 17:10:49 +0000
Subject: [PATCH 244/336] python3Packages.oslo-utils: 10.0.0 -> 10.0.1

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

diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix
index 95c299a205b6..9237fd3d6d8e 100644
--- a/pkgs/development/python-modules/oslo-utils/default.nix
+++ b/pkgs/development/python-modules/oslo-utils/default.nix
@@ -35,13 +35,13 @@
 
 buildPythonPackage rec {
   pname = "oslo-utils";
-  version = "10.0.0";
+  version = "10.0.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "oslo_utils";
     inherit version;
-    hash = "sha256-u0ZxPnYNlERqCE9elMHPJzk1NpMIrYjuW1OReSPZw5M=";
+    hash = "sha256-Ib/Cm7TBzZr7TvdB+445Ro+lSF5gcX9PkPOtPc6KHyI=";
   };
 
   postPatch =

From a958c920524e4301653beaefef33b91883202a3b Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Mon, 13 Apr 2026 12:11:14 +0100
Subject: [PATCH 245/336] spire-tpm-plugin: init at 1.11.1

---
 pkgs/by-name/sp/spire-tpm-plugin/package.nix | 45 ++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/sp/spire-tpm-plugin/package.nix

diff --git a/pkgs/by-name/sp/spire-tpm-plugin/package.nix b/pkgs/by-name/sp/spire-tpm-plugin/package.nix
new file mode 100644
index 000000000000..299bae4d1d00
--- /dev/null
+++ b/pkgs/by-name/sp/spire-tpm-plugin/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  openssl,
+  tpm2-tools,
+  xxd,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "spire-tpm-plugin";
+  version = "1.11.1";
+
+  src = fetchFromGitHub {
+    owner = "spiffe";
+    repo = "spire-tpm-plugin";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6hy1aQg0tS2wxOZRbZLv82HQEufVmW/a5L6Da+bNeHU=";
+  };
+
+  proxyVendor = true;
+  vendorHash = "sha256-cENDkx/iz6H/AhAO1lKypHhOFz+F3gC3bMg8Jw7eeo0=";
+
+  ldflags = [ "-s" ];
+
+  buildInputs = [ openssl ];
+
+  nativeCheckInputs = [
+    openssl.bin
+    tpm2-tools
+    xxd
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Provides agent and server plugins for SPIRE to allow TPM 2-based node attestation";
+    homepage = "https://github.com/spiffe/spire-tpm-plugin";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ arianvp ];
+  };
+})

From ecc662dc4f171f90ef85772f6235b3dce7b6a0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 13 Apr 2026 13:57:53 +0200
Subject: [PATCH 246/336] vaultwarden.webvault: 2026.1.1+0 -> 2026.2.0+0

---
 pkgs/by-name/va/vaultwarden/webvault.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/va/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix
index 04454d9e4c44..c988cf8c78a4 100644
--- a/pkgs/by-name/va/vaultwarden/webvault.nix
+++ b/pkgs/by-name/va/vaultwarden/webvault.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildNpmPackage,
-  nodejs_22,
   fetchFromGitHub,
   nixosTests,
   python3,
@@ -11,19 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vaultwarden-webvault";
-  version = "2026.1.1+0";
-
-  # doesn't build with newer versions
-  nodejs = nodejs_22;
+  version = "2026.2.0+0";
 
   src = fetchFromGitHub {
     owner = "vaultwarden";
     repo = "vw_web_builds";
     tag = "v${version}";
-    hash = "sha256-ehL3DDjCav20XJgUR+ED2x0lax4fm1jMZ0rRiqR78a4=";
+    hash = "sha256-rXBDv8ecImA6qdM5JVYy5QJHRj0jP7zinj/8gWRREtQ=";
   };
 
-  npmDepsHash = "sha256-/S0itw2m2k7GiiwBEzeqFQ8oUYD4yIO4knTTn37qkfA=";
+  npmDepsHash = "sha256-PATpmxIHYSgmuOj8dOoa7ynzkGw5l7z62DiulJmufJY=";
 
   nativeBuildInputs = [
     python3
@@ -68,8 +64,7 @@ buildNpmPackage rec {
 
   meta = {
     description = "Integrates the web vault into vaultwarden";
-    homepage = "https://github.com/dani-garcia/bw_web_builds";
-    changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${lib.concatStringsSep "." (lib.take 3 (lib.versions.splitVersion version))}";
+    homepage = "https://github.com/vaultwarden/vw_web_builds";
     platforms = lib.platforms.all;
     license = lib.licenses.gpl3Plus;
     inherit (vaultwarden.meta) maintainers;

From f8330c08fb82f1f84b3e6b3d826950536a6e6738 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Mon, 13 Apr 2026 10:54:48 +0200
Subject: [PATCH 247/336] bird2: 2.18 -> 2.18.1

Diff: https://gitlab.nic.cz/labs/bird/-/compare/v2.18...v2.18.1

Changelog: https://gitlab.nic.cz/labs/bird/-/blob/v2.18.1/NEWS
---
 pkgs/by-name/bi/bird2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix
index b4ae44f954a0..0ab5f5eb73fb 100644
--- a/pkgs/by-name/bi/bird2/package.nix
+++ b/pkgs/by-name/bi/bird2/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bird";
-  version = "2.18";
+  version = "2.18.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.nic.cz";
     owner = "labs";
     repo = "bird";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Kta8zzM/EYC3Mz3mLptaJ+pFgs1Hi7MBsWjwkR4hwL8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tYICTipTzugtb7kv/zwsChM8v+zJ2TVsotEkJDcZCto=";
   };
 
   nativeBuildInputs = [

From eade3ea0a01a49a49887b02b4f6d2926e3f2dc1f Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Mon, 13 Apr 2026 14:02:09 +0200
Subject: [PATCH 248/336] bird3: switch from rev to tag for src

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

diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix
index 182439cd6846..acbe1d3deb9b 100644
--- a/pkgs/by-name/bi/bird3/package.nix
+++ b/pkgs/by-name/bi/bird3/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.nic.cz";
     owner = "labs";
     repo = "bird";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-FkrVrjT4Q9zLeauP2GOX38a7a4q7h2aQbEe/kmfKB3A=";
   };
 

From ee41b012c4b2bab6af02dd173ba58603d7012f7c Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Sat, 11 Apr 2026 15:57:34 +0200
Subject: [PATCH 249/336] librepods: 0.1.0-unstable-2025-12-07 -> 0.2.0-alpha

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

diff --git a/pkgs/by-name/li/librepods/package.nix b/pkgs/by-name/li/librepods/package.nix
index 796991baf99a..28f218994d7f 100644
--- a/pkgs/by-name/li/librepods/package.nix
+++ b/pkgs/by-name/li/librepods/package.nix
@@ -9,15 +9,15 @@
   lib,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "librepods";
-  version = "0.1.0-unstable-2025-12-07";
+  version = "0.2.0-alpha.2";
 
   src = fetchFromGitHub {
     owner = "kavishdevar";
     repo = "librepods";
-    rev = "0e1f784737122913c21b429810d059aadfb4479e";
-    hash = "sha256-nXEMIyQWEDMjyKGPAleqqSttznNmrdSHKT4Kr2tLHBY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-37dLiXC+eO4f5waLKgMMpHXH1m6W54O/l2axJsnyU5M=";
   };
 
   sourceRoot = "source/linux";
@@ -41,6 +41,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/kavishdevar/librepods";
     description = "AirPods liberated from Apple's ecosystem";
     license = lib.licenses.gpl3;
+    mainProgram = "librepods";
     maintainers = [ lib.maintainers.thefossguy ];
   };
-}
+})

From 28ede2449fe109d0e3f929f4282204bd20829639 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Mon, 13 Apr 2026 14:14:49 +0200
Subject: [PATCH 250/336] python3Packages.scim2-client: 0.7.3 -> 0.7.5

Diff: https://github.com/python-scim/scim2-client/compare/0.7.3...0.7.5

Changelog: https://github.com/python-scim/scim2-client/releases/tag/0.7.5
---
 pkgs/development/python-modules/scim2-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scim2-client/default.nix b/pkgs/development/python-modules/scim2-client/default.nix
index 011338a01859..cb98b3bdbc6c 100644
--- a/pkgs/development/python-modules/scim2-client/default.nix
+++ b/pkgs/development/python-modules/scim2-client/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "scim2-client";
-  version = "0.7.3";
+  version = "0.7.5";
 
   pyproject = true;
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "python-scim";
     repo = "scim2-client";
     tag = version;
-    hash = "sha256-jw8Dp/PekM0JrgxRkN+A896O2twkSDxQpsGsljJFdB0=";
+    hash = "sha256-vySSYdCd7O7wDB3NDzGizhREwBJQdLfaXk6edJ1HqGE=";
   };
 
   postPatch = ''

From 6c19e12a217147f2ec6c3230e0ff0f5b8268dcc7 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Sun, 12 Apr 2026 19:56:50 +0200
Subject: [PATCH 251/336] nixos/librepods: init

---
 nixos/modules/module-list.nix        |  1 +
 nixos/modules/programs/librepods.nix | 42 ++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 nixos/modules/programs/librepods.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fb773e97f7ef..1c066b30f915 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -257,6 +257,7 @@
   ./programs/lazygit.nix
   ./programs/less.nix
   ./programs/liboping.nix
+  ./programs/librepods.nix
   ./programs/lix.nix
   ./programs/localsend.nix
   ./programs/mdevctl.nix
diff --git a/nixos/modules/programs/librepods.nix b/nixos/modules/programs/librepods.nix
new file mode 100644
index 000000000000..f2d1a35bccb7
--- /dev/null
+++ b/nixos/modules/programs/librepods.nix
@@ -0,0 +1,42 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.librepods;
+in
+{
+  options = {
+    programs.librepods = {
+      enable = lib.mkOption {
+        default = false;
+        type = lib.types.bool;
+        description = ''
+          Whether to configure system to enable librepods.
+          To grant access to a user, it must be part of librepods group:
+          `users.users.alice.extraGroups = ["librepods"];`
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ librepods ];
+    users.groups.librepods = { };
+
+    security.wrappers.librepods = {
+      source = lib.getExe pkgs.librepods;
+      capabilities = "cap_net_admin+ep";
+      owner = "root";
+      group = "librepods";
+      permissions = "u+rx,g+x";
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [
+    thefossguy
+    Cameo007
+  ];
+}

From 5c4a0a541a060625ff74a6d877b8e5d1650969a1 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Sun, 12 Apr 2026 20:04:43 +0200
Subject: [PATCH 252/336] librepods: add Cameo007 as maintainer

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

diff --git a/pkgs/by-name/li/librepods/package.nix b/pkgs/by-name/li/librepods/package.nix
index 28f218994d7f..421b5b4abd80 100644
--- a/pkgs/by-name/li/librepods/package.nix
+++ b/pkgs/by-name/li/librepods/package.nix
@@ -42,6 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
     description = "AirPods liberated from Apple's ecosystem";
     license = lib.licenses.gpl3;
     mainProgram = "librepods";
-    maintainers = [ lib.maintainers.thefossguy ];
+    maintainers = with lib.maintainers; [
+      thefossguy
+      Cameo007
+    ];
   };
 })

From 800251373641941de2492ab37e2c669fd2873687 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 12:24:01 +0000
Subject: [PATCH 253/336] zwave-js-ui: 11.15.1 -> 11.16.0

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

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index db12627b1851..b3ee628cc86a 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.15.1";
+  version = "11.16.0";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-EbLf3Jwr6p0MtOk4TfrW5KgojlTBrWHzcpwqO4aLib4=";
+    hash = "sha256-6pPC500ZQmtCC3ATiWD79DTh5cagdqLoDwTHivHgfWg=";
   };
-  npmDepsHash = "sha256-aydGtWGgGqkN8XcVzhv+HfIxSoEYEFrE4tm1YJR95ig=";
+  npmDepsHash = "sha256-Qeh5sk2aLWrsmMShE26jz7nzWg6YWcPeUNhTg3u411I=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

From fd194e2162da4fd4cc3df05a6c7a9818b46f890c Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Mon, 13 Apr 2026 14:14:57 +0200
Subject: [PATCH 254/336] python3Packages.scim2-models: 0.6.6 -> 0.6.11

Diff: https://github.com/python-scim/scim2-models/compare/0.6.6...0.6.11

Changelog: https://github.com/python-scim/scim2-models/releases/tag/0.6.11
---
 .../python-modules/scim2-models/default.nix      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/scim2-models/default.nix b/pkgs/development/python-modules/scim2-models/default.nix
index 841d57fc1cc5..cd1f8543d7c9 100644
--- a/pkgs/development/python-modules/scim2-models/default.nix
+++ b/pkgs/development/python-modules/scim2-models/default.nix
@@ -5,11 +5,15 @@
   uv-build,
   pydantic,
   pytestCheckHook,
+  django,
+  fastapi,
+  flask,
+  httpx,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "scim2-models";
-  version = "0.6.6";
+  version = "0.6.11";
 
   pyproject = true;
 
@@ -17,7 +21,7 @@ buildPythonPackage (finalAttrs: {
     owner = "python-scim";
     repo = "scim2-models";
     tag = finalAttrs.version;
-    hash = "sha256-pYINB8avoYt1VUgvyDTXw3ejSBoZDFEQK0F4flTeyaY=";
+    hash = "sha256-sqXygOutxdLBRJYC3nn78JFsngF2Tq6E0g91VKXQhZE=";
   };
 
   postPatch = ''
@@ -29,7 +33,13 @@ buildPythonPackage (finalAttrs: {
 
   dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email;
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    django
+    fastapi
+    flask
+    httpx
+  ];
 
   pythonImportsCheck = [ "scim2_models" ];
 

From dd2b5675ac29422590a3cf4fc4049f71da63af7f Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Mon, 13 Apr 2026 14:16:06 +0200
Subject: [PATCH 255/336] python3Packages.scim2-tester: 0.2.6 -> 0.2.8

Diff: https://github.com/python-scim/scim2-tester/compare/0.2.6...0.2.8

Changelog: https://github.com/python-scim/scim2-tester/releases/tag/0.2.8
---
 pkgs/development/python-modules/scim2-tester/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scim2-tester/default.nix b/pkgs/development/python-modules/scim2-tester/default.nix
index 2d744bc95727..bedbcec478bf 100644
--- a/pkgs/development/python-modules/scim2-tester/default.nix
+++ b/pkgs/development/python-modules/scim2-tester/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "scim2-tester";
-  version = "0.2.6";
+  version = "0.2.8";
 
   pyproject = true;
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "python-scim";
     repo = "scim2-tester";
     tag = version;
-    hash = "sha256-PoaY3gPSm+J/C1ad81Dmn7zrbf00pies8CLmLdV+gus=";
+    hash = "sha256-mWlIZC7080YABBWT2oNDVyrV5YrRzkzCUSZZBK7NNVM=";
   };
 
   postPatch = ''

From 98825dcbb6a82eb84136a796067dbd7c93001e8e Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Mon, 13 Apr 2026 14:00:48 +0200
Subject: [PATCH 256/336] canaille: 0.2.3 -> 0.2.4

Diff: https://gitlab.com/yaal/canaille/-/compare/0.2.3...0.2.4

Changelog: https://gitlab.com/yaal/canaille/-/blob/0.2.4/CHANGES.rst
---
 pkgs/by-name/ca/canaille/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix
index 1701a687fcb9..f3f04e511d0b 100644
--- a/pkgs/by-name/ca/canaille/package.nix
+++ b/pkgs/by-name/ca/canaille/package.nix
@@ -12,14 +12,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "canaille";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "yaal";
     repo = "canaille";
     tag = version;
-    hash = "sha256-kBbkqoXyGO238EArwYyjO46Kk5SkfP31Dc51qglLmqQ=";
+    hash = "sha256-iCiQvB+wYpm/Cns63kjo2wVGnSbcQHWo3UJvi0xJf50=";
   };
 
   build-system = with python.pkgs; [

From fbc7b5e018430ee29735ec268759d28d50090356 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 12:26:06 +0000
Subject: [PATCH 257/336] glaze: 7.2.3 -> 7.3.3

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

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index 34bf839136aa..b253b6c104f0 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glaze";
-  version = "7.2.3";
+  version = "7.3.3";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rqObV/yaGTI9JCyMZxbT4UXeDzYmcEuc/3V+s07Ucxs=";
+    hash = "sha256-RqsJupqXvbgtGNCYszEx22KuDBH0zp9yha6dcsNlaKY=";
   };
 
   nativeBuildInputs = [ cmake ];

From c9dddb8541772fd3fd4e41db4e30523c043b5064 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 12:36:56 +0000
Subject: [PATCH 258/336] mago: 1.18.1 -> 1.19.0

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

diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix
index 0795a1cf780f..70fc78335250 100644
--- a/pkgs/by-name/ma/mago/package.nix
+++ b/pkgs/by-name/ma/mago/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mago";
-  version = "1.18.1";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "carthage-software";
     repo = "mago";
     tag = finalAttrs.version;
-    hash = "sha256-Y18ab4Xh/R54H91sWVqKVDxc1OmVrQh/LB2eMmIjs04=";
+    hash = "sha256-K3gUZjthTLWMCPnenaSc4jn2lznpWa9GiJ5s6Vus8I4=";
     forceFetchGit = true; # Does not download all files otherwise
   };
 
-  cargoHash = "sha256-Jq/11J3diOe/z0W6smnmmbdeFdX1vOO3sn+KZ/Z/6M8=";
+  cargoHash = "sha256-EjI/dpYnohUdd12qT/mB7rtPetgNTi7RNfOnSgeJxnM=";
 
   env = {
     # Get openssl-sys to use pkg-config

From b758f062ef9a529e2b4c34e1ee74dc1720f1e940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 13 Apr 2026 14:41:18 +0200
Subject: [PATCH 259/336] openclaw: 2026.4.10 -> 2026.4.11

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkgs/by-name/op/openclaw/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openclaw/package.nix b/pkgs/by-name/op/openclaw/package.nix
index f2b5219de215..d552a900be56 100644
--- a/pkgs/by-name/op/openclaw/package.nix
+++ b/pkgs/by-name/op/openclaw/package.nix
@@ -11,7 +11,7 @@
   versionCheckHook,
   rolldown,
   installShellFiles,
-  version ? "2026.4.10",
+  version ? "2026.4.11",
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openclaw";
@@ -21,10 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "openclaw";
     repo = "openclaw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uQpIdemz/x0KhknVxO4ZVd3+Gg7J+PCdU0Ycc/cLczM=";
+    hash = "sha256-KDRcjb6nuJ67X7ZImjBgyWyS4YXQlv8OOAkZdZa39Ds=";
   };
 
-  pnpmDepsHash = "sha256-4tisW4TcCXyrFDkQ220cnVWm38L51UnIuDHnx79Eyjc=";
+  pnpmDepsHash = "sha256-fVy4T/JPOX0Ts6/D8pb/2iVxYy/GXJQsdefg84pl4cc=";
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;

From 56b5f53187d19d2ec7377d3edb6ab9955bbf8dd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 12:49:17 +0000
Subject: [PATCH 260/336] git-pkgs: 0.15.2 -> 0.15.3

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

diff --git a/pkgs/by-name/gi/git-pkgs/package.nix b/pkgs/by-name/gi/git-pkgs/package.nix
index 2aa82bebe181..6f8dc3f6aa02 100644
--- a/pkgs/by-name/gi/git-pkgs/package.nix
+++ b/pkgs/by-name/gi/git-pkgs/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "git-pkgs";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "git-pkgs";
     repo = "git-pkgs";
     tag = "v${version}";
-    hash = "sha256-2vtzWzl9x6wd6XE0Z3a9Z/Ph9kschBwcTsNGC7JEFrA=";
+    hash = "sha256-VYITWQfinKxDjShApjoN7h8JKbyW8ft09e6TSYtdjT8=";
   };
 
-  vendorHash = "sha256-USEs7eL0gwrddZDiKUUejYEBEAzWxt62qBo9o5/7AKc=";
+  vendorHash = "sha256-0QddQURXTZV/nKhARA7PVu61Mr/VZojf5mrvZvd7uWQ=";
 
   subPackages = [ "." ];
 

From 9a4f2cae89d822ccdf5d3c750f24f9d79937c601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 13 Apr 2026 14:51:13 +0200
Subject: [PATCH 261/336] python313Packages.python-troveclient: disable failing
 tests

---
 .../python-modules/python-troveclient/default.nix            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-troveclient/default.nix b/pkgs/development/python-modules/python-troveclient/default.nix
index f0a2b48bf91b..e45f4ca649b2 100644
--- a/pkgs/development/python-modules/python-troveclient/default.nix
+++ b/pkgs/development/python-modules/python-troveclient/default.nix
@@ -70,7 +70,10 @@ buildPythonPackage rec {
 
   checkPhase = ''
     runHook preCheck
-    stestr run
+    stestr run -e <(echo "
+    troveclient.tests.test_shell.ShellTest.test_help
+    troveclient.tests.test_shell.ShellTestKeystoneV3.test_help
+    ")
     runHook postCheck
   '';
 

From d7f2dfe6bff0d63e361df324d526355734edc3bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 13 Apr 2026 14:53:48 +0200
Subject: [PATCH 262/336] ollama: 0.20.5 -> 0.20.6

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkgs/by-name/ol/ollama/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index b526cc61d335..aa37c6b22f01 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -94,7 +94,7 @@ let
 
   cudaToolkit = buildEnv {
     # ollama hardcodes the major version in the Makefile to support different variants.
-    # - https://github.com/ollama/ollama/blob/v0.20.5/CMakePresets.json#L21-L47
+    # - https://github.com/ollama/ollama/blob/v0.20.6/CMakePresets.json#L21-L47
     name = "cuda-merged-${cudaMajorVersion}";
     paths = map lib.getLib cudaLibs ++ [
       (lib.getOutput "static" cudaPackages.cuda_cudart)
@@ -140,13 +140,13 @@ let
 in
 goBuild (finalAttrs: {
   pname = "ollama";
-  version = "0.20.5";
+  version = "0.20.6";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/H4DZ/aRB04lKSke9XsK+vb76pcy940scoTunXO4pf4=";
+    hash = "sha256-ol+LsKRxOR37Rpwc9/NouwMg0GOpaeh6zmN5quIBgnA=";
   };
 
   vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";

From 2bb4d0324f34d049cab2d35c93d5cf08bdb61093 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 12:55:56 +0000
Subject: [PATCH 263/336] yara-x: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index 2350b2972e6b..a6f171206bca 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yara-x";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara-x";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gGkBmJoUa9WiIozSwhe18N8i5uSiKsSQ3J1NAT41ro4=";
+    hash = "sha256-P0VxfsyjtgLNJcZMh+BHj7ujg/ReB4xycinfCS3NJyU=";
   };
 
-  cargoHash = "sha256-j+sIxYPvkI1EnAN7LcBoS4m04rYdKlK48tGO0uFa7KU=";
+  cargoHash = "sha256-FIZihLzpP9EhqQU/L6hKQQsMAhd1SsVzKap3GlghHSk=";
 
   env = {
     CARGO_PROFILE_RELEASE_LTO = "fat";

From fe0b8e32075958ea2832871b914e707b5df978e8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 14:57:29 +0200
Subject: [PATCH 264/336] python3Packages.python-obfuscator: 0.0.2 -> 0.1.0

Changelog: https://github.com/davidteather/python-obfuscator/releases/tag/vv0.1.0
---
 .../python-obfuscator/default.nix             | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/python-obfuscator/default.nix b/pkgs/development/python-modules/python-obfuscator/default.nix
index 4f1a8cba456e..af3c6b530e0f 100644
--- a/pkgs/development/python-modules/python-obfuscator/default.nix
+++ b/pkgs/development/python-modules/python-obfuscator/default.nix
@@ -4,24 +4,30 @@
   fetchFromGitHub,
   pytestCheckHook,
   regex,
-  setuptools,
+  typer,
+  poetry-core,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "python-obfuscator";
-  version = "0.0.2";
+  version = "0.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "davidteather";
     repo = "python-obfuscator";
-    tag = "V${version}";
-    hash = "sha256-LUD+9vNd1sdigbKG2tm5hE3zLtmor/2LqsIarUWS2Ek=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ddFmlNBtITMPJszLjD2FNjSFF8TrawOv0q7iB3EIdAY=";
   };
 
-  build-system = [ setuptools ];
+  pythonRelaxDeps = [ "typer" ];
 
-  dependencies = [ regex ];
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    regex
+    typer
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -30,8 +36,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module to obfuscate code";
     homepage = "https://github.com/davidteather/python-obfuscator";
-    changelog = "https://github.com/davidteather/python-obfuscator/releases/tag/${src.tag}";
+    changelog = "https://github.com/davidteather/python-obfuscator/releases/tag/v${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From b139eab700e8cf41ef8057caf5205f6b67aedede Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 13:14:55 +0000
Subject: [PATCH 265/336] wine-staging: 11.5 -> 11.6

---
 pkgs/applications/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index 562f0cd2dede..a74f9fa8fee0 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -142,9 +142,9 @@ rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "11.5";
+    version = "11.6";
     url = "https://dl.winehq.org/wine/source/11.x/wine-${version}.tar.xz";
-    hash = "sha256-ETcLV+pdVIpU2Syc1l0LpjX08cPq2s4J7RxBn3BeGdE=";
+    hash = "sha256-1J0WaXVHj2Ceapzb2goHxlo7eV4GH8RU0/EDTIKNGeA=";
 
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -154,7 +154,7 @@ rec {
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
       inherit version;
-      hash = "sha256-tkx1LB/iZoFvarMvc9QofuQLrZwZyaoL0FUh3nsvYjs=";
+      hash = "sha256-vI6GnnAqkyQSff9jrGYCTFR6fSIg2i9FT4mvbOlU1M4=";
       domain = "gitlab.winehq.org";
       owner = "wine";
       repo = "wine-staging";

From b714c05c4a416ce498e31eb454e5251702b2d4cd Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Mon, 13 Apr 2026 15:24:07 +0200
Subject: [PATCH 266/336] netpeek: switch to finalAttrs

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

diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix
index c7cb6829bd63..de30c0f7d2d3 100644
--- a/pkgs/by-name/ne/netpeek/package.nix
+++ b/pkgs/by-name/ne/netpeek/package.nix
@@ -8,12 +8,10 @@
   desktop-file-utils,
   gobject-introspection,
   wrapGAppsHook4,
-  pkg-config,
   libadwaita,
   libportal-gtk4,
-  gnome,
 }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "netpeek";
   version = "0.2.6";
   pyproject = false;
@@ -21,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ZingyTomato";
     repo = "NetPeek";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-SFY/bUUS4AOniOGjngH/fUHrYiq+dMWxHYvoSkhfnkA=";
   };
 
@@ -32,7 +30,6 @@ python3Packages.buildPythonApplication rec {
     desktop-file-utils
     gobject-introspection
     wrapGAppsHook4
-    pkg-config
   ];
 
   buildInputs = [
@@ -55,10 +52,10 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Modern network scanner for GNOME";
     homepage = "https://github.com/ZingyTomato/NetPeek";
-    changelog = "https://github.com/ZingyTomato/NetPeek/releases/tag/${src.tag}";
+    changelog = "https://github.com/ZingyTomato/NetPeek/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ Cameo007 ];
     mainProgram = "netpeek";
     platforms = lib.platforms.linux;
   };
-}
+})

From cf431ef62bd8d4b90819e2267b35f7255fd8e0cd Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Mon, 13 Apr 2026 14:17:07 +0200
Subject: [PATCH 267/336] nixos/dovecot: hotfix config defaults for sieve-less
 setups

The sieve_script_bin_path setting can only be set when the plugin is
loaded, so on sieve-less setups dovecot will refuse to start since
sieve_script_bin_path is an invalid setting. Don't set it there.
---
 nixos/modules/services/mail/dovecot.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index a9dd9531fadf..7f7cc10d15d5 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -163,6 +163,11 @@ let
     );
 
   isPre24 = versionOlder cfg.package.version "2.4";
+
+  # HACK: We can not auto-add the default for sieve_script_bin_path unless we have the pigeonhole plugin loaded. Solve this in a better way in the future
+  hasPigeonhole = builtins.any (
+    pkg: pkg.pname or null == "dovecot-pigeonhole"
+  ) config.environment.systemPackages;
 in
 {
   imports = [
@@ -579,9 +584,9 @@ in
               # 2.4-only options
 
               sieve_script_bin_path = mkOption {
-                default = if isPre24 then null else "/tmp/dovecot-%{user|username|lower}";
+                default = if isPre24 || !hasPigeonhole then null else "/tmp/dovecot-%{user|username|lower}";
                 defaultText = literalExpression ''
-                  if isPre24
+                  if isPre24 || !hasPigeonhole
                   then null
                   else "/tmp/dovecot-%{user|username|lower}"
                 '';

From 9ffd29fb9c554e1fa667aa96c07fb3d1b3ac0659 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 13 Apr 2026 17:36:18 +0300
Subject: [PATCH 268/336] linux_7_0: init at 7.0

---
 pkgs/os-specific/linux/kernel/kernels-org.json |  5 +++++
 pkgs/top-level/aliases.nix                     |  2 ++
 pkgs/top-level/linux-kernels.nix               | 11 ++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index d0581ef08f29..00b2bf8dba75 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -38,5 +38,10 @@
         "version": "6.19.12",
         "hash": "sha256:1md8b270pdyk9d8cq0qyr8qmymcijmj3gc39nn394wpr0l94yp6f",
         "lts": false
+    },
+    "7.0": {
+        "version": "7.0",
+        "hash": "sha256:1w4i705i0nl1xqv7fdhdbhy7j3xrzhl31fabs6vmgiw7nf06szxv",
+        "lts": false
     }
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8b99d451c4b7..1331fca251ee 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1177,6 +1177,7 @@ mapAliases {
   linux_6_17 = linuxKernel.kernels.linux_6_17;
   linux_6_18 = linuxKernel.kernels.linux_6_18;
   linux_6_19 = linuxKernel.kernels.linux_6_19;
+  linux_7_0 = linuxKernel.kernels.linux_7_0;
   linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
   linux_hardened = throw "linux_hardened has been removed due to lack of maintenance"; # Added 2026-03-18
   linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
@@ -1211,6 +1212,7 @@ mapAliases {
   linuxPackages_6_17 = linuxKernel.packages.linux_6_17;
   linuxPackages_6_18 = linuxKernel.packages.linux_6_18;
   linuxPackages_6_19 = linuxKernel.packages.linux_6_19;
+  linuxPackages_7_0 = linuxKernel.packages.linux_7_0;
   linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
   linuxPackages_hardened = throw "linuxPackages_hardened has been removed due to lack of maintenance"; # Added 2026-03-18
   linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 1c65a10f26ef..dd28c3df679b 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -114,6 +114,14 @@ in
           ];
         };
 
+        linux_7_0 = callPackage ../os-specific/linux/kernel/mainline.nix {
+          branch = "7.0";
+          kernelPatches = [
+            kernelPatches.bridge_stp_helper
+            kernelPatches.request_key_helper
+          ];
+        };
+
         linux_testing =
           let
             testing = callPackage ../os-specific/linux/kernel/mainline.nix {
@@ -677,6 +685,7 @@ in
     linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
     linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18);
     linux_6_19 = recurseIntoAttrs (packagesFor kernels.linux_6_19);
+    linux_7_0 = recurseIntoAttrs (packagesFor kernels.linux_7_0);
   }
   // lib.optionalAttrs config.allowAliases {
     linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
@@ -744,7 +753,7 @@ in
   packageAliases = {
     linux_default = packages.linux_6_18;
     # Update this when adding the newest kernel major version!
-    linux_latest = packages.linux_6_19;
+    linux_latest = packages.linux_7_0;
   }
   // lib.optionalAttrs config.allowAliases {
     linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";

From f75cfe7041f1e35147b8dc50aa81fa31849dfc00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 14:38:00 +0000
Subject: [PATCH 269/336] python3Packages.aiodukeenergy: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/aiodukeenergy/default.nix b/pkgs/development/python-modules/aiodukeenergy/default.nix
index 54878fc31c9f..4a22e8f24019 100644
--- a/pkgs/development/python-modules/aiodukeenergy/default.nix
+++ b/pkgs/development/python-modules/aiodukeenergy/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "aiodukeenergy";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hunterjm";
     repo = "aiodukeenergy";
     tag = "v${version}";
-    hash = "sha256-tHtuQFOw9CPqWJ6QzdqcN3W8uzjgZFh5z8DqAc+5jLo=";
+    hash = "sha256-v8rWRjAlTGu7d0bQaAQ1A7Qm4oP3STkIzHcKLa8+/OY=";
   };
 
   build-system = [ poetry-core ];

From 72f9a5a94dbaf7108b883c798b577b8966462b4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Apr 2026 16:49:55 +0200
Subject: [PATCH 270/336] servo: 0.0.6 -> 0.1.0

https://servo.org/blog/2026/04/13/servo-0.1.0-release/
---
 nixos/tests/servo.nix             |  2 +-
 pkgs/by-name/se/servo/package.nix | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/servo.nix b/nixos/tests/servo.nix
index 090b1e5b28c4..89c3769cd902 100644
--- a/nixos/tests/servo.nix
+++ b/nixos/tests/servo.nix
@@ -20,7 +20,7 @@
     machine.wait_for_x()
 
     with subtest("Wait until Servo has finished loading the Valgrind docs page"):
-      machine.execute("xterm -e 'servo file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &");
+      machine.execute("xterm -e '${lib.getExe pkgs.servo} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &");
       machine.wait_for_window("Valgrind")
       machine.wait_for_text("Quick Start Guide")
   '';
diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 8bc1c0bd5433..c5546d7ee9e3 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -69,13 +69,13 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "servo";
-  version = "0.0.6";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eKog8kcZJXBMJz/Lr0+ZwU95HYZRljGWByJ84vPfiEY=";
+    hash = "sha256-DnjtKizYwadBYDqafFDuE/DRIjCqnK/L95zV0Fv0Xhc=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-VP+hAQDfUVbOa2+Uq6hqG5YgQYRNI01+gDaR2MyYUTM=";
+  cargoHash = "sha256-TJXWscTnsXxaWTfn7BugVMPamXOsyHXQhJskX04X7Zw=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
@@ -159,7 +159,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mkdir -p $out/resources
     cp -r ./resources $out/
 
-    wrapProgram $out/bin/servo \
+    wrapProgram $out/bin/servoshell \
       --prefix LD_LIBRARY_PATH : ${runtimePaths}
   '';
 
@@ -178,7 +178,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       hexa
     ];
     teams = with lib.teams; [ ngi ];
-    mainProgram = "servo";
+    mainProgram = "servoshell";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })

From 84171d1e33efc604058e018ae0d7ec6a3e4be547 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 15:05:34 +0000
Subject: [PATCH 271/336] camunda-modeler: 5.45.0 -> 5.46.0

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

diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix
index fde12b337f56..ddcaa2e1428c 100644
--- a/pkgs/by-name/ca/camunda-modeler/package.nix
+++ b/pkgs/by-name/ca/camunda-modeler/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "camunda-modeler";
-  version = "5.45.0";
+  version = "5.46.0";
 
   src = fetchurl {
     url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
-    hash = "sha256-5hYMRFdMXlnhHzwbj8Hy48WJBf7L5UUhZUfKSlr06Z0=";
+    hash = "sha256-uDZYy+Lkvc5YdIdn84l8QbNPcU5EQzOqTTdTezgCudw=";
   };
   sourceRoot = "camunda-modeler-${version}-linux-x64";
 

From efa0fd1fd07e5c40d0e7554011c423c229ae7a95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 15:10:13 +0000
Subject: [PATCH 272/336] cargo-wizard: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/by-name/ca/cargo-wizard/package.nix b/pkgs/by-name/ca/cargo-wizard/package.nix
index 67ba02eed1ee..e0c1a2d17d26 100644
--- a/pkgs/by-name/ca/cargo-wizard/package.nix
+++ b/pkgs/by-name/ca/cargo-wizard/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-wizard";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "kobzol";
     repo = "cargo-wizard";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oFPSgjXZ+Kq59tV/7s6WPF6FHXENoZv8D245yyT0E9E=";
+    hash = "sha256-WLGE2ZuytjSridZwfUTtNQF5woeBbx5ZoHfB9eyvedI=";
   };
 
-  cargoHash = "sha256-ClulQP+1/RLvOWWB3uKTCn2Sx3+TO25qRs456DWHKu0=";
+  cargoHash = "sha256-vRakgwZRyYkk3xFfZzl197tgRmx+/g2b8eaDunwrCzM=";
 
   preCheck = ''
     export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType

From 6f975340c87fab1281eb9b5b67eab57fddd5ec38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 15:13:40 +0000
Subject: [PATCH 273/336] cargo-xwin: 0.21.4 -> 0.21.5

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

diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 2bd25e2dcac7..6c4f49889b90 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-xwin";
-  version = "0.21.4";
+  version = "0.21.5";
 
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mgFMjNxjB4S9/nou6S8NN8ZpXX7K49lLArt/cXcSPIE=";
+    hash = "sha256-RgR0YBjgpk10IS62+/CdIbZ+7oSnkOC5npIqRrib6eU=";
   };
 
-  cargoHash = "sha256-Md2pk8kYqUDPzRQedbne4Crg5UbGHHE5OTRz4LXLs3E=";
+  cargoHash = "sha256-dJkfEPRyXFpMwqExvyimLMc+iOAby5yeEUpHt0MoQ6M=";
 
   meta = {
     description = "Cross compile Cargo project to Windows MSVC target with ease";

From d7b5f85137720a9811937afaad0511296107dbc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 15:13:42 +0000
Subject: [PATCH 274/336] arkade: 0.11.92 -> 0.11.93

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

diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix
index 7653cca489a6..f3e002decb83 100644
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "arkade";
-  version = "0.11.92";
+  version = "0.11.93";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     tag = finalAttrs.version;
-    hash = "sha256-7xBtmpi4Mm9C9HSGsuluu7N4IglZisw3fWSgK9DFizo=";
+    hash = "sha256-VWdWlUBSyRqHtApX2n/eBVBMw34zt+I2hi0Nmvx901o=";
   };
 
   env.CGO_ENABLED = 0;

From fd1f7efde060b9805af9b90ec40d6e0087f6f46f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 13 Apr 2026 18:13:55 +0300
Subject: [PATCH 275/336] linuxPackages.bcachefs: allow kernel 7.0

It is supported starting from 1.37.
---
 pkgs/by-name/bc/bcachefs-tools/kernel-module.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
index 6889353cec9c..ad9e4a9c5483 100644
--- a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation {
       platforms
       ;
 
-    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.20");
+    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.1");
   };
 }

From 9834593727344c72a8cca7d0a0b949e219573843 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 15:55:30 +0000
Subject: [PATCH 276/336] umap: 3.7.1 -> 3.7.3

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

diff --git a/pkgs/by-name/um/umap/package.nix b/pkgs/by-name/um/umap/package.nix
index c5e3ff1af1b3..c2fbcb080b6b 100644
--- a/pkgs/by-name/um/umap/package.nix
+++ b/pkgs/by-name/um/umap/package.nix
@@ -19,14 +19,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "umap";
-  version = "3.7.1";
+  version = "3.7.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "umap-project";
     repo = "umap";
     rev = version;
-    hash = "sha256-Fuq2whUFwidLd2pk1c1+jumik3IO13CwGLJraGvHHIA=";
+    hash = "sha256-rM1o83/udkqiVD0nSiAjNVAzriJr2ztvSXh45wxmYzU=";
   };
 
   build-system = [

From 1166aab11c9b096213b9ea5db46fdaf772bf11e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 16:24:14 +0000
Subject: [PATCH 277/336] dms-shell: 1.4.4 -> 1.4.4.1

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

diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix
index 31c6bc9bbe74..a5bfd58b2c37 100644
--- a/pkgs/by-name/dm/dms-shell/package.nix
+++ b/pkgs/by-name/dm/dms-shell/package.nix
@@ -28,13 +28,13 @@ buildGoModule (
   in
   {
     pname = "dms-shell";
-    version = "1.4.4";
+    version = "1.4.4.1";
 
     src = fetchFromGitHub {
       owner = "AvengeMedia";
       repo = "DankMaterialShell";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-rfWvWbPVrpujmBp/q9My/70fWgRLaELdrnZB3CZKlWg=";
+      hash = "sha256-iYBdSBvcW7bJtc84G6k5TFJEbPHQrif9KzZyE9Lbq8M=";
     };
 
     sourceRoot = "${finalAttrs.src.name}/core";

From feaef5cc96300e1c8558e7c8488a7e75defd791c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 4 Apr 2026 22:37:44 +0200
Subject: [PATCH 278/336] nixos/tests/machinectl: add systemd-vmspawn tests

---
 nixos/tests/systemd-machinectl.nix | 134 +++++++++++++++++++++++------
 1 file changed, 109 insertions(+), 25 deletions(-)

diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix
index 8238bcea3f3a..19e40b882c4c 100644
--- a/nixos/tests/systemd-machinectl.nix
+++ b/nixos/tests/systemd-machinectl.nix
@@ -1,33 +1,38 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 let
+  evalConfig =
+    module:
+    (import ../lib/eval-config.nix {
+      system = null;
+      modules = [ module ];
+    }).config.system.build.toplevel;
 
-  container =
+  common =
     { config, ... }:
     {
-      # We re-use the NixOS container option ...
-      boot.isNspawnContainer = true;
-      # ... and revert unwanted defaults
-      networking.useHostResolvConf = false;
-
-      # use networkd to obtain systemd network setup
-      networking.useNetworkd = true;
-      networking.useDHCP = false;
-
-      # systemd-nspawn expects /sbin/init
-      boot.loader.initScript.enable = true;
-
       imports = [ ../modules/profiles/minimal.nix ];
 
       system.stateVersion = config.system.nixos.release;
 
       nixpkgs.pkgs = pkgs;
+
+      # use networkd to obtain systemd network setup
+      networking.useNetworkd = true;
     };
 
-  containerSystem =
-    (import ../lib/eval-config.nix {
-      system = null;
-      modules = [ container ];
-    }).config.system.build.toplevel;
+  container = {
+    imports = [ common ];
+
+    # We re-use the NixOS container option ...
+    boot.isNspawnContainer = true;
+    # ... and revert unwanted defaults
+    networking.useHostResolvConf = false;
+
+    # systemd-nspawn expects /sbin/init
+    boot.loader.initScript.enable = true;
+  };
+
+  containerSystem = evalConfig container;
 
   containerName = "container";
   containerRoot = "/var/lib/machines/${containerName}";
@@ -51,16 +56,52 @@ let
       }
     ];
   };
+
+  vm = {
+    imports = [
+      common
+      ../modules/profiles/qemu-guest.nix
+    ];
+    # improvement: move following configuration to qemu-guest.nix
+    boot.initrd.availableKernelModules = [
+      "virtiofs"
+    ];
+
+    boot.initrd.systemd.enable = true;
+    # root is defined by systemd-vmspawn
+    boot.initrd.systemd.root = null;
+
+    boot.loader.grub.enable = false;
+
+    services.openssh.enable = true;
+  };
+  vmSystem = evalConfig vm;
+
+  vmShared = {
+    imports = [ vm ];
+
+    fileSystems."/nix/store" = {
+      device = "mnt0";
+      fsType = "virtiofs";
+      neededForBoot = true;
+    };
+  };
+  vmSharedSystem = evalConfig vmShared;
 in
 {
   name = "systemd-machinectl";
+  meta.maintainers = with lib.maintainers; [ ck3d ];
 
   nodes.machine =
-    { lib, ... }:
+    {
+      config,
+      lib,
+      pkgs,
+      ...
+    }:
     {
       # use networkd to obtain systemd network setup
       networking.useNetworkd = true;
-      networking.useDHCP = false;
 
       # do not try to access cache.nixos.org
       nix.settings.substituters = lib.mkForce [ ];
@@ -71,8 +112,12 @@ in
       virtualisation.additionalPaths = [
         containerSystem
         containerTarball
+        vmSystem
+        vmSharedSystem
       ];
 
+      virtualisation.diskSize = 2048;
+
       systemd.tmpfiles.rules = [
         "d /var/lib/machines/shared-decl 0755 root root - -"
       ];
@@ -102,22 +147,62 @@ in
         overrideStrategy = "asDropin";
       };
 
-      # open DHCP for container
       networking.firewall.extraCommands = ''
+        # open DHCP for nspawn interfaces
         ${pkgs.iptables}/bin/iptables -A nixos-fw -i ve-+ -p udp -m udp --dport 67 -j nixos-fw-accept
+        # open DHCP for vmspawn interfaces
+        ${pkgs.iptables}/bin/iptables -A nixos-fw -i vt-+ -p udp -m udp --dport 67 -j nixos-fw-accept
       '';
+
+      environment.systemPackages =
+        let
+          # improvement: following wrapper should be moved to pkgs
+          vmspawn-wrapped =
+            pkgs.runCommand "systemd-vmspawn-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; }
+              ''
+                makeWrapper ${config.systemd.package}/bin/systemd-vmspawn $out/bin/systemd-vmspawn-wrapped \
+                  --prefix PATH : ${
+                    lib.makeBinPath [
+                      pkgs.qemu
+                      pkgs.virtiofsd
+                      pkgs.openssh # ssh-keygen
+                    ]
+                  } \
+                  --prefix XDG_CONFIG_HOME : ${pkgs.qemu}/share
+              '';
+        in
+        [ vmspawn-wrapped ];
     };
 
   testScript = ''
     start_all()
     machine.wait_for_unit("default.target");
+    # Workaround for nixos-install
+    machine.succeed("chmod o+rx /var/lib/machines");
+
+    with subtest("vm-shared"):
+      machine.succeed("mkdir -p /var/lib/machines/vm-shared");
+      # Start vm-shared
+      machine.succeed("systemd-run systemd-vmspawn-wrapped --directory=/var/lib/machines/vm-shared --bind-ro=/nix/store --linux=${vmSharedSystem}/kernel --initrd=${vmSharedSystem}/initrd ${vmSharedSystem}/kernel-params init=${vmSharedSystem}/init")
+      machine.wait_until_succeeds("machinectl status vm-shared");
+      machine.wait_until_succeeds("eval $(machinectl show vm-shared --property=SSHPrivateKeyPath --property=SSHAddress) && ssh -i $SSHPrivateKeyPath $SSHAddress true")
+      machine.succeed("machinectl stop vm-shared");
+
+    with subtest("vm"):
+      machine.succeed("mkdir -p /var/lib/machines/vm");
+      # Install vm
+      machine.succeed("nixos-install --root /var/lib/machines/vm --system ${vmSystem} --no-channel-copy --no-root-passwd");
+      # Start vm
+      machine.succeed("systemd-run systemd-vmspawn-wrapped --directory=/var/lib/machines/vm --linux=${vmSystem}/kernel --initrd=${vmSystem}/initrd ${vmSystem}/kernel-params init=${vmSystem}/init")
+      machine.wait_until_succeeds("machinectl status vm");
+      machine.wait_until_succeeds("eval $(machinectl show vm --property=SSHPrivateKeyPath --property=SSHAddress) && ssh -i $SSHPrivateKeyPath $SSHAddress true")
+      machine.succeed("machinectl stop vm");
 
     # Test machinectl start stop of shared-decl
     machine.succeed("machinectl start shared-decl");
     machine.wait_until_succeeds("systemctl -M shared-decl is-active default.target");
     machine.succeed("machinectl stop shared-decl");
 
-    # create containers root
     machine.succeed("mkdir -p ${containerRoot}");
 
     # start container with shared nix store by using same arguments as for systemd-nspawn@.service
@@ -128,8 +213,6 @@ in
     machine.succeed("machinectl stop ${containerName}");
 
     # Install container
-    # Workaround for nixos-install
-    machine.succeed("chmod o+rx /var/lib/machines");
     machine.succeed("nixos-install --root ${containerRoot} --system ${containerSystem} --no-channel-copy --no-root-passwd");
 
     # Allow systemd-nspawn to apply user namespace on immutable files
@@ -183,6 +266,7 @@ in
 
     # Test auto-start
     machine.succeed("machinectl show ${containerName}")
+    machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target");
 
     # Test machinectl stop
     machine.succeed("machinectl stop ${containerName}");

From a735cae567974fcc303e96c8e9317bb90b06458d Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Thu, 19 Mar 2026 08:30:31 -0700
Subject: [PATCH 279/336] rocmPackages.rocprofiler-sdk: init at 7.2.1

---
 pkgs/development/rocm-modules/default.nix     |   1 +
 ...rename-consumer-test-for-dependent-c.patch |  42 +++
 ...profiler-sdk-add-missing-stl-headers.patch |  69 +++++
 ...add-missing-rocprofiler-sdk-rocprofi.patch | 190 +++++++++++++
 ...fix-find_package-dependency-scoping-.patch |  89 ++++++
 ...-allow-using-system-elfio-dependency.patch |  76 +++++
 ...k-allow-using-system-otf2-dependency.patch |  53 ++++
 ...k-Allow-using-system-json-dependency.patch |  73 +++++
 ...stop-manually-setting-warning-flags-.patch | 269 ++++++++++++++++++
 .../rocm-modules/rocprofiler-sdk/default.nix  | 210 ++++++++++++++
 10 files changed, 1072 insertions(+)
 create mode 100644 pkgs/development/rocm-modules/rocprofiler-sdk/0001-rocprofiler-sdk-rename-consumer-test-for-dependent-c.patch
 create mode 100644 pkgs/development/rocm-modules/rocprofiler-sdk/0002-rocprofiler-sdk-add-missing-stl-headers.patch
 create mode 100644 pkgs/development/rocm-modules/rocprofiler-sdk/0003-rocprofiler-sdk-add-missing-rocprofiler-sdk-rocprofi.patch
 create mode 100644 pkgs/development/rocm-modules/rocprofiler-sdk/0004-rocprofiler-sdk-fix-find_package-dependency-scoping-.patch
 create mode 100644 pkgs/development/rocm-modules/rocprofiler-sdk/0005-rocprofiler-sdk-allow-using-system-elfio-dependency.patch
 create mode 100644 pkgs/development/rocm-modules/rocprofiler-sdk/0006-rocprofiler-sdk-allow-using-system-otf2-dependency.patch
 create mode 100644 pkgs/development/rocm-modules/rocprofiler-sdk/0007-rocprofiler-sdk-Allow-using-system-json-dependency.patch
 create mode 100644 pkgs/development/rocm-modules/rocprofiler-sdk/0008-rocprofiler-sdk-stop-manually-setting-warning-flags-.patch
 create mode 100644 pkgs/development/rocm-modules/rocprofiler-sdk/default.nix

diff --git a/pkgs/development/rocm-modules/default.nix b/pkgs/development/rocm-modules/default.nix
index 01077ced8012..5fbf0b40f132 100644
--- a/pkgs/development/rocm-modules/default.nix
+++ b/pkgs/development/rocm-modules/default.nix
@@ -87,6 +87,7 @@ let
       rocprofiler-register = self.callPackage ./rocprofiler-register {
         inherit (llvm) clang;
       };
+      rocprofiler-sdk = self.callPackage ./rocprofiler-sdk { };
 
       rocprof-trace-decoder = self.callPackage ./rocprof-trace-decoder { };
 
diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0001-rocprofiler-sdk-rename-consumer-test-for-dependent-c.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0001-rocprofiler-sdk-rename-consumer-test-for-dependent-c.patch
new file mode 100644
index 000000000000..bf13b730dc86
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0001-rocprofiler-sdk-rename-consumer-test-for-dependent-c.patch
@@ -0,0 +1,42 @@
+From 2868bcf8a340ecd4c564c1bd3210753fbd6aad8c Mon Sep 17 00:00:00 2001
+From: Robin Voetter <rvoetter@amd.com>
+Date: Sun, 5 Apr 2026 15:14:12 +0000
+Subject: [PATCH] [rocprofiler-sdk] rename consumer-test for dependent change
+
+This target has been renamed on the develop branch in
+https://github.com/ROCm/rocm-systems/commit/a2288eb50bd805e5d6d7dfa98834972083e4356a,
+however, that commit requires additional commits in order to apply properly. For now
+it is easier to fix this by renaming this target so that the other patch applies
+cleanly.
+---
+ .../lib/rocprofiler-sdk/counters/tests/CMakeLists.txt     | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt
+index 66fd9efa5b..d3b5fbe378 100644
+--- a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt
++++ b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt
+@@ -104,16 +104,16 @@ set_tests_properties(
+ 
+ set(ROCPROFILER_LIB_CONSUMER_TEST_SOURCES consumer_test.cpp)
+ 
+-add_executable(consumer-test)
+-target_sources(consumer-test PRIVATE ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES})
++add_executable(consumer-tests)
++target_sources(consumer-tests PRIVATE ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES})
+ 
+ target_link_libraries(
+-    consumer-test rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
++    consumer-tests rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+     rocprofiler-sdk::rocprofiler-sdk-hip rocprofiler-sdk::rocprofiler-sdk-common-library
+     rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest GTest::gtest_main)
+ 
+ gtest_add_tests(
+-    TARGET consumer-test
++    TARGET consumer-tests
+     SOURCES ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES}
+     TEST_LIST consumer-tests_TESTS
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+-- 
+2.43.0
+
diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0002-rocprofiler-sdk-add-missing-stl-headers.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0002-rocprofiler-sdk-add-missing-stl-headers.patch
new file mode 100644
index 000000000000..3afe49d59248
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0002-rocprofiler-sdk-add-missing-stl-headers.patch
@@ -0,0 +1,69 @@
+From af363337240fb6e4976004900b610317ba459165 Mon Sep 17 00:00:00 2001
+From: Robin Voetter <rvoetter@amd.com>
+Date: Sat, 4 Apr 2026 21:01:33 +0000
+Subject: [PATCH] [rocprofiler-sdk] add missing stl headers
+
+These missing includes became apparent when building with
+ROCPROFILER_BUILD_GHC_FS=OFF.
+---
+ source/lib/att-tool/att_lib_wrapper.hpp                | 2 ++
+ source/lib/rocprofiler-sdk-rocpd/sql.cpp               | 1 +
+ source/lib/rocprofiler-sdk/counters/metrics.cpp        | 1 +
+ source/lib/rocprofiler-sdk/tests/status.cpp            | 1 +
+ 4 files changed, 5 insertions(+)
+
+diff --git a/source/lib/att-tool/att_lib_wrapper.hpp b/source/lib/att-tool/att_lib_wrapper.hpp
+index e7e58c5991..7dcd000a43 100644
+--- a/source/lib/att-tool/att_lib_wrapper.hpp
++++ b/source/lib/att-tool/att_lib_wrapper.hpp
+@@ -28,9 +28,11 @@
+ #include <rocprofiler-sdk/experimental/thread-trace/trace_decoder.h>
+ 
+ #include <algorithm>
++#include <array>
+ #include <fstream>
+ #include <iostream>
+ #include <map>
++#include <memory>
+ #include <vector>
+ 
+ namespace rocprofiler
+diff --git a/source/lib/rocprofiler-sdk-rocpd/sql.cpp b/source/lib/rocprofiler-sdk-rocpd/sql.cpp
+index b052ec51c3..7e8742686e 100644
+--- a/source/lib/rocprofiler-sdk-rocpd/sql.cpp
++++ b/source/lib/rocprofiler-sdk-rocpd/sql.cpp
+@@ -39,6 +39,7 @@
+ #include <fmt/ranges.h>
+ 
+ #include <dlfcn.h>
++#include <fstream>
+ #include <initializer_list>
+ #include <unordered_map>
+ 
+diff --git a/source/lib/rocprofiler-sdk/counters/metrics.cpp b/source/lib/rocprofiler-sdk/counters/metrics.cpp
+index 8adcf0f991..ee3391e904 100644
+--- a/source/lib/rocprofiler-sdk/counters/metrics.cpp
++++ b/source/lib/rocprofiler-sdk/counters/metrics.cpp
+@@ -46,6 +46,7 @@
+ #include <dlfcn.h>  // for dladdr
+ #include <cstdint>
+ #include <cstdlib>
++#include <fstream>
+ #include <memory>
+ #include <system_error>
+ #include <vector>
+diff --git a/source/lib/rocprofiler-sdk/tests/status.cpp b/source/lib/rocprofiler-sdk/tests/status.cpp
+index a5a492101d..b01f511b99 100644
+--- a/source/lib/rocprofiler-sdk/tests/status.cpp
++++ b/source/lib/rocprofiler-sdk/tests/status.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include <gtest/gtest.h>
+ 
++#include <iomanip>
+ #include <string_view>
+ 
+ TEST(rocprofiler_lib, error_string)
+-- 
+2.43.0
+
diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0003-rocprofiler-sdk-add-missing-rocprofiler-sdk-rocprofi.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0003-rocprofiler-sdk-add-missing-rocprofiler-sdk-rocprofi.patch
new file mode 100644
index 000000000000..47944043df68
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0003-rocprofiler-sdk-add-missing-rocprofiler-sdk-rocprofi.patch
@@ -0,0 +1,190 @@
+From c767eafb393294214e9d25142a9eebebf234892b Mon Sep 17 00:00:00 2001
+From: Robin Voetter <rvoetter@amd.com>
+Date: Sat, 4 Apr 2026 21:20:32 +0000
+Subject: [PATCH] [rocprofiler-sdk] add missing
+ rocprofiler-sdk::rocprofiler-sdk-amd-comgr dependencies
+
+These targets, mostly tests, were missing dependencies on amd comgr.
+---
+ .../lib/att-tool/waitcnt/tests/CMakeLists.txt |  1 +
+ source/lib/python/utilities.cmake             |  3 ++-
+ .../counters/tests/CMakeLists.txt             | 13 +++++++++---
+ .../pc_sampling/parser/tests/CMakeLists.txt   | 20 ++++++++++++++-----
+ .../pc_sampling/tests/CMakeLists.txt          |  4 +++-
+ .../lib/rocprofiler-sdk/tests/CMakeLists.txt  |  2 ++
+ .../thread_trace/tests/CMakeLists.txt         |  1 +
+ 7 files changed, 34 insertions(+), 10 deletions(-)
+
+diff --git a/source/lib/att-tool/waitcnt/tests/CMakeLists.txt b/source/lib/att-tool/waitcnt/tests/CMakeLists.txt
+index 4cc800600e..88dbeaf15a 100644
+--- a/source/lib/att-tool/waitcnt/tests/CMakeLists.txt
++++ b/source/lib/att-tool/waitcnt/tests/CMakeLists.txt
+@@ -17,6 +17,7 @@ target_link_libraries(
+             rocprofiler-sdk::rocprofiler-sdk-common-library
+             rocprofiler-sdk::rocprofiler-sdk-glog
+             rocprofiler-sdk::rocprofiler-sdk-static-library
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
+             GTest::gtest
+             GTest::gtest_main)
+ 
+diff --git a/source/lib/python/utilities.cmake b/source/lib/python/utilities.cmake
+index 8f51fe971b..e527278f38 100644
+--- a/source/lib/python/utilities.cmake
++++ b/source/lib/python/utilities.cmake
+@@ -211,7 +211,8 @@ function(rocprofiler_rocpd_python_bindings _VERSION)
+                 rocprofiler-sdk::rocprofiler-sdk-gotcha
+                 rocprofiler-sdk::rocprofiler-sdk-dw
+                 rocprofiler-sdk::rocprofiler-sdk-static-library
+-                rocprofiler-sdk::rocprofiler-sdk-rocpd-library)
++                rocprofiler-sdk::rocprofiler-sdk-rocpd-library
++                rocprofiler-sdk::rocprofiler-sdk-amd-comgr)
+ 
+     # if "Development" is specified instead of "Development.Module", we need to link to
+     # python libraries
+diff --git a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt
+index 824a5c7ae0..5f0bdf313f 100644
+--- a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt
++++ b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt
+@@ -55,6 +55,7 @@ target_sources(
+ target_link_libraries(
+     counter_test_constants
+     PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
+             rocprofiler-sdk::rocprofiler-sdk-static-library
+             rocprofiler-sdk::rocprofiler-sdk-hip
+             rocprofiler-sdk::rocprofiler-sdk-hsa-runtime)
+@@ -77,6 +78,7 @@ target_link_libraries(
+             rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+             rocprofiler-sdk::rocprofiler-sdk-hip
+             rocprofiler-sdk::rocprofiler-sdk-common-library
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
+             rocprofiler-sdk::rocprofiler-sdk-static-library
+             GTest::gtest
+             GTest::gtest_main)
+@@ -111,9 +113,14 @@ add_executable(consumer-tests)
+ target_sources(consumer-tests PRIVATE ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES})
+ 
+ target_link_libraries(
+-    consumer-tests rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+-    rocprofiler-sdk::rocprofiler-sdk-hip rocprofiler-sdk::rocprofiler-sdk-common-library
+-    rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest GTest::gtest_main)
++    consumer-tests
++    rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
++    rocprofiler-sdk::rocprofiler-sdk-hip
++    rocprofiler-sdk::rocprofiler-sdk-common-library
++    rocprofiler-sdk::rocprofiler-sdk-amd-comgr
++    rocprofiler-sdk::rocprofiler-sdk-static-library
++    GTest::gtest
++    GTest::gtest_main)
+ 
+ rocprofiler_add_unit_test(
+     TARGET consumer-tests
+diff --git a/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt
+index 46feb0cf51..8a8168186e 100644
+--- a/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt
++++ b/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt
+@@ -30,7 +30,9 @@ target_include_directories(pcs_gfx9_test PRIVATE ${PCTEST_INCLUDE_DIR})
+ target_link_libraries(
+     pcs_gfx9_test
+     PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+-            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
++            rocprofiler-sdk::rocprofiler-sdk-static-library
++            GTest::gtest
+             GTest::gtest_main)
+ 
+ rocprofiler_add_unit_test(
+@@ -50,7 +52,9 @@ target_include_directories(pcs_id_test PRIVATE ${PCTEST_INCLUDE_DIR})
+ target_link_libraries(
+     pcs_id_test
+     PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+-            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
++            rocprofiler-sdk::rocprofiler-sdk-static-library
++            GTest::gtest
+             GTest::gtest_main)
+ 
+ rocprofiler_add_unit_test(
+@@ -72,7 +76,9 @@ target_include_directories(pcs_bench_test PRIVATE ${PCTEST_INCLUDE_DIR})
+ target_link_libraries(
+     pcs_bench_test
+     PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+-            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
++            rocprofiler-sdk::rocprofiler-sdk-static-library
++            GTest::gtest
+             GTest::gtest_main)
+ 
+ add_executable(pcs_thread_test)
+@@ -85,7 +91,9 @@ target_include_directories(pcs_thread_test PRIVATE ${PCTEST_INCLUDE_DIR})
+ target_link_libraries(
+     pcs_thread_test
+     PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+-            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
++            rocprofiler-sdk::rocprofiler-sdk-static-library
++            GTest::gtest
+             GTest::gtest_main)
+ 
+ rocprofiler_add_unit_test(
+@@ -106,7 +114,9 @@ target_include_directories(pcs_gfx12_test PRIVATE ${PCTEST_INCLUDE_DIR})
+ target_link_libraries(
+     pcs_gfx12_test
+     PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+-            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
++            rocprofiler-sdk::rocprofiler-sdk-static-library
++            GTest::gtest
+             GTest::gtest_main)
+ 
+ rocprofiler_add_unit_test(
+diff --git a/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt
+index 4f91344f06..2268cd9eba 100644
+--- a/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt
++++ b/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt
+@@ -16,7 +16,9 @@ target_sources(pcs-test PRIVATE ${ROCPROFILER_LIB_PC_SAMPLING_TEST_SOURCES}
+ target_link_libraries(
+     pcs-test
+     PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+-            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
++            rocprofiler-sdk::rocprofiler-sdk-static-library
++            GTest::gtest
+             GTest::gtest_main)
+ 
+ rocprofiler_add_unit_test(
+diff --git a/source/lib/rocprofiler-sdk/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/tests/CMakeLists.txt
+index 3a33b6b547..15f1728955 100644
+--- a/source/lib/rocprofiler-sdk/tests/CMakeLists.txt
++++ b/source/lib/rocprofiler-sdk/tests/CMakeLists.txt
+@@ -30,6 +30,7 @@ target_link_libraries(
+     rocprofiler-sdk-lib-tests
+     PRIVATE rocprofiler-sdk::rocprofiler-sdk-static-library
+             rocprofiler-sdk::rocprofiler-sdk-common-library
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
+             rocprofiler-sdk::counter-test-constants
+             rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+             rocprofiler-sdk::rocprofiler-sdk-drm
+@@ -64,6 +65,7 @@ target_link_libraries(
+     rocprofiler-sdk-lib-tests-shared
+     PRIVATE rocprofiler-sdk::rocprofiler-sdk-shared-library
+             rocprofiler-sdk::rocprofiler-sdk-common-library
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
+             rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+             rocprofiler-sdk::rocprofiler-sdk-drm
+             rocprofiler-sdk::rocprofiler-sdk-roctx-shared-library
+diff --git a/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt
+index 410fa84eb4..7ce4c73e20 100644
+--- a/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt
++++ b/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt
+@@ -15,6 +15,7 @@ target_link_libraries(
+             rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+             rocprofiler-sdk::rocprofiler-sdk-hip
+             rocprofiler-sdk::rocprofiler-sdk-common-library
++            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
+             GTest::gtest
+             GTest::gtest_main
+             rocprofiler-sdk::counter-test-constants)
+-- 
+2.43.0
+
diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0004-rocprofiler-sdk-fix-find_package-dependency-scoping-.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0004-rocprofiler-sdk-fix-find_package-dependency-scoping-.patch
new file mode 100644
index 000000000000..dd9480b04070
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0004-rocprofiler-sdk-fix-find_package-dependency-scoping-.patch
@@ -0,0 +1,89 @@
+From 33058e85d1ee985f9b622bbb2a48199eb55afc20 Mon Sep 17 00:00:00 2001
+From: Robin Voetter <rvoetter@amd.com>
+Date: Sat, 4 Apr 2026 21:34:58 +0000
+Subject: [PATCH] [rocprofiler-sdk] fix find_package dependency scoping issues
+
+By default, find_package() packages are only made visible to the current
+scope. add_subdirectory() enters a new scope, so the packages searched for
+in external/CMakeLists.txt are not visible in any other CMake files. This
+causes dependency errors for these dependencies. find_package() packages can
+be made visible to the entire project by supplying the GLOBAL argument.
+
+The GLOBAL keyword was added in CMake version 3.24, hence the minimum required
+version is also bumped. Other projects across rocm-systems (rocprofiler-register)
+also already require CMake 3.24, so that should not cause any problems.
+
+See https://github.com/ROCm/rocm-systems/pull/1243, that change fixes the
+same problem in rocprofiler-register.
+---
+ CMakeLists.txt          | 2 +-
+ external/CMakeLists.txt | 8 ++++----
+ requirements.txt        | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 25f335afb3..0d86e05170 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
+ 
+ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND CMAKE_CURRENT_SOURCE_DIR STREQUAL
+                                                   CMAKE_SOURCE_DIR)
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index cab59c07bd..fcc872d118 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -64,7 +64,7 @@ if(ROCPROFILER_BUILD_TESTS)
+         mark_as_advanced(BUILD_GMOCK)
+         mark_as_advanced(GTEST_HAS_ABSL)
+     else()
+-        find_package(GTest REQUIRED)
++        find_package(GTest REQUIRED GLOBAL)
+         target_link_libraries(rocprofiler-sdk-gtest INTERFACE GTest::gtest)
+     endif()
+ endif()
+@@ -90,7 +90,7 @@ if(ROCPROFILER_BUILD_GLOG)
+         INTERFACE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/external/glog>
+                   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/external/glog/src>)
+ else()
+-    find_package(glog REQUIRED)
++    find_package(glog REQUIRED GLOBAL)
+     target_link_libraries(rocprofiler-sdk-glog INTERFACE glog::glog)
+ endif()
+ 
+@@ -111,7 +111,7 @@ if(ROCPROFILER_BUILD_FMT)
+         rocprofiler-sdk-fmt SYSTEM
+         INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/external/fmt/include>)
+ else()
+-    find_package(fmt REQUIRED)
++    find_package(fmt REQUIRED GLOBAL)
+     target_link_libraries(rocprofiler-sdk-fmt INTERFACE fmt::fmt)
+ endif()
+ 
+@@ -147,7 +147,7 @@ if(ROCPROFILER_BUILD_YAML_CPP)
+         rocprofiler-sdk-yaml-cpp
+         INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/external/yaml-cpp/include>)
+ else()
+-    find_package(yaml-cpp 0.8.0 REQUIRED)
++    find_package(yaml-cpp 0.8.0 REQUIRED GLOBAL)
+     target_link_libraries(rocprofiler-sdk-yaml-cpp INTERFACE yaml-cpp::yaml-cpp)
+ endif()
+ 
+diff --git a/requirements.txt b/requirements.txt
+index de7421da0d..3eb60c088b 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,7 +1,7 @@
+ black
+ clang-format>=11.0.0,<12.0.0
+ clang-tidy>=15.0.0,<20.0.0
+-cmake>=3.21.0
++cmake>=3.24.0
+ cmake-format
+ dataclasses
+ flake8
+-- 
+2.43.0
+
diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0005-rocprofiler-sdk-allow-using-system-elfio-dependency.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0005-rocprofiler-sdk-allow-using-system-elfio-dependency.patch
new file mode 100644
index 000000000000..9652b8eb2170
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0005-rocprofiler-sdk-allow-using-system-elfio-dependency.patch
@@ -0,0 +1,76 @@
+From 40b1abf9d3ec8eb3f798946263f144988fa3a416 Mon Sep 17 00:00:00 2001
+From: Robin Voetter <rvoetter@amd.com>
+Date: Sat, 4 Apr 2026 21:50:57 +0000
+Subject: [PATCH] [rocprofiler-sdk] allow using system elfio dependency
+
+This adds a new option, ROCPROFILER_BUILD_ELFIO, which can be set to OFF to
+make rocprofiler use a system dependency for ELFIO instead of trying to build
+it manually. To mimick old behavior, ROCPROFILER_BUILD_ELFIO is set to ON by
+default.
+
+Related: https://github.com/ROCm/rocm-systems/pull/2319
+---
+ cmake/rocprofiler_options.cmake |  2 ++
+ external/CMakeLists.txt         | 33 +++++++++++++++++++--------------
+ 2 files changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/cmake/rocprofiler_options.cmake b/cmake/rocprofiler_options.cmake
+index c29311cc8c..da9ee9ad29 100644
+--- a/cmake/rocprofiler_options.cmake
++++ b/cmake/rocprofiler_options.cmake
+@@ -67,6 +67,8 @@ rocprofiler_add_option(ROCPROFILER_BUILD_GOTCHA
+                        "Enable building gotcha library internally" ON)
+ rocprofiler_add_option(ROCPROFILER_BUILD_YAML_CPP
+                        "Enable building yaml-cpp library internally" ON)
++rocprofiler_add_option(ROCPROFILER_BUILD_ELFIO "Enable building ELFIO library internally"
++                       ON)
+ if(ROCPROFILER_BUILD_TESTS)
+     rocprofiler_add_option(
+         ROCPROFILER_BUILD_GTEST
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index fcc872d118..ade8d25c1b 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -201,20 +201,25 @@ target_link_libraries(
+     INTERFACE $<BUILD_INTERFACE:rocprofiler-sdk-perfetto-static-library>)
+ 
+ # ELFIO
+-rocprofiler_checkout_git_submodule(
+-    RECURSIVE
+-    RELATIVE_PATH external/elfio
+-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-    REPO_URL https://github.com/serge1/ELFIO.git
+-    REPO_BRANCH "Release_3.12")
+-
+-set(ELFIO_BUILD_EXAMPLES OFF)
+-set(ELFIO_BUILD_TESTS OFF)
+-add_subdirectory(elfio EXCLUDE_FROM_ALL)
+-if(TARGET rocprofiler-sdk-elfio)
+-    get_target_property(ELFIO_INCLUDE_DIR elfio::elfio INTERFACE_INCLUDE_DIRECTORIES)
+-    target_include_directories(rocprofiler-sdk-elfio SYSTEM
+-                               INTERFACE ${ELFIO_INCLUDE_DIR})
++if(ROCPROFILER_BUILD_ELFIO)
++    rocprofiler_checkout_git_submodule(
++        RECURSIVE
++        RELATIVE_PATH external/elfio
++        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
++        REPO_URL https://github.com/serge1/ELFIO.git
++        REPO_BRANCH "Release_3.12")
++
++    set(ELFIO_BUILD_EXAMPLES OFF)
++    set(ELFIO_BUILD_TESTS OFF)
++    add_subdirectory(elfio EXCLUDE_FROM_ALL)
++    if(TARGET rocprofiler-sdk-elfio)
++        get_target_property(ELFIO_INCLUDE_DIR elfio::elfio INTERFACE_INCLUDE_DIRECTORIES)
++        target_include_directories(rocprofiler-sdk-elfio SYSTEM
++                                   INTERFACE ${ELFIO_INCLUDE_DIR})
++    endif()
++else()
++    find_package(elfio REQUIRED GLOBAL)
++    target_link_libraries(rocprofiler-sdk-elfio INTERFACE elfio::elfio)
+ endif()
+ 
+ #
+-- 
+2.43.0
+
diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0006-rocprofiler-sdk-allow-using-system-otf2-dependency.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0006-rocprofiler-sdk-allow-using-system-otf2-dependency.patch
new file mode 100644
index 000000000000..5eab70166b33
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0006-rocprofiler-sdk-allow-using-system-otf2-dependency.patch
@@ -0,0 +1,53 @@
+From 0f81ad1a46df9da7c9653812eded2165d0cd794d Mon Sep 17 00:00:00 2001
+From: Robin Voetter <rvoetter@amd.com>
+Date: Sat, 4 Apr 2026 21:58:13 +0000
+Subject: [PATCH] [rocprofiler-sdk] allow using system otf2 dependency
+
+This adds a new option, ROCPROFILER_BUILD_OTF2, which can be set to OFF to
+make rocprofiler-sdk use a system dependency for OTF2 instead of trying to
+build it manually. To mimick old behavior, ROCPROFILER_BUILD_OTF2 is set to
+ON by default.
+
+Related: https://github.com/ROCm/rocm-systems/pull/2319
+---
+ cmake/rocprofiler_options.cmake |  2 ++
+ external/CMakeLists.txt         | 10 +++++++++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/rocprofiler_options.cmake b/cmake/rocprofiler_options.cmake
+index da9ee9ad29..077898a520 100644
+--- a/cmake/rocprofiler_options.cmake
++++ b/cmake/rocprofiler_options.cmake
+@@ -69,6 +69,8 @@ rocprofiler_add_option(ROCPROFILER_BUILD_YAML_CPP
+                        "Enable building yaml-cpp library internally" ON)
+ rocprofiler_add_option(ROCPROFILER_BUILD_ELFIO "Enable building ELFIO library internally"
+                        ON)
++rocprofiler_add_option(ROCPROFILER_BUILD_OTF2 "Enable building OTF2 library internally"
++                       ON)
+ if(ROCPROFILER_BUILD_TESTS)
+     rocprofiler_add_option(
+         ROCPROFILER_BUILD_GTEST
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index ade8d25c1b..0c5d4e5fe5 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -225,7 +225,15 @@ endif()
+ #
+ # OTF2
+ #
+-add_subdirectory(otf2)
++if(ROCPROFILER_BUILD_OTF2)
++    add_subdirectory(otf2)
++else()
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(OTF2 REQUIRED IMPORTED_TARGET otf2)
++    add_library(otf2 INTERFACE)
++    add_library(otf2::otf2 ALIAS otf2)
++    target_link_libraries(otf2 INTERFACE PkgConfig::OTF2)
++endif()
+ 
+ rocprofiler_checkout_git_submodule(
+     RECURSIVE
+-- 
+2.43.0
+
diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0007-rocprofiler-sdk-Allow-using-system-json-dependency.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0007-rocprofiler-sdk-Allow-using-system-json-dependency.patch
new file mode 100644
index 000000000000..57d77fdf14df
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0007-rocprofiler-sdk-Allow-using-system-json-dependency.patch
@@ -0,0 +1,73 @@
+From fda4ff3c2389a5a8b57d44fd9be715ade37d576e Mon Sep 17 00:00:00 2001
+From: Robin Voetter <rvoetter@amd.com>
+Date: Sat, 4 Apr 2026 22:01:44 +0000
+Subject: [PATCH] [rocprofiler-sdk] Allow using system json dependency
+
+This adds a new option, ROCPROFILER_BUILD_JSON, which can be set to OFF to
+make rocprofiler-sdk use a system dependency for nlohmann_json instead of trying
+to build it manually. To mimick old behavior, ROCPROFILER_BUILD_JSON is set to
+ON by default.
+
+Related: https://github.com/ROCm/rocm-systems/pull/2319
+---
+ cmake/rocprofiler_options.cmake |  2 ++
+ external/CMakeLists.txt         | 27 ++++++++++++++++-----------
+ 2 files changed, 18 insertions(+), 11 deletions(-)
+
+diff --git a/cmake/rocprofiler_options.cmake b/cmake/rocprofiler_options.cmake
+index 077898a520..e35a41c95c 100644
+--- a/cmake/rocprofiler_options.cmake
++++ b/cmake/rocprofiler_options.cmake
+@@ -71,6 +71,8 @@ rocprofiler_add_option(ROCPROFILER_BUILD_ELFIO "Enable building ELFIO library in
+                        ON)
+ rocprofiler_add_option(ROCPROFILER_BUILD_OTF2 "Enable building OTF2 library internally"
+                        ON)
++rocprofiler_add_option(ROCPROFILER_BUILD_JSON "Enable building JSON library internally"
++                       ON)
+ if(ROCPROFILER_BUILD_TESTS)
+     rocprofiler_add_option(
+         ROCPROFILER_BUILD_GTEST
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 0c5d4e5fe5..b943be5ad6 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -235,20 +235,25 @@ else()
+     target_link_libraries(otf2 INTERFACE PkgConfig::OTF2)
+ endif()
+ 
+-rocprofiler_checkout_git_submodule(
+-    RECURSIVE
+-    RELATIVE_PATH external/json
+-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-    REPO_URL https://github.com/nlohmann/json.git
+-    REPO_BRANCH "develop")
+-
+ #
+ # JSON
+ #
+-add_subdirectory(json)
+-target_include_directories(
+-    rocprofiler-sdk-json SYSTEM
+-    INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/external/json/include>)
++if(ROCPROFILER_BUILD_JSON)
++    rocprofiler_checkout_git_submodule(
++        RECURSIVE
++        RELATIVE_PATH external/json
++        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
++        REPO_URL https://github.com/nlohmann/json.git
++        REPO_BRANCH "develop")
++
++    add_subdirectory(json)
++    target_include_directories(
++        rocprofiler-sdk-json SYSTEM
++        INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/external/json/include>)
++else()
++    find_package(nlohmann_json REQUIRED GLOBAL)
++    target_link_libraries(rocprofiler-sdk-json INTERFACE nlohmann_json::nlohmann_json)
++endif()
+ 
+ #
+ # SQLite3
+-- 
+2.43.0
+
diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0008-rocprofiler-sdk-stop-manually-setting-warning-flags-.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0008-rocprofiler-sdk-stop-manually-setting-warning-flags-.patch
new file mode 100644
index 000000000000..33caf8a3561f
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0008-rocprofiler-sdk-stop-manually-setting-warning-flags-.patch
@@ -0,0 +1,269 @@
+From ae4cffc06a368893d91be2739bb6482182681efc Mon Sep 17 00:00:00 2001
+From: Robin Voetter <rvoetter@amd.com>
+Date: Sat, 4 Apr 2026 22:22:56 +0000
+Subject: [PATCH] [rocprofiler-sdk] stop manually setting warning flags on
+ integration tests
+
+The primary motivation for this change is that -Werror is added to the compiler
+options unconditionally, which causes problems when compiling these tests during
+downstream packaging builds. The rocprofiler-sdk::tests-build-flags and
+rocprofiler-sdk::tests-common targets already include these warning flags, and this
+target also already handles setting -Werror conditionally based on ROCPROF_BUILD_WERROR.
+Some integration tests also set -Wpedantic, these have been left as-is. When
+ROCPROF_BUILD_WERROR is set to ON (default), behavior is the same as before this commit.
+---
+ tests/bin/attachment-test/CMakeLists.txt                  | 6 +++---
+ tests/bin/hip-graph/CMakeLists.txt                        | 5 +++--
+ tests/bin/hip-in-libraries/CMakeLists.txt                 | 6 +++---
+ tests/bin/hsa-code-object/CMakeLists.txt                  | 1 -
+ tests/bin/hsa-memory-allocation/CMakeLists.txt            | 3 +--
+ tests/bin/hsa-queue-dependency/CMakeLists.txt             | 1 -
+ tests/bin/multistream/CMakeLists.txt                      | 5 +++--
+ .../bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt | 6 +++---
+ tests/bin/reproducible-dispatch-count/CMakeLists.txt      | 8 ++++----
+ tests/bin/reproducible-runtime/CMakeLists.txt             | 8 ++++----
+ tests/bin/scratch-memory/CMakeLists.txt                   | 3 +--
+ tests/bin/simple-transpose/CMakeLists.txt                 | 8 ++++----
+ tests/bin/transpose/CMakeLists.txt                        | 2 +-
+ tests/bin/vector-operations/CMakeLists.txt                | 2 +-
+ 14 files changed, 31 insertions(+), 33 deletions(-)
+
+diff --git a/tests/bin/attachment-test/CMakeLists.txt b/tests/bin/attachment-test/CMakeLists.txt
+index 332f5e551a..50c644942d 100644
+--- a/tests/bin/attachment-test/CMakeLists.txt
++++ b/tests/bin/attachment-test/CMakeLists.txt
+@@ -42,8 +42,8 @@ find_package(rocprofiler-sdk-roctx REQUIRED)
+ set_source_files_properties(attachment_test.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(attachment-test)
+ target_sources(attachment-test PRIVATE attachment_test.cpp)
+-target_compile_options(attachment-test PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow
+-                                               -Werror)
++target_compile_options(attachment-test PRIVATE -Wpedantic)
+ 
+ target_link_libraries(
+-    attachment-test PRIVATE Threads::Threads rocprofiler-sdk-roctx::rocprofiler-sdk-roctx)
++    attachment-test PRIVATE Threads::Threads rocprofiler-sdk-roctx::rocprofiler-sdk-roctx
++                            rocprofiler-sdk::tests-build-flags)
+diff --git a/tests/bin/hip-graph/CMakeLists.txt b/tests/bin/hip-graph/CMakeLists.txt
+index e4d984b68a..dfa9233097 100644
+--- a/tests/bin/hip-graph/CMakeLists.txt
++++ b/tests/bin/hip-graph/CMakeLists.txt
+@@ -35,10 +35,11 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON)
+ set_source_files_properties(hip-graph.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(hip-graph)
+ target_sources(hip-graph PRIVATE hip-graph.cpp)
+-target_compile_options(hip-graph PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow -Werror)
++target_compile_options(hip-graph PRIVATE -Wpedantic)
+ 
+ find_package(Threads REQUIRED)
+-target_link_libraries(hip-graph PRIVATE Threads::Threads)
++target_link_libraries(hip-graph PRIVATE Threads::Threads
++                                        rocprofiler-sdk::tests-build-flags)
+ 
+ # find_package(rocprofiler-sdk-roctx REQUIRED) target_link_libraries(hip-graph PRIVATE
+ # rocprofiler-sdk-roctx::rocprofiler-sdk-roctx)
+diff --git a/tests/bin/hip-in-libraries/CMakeLists.txt b/tests/bin/hip-in-libraries/CMakeLists.txt
+index d908704604..5f5d92b80a 100644
+--- a/tests/bin/hip-in-libraries/CMakeLists.txt
++++ b/tests/bin/hip-in-libraries/CMakeLists.txt
+@@ -11,8 +11,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+ add_executable(hip-in-libraries)
+ target_sources(hip-in-libraries PRIVATE hip-in-libraries.cpp)
+-target_compile_options(hip-in-libraries PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow
+-                                                -Werror)
++target_compile_options(hip-in-libraries PRIVATE -Wpedantic)
+ target_link_libraries(hip-in-libraries PRIVATE transpose-shared-library
+                                                vector-ops-shared-library)
+ 
+@@ -20,7 +19,8 @@ find_package(hip REQUIRED)
+ target_link_libraries(hip-in-libraries PRIVATE hip::host)
+ 
+ find_package(Threads REQUIRED)
+-target_link_libraries(hip-in-libraries PRIVATE Threads::Threads)
++target_link_libraries(hip-in-libraries PRIVATE Threads::Threads
++                                               rocprofiler-sdk::tests-build-flags)
+ 
+ if(TRANSPOSE_USE_MPI)
+     find_package(MPI REQUIRED)
+diff --git a/tests/bin/hsa-code-object/CMakeLists.txt b/tests/bin/hsa-code-object/CMakeLists.txt
+index 2e11314509..099606dc26 100644
+--- a/tests/bin/hsa-code-object/CMakeLists.txt
++++ b/tests/bin/hsa-code-object/CMakeLists.txt
+@@ -72,7 +72,6 @@ add_custom_target(generate_hsaco_targets_code_object DEPENDS ${HSACO_TARGET_LIST
+ 
+ add_executable(hsa_code_object_testapp)
+ target_sources(hsa_code_object_testapp PRIVATE hsa_code_object_app.cpp)
+-target_compile_options(hsa_code_object_testapp PRIVATE -W -Wall -Wextra -Wshadow -Werror)
+ 
+ find_package(Threads REQUIRED)
+ target_link_libraries(hsa_code_object_testapp PRIVATE stdc++fs Threads::Threads)
+diff --git a/tests/bin/hsa-memory-allocation/CMakeLists.txt b/tests/bin/hsa-memory-allocation/CMakeLists.txt
+index 485b866209..b0d12490b6 100644
+--- a/tests/bin/hsa-memory-allocation/CMakeLists.txt
++++ b/tests/bin/hsa-memory-allocation/CMakeLists.txt
+@@ -35,8 +35,7 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON)
+ set_source_files_properties(hsa-memory-allocation.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(hsa-memory-allocation)
+ target_sources(hsa-memory-allocation PRIVATE hsa-memory-allocation.cpp)
+-target_compile_options(hsa-memory-allocation PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow
+-                                                     -Werror)
++target_compile_options(hsa-memory-allocation PRIVATE -Wpedantic)
+ 
+ find_package(Threads REQUIRED)
+ target_link_libraries(hsa-memory-allocation PRIVATE Threads::Threads hsa-runtime64
+diff --git a/tests/bin/hsa-queue-dependency/CMakeLists.txt b/tests/bin/hsa-queue-dependency/CMakeLists.txt
+index 6753da98f2..e02b57f802 100644
+--- a/tests/bin/hsa-queue-dependency/CMakeLists.txt
++++ b/tests/bin/hsa-queue-dependency/CMakeLists.txt
+@@ -49,7 +49,6 @@ add_custom_target(generate_hsaco_targets DEPENDS ${HSACO_TARGET_LIST})
+ 
+ add_executable(multiqueue_testapp)
+ target_sources(multiqueue_testapp PRIVATE multiqueue_app.cpp)
+-target_compile_options(multiqueue_testapp PRIVATE -W -Wall -Wextra -Wshadow -Werror)
+ 
+ find_package(Threads REQUIRED)
+ target_link_libraries(multiqueue_testapp PRIVATE stdc++fs Threads::Threads)
+diff --git a/tests/bin/multistream/CMakeLists.txt b/tests/bin/multistream/CMakeLists.txt
+index 13ef8dee31..37c837976d 100644
+--- a/tests/bin/multistream/CMakeLists.txt
++++ b/tests/bin/multistream/CMakeLists.txt
+@@ -35,7 +35,8 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON)
+ set_source_files_properties(multistream_app.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(multistream)
+ target_sources(multistream PRIVATE multistream_app.cpp)
+-target_compile_options(multistream PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow -Werror)
++target_compile_options(multistream PRIVATE -Wpedantic)
+ 
+ find_package(Threads REQUIRED)
+-target_link_libraries(multistream PRIVATE Threads::Threads)
++target_link_libraries(multistream PRIVATE Threads::Threads
++                                          rocprofiler-sdk::tests-build-flags)
+diff --git a/tests/bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt b/tests/bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt
+index 1e84318f63..aa5d9c88a0 100644
+--- a/tests/bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt
++++ b/tests/bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt
+@@ -36,8 +36,8 @@ set_source_files_properties(exec_mask_manipulation.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(exec-mask-manipulation)
+ target_sources(exec-mask-manipulation PRIVATE exec_mask_manipulation.cpp)
+ # debug symbols required for PC sampling decoding validation
+-target_compile_options(exec-mask-manipulation PRIVATE -W -Wall -Wextra -Wpedantic
+-                                                      -Wshadow -Werror -g)
++target_compile_options(exec-mask-manipulation PRIVATE -Wpedantic)
+ 
+ find_package(Threads REQUIRED)
+-target_link_libraries(exec-mask-manipulation PRIVATE Threads::Threads)
++target_link_libraries(exec-mask-manipulation PRIVATE Threads::Threads
++                                                     rocprofiler-sdk::tests-build-flags)
+diff --git a/tests/bin/reproducible-dispatch-count/CMakeLists.txt b/tests/bin/reproducible-dispatch-count/CMakeLists.txt
+index df10dd7e3f..40fd04cdfc 100644
+--- a/tests/bin/reproducible-dispatch-count/CMakeLists.txt
++++ b/tests/bin/reproducible-dispatch-count/CMakeLists.txt
+@@ -42,15 +42,15 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON)
+ set_source_files_properties(reproducible-dispatch-count.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(reproducible-dispatch-count)
+ target_sources(reproducible-dispatch-count PRIVATE reproducible-dispatch-count.cpp)
+-target_compile_options(reproducible-dispatch-count PRIVATE -W -Wall -Wextra -Wpedantic
+-                                                           -Wshadow -Werror)
++target_compile_options(reproducible-dispatch-count PRIVATE -Wpedantic)
+ 
+ find_package(Threads REQUIRED)
+ target_link_libraries(reproducible-dispatch-count PRIVATE Threads::Threads)
+ 
+ find_package(rocprofiler-sdk-roctx REQUIRED)
+-target_link_libraries(reproducible-dispatch-count
+-                      PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx)
++target_link_libraries(
++    reproducible-dispatch-count PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx
++                                        rocprofiler-sdk::tests-build-flags)
+ 
+ if(REPRODUCIBLE_DISPATCH_COUNT_USE_MPI)
+     find_package(MPI REQUIRED)
+diff --git a/tests/bin/reproducible-runtime/CMakeLists.txt b/tests/bin/reproducible-runtime/CMakeLists.txt
+index 721b1e190b..4a65e9d60d 100644
+--- a/tests/bin/reproducible-runtime/CMakeLists.txt
++++ b/tests/bin/reproducible-runtime/CMakeLists.txt
+@@ -41,15 +41,15 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON)
+ set_source_files_properties(reproducible-runtime.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(reproducible-runtime)
+ target_sources(reproducible-runtime PRIVATE reproducible-runtime.cpp)
+-target_compile_options(reproducible-runtime PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow
+-                                                    -Werror)
++target_compile_options(reproducible-runtime PRIVATE -Wpedantic)
+ 
+ find_package(Threads REQUIRED)
+ target_link_libraries(reproducible-runtime PRIVATE Threads::Threads)
+ 
+ find_package(rocprofiler-sdk-roctx REQUIRED)
+-target_link_libraries(reproducible-runtime
+-                      PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx)
++target_link_libraries(
++    reproducible-runtime PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx
++                                 rocprofiler-sdk::tests-build-flags)
+ 
+ if(REPRODUCIBLE_RUNTIME_USE_MPI)
+     find_package(MPI REQUIRED)
+diff --git a/tests/bin/scratch-memory/CMakeLists.txt b/tests/bin/scratch-memory/CMakeLists.txt
+index 06ba7ddadb..419830ec51 100644
+--- a/tests/bin/scratch-memory/CMakeLists.txt
++++ b/tests/bin/scratch-memory/CMakeLists.txt
+@@ -35,8 +35,7 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON)
+ set_source_files_properties(scratch-memory.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(scratch-memory)
+ target_sources(scratch-memory PRIVATE scratch-memory.cpp)
+-target_compile_options(scratch-memory PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow
+-                                              -Werror)
++target_compile_options(scratch-memory PRIVATE -Wpedantic)
+ 
+ find_package(Threads REQUIRED)
+ target_link_libraries(scratch-memory PRIVATE Threads::Threads hsa-runtime64
+diff --git a/tests/bin/simple-transpose/CMakeLists.txt b/tests/bin/simple-transpose/CMakeLists.txt
+index 41f4954e79..6370289c4a 100644
+--- a/tests/bin/simple-transpose/CMakeLists.txt
++++ b/tests/bin/simple-transpose/CMakeLists.txt
+@@ -35,12 +35,12 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON)
+ set_source_files_properties(simple-transpose.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(simple-transpose)
+ target_sources(simple-transpose PRIVATE simple-transpose.cpp)
+-target_compile_options(simple-transpose PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow
+-                                                -Werror)
++target_compile_options(simple-transpose PRIVATE -Wpedantic)
+ 
+ find_package(Threads REQUIRED)
+ target_link_libraries(simple-transpose PRIVATE Threads::Threads)
+ 
+ find_package(rocprofiler-sdk-roctx REQUIRED)
+-target_link_libraries(simple-transpose
+-                      PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx)
++target_link_libraries(
++    simple-transpose PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx
++                             rocprofiler-sdk::tests-build-flags)
+diff --git a/tests/bin/transpose/CMakeLists.txt b/tests/bin/transpose/CMakeLists.txt
+index 7d85195a9a..8c98307329 100644
+--- a/tests/bin/transpose/CMakeLists.txt
++++ b/tests/bin/transpose/CMakeLists.txt
+@@ -40,7 +40,7 @@ function(transpose_build_target _NAME _COMPILE_DEFS _LINK_TARGETS)
+     add_executable(${_NAME})
+     target_sources(${_NAME} PRIVATE transpose.cpp)
+     target_compile_definitions(${_NAME} PRIVATE ${_COMPILE_DEFS})
+-    target_compile_options(${_NAME} PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow -Werror)
++    target_compile_options(${_NAME} PRIVATE -Wpedantic)
+     target_link_libraries(
+         ${_NAME} PRIVATE Threads::Threads rocprofiler-sdk::tests-build-flags
+                          ${_LINK_TARGETS})
+diff --git a/tests/bin/vector-operations/CMakeLists.txt b/tests/bin/vector-operations/CMakeLists.txt
+index efd16ab04d..9fa1d8fb96 100644
+--- a/tests/bin/vector-operations/CMakeLists.txt
++++ b/tests/bin/vector-operations/CMakeLists.txt
+@@ -35,7 +35,7 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON)
+ set_source_files_properties(vector-ops.cpp PROPERTIES LANGUAGE HIP)
+ add_executable(vector-ops)
+ target_sources(vector-ops PRIVATE vector-ops.cpp)
+-target_compile_options(vector-ops PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow -Werror)
++target_compile_options(vector-ops PRIVATE -Wpedantic)
+ 
+ find_package(Threads REQUIRED)
+ target_link_libraries(vector-ops PRIVATE Threads::Threads
+-- 
+2.43.0
+
diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix b/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix
new file mode 100644
index 000000000000..7e8cd74115f0
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix
@@ -0,0 +1,210 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  pkg-config,
+  clr,
+  rocm-cmake,
+  rocm-runtime,
+  rocprofiler-register,
+  rocprof-trace-decoder,
+  aqlprofile,
+  rocm-comgr,
+  rccl,
+  python3,
+  python3Packages,
+  libdrm,
+  elfutils,
+  sqlite,
+  otf2,
+  zlib,
+  zstd,
+  xz,
+  numactl,
+  fmt,
+  glog,
+  gtest,
+  fetchpatch,
+  yaml-cpp,
+  elfio,
+  nlohmann_json,
+  makeWrapper,
+  gpuTargets ? (clr.localGpuTargets or clr.gpuTargets),
+  buildTests ? false,
+  buildSamples ? false,
+}:
+
+# FIXME: devendor remaining git submodules:
+#   external/cereal     -> https://github.com/jrmadsen/cereal
+#   external/gotcha     -> https://github.com/jrmadsen/GOTCHA
+#   external/perfetto   -> https://github.com/google/perfetto
+#   external/ptl        -> https://github.com/jrmadsen/PTL
+
+# rocprofiler-sdk is the home of rocprofv3
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rocprofiler-sdk";
+  version = "7.2.1";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "rocm-systems";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-P8c1/HtkdLlZRTMaOFhFF7a/0SlsOabnUwci1w1Svfc=";
+    fetchSubmodules = true;
+    sparseCheckout = [
+      "projects/rocprofiler-sdk"
+    ];
+  };
+  sourceRoot = "${finalAttrs.src.name}/projects/rocprofiler-sdk";
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    clr
+    python3
+    makeWrapper
+  ];
+
+  buildInputs = [
+    clr
+    rocm-cmake
+    rocm-runtime
+    rocprofiler-register
+    aqlprofile
+    rocm-comgr
+    libdrm
+    elfutils
+    sqlite
+    otf2
+    zlib
+    zstd
+    xz
+    numactl
+    fmt
+    glog
+    gtest
+    yaml-cpp
+    elfio
+    nlohmann_json
+    rccl
+    python3Packages.pybind11
+  ];
+
+  patches = [
+    (fetchpatch {
+      # [rocprofiler-sdk] Improve build with system libraries.
+      # https://github.com/ROCm/rocm-systems/pull/2319
+      # Merged in develop branch, but not yet in ROCm 7.2.1.
+      url = "https://github.com/ROCm/rocm-systems/commit/86ee7b2eb2273adaf1181ef9a6b2091465c6f0c7.patch";
+      hash = "sha256-PRmv8SI90jmO6MgJmk1DWf/WVmFy18nUTZClfOvI6a8=";
+      excludes = [ "external/fmt" ];
+      relative = "projects/rocprofiler-sdk";
+    })
+    (fetchpatch {
+      # Users/mkuriche/rocprofiler sdk fmt build fix memory header
+      url = "https://github.com/ROCm/rocm-systems/commit/36d9d33d90879bfbd406498011070ebd929a56b1.patch";
+      hash = "sha256-yRy5pmCX9hd4eeZIz/g3B5VFCL9idkEaGK+S5+2sOsk=";
+      relative = "projects/rocprofiler-sdk";
+    })
+    (fetchpatch {
+      # Fix missing amd_comgr linkage in pc-sampling integration test
+      url = "https://github.com/ROCm/rocm-systems/commit/94a4595a5d02bc066f7a32e1b2134a99a5231213.patch";
+      hash = "sha256-86Fx0bKL0pvXTwVN8QJL+yzCbMYkmMaKzcU4PYcW6ig=";
+      relative = "projects/rocprofiler-sdk";
+    })
+    # See https://github.com/ROCm/rocm-systems/pull/4721
+    # First change is separate and required to make the patches from that pull request
+    # apply cleanly. Its something that was changed on the develop branch, but requires
+    # more effort to backport.
+    ./0001-rocprofiler-sdk-rename-consumer-test-for-dependent-c.patch
+    ./0002-rocprofiler-sdk-add-missing-stl-headers.patch
+    ./0003-rocprofiler-sdk-add-missing-rocprofiler-sdk-rocprofi.patch
+    ./0004-rocprofiler-sdk-fix-find_package-dependency-scoping-.patch
+    ./0005-rocprofiler-sdk-allow-using-system-elfio-dependency.patch
+    ./0006-rocprofiler-sdk-allow-using-system-otf2-dependency.patch
+    ./0007-rocprofiler-sdk-Allow-using-system-json-dependency.patch
+    ./0008-rocprofiler-sdk-stop-manually-setting-warning-flags-.patch
+  ];
+
+  postPatch = ''
+    # NixOS' ROCm distribution does not support libomptarget yet
+    substituteInPlace samples/CMakeLists.txt \
+      --replace-fail 'add_subdirectory(openmp_target)' '# add_subdirectory(openmp_target)'
+    substituteInPlace tests/CMakeLists.txt \
+      --replace-fail 'add_subdirectory(openmp-tools)' '# add_subdirectory(openmp-tools)'
+    substituteInPlace tests/bin/CMakeLists.txt \
+      --replace-fail 'add_subdirectory(openmp)' '# add_subdirectory(openmp)'
+
+    # This requires building perfetto's trace-processor-shell via a weird external script
+    substituteInPlace tests/CMakeLists.txt \
+      --replace-fail 'add_subdirectory(pytest-packages)' ""
+
+    patchShebangs source/libexec/rocprofiler-sdk/rocprofiler-sdk-launch-compiler/rocprofiler-sdk-launch-compiler.sh
+  '';
+
+  cmakeFlags = [
+    (lib.cmakeBool "ROCPROFILER_BUILD_GHC_FS" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_FMT" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_GLOG" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_GTEST" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_PYBIND11" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_YAML_CPP" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_ELFIO" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_OTF2" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_JSON" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_TESTS" buildTests)
+    (lib.cmakeBool "ROCPROFILER_BUILD_SAMPLES" buildSamples)
+    (lib.cmakeBool "ROCPROFILER_BUILD_BENCHMARK" false)
+    (lib.cmakeBool "ROCPROFILER_BUILD_WERROR" false)
+    # rocprofiler-sdk's CMake file doesn't add this dependency properly.
+    "-DCMAKE_HIP_FLAGS=-I${rocm-runtime}/include"
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    # Required for rocprofiler-sdk-launch-compiler.sh
+    "-DCMAKE_INSTALL_LIBEXECDIR=libexec"
+    "--debug-find-pkg=amd_comgr"
+    "--trace-source=tests/pc_sampling/CMakeLists.txt"
+    "--trace-expand"
+  ]
+  ++ lib.optionals (buildTests || buildSamples) [
+    # rocprofiler-sdk normally doesn't depend on which GPU is in the system, only when
+    # building tests or samples.
+    (lib.cmakeFeature "GPU_TARGETS" (lib.concatStringsSep ";" gpuTargets))
+  ];
+
+  doCheck = false; # Requires GPU
+
+  postFixup = ''
+    patchelf $out/lib/*.so \
+      --add-rpath ${aqlprofile}/lib \
+      --add-needed libhsa-amd-aqlprofile64.so
+
+    wrapProgram $out/bin/rocprofv3 --add-flags "--att-library-path ${
+      lib.makeLibraryPath [ rocprof-trace-decoder ]
+    }"
+  '';
+
+  postInstall = ''
+    mkdir -p $dev/lib $dev/share/rocprofiler-sdk
+    mv $out/lib/cmake $dev/lib/
+    mv $out/share/rocprofiler-sdk/{samples,tests} $dev/share/rocprofiler-sdk/
+  '';
+
+  meta = {
+    description = "ROCm GPU performance analysis SDK";
+    homepage = "https://github.com/ROCm/rocprofiler-sdk";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+  };
+})

From b645b3f35e187537b0cba87ee69c475acc28a70a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 11 Feb 2026 17:02:11 -0600
Subject: [PATCH 280/336] chef-cli: migrate to by-name

---
 pkgs/{tools/misc => by-name/ch}/chef-cli/Gemfile                | 0
 pkgs/{tools/misc => by-name/ch}/chef-cli/Gemfile.lock           | 0
 pkgs/{tools/misc => by-name/ch}/chef-cli/gemset.nix             | 0
 .../chef-cli/default.nix => by-name/ch/chef-cli/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/misc => by-name/ch}/chef-cli/Gemfile (100%)
 rename pkgs/{tools/misc => by-name/ch}/chef-cli/Gemfile.lock (100%)
 rename pkgs/{tools/misc => by-name/ch}/chef-cli/gemset.nix (100%)
 rename pkgs/{tools/misc/chef-cli/default.nix => by-name/ch/chef-cli/package.nix} (100%)

diff --git a/pkgs/tools/misc/chef-cli/Gemfile b/pkgs/by-name/ch/chef-cli/Gemfile
similarity index 100%
rename from pkgs/tools/misc/chef-cli/Gemfile
rename to pkgs/by-name/ch/chef-cli/Gemfile
diff --git a/pkgs/tools/misc/chef-cli/Gemfile.lock b/pkgs/by-name/ch/chef-cli/Gemfile.lock
similarity index 100%
rename from pkgs/tools/misc/chef-cli/Gemfile.lock
rename to pkgs/by-name/ch/chef-cli/Gemfile.lock
diff --git a/pkgs/tools/misc/chef-cli/gemset.nix b/pkgs/by-name/ch/chef-cli/gemset.nix
similarity index 100%
rename from pkgs/tools/misc/chef-cli/gemset.nix
rename to pkgs/by-name/ch/chef-cli/gemset.nix
diff --git a/pkgs/tools/misc/chef-cli/default.nix b/pkgs/by-name/ch/chef-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/chef-cli/default.nix
rename to pkgs/by-name/ch/chef-cli/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6059eb5fd80..d6178151cad3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -375,8 +375,6 @@ with pkgs;
     practiceMod = true;
   };
 
-  chef-cli = callPackage ../tools/misc/chef-cli { };
-
   coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });
 
   dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };

From 88e17999f69ba3fa0275c1344d568de83c23cacc Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 11 Feb 2026 17:05:33 -0600
Subject: [PATCH 281/336] chef-cli: add missing syslog gem

---
 pkgs/by-name/ch/chef-cli/Gemfile      | 2 ++
 pkgs/by-name/ch/chef-cli/Gemfile.lock | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chef-cli/Gemfile b/pkgs/by-name/ch/chef-cli/Gemfile
index 2b0f5743e5a0..9d9dddba2504 100644
--- a/pkgs/by-name/ch/chef-cli/Gemfile
+++ b/pkgs/by-name/ch/chef-cli/Gemfile
@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
 gem "chef-cli"
+
+gem "syslog", "~> 0.4.0"
diff --git a/pkgs/by-name/ch/chef-cli/Gemfile.lock b/pkgs/by-name/ch/chef-cli/Gemfile.lock
index 47c3a142e1c6..9112b45be4f2 100644
--- a/pkgs/by-name/ch/chef-cli/Gemfile.lock
+++ b/pkgs/by-name/ch/chef-cli/Gemfile.lock
@@ -321,6 +321,8 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
+    syslog (0.4.0)
+      logger
     syslog-logger (1.6.8)
     thor (1.2.2)
     time (0.4.1)
@@ -378,6 +380,7 @@ PLATFORMS
 
 DEPENDENCIES
   chef-cli
+  syslog (~> 0.4.0)
 
 BUNDLED WITH
-   2.6.6
+   2.7.2

From 4db9cdce834d9f2a327c967f75275cf7ad50bcac Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 11 Feb 2026 17:08:52 -0600
Subject: [PATCH 282/336] chef-cli: 5.6.21 -> 5.6.23

---
 pkgs/by-name/ch/chef-cli/Gemfile.lock | 279 ++++++++-------
 pkgs/by-name/ch/chef-cli/gemset.nix   | 485 ++++++++++++++++----------
 2 files changed, 459 insertions(+), 305 deletions(-)

diff --git a/pkgs/by-name/ch/chef-cli/Gemfile.lock b/pkgs/by-name/ch/chef-cli/Gemfile.lock
index 9112b45be4f2..2b7ee611977c 100644
--- a/pkgs/by-name/ch/chef-cli/Gemfile.lock
+++ b/pkgs/by-name/ch/chef-cli/Gemfile.lock
@@ -1,59 +1,56 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1110.0)
-    aws-sdk-core (3.225.0)
+    aws-partitions (1.1213.0)
+    aws-sdk-core (3.242.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.102.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-kms (1.121.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.189.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.213.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-secretsmanager (1.116.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-secretsmanager (1.128.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.12.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.3.0)
-    bigdecimal (3.2.1)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     builder (3.3.0)
-    chef (18.7.10)
+    chef (18.3.0)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.7.10)
-      chef-utils (= 18.7.10)
+      chef-config (= 18.3.0)
+      chef-utils (= 18.3.0)
       chef-vault
-      chef-zero (>= 15.0.17)
+      chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
       diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
       erubis (~> 2.7)
-      ffi (>= 1.15.5, <= 1.16.3)
+      ffi (>= 1.15.5)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
-      inspec-core (>= 5, < 6)
+      inspec-core (>= 5)
       license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
-      mixlib-log (>= 2.0.3, < 3.2)
+      mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 3.1.1, < 4.0)
       net-ftp
       net-sftp (>= 2.1.2, < 5.0)
@@ -61,13 +58,13 @@ GEM
       plist (~> 3.2)
       proxifier2 (~> 1.1)
       syslog-logger (~> 1.6)
-      train-core (~> 3.10, <= 3.12.13)
+      train-core (~> 3.10)
       train-rest (>= 0.4.1)
-      train-winrm (~> 0.2.17)
-      unf_ext (~> 0.0.8.2)
+      train-winrm (>= 0.2.5)
+      unf_ext (>= 0.0.8.2)
       uuidtools (>= 2.1.5, < 3.0)
-      vault (~> 0.18.2)
-    chef-cli (5.6.21)
+      vault (~> 0.16)
+    chef-cli (5.6.23)
       addressable (>= 2.3.5, < 2.9)
       chef (~> 18.0)
       cookbook-omnifetch (~> 0.5)
@@ -79,116 +76,136 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       pastel (~> 0.7)
       solve (> 2.0, < 5.0)
-    chef-config (18.7.10)
+    chef-config (18.3.0)
       addressable
-      chef-utils (= 18.7.10)
+      chef-utils (= 18.3.0)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-gyoku (1.4.5)
+    chef-gyoku (1.5.0)
       builder (>= 2.1.2)
       rexml (~> 3.4)
+    chef-licensing (1.4.0)
+      chef-config (>= 15)
+      faraday (>= 1, < 3)
+      faraday-http-cache
+      mixlib-log (~> 3.0)
+      ostruct (~> 0.6.0)
+      pstore (~> 0.1.1)
+      tty-prompt (~> 0.23)
+      tty-spinner (~> 0.9.3)
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (18.7.10)
+    chef-utils (18.3.0)
       concurrent-ruby
-    chef-vault (4.1.23)
-    chef-winrm (2.3.12)
+    chef-vault (4.2.5)
+      syslog (~> 0.3)
+    chef-winrm (2.5.0)
       builder (>= 2.1.2)
-      chef-gyoku (~> 1.4.0, <= 1.4.5)
+      chef-gyoku (~> 1.5)
       erubi (~> 1.8)
-      ffi (>= 1.15.5, < 1.17.0)
       gssapi (~> 1.2)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
-      nori (= 2.7.0)
-      rexml (~> 3.3)
+      nori (~> 2.7)
+      rexml (>= 3.4.2, < 4.0)
       rubyntlm (~> 0.6.0, >= 0.6.3)
     chef-winrm-elevated (1.2.5)
       chef-winrm (>= 2.3.11)
       chef-winrm-fs (>= 1.3.7)
       erubi (~> 1.8)
-    chef-winrm-fs (1.3.7)
-      chef-winrm (>= 2.3.11)
+    chef-winrm-fs (1.4.2)
+      benchmark (~> 0.5.0)
+      chef-winrm (~> 2.4)
+      csv (~> 3.3)
       erubi (>= 1.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 2.0)
-    chef-zero (15.0.17)
-      activesupport (~> 7.0, < 7.1)
-      ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 5.0)
+    chef-zero (15.1.0)
+      ffi-yajl (>= 2.2, < 4.0)
+      hashie (>= 2.0, < 6.0)
       mixlib-log (>= 2.0, < 4.0)
-      rack (~> 3.1, >= 3.1.10)
+      rack (~> 3.1, >= 3.1.16)
       rackup (~> 2.2, >= 2.2.1)
+      unf_ext (~> 0.0.8)
       uuidtools (~> 2.1)
       webrick
     coderay (1.1.3)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
     cookbook-omnifetch (0.12.2)
       mixlib-archive (>= 0.4, < 2.0)
-    cookstyle (8.1.4)
-      rubocop (= 1.75.8)
+    cookstyle (8.5.3)
+      rubocop (= 1.81.7)
     corefoundation (0.3.13)
       ffi (>= 1.15.0)
-    date (3.4.1)
+    csv (3.3.5)
+    date (3.5.1)
     diff-lcs (1.5.1)
     domain_name (0.6.20240107)
     erubi (1.13.1)
     erubis (2.7.0)
-    faraday (2.13.1)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-follow_redirects (0.3.0)
+    faraday-follow_redirects (0.5.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
-    ffi (1.16.3)
+    faraday-http-cache (2.6.1)
+      faraday (>= 0.8)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    ffi (1.17.3)
     ffi-libarchive (1.1.14)
       ffi (~> 1.0)
-    ffi-yajl (2.6.0)
-      libyajl2 (>= 1.2)
+    ffi-yajl (2.7.7)
+      libyajl2 (>= 2.1)
+      yajl
     fuzzyurl (0.9.0)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
-    hashie (4.1.0)
+    hashie (5.1.0)
+      logger
     http-accept (1.7.0)
-    http-cookie (1.0.8)
+    http-cookie (1.1.0)
       domain_name (~> 0.5)
     httpclient (2.9.0)
       mutex_m
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
-    inspec-core (5.22.80)
+    inspec-core (7.0.95)
       addressable (~> 2.4)
+      chef-licensing (>= 1.2.0)
       chef-telemetry (~> 1.0, >= 1.0.8)
       cookstyle
+      csv (~> 3.0)
       faraday (>= 1, < 3)
       faraday-follow_redirects (~> 0.3)
       hashie (>= 3.4, < 6.0)
       license-acceptance (>= 0.2.13, < 3.0)
       method_source (>= 0.8, < 2.0)
-      mixlib-log (~> 3.0, < 3.2)
+      mixlib-log (~> 3.0)
       multipart-post (~> 2.0)
+      ostruct (>= 0.1, < 0.7)
       parallel (~> 1.9)
       parslet (>= 1.5, < 3.0)
       pry (~> 0.13)
-      rspec (>= 3.9, <= 3.12)
-      rspec-its (~> 1.2)
-      rubyzip (>= 1.2.2, < 3.0)
+      rspec (>= 3.9, <= 3.14)
+      rspec-its (>= 1.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       semverse (~> 3.0)
       sslshake (~> 1.2)
-      thor (>= 0.20, < 1.3.0)
-      tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.12.13)
+      syslog (~> 0.1)
+      thor (>= 0.20, < 1.5.0)
+      tomlrb (>= 1.3, < 2.1)
+      train-core (~> 3.13, >= 3.13.4)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
+    io-console (0.8.2)
     ipaddress (0.8.3)
     jmespath (1.6.2)
-    json (2.12.2)
+    json (2.18.1)
     language_server-protocol (3.17.0.5)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
@@ -206,28 +223,29 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0527)
-    minitar (1.0.2)
-    minitest (5.25.5)
-    mixlib-archive (1.1.7)
+    mime-types-data (3.2026.0203)
+    minitar (1.1.0)
+    mixlib-archive (1.3.3)
       mixlib-log
     mixlib-authentication (3.0.10)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
-    mixlib-log (3.1.2.1)
-      ffi (< 1.17.0)
-    mixlib-shellout (3.3.9)
+    mixlib-log (3.2.3)
+      ffi (>= 1.15.5)
+    mixlib-shellout (3.4.10)
       chef-utils
     molinillo (0.8.0)
-    multi_json (1.15.0)
+    multi_json (1.19.1)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
-    net-ftp (0.3.8)
+    net-ftp (0.3.9)
       net-protocol
       time
-    net-http (0.6.0)
-      uri
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    net-http-persistent (4.0.8)
+      connection_pool (>= 2.2.4, < 4)
     net-protocol (0.2.2)
       timeout
     net-scp (4.1.0)
@@ -236,12 +254,12 @@ GEM
       net-ssh (>= 5.0.0, < 8.0.0)
     net-ssh (7.3.0)
     netrc (0.11.0)
-    nori (2.7.0)
+    nori (2.7.1)
       bigdecimal
-    ohai (18.2.6)
+    ohai (18.1.18)
       chef-config (>= 14.12, < 19)
       chef-utils (>= 16.0, < 19)
-      ffi (~> 1.9, <= 1.17.0)
+      ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
@@ -251,49 +269,54 @@ GEM
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
+    ostruct (0.6.3)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
     plist (3.7.2)
-    prism (1.4.0)
+    prism (1.9.0)
     proxifier2 (1.1.0)
-    pry (0.15.2)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (6.0.2)
+      reline (>= 0.6.0)
+    pstore (0.1.4)
+    public_suffix (7.0.2)
     racc (1.8.1)
-    rack (3.1.15)
-    rackup (2.2.1)
+    rack (3.2.4)
+    rackup (2.3.1)
       rack (>= 3)
     rainbow (3.1.1)
-    regexp_parser (2.10.0)
+    regexp_parser (2.11.3)
+    reline (0.6.3)
+      io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.4.1)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.3)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.4)
+    rexml (3.4.4)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-its (1.3.1)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.7)
+      rspec-support (~> 3.13.0)
+    rspec-its (2.0.0)
+      rspec-core (>= 3.13.0)
+      rspec-expectations (>= 3.13.0)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.2)
-    rubocop (1.75.8)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -301,17 +324,18 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.0)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     ruby-progressbar (1.13.0)
     rubyntlm (0.6.5)
       base64
     rubyzip (2.4.1)
     semverse (3.0.2)
+    socksify (1.8.1)
     solve (4.0.4)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
@@ -324,14 +348,14 @@ GEM
     syslog (0.4.0)
       logger
     syslog-logger (1.6.8)
-    thor (1.2.2)
-    time (0.4.1)
+    thor (1.4.0)
+    time (0.4.2)
       date
-    timeout (0.4.3)
+    timeout (0.6.0)
     tomlrb (1.3.0)
-    train-core (3.12.13)
+    train-core (3.16.1)
       addressable (~> 2.5)
-      ffi (!= 1.13.0)
+      ffi (>= 1.16.0, < 1.18)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 5.0)
@@ -340,10 +364,11 @@ GEM
       aws-sigv4 (~> 1.5)
       rest-client (~> 2.1)
       train-core (~> 3.0)
-    train-winrm (0.2.19)
-      chef-winrm (~> 2.3.12)
-      chef-winrm-elevated (~> 1.2.5)
-      chef-winrm-fs (~> 1.3.7)
+    train-winrm (0.4.3)
+      chef-winrm (>= 2.4.4, < 3.0)
+      chef-winrm-elevated (>= 1.2.5, < 2.0)
+      chef-winrm-fs (>= 1.4.1, < 2.0)
+      socksify (~> 1.8)
     tty-box (0.7.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
@@ -358,22 +383,26 @@ GEM
       tty-screen (~> 0.8)
       wisper (~> 2.0)
     tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
     tty-table (0.12.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unf_ext (0.0.8.2)
+    unf_ext (0.0.9.1)
     unicode-display_width (2.6.0)
     unicode_utils (1.4.0)
-    uri (1.0.3)
+    uri (1.1.1)
     uuidtools (2.2.0)
-    vault (0.18.2)
+    vault (0.20.0)
       aws-sigv4
-    webrick (1.9.1)
+      base64
+      connection_pool (~> 2.4)
+      net-http-persistent (~> 4.0, >= 4.0.2)
+    webrick (1.9.2)
     wisper (2.0.1)
     wmi-lite (1.0.7)
+    yajl (0.3.4)
 
 PLATFORMS
   ruby
diff --git a/pkgs/by-name/ch/chef-cli/gemset.nix b/pkgs/by-name/ch/chef-cli/gemset.nix
index 400f0a49a3f3..8be40dbcc7c5 100644
--- a/pkgs/by-name/ch/chef-cli/gemset.nix
+++ b/pkgs/by-name/ch/chef-cli/gemset.nix
@@ -1,30 +1,14 @@
 {
-  activesupport = {
-    dependencies = [
-      "concurrent-ruby"
-      "i18n"
-      "minitest"
-      "tzinfo"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1zq4f834my1z6yh05rfr1dzl3i8padh33j092zlal979blvh4iyz";
-      type = "gem";
-    };
-    version = "7.0.8.7";
-  };
   addressable = {
     dependencies = [ "public_suffix" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
+      sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw";
       type = "gem";
     };
-    version = "2.8.7";
+    version = "2.8.8";
   };
   ast = {
     groups = [ "default" ];
@@ -51,10 +35,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11djv6d95y2snbkx74jfl089z0p0pzx182lsd7zxhxh6hnabq5w3";
+      sha256 = "0pp0sagj31zvmv8ca0hf0kgdfb7wwkq733sv2812gvs43pck5hay";
       type = "gem";
     };
-    version = "1.1110.0";
+    version = "1.1213.0";
   };
   aws-sdk-core = {
     dependencies = [
@@ -62,6 +46,7 @@
       "aws-partitions"
       "aws-sigv4"
       "base64"
+      "bigdecimal"
       "jmespath"
       "logger"
     ];
@@ -69,10 +54,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kafaaa9a2yh2cia6s2bn3m5jmya43l239j2ncbsndcq925xhjkw";
+      sha256 = "1819b99lgs3i637j2y6f95vlsppw3id2hys3m30q13f7mh1k0yy1";
       type = "gem";
     };
-    version = "3.225.0";
+    version = "3.242.0";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -83,10 +68,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hraq9gbjcdjvy4z80pf94r11253bn7yq0wnylz8cf9s50dv0g24";
+      sha256 = "1q015l5gm3f230jz9l6si9s3hlw7ra76q8biqvxlwxdmnk7w2qym";
       type = "gem";
     };
-    version = "1.102.0";
+    version = "1.121.0";
   };
   aws-sdk-s3 = {
     dependencies = [
@@ -98,10 +83,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x3ylssjaq9bvsgs89l601x1fywxzi80dc1xc8zgvzigsyk2yqia";
+      sha256 = "03g5k3jl0sgp60ppmxa267qflxlj174mrs8hnrnl10j5ak7nqndg";
       type = "gem";
     };
-    version = "1.189.0";
+    version = "1.213.0";
   };
   aws-sdk-secretsmanager = {
     dependencies = [
@@ -112,10 +97,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lhsp7dpm08izdgrvpc601py8qqzvbgl5axgwhvvrkhc1izqv2di";
+      sha256 = "16ib5p04fk66qr2vfps0qr340ld5xb5dsypbdii9f40n6hfxwb6n";
       type = "gem";
     };
-    version = "1.116.0";
+    version = "1.128.0";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -123,10 +108,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rcd2365hrizphycz2386fzs8cb8ld1a6q7l3mklxrhrp8zzh23f";
+      sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9";
       type = "gem";
     };
-    version = "1.12.0";
+    version = "1.12.1";
   };
   base64 = {
     groups = [ "default" ];
@@ -138,15 +123,25 @@
     };
     version = "0.3.0";
   };
+  benchmark = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0v1337j39w1z7x9zs4q7ag0nfv4vs4xlsjx2la0wpv8s6hig2pa6";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
   bigdecimal = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1qq2v3ly3g8my73d86idzy9k5bam7jc3cjxqx67vlskchwg66s0z";
+      sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb";
       type = "gem";
     };
-    version = "3.2.1";
+    version = "4.0.1";
   };
   builder = {
     groups = [ "default" ];
@@ -198,10 +193,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0sq7gg4ikhmiyqhx0i4rq1018h3pjga94zvw84w79dpgyznycdhm";
+      sha256 = "1iafkrjiwkrv3mn420byr96y3g8ik4bqbfms3yqvhyfjx1c2z6fz";
       type = "gem";
     };
-    version = "18.7.10";
+    version = "18.3.0";
   };
   chef-cli = {
     dependencies = [
@@ -221,10 +216,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "087f0i8z8faja66wyq26ja3i6zhc6jjkysqzz8yn3w9c15qfi0a7";
+      sha256 = "0mx7scgzkzsz5z9fpzk7ccng7yjv45pjp705h386fzmj6gl2w1rg";
       type = "gem";
     };
-    version = "5.6.21";
+    version = "5.6.23";
   };
   chef-config = {
     dependencies = [
@@ -239,10 +234,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zvivwny9fm0czyw2q88sqnszgmxbf75pzpjlqf816yhallsghl4";
+      sha256 = "1pvjf3qbb3apg9vdy4zykamm7801qz4m6256wjqn73fs87zs50y1";
       type = "gem";
     };
-    version = "18.7.10";
+    version = "18.3.0";
   };
   chef-gyoku = {
     dependencies = [
@@ -253,10 +248,30 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fmjn2zcifxnfnmswxvjgdn9j6va8cxmyqvyy4cfkbq9wygrs1j8";
+      sha256 = "0dpqrxpn5xx0jahga8kny2vagx7vxiinw4xcz6xwjg14z37s6m3k";
       type = "gem";
     };
-    version = "1.4.5";
+    version = "1.5.0";
+  };
+  chef-licensing = {
+    dependencies = [
+      "chef-config"
+      "faraday"
+      "faraday-http-cache"
+      "mixlib-log"
+      "ostruct"
+      "pstore"
+      "tty-prompt"
+      "tty-spinner"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1xwk8dq0rbzirfxksx5yxfzwwkslxqi4ym024ayf0kd60i88cxdz";
+      type = "gem";
+    };
+    version = "1.4.0";
   };
   chef-telemetry = {
     dependencies = [
@@ -278,27 +293,27 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "194r9d6945da48gj6qwcggrjkp35gfqa6v3zlfbd89nma0z474yd";
+      sha256 = "0087jwhqslfm3ygj507dmmdp3k0589j5jl54mkwgbabbwan7lzw2";
       type = "gem";
     };
-    version = "18.7.10";
+    version = "18.3.0";
   };
   chef-vault = {
+    dependencies = [ "syslog" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wq59cxyrx1vicq9m5d0dqcyzl4dkldfg2ykzmcqrsan80mrms8w";
+      sha256 = "021lnj0w1lmbf5r7b4yjh8xrdxqqwi9qpynzncnsfd7v75qppjg2";
       type = "gem";
     };
-    version = "4.1.23";
+    version = "4.2.5";
   };
   chef-winrm = {
     dependencies = [
       "builder"
       "chef-gyoku"
       "erubi"
-      "ffi"
       "gssapi"
       "httpclient"
       "logging"
@@ -310,10 +325,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0llp2lcw36n0krsx8x18an4yizr6lkzvaf9zpj48qw5lsnb3h2pd";
+      sha256 = "1ww5iclrsl1fpzj7lm6ds5dza7ifn7px0a6wic787mrr5v3ly8fh";
       type = "gem";
     };
-    version = "2.3.12";
+    version = "2.5.0";
   };
   chef-winrm-elevated = {
     dependencies = [
@@ -332,7 +347,9 @@
   };
   chef-winrm-fs = {
     dependencies = [
+      "benchmark"
       "chef-winrm"
+      "csv"
       "erubi"
       "logging"
       "rubyzip"
@@ -341,19 +358,19 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "054sv0q8159xs68n0f8p4ik3pw0p73ghjnr376pgm6jmiay5d3nl";
+      sha256 = "0fk8p20cgz392h03l6nilk8wpwwwkx3819c8svy0q1zbz3x9dmp8";
       type = "gem";
     };
-    version = "1.3.7";
+    version = "1.4.2";
   };
   chef-zero = {
     dependencies = [
-      "activesupport"
       "ffi-yajl"
       "hashie"
       "mixlib-log"
       "rack"
       "rackup"
+      "unf_ext"
       "uuidtools"
       "webrick"
     ];
@@ -361,10 +378,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mvk120r3sp9s2qn8bv9bzgmxggm0a8iramwihdsl1sykd4ihgj2";
+      sha256 = "12jqa1a1px56j5qkrl0bjb14pg7hyylbl23zd780rvmq7nghw8l5";
       type = "gem";
     };
-    version = "15.0.17";
+    version = "15.1.0";
   };
   coderay = {
     groups = [ "default" ];
@@ -381,10 +398,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
+      sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb";
       type = "gem";
     };
-    version = "1.3.5";
+    version = "1.3.6";
+  };
+  connection_pool = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1b8nlxr5z843ii7hfk6igpr5acw3k2ih9yjrgkyz2gbmallgjkz5";
+      type = "gem";
+    };
+    version = "2.5.5";
   };
   cookbook-omnifetch = {
     dependencies = [ "mixlib-archive" ];
@@ -403,10 +430,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bz4w7wlfzy8s06w1ibrbai63yvw2877j4k8bvsqd8v7a7lfkspj";
+      sha256 = "04xbjydimr144rnl1azhc3hignpdpi0s1rb0xzzbi1v2may7lwn0";
       type = "gem";
     };
-    version = "8.1.4";
+    version = "8.5.3";
   };
   corefoundation = {
     dependencies = [ "ffi" ];
@@ -419,15 +446,25 @@
     };
     version = "0.3.13";
   };
+  csv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
+      type = "gem";
+    };
+    version = "3.3.5";
+  };
   date = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz";
+      sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm";
       type = "gem";
     };
-    version = "3.4.1";
+    version = "3.5.1";
   };
   diff-lcs = {
     groups = [ "default" ];
@@ -479,10 +516,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
+      sha256 = "077n5ss3z3ds4vj54w201kd12smai853dp9c9n7ii7g3q7nwwg54";
       type = "gem";
     };
-    version = "2.13.1";
+    version = "2.14.1";
   };
   faraday-follow_redirects = {
     dependencies = [ "faraday" ];
@@ -490,10 +527,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr";
+      sha256 = "1b8hgpci3wjm3rm41bzpasvsc5j253ljyg5rsajl62dkjk497pjw";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.5.0";
+  };
+  faraday-http-cache = {
+    dependencies = [ "faraday" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11a27jbbbkawakwf8dll9qqc7g0mkc31zv1d8m1h477yqmhswwkp";
+      type = "gem";
+    };
+    version = "2.6.1";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -501,20 +549,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
+      sha256 = "0v4hfmc7d4lrqqj2wl366rm9551gd08zkv2ppwwnjlnkc217aizi";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.4.2";
   };
   ffi = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
+      sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf";
       type = "gem";
     };
-    version = "1.16.3";
+    version = "1.17.3";
   };
   ffi-libarchive = {
     dependencies = [ "ffi" ];
@@ -528,15 +576,18 @@
     version = "1.1.14";
   };
   ffi-yajl = {
-    dependencies = [ "libyajl2" ];
+    dependencies = [
+      "libyajl2"
+      "yajl"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dj3y95260rvlclkkcxak6c1dsrzbyr4wik7jv3y949r4w9adfk9";
+      sha256 = "04m8c2bp7hgw2b1zrwanalkh1s2smyv2nl84vw0dzsn0253pca06";
       type = "gem";
     };
-    version = "2.6.0";
+    version = "2.7.7";
   };
   fuzzyurl = {
     groups = [ "default" ];
@@ -560,14 +611,15 @@
     version = "1.3.1";
   };
   hashie = {
+    dependencies = [ "logger" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q";
+      sha256 = "0w1qrab701d3a63aj2qavwc2fpcqmkzzh1w2x93c88zkjqc4frn2";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "5.1.0";
   };
   http-accept = {
     groups = [ "default" ];
@@ -585,10 +637,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
+      sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q";
       type = "gem";
     };
-    version = "1.0.8";
+    version = "1.1.0";
   };
   httpclient = {
     dependencies = [ "mutex_m" ];
@@ -601,17 +653,6 @@
     };
     version = "2.9.0";
   };
-  i18n = {
-    dependencies = [ "concurrent-ruby" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
-      type = "gem";
-    };
-    version = "1.14.7";
-  };
   iniparse = {
     groups = [ "default" ];
     platforms = [ ];
@@ -625,8 +666,10 @@
   inspec-core = {
     dependencies = [
       "addressable"
+      "chef-licensing"
       "chef-telemetry"
       "cookstyle"
+      "csv"
       "faraday"
       "faraday-follow_redirects"
       "hashie"
@@ -634,6 +677,7 @@
       "method_source"
       "mixlib-log"
       "multipart-post"
+      "ostruct"
       "parallel"
       "parslet"
       "pry"
@@ -642,6 +686,7 @@
       "rubyzip"
       "semverse"
       "sslshake"
+      "syslog"
       "thor"
       "tomlrb"
       "train-core"
@@ -652,10 +697,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12r6zsam6a60d6z6qvnbhd2g20ljl5cy3zvnwzjvjr33lsi5s9pi";
+      sha256 = "0mghshl98py0q1wwd2dbmx72b1641y0nqz7y68bpws1b8n2hy5df";
       type = "gem";
     };
-    version = "5.22.80";
+    version = "7.0.95";
+  };
+  io-console = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn";
+      type = "gem";
+    };
+    version = "0.8.2";
   };
   ipaddress = {
     groups = [ "default" ];
@@ -682,10 +737,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
+      sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.18.1";
   };
   language_server-protocol = {
     groups = [ "default" ];
@@ -796,30 +851,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00ks975j562zlcjg95g5qlzdc7mrc71byg8ln1fyl9yv1iw8v00i";
+      sha256 = "0bradmf21c9g4z6f3hvqmnf6i2sbgp0630y2j5rq8a7h79lksdal";
       type = "gem";
     };
-    version = "3.2025.0527";
+    version = "3.2026.0203";
   };
   minitar = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0wj6cgvzbnc8qvdb5rai4hf9z10a2f422gc5agnhcab7lwmyp4mi";
+      sha256 = "0gm2ksf678gr5cqr4a3mzx0zvwrc7z2qvkfd8rwh209qdzxhrnrq";
       type = "gem";
     };
-    version = "1.0.2";
-  };
-  minitest = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
-      type = "gem";
-    };
-    version = "5.25.5";
+    version = "1.1.0";
   };
   mixlib-archive = {
     dependencies = [ "mixlib-log" ];
@@ -827,10 +872,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17vw0h8ag45608hvm02g43bkfvqy8l3lwk9lqj7b5kzdw6ynvn6a";
+      sha256 = "0mkhk1wz2skjijacygdak81i41syp9bwdi9kasij22p6bqjyqrhy";
       type = "gem";
     };
-    version = "1.1.7";
+    version = "1.3.3";
   };
   mixlib-authentication = {
     groups = [ "default" ];
@@ -869,10 +914,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0schkfjf3px8c6cfc9vaf0zha8piavw6ya4xbip6vzlc9cg6hz29";
+      sha256 = "0s57cq8qx3823pcfzizshp8vagvp3f87r0lksknj18r26nl3y79a";
       type = "gem";
     };
-    version = "3.1.2.1";
+    version = "3.2.3";
   };
   mixlib-shellout = {
     dependencies = [ "chef-utils" ];
@@ -880,10 +925,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "126k9zgxwj726gi0q0ywj4kdzf1gfm8z16i1nn7dw9kmn3imxpqf";
+      sha256 = "032z85m9w8kpf232xspd9r8im6wwq4lj2s7df642m4lhdid6r2kw";
       type = "gem";
     };
-    version = "3.3.9";
+    version = "3.4.10";
   };
   molinillo = {
     groups = [ "default" ];
@@ -900,10 +945,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "1drisvysgvnjlz49a0qcbs294id6mvj3i8iik5rvym68ybwfzvvs";
       type = "gem";
     };
-    version = "1.15.0";
+    version = "1.19.1";
   };
   multipart-post = {
     groups = [ "default" ];
@@ -934,10 +979,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8";
+      sha256 = "0r9vn7q6c66y4iw048qdbqviv7bankdkcziz12fzfa7lyz61fy1h";
       type = "gem";
     };
-    version = "0.3.8";
+    version = "0.3.9";
   };
   net-http = {
     dependencies = [ "uri" ];
@@ -945,10 +990,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
+      sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.9.1";
+  };
+  net-http-persistent = {
+    dependencies = [ "connection_pool" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1rk03449disq3azyiymv1c3qnpqr6cxawgq556rkf5b9klqyhggg";
+      type = "gem";
+    };
+    version = "4.0.8";
   };
   net-protocol = {
     dependencies = [ "timeout" ];
@@ -1009,10 +1065,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql";
+      sha256 = "0qb84bbi74q0zgs09sdkq750jf2ri3lblbry0xi4g1ard4rwsrk1";
       type = "gem";
     };
-    version = "2.7.0";
+    version = "2.7.1";
   };
   ohai = {
     dependencies = [
@@ -1033,10 +1089,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h6r3hcv6hibv46i9pxihmfwsp2ivaqi6vq1s03rsgmz592g4w6c";
+      sha256 = "1w0zrk1n6n7jl493k4vv5xaiszbmxsmaffy9xvykbfawjjb83vj2";
       type = "gem";
     };
-    version = "18.2.6";
+    version = "18.1.18";
+  };
+  ostruct = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
+      type = "gem";
+    };
+    version = "0.6.3";
   };
   parallel = {
     groups = [ "default" ];
@@ -1057,10 +1123,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4";
+      sha256 = "1256ws3w3gnfqj7r3yz2i9y1y7k38fhjphxpybkyb4fds8jsgxh6";
       type = "gem";
     };
-    version = "3.3.8.0";
+    version = "3.3.10.1";
   };
   parslet = {
     groups = [ "default" ];
@@ -1098,10 +1164,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
+      sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.9.0";
   };
   proxifier2 = {
     groups = [ "default" ];
@@ -1117,25 +1183,36 @@
     dependencies = [
       "coderay"
       "method_source"
+      "reline"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ssv704qg75mwlyagdfr9xxbzn1ziyqgzm0x474jkynk8234pm8j";
+      sha256 = "0kh5nv8v74k1ccy6gc7nd04aaf1cjkbk7g8pwy2izvcqaq36jv6p";
       type = "gem";
     };
-    version = "0.15.2";
+    version = "0.16.0";
+  };
+  pstore = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11mvc9s72fq7bl6h3f1rcng4ffa0nbjy1fr9wpshgzn4b9zznxm2";
+      type = "gem";
+    };
+    version = "0.1.4";
   };
   public_suffix = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
+      sha256 = "0mx84s7gn3xabb320hw8060v7amg6gmcyyhfzp0kawafiq60j54i";
       type = "gem";
     };
-    version = "6.0.2";
+    version = "7.0.2";
   };
   racc = {
     groups = [ "default" ];
@@ -1152,10 +1229,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "197wpw61cfwwdrwfdns0zx4mndrv1qn0y9b1v7g2d2nic2ckwayi";
+      sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x";
       type = "gem";
     };
-    version = "3.1.15";
+    version = "3.2.4";
   };
   rackup = {
     dependencies = [ "rack" ];
@@ -1163,10 +1240,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13brkq5xkj6lcdxj3f0k7v28hgrqhqxjlhd4y2vlicy5slgijdzp";
+      sha256 = "0s48d2a0z5f0cg4npvzznf933vipi6j7gmk16yc913kpadkw4ybc";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.3.1";
   };
   rainbow = {
     groups = [ "default" ];
@@ -1183,10 +1260,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb";
+      sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya";
       type = "gem";
     };
-    version = "2.10.0";
+    version = "2.11.3";
+  };
+  reline = {
+    dependencies = [ "io-console" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i";
+      type = "gem";
+    };
+    version = "0.6.3";
   };
   rest-client = {
     dependencies = [
@@ -1209,10 +1297,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7";
+      sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
       type = "gem";
     };
-    version = "3.4.1";
+    version = "3.4.4";
   };
   rspec = {
     dependencies = [
@@ -1224,10 +1312,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
+      sha256 = "11q5hagj6vr694innqj4r45jrm8qcwvkxjnphqgyd66piah88qi0";
       type = "gem";
     };
-    version = "3.12.0";
+    version = "3.13.2";
   };
   rspec-core = {
     dependencies = [ "rspec-support" ];
@@ -1235,10 +1323,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03bgkck72xihfg3h619zxhkf7i5l52zzfgv158frfa5clpg8j8bq";
+      sha256 = "0bcbh9yv6cs6pv299zs4bvalr8yxa51kcdd1pjl60yv625j3r0m8";
       type = "gem";
     };
-    version = "3.12.3";
+    version = "3.13.6";
   };
   rspec-expectations = {
     dependencies = [
@@ -1249,10 +1337,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0p770cdjla3iqkm8zdkqvxxm2jir3xc5v0j9r727b9sihnbghvw4";
+      sha256 = "0dl8npj0jfpy31bxi6syc7jymyd861q277sfr6jawq2hv6hx791k";
       type = "gem";
     };
-    version = "3.12.4";
+    version = "3.13.5";
   };
   rspec-its = {
     dependencies = [
@@ -1263,10 +1351,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xjikikx2sn9b7nbaza60xq7livjw9kp3a6gwbv5xz9zjd7k2164";
+      sha256 = "1pv0a8pvixgrwsi6j4nlpyn9m0jw9zn92dakjdg87wj9h71qp3m8";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "2.0.0";
   };
   rspec-mocks = {
     dependencies = [
@@ -1277,20 +1365,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1a66wizqkdq49h74aysp9p0ymm3pj8wxrr98ix2fj7bqg5w0mwdj";
+      sha256 = "071bqrk2rblk3zq3jk1xxx0dr92y0szi5pxdm8waimxici706y89";
       type = "gem";
     };
-    version = "3.12.7";
+    version = "3.13.7";
   };
   rspec-support = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07bn3c3qs02myyq8h90b9lqxjzwdmcnlmgjjc34l4f6hr6yrlwfy";
+      sha256 = "0z64h5rznm2zv21vjdjshz4v0h7bxvg02yc6g7yzxakj11byah06";
       type = "gem";
     };
-    version = "3.12.2";
+    version = "3.13.7";
   };
   rubocop = {
     dependencies = [
@@ -1309,10 +1397,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1savm34ajizcwkypmvlnijsn76snlpdpqy6igafw9ksxdhlb82n8";
+      sha256 = "157hg99cq6ys670sw8xbggnvxc9yl50h1zhllki925kkihlwrdbg";
       type = "gem";
     };
-    version = "1.75.8";
+    version = "1.81.7";
   };
   rubocop-ast = {
     dependencies = [
@@ -1323,10 +1411,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mvqdzqbifs49vhjb9ffmhb56kqnk3x45yqlfbhbj9azs5vxwjhb";
+      sha256 = "1zbikzd6237fvlzjfxdlhwi2vbmavg1cc81y6cyr581365nnghs9";
       type = "gem";
     };
-    version = "1.45.0";
+    version = "1.49.0";
   };
   ruby-progressbar = {
     groups = [ "default" ];
@@ -1369,6 +1457,16 @@
     };
     version = "3.0.2";
   };
+  socksify = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0mm8m7zfvszbf9l750c2x693p8100rrk6ckvcp6909631ir02ang";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
   solve = {
     dependencies = [
       "molinillo"
@@ -1418,6 +1516,17 @@
     };
     version = "0.2.0";
   };
+  syslog = {
+    dependencies = [ "logger" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wklh86rhpiff34ja0hda5pwdfywybjvb50hqhz90wpyhblqmhy4";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   syslog-logger = {
     groups = [ "default" ];
     platforms = [ ];
@@ -1433,10 +1542,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg";
+      sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.4.0";
   };
   time = {
     dependencies = [ "date" ];
@@ -1444,20 +1553,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qgarmdyqypzsaanf4w9vqrd9axrcrjqilxwrfmxp954102kcpq3";
+      sha256 = "1arxpii25xgb3fkgqp5acyc0x6179j3qzld78lflgsdxqfcf897k";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "0.4.2";
   };
   timeout = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm";
+      sha256 = "1bz11pq7n1g51f50jqmgyf5b1v64p1pfqmy5l21y6vpr37b2lwkd";
       type = "gem";
     };
-    version = "0.4.3";
+    version = "0.6.0";
   };
   tomlrb = {
     groups = [ "default" ];
@@ -1482,10 +1591,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bs15f4gvjvi9yjdpl91hp04m0a230j27f1m2x668kv2j2djk5x3";
+      sha256 = "1paxsm06cbhq73k8p4fnb184774w0rrycwzg78lh9awlv6s3wgxw";
       type = "gem";
     };
-    version = "3.12.13";
+    version = "3.16.1";
   };
   train-rest = {
     dependencies = [
@@ -1507,15 +1616,16 @@
       "chef-winrm"
       "chef-winrm-elevated"
       "chef-winrm-fs"
+      "socksify"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cxxx93h8wajqhahyg7yi40x15j797716g9qmdf2m2mwgbcbpg7y";
+      sha256 = "1yl4hzwksa89xd7hzfhr299q1w8hqmvzcfqxxi7rhm22y9k5d8sg";
       type = "gem";
     };
-    version = "0.2.19";
+    version = "0.4.3";
   };
   tty-box = {
     dependencies = [
@@ -1591,6 +1701,17 @@
     };
     version = "0.8.2";
   };
+  tty-spinner = {
+    dependencies = [ "tty-cursor" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf";
+      type = "gem";
+    };
+    version = "0.9.3";
+  };
   tty-table = {
     dependencies = [
       "pastel"
@@ -1606,26 +1727,15 @@
     };
     version = "0.12.0";
   };
-  tzinfo = {
-    dependencies = [ "concurrent-ruby" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
-      type = "gem";
-    };
-    version = "2.0.6";
-  };
   unf_ext = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch";
+      sha256 = "1sf6bxvf6x8gihv6j63iakixmdddgls58cpxpg32chckb2l18qcj";
       type = "gem";
     };
-    version = "0.0.8.2";
+    version = "0.0.9.1";
   };
   unicode-display_width = {
     groups = [ "default" ];
@@ -1652,10 +1762,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.1";
   };
   uuidtools = {
     groups = [ "default" ];
@@ -1668,25 +1778,30 @@
     version = "2.2.0";
   };
   vault = {
-    dependencies = [ "aws-sigv4" ];
+    dependencies = [
+      "aws-sigv4"
+      "base64"
+      "connection_pool"
+      "net-http-persistent"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z6j8s8cdmkbwzfis3dpk5dm91zi5fasids8npzrxhb4hcnnqd19";
+      sha256 = "0wycd7g00ji9fqlk4ka0qm5fbs37xxd273g8zsnfql61vhf5h83w";
       type = "gem";
     };
-    version = "0.18.2";
+    version = "0.20.0";
   };
   webrick = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
+      sha256 = "0ca1hr2rxrfw7s613rp4r4bxb454i3ylzniv9b9gxpklqigs3d5y";
       type = "gem";
     };
-    version = "1.9.1";
+    version = "1.9.2";
   };
   wisper = {
     groups = [ "default" ];
@@ -1708,4 +1823,14 @@
     };
     version = "1.0.7";
   };
+  yajl = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1r1i0jjxbnnll8336y144sphn1cdns5n8ygb31z826i6xirq8w8d";
+      type = "gem";
+    };
+    version = "0.3.4";
+  };
 }

From 6d4401e1b6a45455d8e7198540911152c7f40f2d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 17 Feb 2026 09:57:47 -0600
Subject: [PATCH 283/336] openafs: migrate to by-name

---
 .../{servers/openafs/1.8 => by-name/op/openafs}/bosserver.patch | 0
 pkgs/{servers => by-name/op}/openafs/cellservdb.nix             | 0
 .../openafs/1.8 => by-name/op/openafs}/cross-build.patch        | 0
 pkgs/{servers/openafs/1.8 => by-name/op/openafs}/module.nix     | 0
 .../openafs/1.8/default.nix => by-name/op/openafs/package.nix}  | 2 +-
 pkgs/{servers/openafs/1.8 => by-name/op/openafs}/srcs.nix       | 0
 pkgs/{servers/openafs/1.8 => by-name/op/openafs}/tsmbac.patch   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 8 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/bosserver.patch (100%)
 rename pkgs/{servers => by-name/op}/openafs/cellservdb.nix (100%)
 rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/cross-build.patch (100%)
 rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/module.nix (100%)
 rename pkgs/{servers/openafs/1.8/default.nix => by-name/op/openafs/package.nix} (98%)
 rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/srcs.nix (100%)
 rename pkgs/{servers/openafs/1.8 => by-name/op/openafs}/tsmbac.patch (100%)

diff --git a/pkgs/servers/openafs/1.8/bosserver.patch b/pkgs/by-name/op/openafs/bosserver.patch
similarity index 100%
rename from pkgs/servers/openafs/1.8/bosserver.patch
rename to pkgs/by-name/op/openafs/bosserver.patch
diff --git a/pkgs/servers/openafs/cellservdb.nix b/pkgs/by-name/op/openafs/cellservdb.nix
similarity index 100%
rename from pkgs/servers/openafs/cellservdb.nix
rename to pkgs/by-name/op/openafs/cellservdb.nix
diff --git a/pkgs/servers/openafs/1.8/cross-build.patch b/pkgs/by-name/op/openafs/cross-build.patch
similarity index 100%
rename from pkgs/servers/openafs/1.8/cross-build.patch
rename to pkgs/by-name/op/openafs/cross-build.patch
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/by-name/op/openafs/module.nix
similarity index 100%
rename from pkgs/servers/openafs/1.8/module.nix
rename to pkgs/by-name/op/openafs/module.nix
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/by-name/op/openafs/package.nix
similarity index 98%
rename from pkgs/servers/openafs/1.8/default.nix
rename to pkgs/by-name/op/openafs/package.nix
index 76c0d2f64597..d3b1630a7773 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/by-name/op/openafs/package.nix
@@ -144,7 +144,7 @@ stdenv.mkDerivation {
     done
   '';
 
-  passthru.cellservdb = callPackage ../cellservdb.nix { };
+  passthru.cellservdb = callPackage ./cellservdb.nix { };
 
   meta = {
     outputsToInstall = [
diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/by-name/op/openafs/srcs.nix
similarity index 100%
rename from pkgs/servers/openafs/1.8/srcs.nix
rename to pkgs/by-name/op/openafs/srcs.nix
diff --git a/pkgs/servers/openafs/1.8/tsmbac.patch b/pkgs/by-name/op/openafs/tsmbac.patch
similarity index 100%
rename from pkgs/servers/openafs/1.8/tsmbac.patch
rename to pkgs/by-name/op/openafs/tsmbac.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6059eb5fd80..bb3b979e0462 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8220,8 +8220,6 @@ with pkgs;
 
   nsdiff = perlPackages.nsdiff;
 
-  openafs = callPackage ../servers/openafs/1.8 { };
-
   openresty = callPackage ../servers/http/openresty {
     zlib-ng = zlib;
     withPerl = false;

From e392ae4881324f001f8b7cb4b8cfef15d4b7591e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 17 Feb 2026 10:59:57 -0600
Subject: [PATCH 284/336] openafs: refactor derivation

---
 pkgs/by-name/op/openafs/package.nix | 22 +++++++++-------------
 pkgs/top-level/linux-kernels.nix    |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/op/openafs/package.nix b/pkgs/by-name/op/openafs/package.nix
index d3b1630a7773..287a78cbad5f 100644
--- a/pkgs/by-name/op/openafs/package.nix
+++ b/pkgs/by-name/op/openafs/package.nix
@@ -14,7 +14,6 @@
   libkrb5,
   libxslt,
   docbook_xsl,
-  file,
   docbook_xml_dtd_43,
   libtool_2,
   withDevdoc ? false,
@@ -27,10 +26,7 @@
 }:
 
 with (import ./srcs.nix { inherit fetchurl; });
-let
-  inherit (lib) optional optionalString optionals;
 
-in
 stdenv.mkDerivation {
   pname = "openafs";
   inherit version srcs;
@@ -46,18 +42,18 @@ stdenv.mkDerivation {
     which
     bison
   ]
-  ++ optionals withDevdoc [
+  ++ lib.optionals withDevdoc [
     doxygen
     dblatex
   ];
 
-  buildInputs = [ libkrb5 ] ++ optional withNcurses ncurses;
+  buildInputs = [ libkrb5 ] ++ lib.optional withNcurses ncurses;
 
   patches = [
     ./bosserver.patch
     ./cross-build.patch
   ]
-  ++ optional withTsm ./tsmbac.patch;
+  ++ lib.optional withTsm ./tsmbac.patch;
 
   outputs = [
     "out"
@@ -65,7 +61,7 @@ stdenv.mkDerivation {
     "man"
     "doc"
   ]
-  ++ optional withDevdoc "devdoc";
+  ++ lib.optional withDevdoc "devdoc";
 
   enableParallelBuilding = false;
 
@@ -98,12 +94,12 @@ stdenv.mkDerivation {
       "--disable-kernel-module"
       "--disable-fuse-client"
       "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
-      ${optionalString withTsm "--enable-tivoli-tsm"}
-      ${optionalString (!withNcurses) "--disable-gtx"}
+      ${lib.optionalString withTsm "--enable-tivoli-tsm"}
+      ${lib.optionalString (!withNcurses) "--disable-gtx"}
       "--disable-linux-d_splice-alias-extra-iput"
     )
   ''
-  + optionalString withTsm ''
+  + lib.optionalString withTsm ''
     export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/opt/tivoli/tsm/client/api/bin64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\""
   '';
 
@@ -114,7 +110,7 @@ stdenv.mkDerivation {
       make -C "''${d}" index.html
     done
   ''
-  + optionalString withDevdoc ''
+  + lib.optionalString withDevdoc ''
     make dox
   '';
 
@@ -129,7 +125,7 @@ stdenv.mkDerivation {
 
     rm -r $out/lib/openafs
   ''
-  + optionalString withDevdoc ''
+  + lib.optionalString withDevdoc ''
     mkdir -p $devdoc/share/devhelp/openafs/doxygen
     cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs
     cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index dd28c3df679b..42151b2f90bf 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -493,7 +493,7 @@ in
         rtw89 =
           if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null;
 
-        openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
+        openafs_1_8 = callPackage ../by-name/op/openafs/module.nix { };
         # Current stable release; don't backport release updates!
         openafs = openafs_1_8;
 

From 2c2a1af6ecd970d55154d29c8be66b6c427e9c2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 17:35:05 +0000
Subject: [PATCH 285/336] python3Packages.unicode-segmentation-rs: 0.2.3 ->
 0.2.4

---
 .../unicode-segmentation-rs/Cargo.lock        | 34 +++++++++----------
 .../unicode-segmentation-rs/default.nix       |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock b/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock
index f837b7de6f4a..e5f2b7f2a770 100644
--- a/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock
+++ b/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "cc"
-version = "1.2.58"
+version = "1.2.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -26,9 +26,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "libc"
-version = "0.2.183"
+version = "0.2.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
 name = "once_cell"
@@ -53,9 +53,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf85e27e86080aafd5a22eae58a162e133a589551542b3e5cee4beb27e54f8e1"
+checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12"
 dependencies = [
  "libc",
  "once_cell",
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7"
+checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e"
 dependencies = [
  "python3-dll-a",
  "target-lexicon",
@@ -77,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "491aa5fc66d8059dd44a75f4580a2962c1862a1c2945359db36f6c2818b748dc"
+checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -87,9 +87,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d671734e9d7a43449f8480f8b38115df67bef8d21f76837fa75ee7aaa5e52e"
+checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -99,9 +99,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22faaa1ce6c430a1f71658760497291065e6450d7b5dc2bcf254d49f66ee700a"
+checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -112,9 +112,9 @@ dependencies = [
 
 [[package]]
 name = "python3-dll-a"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8"
+checksum = "d80ba7540edb18890d444c5aa8e1f1f99b1bdf26fb26ae383135325f4a36042b"
 dependencies = [
  "cc",
 ]
@@ -165,7 +165,7 @@ checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
 
 [[package]]
 name = "unicode-segmentation-rs"
-version = "0.2.2"
+version = "0.2.4"
 dependencies = [
  "pyo3",
  "unicode-segmentation",
diff --git a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix
index 68b4bbb76032..59208abaee74 100644
--- a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix
+++ b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "unicode-segmentation-rs";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "WeblateOrg";
     repo = "unicode-segmentation-rs";
     tag = "v${version}";
-    hash = "sha256-3Q8a5WfJ3+HKDx2a5O/OvkE16jwuT88T5uyQXa3BRb8=";
+    hash = "sha256-c/KWCJz8ZbWWE7S+2Uxp3+eQWHXAEZXcVN3C5OrFlrc=";
   };
 
   postPatch = ''

From 0008387437cc4d00148413ca8d4233a5cf3fe2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 13 Apr 2026 10:35:10 -0700
Subject: [PATCH 286/336] 
 home-assistant-custom-components.waste_collection_schedule: 2.15.0 -> 2.19.0

Diff: https://github.com/mampfes/hacs_waste_collection_schedule/compare/2.15.0...v2.19.0

Changelog: https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/v2.19.0
---
 .../waste_collection_schedule/package.nix                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
index bc4e71f62c3e..8d17ac71ae51 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -20,13 +20,13 @@
 buildHomeAssistantComponent rec {
   owner = "mampfes";
   domain = "waste_collection_schedule";
-  version = "2.15.0";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
-    tag = version;
-    hash = "sha256-2uOeKB3ivvfsxiwUoGMlT2BFqIdTRKtr84G4QAX0uD0=";
+    tag = "v${version}";
+    hash = "sha256-RkCgyjGetUbGa7F1AWVaXJ/lWAWA1m4SSxNV94EQyuY=";
   };
 
   dependencies = [
@@ -49,7 +49,7 @@ buildHomeAssistantComponent rec {
   ];
 
   meta = {
-    changelog = "https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/${version}";
+    changelog = "https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/${src.tag}";
     description = "Home Assistant integration framework for (garbage collection) schedules";
     homepage = "https://github.com/mampfes/hacs_waste_collection_schedule";
     maintainers = with lib.maintainers; [ jamiemagee ];

From 65526b3b985f570c0a49783831e5fc90b440ca1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 17:45:32 +0000
Subject: [PATCH 287/336] terraform-providers.mongodb_mongodbatlas: 2.9.0 ->
 2.10.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 67018d55cd5c..9a10d132800d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -923,13 +923,13 @@
     "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
   },
   "mongodb_mongodbatlas": {
-    "hash": "sha256-8TcFJv8e9CJOzF+Fy0QvB2juTvyGAxUvgSKCL3fGYDM=",
+    "hash": "sha256-3zypsyMu7ZlEKtmA2brnc3Gidlkd96v1DG3C4HQLByw=",
     "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
     "owner": "mongodb",
     "repo": "terraform-provider-mongodbatlas",
-    "rev": "v2.9.0",
+    "rev": "v2.10.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-mgGmFrP/LhjHiYvxKtGBe2S/ZBHn2qT7eX5eBvNjxk8="
+    "vendorHash": "sha256-cvnxSUCiu6S5lkT9VAyn9K6lmridRb0WZyrrvMv+B48="
   },
   "namecheap_namecheap": {
     "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",

From 814c27744f2d8f3f2273a64b4ec5f3a163ebde89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2026 07:12:24 +0000
Subject: [PATCH 288/336] mslicer: 0.4.0 -> 0.6.0

---
 pkgs/by-name/ms/mslicer/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ms/mslicer/package.nix b/pkgs/by-name/ms/mslicer/package.nix
index de95af66bafb..9ca44c3ef6c7 100644
--- a/pkgs/by-name/ms/mslicer/package.nix
+++ b/pkgs/by-name/ms/mslicer/package.nix
@@ -15,16 +15,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mslicer";
-  version = "0.4.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "connorslade";
     repo = "mslicer";
     rev = finalAttrs.version;
-    hash = "sha256-4b+LVOfV1CZVkdVHIJAhfisflRqpTO0LjWvM7qD9mSY=";
+    hash = "sha256-kDpV9UlqiqV+/h0PWk6fsOWumCHben4gkQk1mEXE5wk=";
   };
 
-  cargoHash = "sha256-U+khaF+XHrZjNHtxon2QFwk1Sd2+b5CRtUBeWWHKtRY=";
+  cargoHash = "sha256-o1igInyC0N8TorQ/naKbRyTTdZiaSNquVy0i0jzNcAk=";
+
+  postPatch = ''
+    patchShebangs --build dist/msla_format/generate.sh
+  '';
 
   buildInputs = [
     libglvnd
@@ -54,6 +58,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--pop-state"
   ];
 
+  # Build all binaries (e.g. the cli `slicer`) -- not just the default `mslicer` GUI application:
+  cargoBuildFlags = [ "--workspace" ];
+
   strictDeps = true;
 
   passthru.updateScript = nix-update-script { };

From 7efac4f5fb84aac7ea8005d4910043d9a7d92633 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 18:36:48 +0000
Subject: [PATCH 289/336] python3Packages.nhc: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/nhc/default.nix b/pkgs/development/python-modules/nhc/default.nix
index 1f77fc383daa..5c5e4dfaaa1f 100644
--- a/pkgs/development/python-modules/nhc/default.nix
+++ b/pkgs/development/python-modules/nhc/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "nhc";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vandeurenglenn";
     repo = "nhc";
     tag = "v${version}";
-    hash = "sha256-zA9aIVP7H4v+W4IBGEWqyzKPriDNYJTyXiKFvQCt33c=";
+    hash = "sha256-lQfuYU/5ONynCv0f+ZNuafblcvuLAdDmRA0FAxp9NTQ=";
   };
 
   build-system = [ setuptools ];

From efef582923f8d4d2cc8668d017b04f03e362ff54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 18:55:53 +0000
Subject: [PATCH 290/336] python3Packages.python-melcloud: 0.1.2 -> 0.1.3

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

diff --git a/pkgs/development/python-modules/python-melcloud/default.nix b/pkgs/development/python-modules/python-melcloud/default.nix
index 1c90472cedfd..5c81e0547f3c 100644
--- a/pkgs/development/python-modules/python-melcloud/default.nix
+++ b/pkgs/development/python-modules/python-melcloud/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-melcloud";
-  version = "0.1.2";
+  version = "0.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "erwindouna";
     repo = "python-melcloud";
     tag = version;
-    hash = "sha256-ccc6mIYWZEBENbmkbAZ0cFXJFhFNBjXoU/VDe+ETgoQ=";
+    hash = "sha256-i0/Ra5V3W/TOW+wRZZfKXuGtJTJeHqs+tPuS6KBZasE=";
   };
 
   postPatch = ''

From fe3321fa8240435c35a460f9380450fd9ff08184 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 18:56:08 +0000
Subject: [PATCH 291/336] terraform-providers.hashicorp_awscc: 1.78.0 -> 1.79.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 67018d55cd5c..123aa81c8a49 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -508,13 +508,13 @@
     "vendorHash": "sha256-picwxtQOtsBX8SkA64+ekFNDC7zIpg0CG66kelO2THk="
   },
   "hashicorp_awscc": {
-    "hash": "sha256-tcDnXPoiwGcy4tW3r/YMM+eivGur90TeAZO5gWhT7DA=",
+    "hash": "sha256-/mQ8GrCbOudqpQ3+xyJccVCVVUkGsnozNHa4Ll/66RI=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.78.0",
+    "rev": "v1.79.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-z2KPnztWBOlKTIwloRGdT1GMjBewQ1FlJgZkoGFK7XY="
+    "vendorHash": "sha256-ZhN2ap9U5xp2HNeAE7HmLGce19jVH4Y7GpuqrUtYf40="
   },
   "hashicorp_azuread": {
     "hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=",

From 4491a1802b80134df07530b3323edbcb80948a39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 19:06:27 +0000
Subject: [PATCH 292/336] regclient: 0.11.2 -> 0.11.3

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

diff --git a/pkgs/by-name/re/regclient/package.nix b/pkgs/by-name/re/regclient/package.nix
index 1d122ae5482d..d6a723d56863 100644
--- a/pkgs/by-name/re/regclient/package.nix
+++ b/pkgs/by-name/re/regclient/package.nix
@@ -18,16 +18,16 @@ in
 
 buildGoModule rec {
   pname = "regclient";
-  version = "0.11.2";
+  version = "0.11.3";
   tag = "v${version}";
 
   src = fetchFromGitHub {
     owner = "regclient";
     repo = "regclient";
     rev = tag;
-    sha256 = "sha256-q3dsIQgUyLQXiiBgz//ttT1leGaUROd1GFxXIbbvV2U=";
+    sha256 = "sha256-/gKvjyFOzyTsgMuqCqZaWl2yun7f+eboQ0iLuXHh4lI=";
   };
-  vendorHash = "sha256-J0kY5tltiicZPdQeq9uHAwqKR7SpFzwgLSryXtxL+9U=";
+  vendorHash = "sha256-P9ayAWvQY4WgmFTWzk2ZLQ5uwMvIsSfL73C99ROmze8=";
 
   outputs = [ "out" ] ++ bins;
 

From 64886b11dd780e2d12f5481f8d23f0a9a31845a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 19:11:58 +0000
Subject: [PATCH 293/336] phpstan: 2.1.46 -> 2.1.47

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

diff --git a/pkgs/by-name/ph/phpstan/package.nix b/pkgs/by-name/ph/phpstan/package.nix
index 8d8a3053d1c3..1e658c1c71d6 100644
--- a/pkgs/by-name/ph/phpstan/package.nix
+++ b/pkgs/by-name/ph/phpstan/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phpstan";
-  version = "2.1.46";
+  version = "2.1.47";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan";
     tag = finalAttrs.version;
-    hash = "sha256-VZQhL9w2/eyMQJhnLTU50wVVjS1gGNKLcPkuEkE5ZaA=";
+    hash = "sha256-xRDNpz01LvhY44Bwvb9MO6YvRpY5kgWIDxED1Yklvxw=";
   };
 
   nativeBuildInputs = [

From df663e5fb1f3f258bde0848fc0f2287eb201f2f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 19:18:23 +0000
Subject: [PATCH 294/336] python3Packages.aiosonos: 0.1.11 -> 0.1.12

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

diff --git a/pkgs/development/python-modules/aiosonos/default.nix b/pkgs/development/python-modules/aiosonos/default.nix
index 8bc8f2947610..f72014c4dec4 100644
--- a/pkgs/development/python-modules/aiosonos/default.nix
+++ b/pkgs/development/python-modules/aiosonos/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aiosonos";
-  version = "0.1.11";
+  version = "0.1.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "aiosonos";
     tag = finalAttrs.version;
-    hash = "sha256-Vd0m96BdFGYslAW/yHYdA4BUo6X8v1eYt6Z9ABinCJU=";
+    hash = "sha256-uWg/2f1R7QUZLqE6zjcox7EHkyU14p9oRtrlaVy0EL8=";
   };
 
   postPatch = ''

From 284288c32ef782e6e28bab2756a3d4aa9315d48a Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Mon, 13 Apr 2026 14:17:07 +0200
Subject: [PATCH 295/336] nixosTests.gitlab: fixup for new dovecot module

---
 nixos/tests/gitlab/gitlab.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/gitlab/gitlab.nix b/nixos/tests/gitlab/gitlab.nix
index 762d0a572854..d2ccfe1d7ab3 100644
--- a/nixos/tests/gitlab/gitlab.nix
+++ b/nixos/tests/gitlab/gitlab.nix
@@ -35,7 +35,7 @@ in
 
   nodes = {
     gitlab =
-      { ... }:
+      { config, ... }:
       {
         imports = [ ../common/user-account.nix ];
 
@@ -75,7 +75,14 @@ in
 
         services.dovecot2 = {
           enable = true;
-          enableImap = true;
+          enablePAM = true;
+          settings = {
+            dovecot_config_version = "2.4.3";
+            dovecot_storage_version = config.services.dovecot2.package.version;
+            protocols.imap = true;
+            mail_driver = "maildir";
+            mail_path = "~/mail";
+          };
         };
 
         systemd.services.gitlab-backup.environment.BACKUP = "dump";

From a52222578b2edaca51efbbf1ef5518d32395b71a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 19:37:24 +0000
Subject: [PATCH 296/336] mmdbctl: 1.4.9 -> 1.4.10

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

diff --git a/pkgs/by-name/mm/mmdbctl/package.nix b/pkgs/by-name/mm/mmdbctl/package.nix
index c9682be2dc9a..2d7279701824 100644
--- a/pkgs/by-name/mm/mmdbctl/package.nix
+++ b/pkgs/by-name/mm/mmdbctl/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "mmdbctl";
-  version = "1.4.9";
+  version = "1.4.10";
 
   src = fetchFromGitHub {
     owner = "ipinfo";
     repo = "mmdbctl";
     tag = "mmdbctl-${version}";
-    hash = "sha256-+LuFy7HLr6AvF/TetendJTCx6zoAGonJtc9BL7PCDsU=";
+    hash = "sha256-s1HKPZmuEENBf5a40i0oTtzvPV3UjMhS/1ijc9WtzXo=";
   };
 
   vendorHash = "sha256-f/FEMTOipss17uVhdvV3QKAmlHsmxnGWrz9csIs7ySk=";

From 2fce735eaa9483acebb8bcf2c2edd776102c8f06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 19:39:52 +0000
Subject: [PATCH 297/336] matlab-language-server: 1.3.9 -> 1.3.10

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

diff --git a/pkgs/by-name/ma/matlab-language-server/package.nix b/pkgs/by-name/ma/matlab-language-server/package.nix
index 37de8f543b19..60b607fed740 100644
--- a/pkgs/by-name/ma/matlab-language-server/package.nix
+++ b/pkgs/by-name/ma/matlab-language-server/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "matlab-language-server";
-  version = "1.3.9";
+  version = "1.3.10";
 
   src = fetchFromGitHub {
     owner = "mathworks";
     repo = "matlab-language-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V4CW7mC3F4L7yqpB4AhpLNtOAaEGIWT8AMWCJkTHepI=";
+    hash = "sha256-DDtgommUDZbrTIGvH8xQyV+qNeDkxwwsx/0uQgGECPM=";
   };
 
-  npmDepsHash = "sha256-eN6Z/UhzovwJh8EoCTuDnhsYyOxY9/fxOkPf0TqIg3k=";
+  npmDepsHash = "sha256-BW2J8yTGegugvPxmj1i1K/GDc5bZH8sHOpLOPgwFGKg=";
 
   npmBuildScript = "package";
 

From d7f265e05324fd8295fb76b9d43fe7346bfe8c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Mon, 13 Apr 2026 21:41:11 +0200
Subject: [PATCH 298/336] nixos/tests/machinectl: re-org configs into profiles

---
 nixos/tests/systemd-machinectl.nix | 121 ++++++++++++++++++-----------
 1 file changed, 75 insertions(+), 46 deletions(-)

diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix
index 19e40b882c4c..493188e4683f 100644
--- a/nixos/tests/systemd-machinectl.nix
+++ b/nixos/tests/systemd-machinectl.nix
@@ -15,14 +15,20 @@ let
       system.stateVersion = config.system.nixos.release;
 
       nixpkgs.pkgs = pkgs;
-
-      # use networkd to obtain systemd network setup
-      networking.useNetworkd = true;
     };
 
-  container = {
-    imports = [ common ];
+  profile-host-nspawn = {
+    # use networkd to obtain systemd network setup
+    networking.useNetworkd = true;
 
+    networking.firewall.extraCommands = ''
+      # open DHCP for nspawn interfaces
+      ${pkgs.iptables}/bin/iptables -A nixos-fw -i ve-+ -p udp -m udp --dport 67 -j nixos-fw-accept
+    '';
+  };
+
+  # improvement: move following profile to ../modules/profiles/nspawn-guest.nix
+  profile-guest-nspawn = {
     # We re-use the NixOS container option ...
     boot.isNspawnContainer = true;
     # ... and revert unwanted defaults
@@ -30,6 +36,65 @@ let
 
     # systemd-nspawn expects /sbin/init
     boot.loader.initScript.enable = true;
+
+    # use networkd to obtain systemd network setup
+    networking.useNetworkd = true;
+  };
+
+  profile-host-vmspawn =
+    { config, pkgs, ... }:
+    {
+      # use networkd to obtain systemd network setup
+      networking.useNetworkd = true;
+
+      networking.firewall.extraCommands = ''
+        # open DHCP for vmspawn interfaces
+        ${pkgs.iptables}/bin/iptables -A nixos-fw -i vt-+ -p udp -m udp --dport 67 -j nixos-fw-accept
+      '';
+
+      environment.systemPackages =
+        let
+          # improvement: following wrapper should be moved to pkgs
+          vmspawn-wrapped =
+            pkgs.runCommand "systemd-vmspawn-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; }
+              ''
+                makeWrapper ${config.systemd.package}/bin/systemd-vmspawn $out/bin/systemd-vmspawn-wrapped \
+                  --prefix PATH : ${
+                    lib.makeBinPath [
+                      pkgs.qemu
+                      pkgs.virtiofsd
+                      pkgs.openssh # ssh-keygen
+                    ]
+                  } \
+                  --prefix XDG_CONFIG_HOME : ${pkgs.qemu}/share
+              '';
+        in
+        [ vmspawn-wrapped ];
+    };
+
+  # improvement: move following profile to ../modules/profiles/vmspawn-guest.nix
+  profile-guest-vmspawn = {
+    imports = [ ../modules/profiles/qemu-guest.nix ];
+    # improvement: move following configuration to qemu-guest.nix
+    boot.initrd.availableKernelModules = [
+      "virtiofs"
+    ];
+
+    boot.initrd.systemd.enable = true;
+    # root is defined by systemd-vmspawn
+    boot.initrd.systemd.root = null;
+
+    boot.loader.grub.enable = false;
+
+    # use networkd to obtain systemd network setup
+    networking.useNetworkd = true;
+  };
+
+  container = {
+    imports = [
+      common
+      profile-guest-nspawn
+    ];
   };
 
   containerSystem = evalConfig container;
@@ -60,18 +125,8 @@ let
   vm = {
     imports = [
       common
-      ../modules/profiles/qemu-guest.nix
+      profile-guest-vmspawn
     ];
-    # improvement: move following configuration to qemu-guest.nix
-    boot.initrd.availableKernelModules = [
-      "virtiofs"
-    ];
-
-    boot.initrd.systemd.enable = true;
-    # root is defined by systemd-vmspawn
-    boot.initrd.systemd.root = null;
-
-    boot.loader.grub.enable = false;
 
     services.openssh.enable = true;
   };
@@ -94,14 +149,14 @@ in
 
   nodes.machine =
     {
-      config,
       lib,
-      pkgs,
       ...
     }:
     {
-      # use networkd to obtain systemd network setup
-      networking.useNetworkd = true;
+      imports = [
+        profile-host-nspawn
+        profile-host-vmspawn
+      ];
 
       # do not try to access cache.nixos.org
       nix.settings.substituters = lib.mkForce [ ];
@@ -146,32 +201,6 @@ in
         ];
         overrideStrategy = "asDropin";
       };
-
-      networking.firewall.extraCommands = ''
-        # open DHCP for nspawn interfaces
-        ${pkgs.iptables}/bin/iptables -A nixos-fw -i ve-+ -p udp -m udp --dport 67 -j nixos-fw-accept
-        # open DHCP for vmspawn interfaces
-        ${pkgs.iptables}/bin/iptables -A nixos-fw -i vt-+ -p udp -m udp --dport 67 -j nixos-fw-accept
-      '';
-
-      environment.systemPackages =
-        let
-          # improvement: following wrapper should be moved to pkgs
-          vmspawn-wrapped =
-            pkgs.runCommand "systemd-vmspawn-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; }
-              ''
-                makeWrapper ${config.systemd.package}/bin/systemd-vmspawn $out/bin/systemd-vmspawn-wrapped \
-                  --prefix PATH : ${
-                    lib.makeBinPath [
-                      pkgs.qemu
-                      pkgs.virtiofsd
-                      pkgs.openssh # ssh-keygen
-                    ]
-                  } \
-                  --prefix XDG_CONFIG_HOME : ${pkgs.qemu}/share
-              '';
-        in
-        [ vmspawn-wrapped ];
     };
 
   testScript = ''

From aea389e00d4d8a106369d24a7eba0eb519745ff0 Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Mon, 13 Apr 2026 21:37:29 +0200
Subject: [PATCH 299/336] nixos/dovecot: define options for config and storage
 version

dovecot_config_version and dovecot_storage_version are accessed by
the module, so should at least have a default set so that assertions
eval correctly.
---
 nixos/modules/services/mail/dovecot.nix | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index a9dd9531fadf..70971db69a97 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -148,8 +148,8 @@ let
 
   doveConf =
     let
-      configVersion = cfg.settings.dovecot_config_version or null;
-      storageVersion = cfg.settings.dovecot_storage_version or null;
+      configVersion = cfg.settings.dovecot_config_version;
+      storageVersion = cfg.settings.dovecot_storage_version;
       remainingSettings = builtins.removeAttrs cfg.settings [
         "dovecot_config_version"
         "dovecot_storage_version"
@@ -578,6 +578,26 @@ in
 
               # 2.4-only options
 
+              dovecot_config_version = mkOption {
+                default = null;
+                description = ''
+                  Dovecot configuration version. It uses the same versioning as Dovecot in general, e.g. 3.0.5. It specifies the configuration syntax, the used setting names and the expected default values.
+
+                  See <https://doc.dovecot.org/latest/core/summaries/settings.html#dovecot_config_version>.
+                '';
+                type = nullOr str;
+              };
+
+              dovecot_storage_version = mkOption {
+                default = null;
+                description = ''
+                  Dovecot storage file format version. It uses the same versioning as Dovecot in general, e.g. 3.0.5. It specifies the oldest Dovecot version that must be able to read files written by this Dovecot instance.
+
+                  See <https://doc.dovecot.org/latest/core/summaries/settings.html#dovecot_storage_version>.
+                '';
+                type = nullOr str;
+              };
+
               sieve_script_bin_path = mkOption {
                 default = if isPre24 then null else "/tmp/dovecot-%{user|username|lower}";
                 defaultText = literalExpression ''

From a705cf65dbb064f618db4b0f3ba3c0586c5d18af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 19:48:44 +0000
Subject: [PATCH 300/336] libretro.mame2003-plus: 0-unstable-2026-04-04 ->
 0-unstable-2026-04-08

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

diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index 30a043cc3d91..e4a5ab217821 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003-plus";
-  version = "0-unstable-2026-04-04";
+  version = "0-unstable-2026-04-08";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-plus-libretro";
-    rev = "3da943f4bcf264c7af83a07b78617e98ce3822cd";
-    hash = "sha256-3hJj8BLePPdEEsQriHSWhIMhamr7pvpKswP5/RxtjcM=";
+    rev = "7d7fc6d9d6a5855118e6580a7b5554e08796a878";
+    hash = "sha256-J2VU9BqVLpre2nnpweYpzR3j7jYVbfcNvjQn3SFk4oI=";
   };
 
   makefile = "Makefile";

From 54c3dd12b80823ae77169204b3b940d6d9002060 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 19:54:04 +0000
Subject: [PATCH 301/336] zipline: 4.5.2 -> 4.5.3

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

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index ba7d5cd39991..943eece50309 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -36,13 +36,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.5.2";
+  version = "4.5.3";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-StseTNZAmJzd+uk5FaBvDXr1wF/AahQp1GXFsZDzSz0=";
+    hash = "sha256-uZnN+kqtCGydrqnOVkhlNiCNSz4g2qLPiYTXpdmv/Mc=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm';
     fetcherVersion = 2;
-    hash = "sha256-d1EvqV+WiLE4mzn4Ewpi9A42xxyIPMewB6CKpSnipi8=";
+    hash = "sha256-eoZi4JMN9PiiRRd/z/HjqSHX9ta33cL4+d1GMGxJ33U=";
   };
 
   buildInputs = [

From 94466d51a76f5f03cf630a3db3e85fd0af33bfe1 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Mon, 13 Apr 2026 12:54:31 -0700
Subject: [PATCH 302/336] signalbackup-tools: 20260407 -> 20260413

Diff: https://github.com/bepaald/signalbackup-tools/compare/20260407...20260413
---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index f8ed4776cb82..ec2818006a2b 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "signalbackup-tools";
-  version = "20260407";
+  version = "20260413";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = finalAttrs.version;
-    hash = "sha256-rkIhaYLRBpqMLpwOHhTAEpgqrKRc3UBMwhS1oiCcbvc=";
+    hash = "sha256-O6hi1L0oMXCJ0MiNZNObcwpszpGdv9gp0gKCjEXZtHw=";
   };
 
   nativeBuildInputs = [

From 63cb61ae504cfdda3a7893557b385ff3f652f7c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 19:57:10 +0000
Subject: [PATCH 303/336] istioctl: 1.29.1 -> 1.29.2

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

diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix
index 4086b698f0f8..4e4291b865f1 100644
--- a/pkgs/by-name/is/istioctl/package.nix
+++ b/pkgs/by-name/is/istioctl/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "istioctl";
-  version = "1.29.1";
+  version = "1.29.2";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = finalAttrs.version;
-    hash = "sha256-+VdMmBf4YRAroMw0Jub7+Np3qEz648FqTgxCjL20WYQ=";
+    hash = "sha256-QGohEiUMCiXiaJGmd8x0o7trr2ZOB4cVQcUhPwnzZ/M=";
   };
-  vendorHash = "sha256-OXd29tw9UzrTF1q4ACWuA0xMOIcptDnUrkmnP576vhg=";
+  vendorHash = "sha256-/RBckWhh+fpogxVz7G6lfnhWjEvqB2b/aXAXQiTBS08=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 8f697ee7bcdb87889018f3cb76bc024952a1f529 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 20:03:09 +0000
Subject: [PATCH 304/336] googlesans-code: 6.001 -> 7.000

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

diff --git a/pkgs/by-name/go/googlesans-code/package.nix b/pkgs/by-name/go/googlesans-code/package.nix
index ab563051321a..045dd06334c8 100644
--- a/pkgs/by-name/go/googlesans-code/package.nix
+++ b/pkgs/by-name/go/googlesans-code/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "googlesans-code";
-  version = "6.001";
+  version = "7.000";
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "googlesans-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ScFx+uty9x+VTWxw7NJm3M7AYr0C00bdSnJJmFW3Jy0=";
+    hash = "sha256-XjsjBMCA1RraXhQiNq/D0mb//VnRKOWl1X4XpGzifNA=";
   };
 
   nativeBuildInputs = [

From c95ef668a58e3e54719705fc6e366fbd4db3535c Mon Sep 17 00:00:00 2001
From: Michael Schneider <michael@m1-s.com>
Date: Mon, 13 Apr 2026 21:07:01 +0100
Subject: [PATCH 305/336] postgresql: cleanup unused imports

---
 pkgs/servers/sql/postgresql/generic.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 6b1158e06aa0..fe21719eb84e 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -6,10 +6,8 @@ let
       stdenv,
       fetchFromGitHub,
       fetchurl,
-      fetchpatch2,
       lib,
       replaceVars,
-      writeShellScriptBin,
 
       # source specification
       hash,
@@ -45,9 +43,7 @@ let
       buildPackages,
       newScope,
       nixosTests,
-      postgresqlTestHook,
       self,
-      stdenvNoCC,
       testers,
 
       # Block size

From 2b8649037b2dd039188016c5e2ddaaec2399fbd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 20:08:02 +0000
Subject: [PATCH 306/336] gatekeeper: 3.22.0 -> 3.22.1

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

diff --git a/pkgs/by-name/ga/gatekeeper/package.nix b/pkgs/by-name/ga/gatekeeper/package.nix
index 3feb98b1fbd7..8dad97fc7d3d 100644
--- a/pkgs/by-name/ga/gatekeeper/package.nix
+++ b/pkgs/by-name/ga/gatekeeper/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gatekeeper";
-  version = "3.22.0";
+  version = "3.22.1";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "gatekeeper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ARgrazsIx3w9BLqI9kWV794ojvZgIdNMGsjAXs19u1g=";
+    hash = "sha256-lYLII1aJwrYmoyVYf08KDyvIVuCJIya/97hLQyGKz44=";
   };
 
-  vendorHash = "sha256-2mnUYuxQ6wXOpK/V+8KpF0f5bkYRBgqJEl1bKOLTHNE=";
+  vendorHash = "sha256-PnBWUvpq7d3yQP50fgACWx/zcYobIGC+KiuzLqpKDcI=";
 
   nativeBuildInputs = [
     installShellFiles

From f9ef591e97d9ca6962ea97aa3263046a0e5c4356 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 20:20:07 +0000
Subject: [PATCH 307/336] python3Packages.aioghost: 0.4.0 -> 0.4.10

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

diff --git a/pkgs/development/python-modules/aioghost/default.nix b/pkgs/development/python-modules/aioghost/default.nix
index 0565d1ba2287..b6fb9e2550c3 100644
--- a/pkgs/development/python-modules/aioghost/default.nix
+++ b/pkgs/development/python-modules/aioghost/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aioghost";
-  version = "0.4.0";
+  version = "0.4.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TryGhost";
     repo = "aioghost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VIMkAPUzIzSwXCbwqu+OOvUwd/l2zUJpnvjLlvIoDAk=";
+    hash = "sha256-Rumg/ABsA2pK1NRPVPW8wZmUL8VwzV48mU97PFWmCEY=";
   };
 
   build-system = [ hatchling ];

From b1e33c00b6a0c3bc813b3bc7f985e7c061b972ae Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 23 Mar 2026 08:36:13 -0500
Subject: [PATCH 308/336] gpg-tui: migrate to by-name

---
 .../gpg-tui/default.nix => by-name/gp/gpg-tui/package.nix}    | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/security/gpg-tui/default.nix => by-name/gp/gpg-tui/package.nix} (97%)

diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/by-name/gp/gpg-tui/package.nix
similarity index 97%
rename from pkgs/tools/security/gpg-tui/default.nix
rename to pkgs/by-name/gp/gpg-tui/package.nix
index 0d974a230347..d222798cc1f4 100644
--- a/pkgs/tools/security/gpg-tui/default.nix
+++ b/pkgs/by-name/gp/gpg-tui/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   python3,
   libiconv,
-  libresolv,
+  darwin,
   x11Support ? true,
   libxcb,
   libxkbcommon,
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
-    libresolv
+    darwin.libresolv
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ca745747ca7..05a0c0cb9642 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1788,10 +1788,6 @@ with pkgs;
 
   ghidra-bin = callPackage ../tools/security/ghidra { };
 
-  gpg-tui = callPackage ../tools/security/gpg-tui {
-    inherit (darwin) libresolv;
-  };
-
   hocr-tools = with python3Packages; toPythonApplication hocr-tools;
 
   hopper = qt5.callPackage ../development/tools/analysis/hopper { };

From a54161acd31be8d33a465b632b9b9208f99bd38b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 23 Mar 2026 08:44:05 -0500
Subject: [PATCH 309/336] gpg-tui: refactor

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

diff --git a/pkgs/by-name/gp/gpg-tui/package.nix b/pkgs/by-name/gp/gpg-tui/package.nix
index d222798cc1f4..e9873c763f32 100644
--- a/pkgs/by-name/gp/gpg-tui/package.nix
+++ b/pkgs/by-name/gp/gpg-tui/package.nix
@@ -14,14 +14,14 @@
   libxkbcommon,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gpg-tui";
   version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "gpg-tui";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-qGm0eHpVFGn8tNdEnmQ4oIfjCxyixMFYdxih7pHvGH0=";
   };
 
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Terminal user interface for GnuPG";
     homepage = "https://github.com/orhun/gpg-tui";
-    changelog = "https://github.com/orhun/gpg-tui/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/orhun/gpg-tui/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       dotlambda
@@ -58,4 +58,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "gpg-tui";
   };
-}
+})

From 9c1a21bed3cda2f95c76860232aa9fdbb7585d32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 20:27:16 +0000
Subject: [PATCH 310/336] libvgm: 0-unstable-2026-03-01 ->
 0-unstable-2026-04-06

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

diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix
index 4c6aa7133832..c6776d0c49da 100644
--- a/pkgs/by-name/li/libvgm/package.nix
+++ b/pkgs/by-name/li/libvgm/package.nix
@@ -38,13 +38,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libvgm";
-  version = "0-unstable-2026-03-01";
+  version = "0-unstable-2026-04-06";
 
   src = fetchFromGitHub {
     owner = "ValleyBell";
     repo = "libvgm";
-    rev = "9f376fbca88db3e9fd169a8b145b7d6932a020a9";
-    hash = "sha256-pWhq+mmk7DJ5qxt9ncWYZlfNw5tjpPHqn5ctCCMfsUk=";
+    rev = "d1151884997ba4769b070b7c7aaedeffc60a25fb";
+    hash = "sha256-SiOB2M7RNo4S5uIr8wXsZ1UtS2+2N8Tqm5iJ+Am3Ep4=";
   };
 
   outputs = [

From bff2fb1a0c15eda6fd2fb913940f4116588fff08 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 22:36:39 +0200
Subject: [PATCH 311/336] python3Packages.pyexploitdb: 0.3.21 -> 0.3.22

Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md
---
 pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index 8baed9d6cc0e..a74896f22372 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyexploitdb";
-  version = "0.3.21";
+  version = "0.3.22";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-j9STueuKwRqbq0zS+xxE8I7EDR4s+Cq1evCtP0h3WX4=";
+    hash = "sha256-yk01aq1rOed312E629Vt5TuXl1vQdgoZZB3c5tk3nEk=";
   };
 
   build-system = [ setuptools ];

From 29bfc9b4d79630c8dd1095797d0da8f901918c6b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 15 Nov 2025 13:41:12 +0000
Subject: [PATCH 312/336] gphoto2,gphoto2fs: move gphoto2 and gphoto2fs to
 pkgs/by-name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- gphoto2: migrate to `pkgs/by-name/gp/gphoto2/package.nix`
  • switch to `stdenv.mkDerivation (finalAttrs: { ... })`
  • use `tag`/`hash` instead of `rev`/`sha256`
  • drop `with lib;` in meta, qualify licenses/platforms/maintainers

- gphoto2fs: migrate to `pkgs/by-name/gp/gphoto2fs/package.nix`
  • switch to `stdenv.mkDerivation (finalAttrs: { ... })`
  • update to `hash` form
  • drop `with lib;` in meta, qualify licenses/platforms/maintainers

- all-packages.nix: remove old `callPackage` entries
---
 .../default.nix => by-name/gp/gphoto2/package.nix}        | 8 ++++----
 .../gphotofs.nix => by-name/gp/gphoto2fs/package.nix}     | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ----
 3 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/misc/gphoto2/default.nix => by-name/gp/gphoto2/package.nix} (86%)
 rename pkgs/{applications/misc/gphoto2/gphotofs.nix => by-name/gp/gphoto2fs/package.nix} (73%)

diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/by-name/gp/gphoto2/package.nix
similarity index 86%
rename from pkgs/applications/misc/gphoto2/default.nix
rename to pkgs/by-name/gp/gphoto2/package.nix
index 2c5e1483f332..afed03c7c766 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/by-name/gp/gphoto2/package.nix
@@ -13,15 +13,15 @@
   readline,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gphoto2";
   version = "2.5.32";
 
   src = fetchFromGitHub {
     owner = "gphoto";
     repo = "gphoto2";
-    rev = "v${version}";
-    sha256 = "sha256-9Tn6CBxZpzPnlyiBYdpQGViT3NEcup6AXT7Z0DqI/vA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9Tn6CBxZpzPnlyiBYdpQGViT3NEcup6AXT7Z0DqI/vA=";
   };
 
   nativeBuildInputs = [
@@ -53,4 +53,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.jcumming ];
     mainProgram = "gphoto2";
   };
-}
+})
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/by-name/gp/gphoto2fs/package.nix
similarity index 73%
rename from pkgs/applications/misc/gphoto2/gphotofs.nix
rename to pkgs/by-name/gp/gphoto2fs/package.nix
index 9232705e06d3..c6ed189ad97c 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/by-name/gp/gphoto2fs/package.nix
@@ -9,12 +9,12 @@
   glib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gphoto2fs";
   version = "0.5.0";
   src = fetchurl {
-    url = "mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2";
-    sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
+    url = "mirror://sourceforge/gphoto/gphotofs/${finalAttrs.version}/gphotofs-0.5.tar.bz2";
+    hash = "sha256-Z27E3mmoHBk//DG9x7WHrCosw3gLFPDnycTApRezQ8w=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -36,4 +36,4 @@ stdenv.mkDerivation rec {
       gpl2
     ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ca745747ca7..1b155beb481c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9591,10 +9591,6 @@ with pkgs;
 
   molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
 
-  gphoto2 = callPackage ../applications/misc/gphoto2 { };
-
-  gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };
-
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
 

From bad67f4f1ac73ad1ffab0f8828fa47cafdf9e5e0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 8 Feb 2026 09:21:09 -0600
Subject: [PATCH 313/336] q4wine: migrate to by-name

---
 .../default.nix => by-name/q4/q4wine/package.nix}   | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{applications/misc/q4wine/default.nix => by-name/q4/q4wine/package.nix} (90%)

diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/by-name/q4/q4wine/package.nix
similarity index 90%
rename from pkgs/applications/misc/q4wine/default.nix
rename to pkgs/by-name/q4/q4wine/package.nix
index 5a93c793e10f..23f35e220974 100644
--- a/pkgs/applications/misc/q4wine/default.nix
+++ b/pkgs/by-name/q4/q4wine/package.nix
@@ -4,10 +4,7 @@
   stdenv,
   cmake,
   sqlite,
-  qtbase,
-  qtsvg,
-  qttools,
-  wrapQtAppsHook,
+  qt6,
   icoutils, # build and runtime deps.
   wget,
   fuseiso,
@@ -29,14 +26,14 @@ stdenv.mkDerivation rec {
   buildInputs = [
     sqlite
     icoutils
-    qtbase
-    qtsvg
-    qttools
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   # Add runtime deps.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ca745747ca7..a2e1933dc639 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9598,8 +9598,6 @@ with pkgs;
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
 
-  q4wine = kdePackages.callPackage ../applications/misc/q4wine { };
-
   googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
 
   gpsbabel-gui = gpsbabel.override {

From be9140fb2c1778ccd19af040babb454840eb6d70 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 8 Feb 2026 09:22:26 -0600
Subject: [PATCH 314/336] q4wine: modernize derivation

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

diff --git a/pkgs/by-name/q4/q4wine/package.nix b/pkgs/by-name/q4/q4wine/package.nix
index 23f35e220974..bae5afc03705 100644
--- a/pkgs/by-name/q4/q4wine/package.nix
+++ b/pkgs/by-name/q4/q4wine/package.nix
@@ -12,15 +12,15 @@
   which, # runtime deps.
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "q4wine";
   version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "brezerk";
     repo = "q4wine";
-    rev = "v${version}";
-    sha256 = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I=";
   };
 
   buildInputs = [
@@ -57,4 +57,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ rkitover ];
     platforms = lib.platforms.unix;
   };
-}
+})

From b32d62efd7d4c63aaf4557d7b4c6461ca133666f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Apr 2026 22:43:30 +0200
Subject: [PATCH 315/336] python3Packages.rns: 1.1.4 -> 1.1.5

Diff: https://github.com/markqvist/Reticulum/compare/1.1.4...1.1.5

Changelog: https://github.com/markqvist/Reticulum/blob/1.1.5/Changelog.md
---
 pkgs/development/python-modules/rns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 09f90e758c0f..f795814512a7 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "rns";
-  version = "1.1.4";
+  version = "1.1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
     tag = finalAttrs.version;
-    hash = "sha256-nhReZXZdquXBpuD7ymfe6uHBpUqfLYfl3rnsY38NPZc=";
+    hash = "sha256-cgDL27KyDS8wPgyZ1ez6k9DRD2m9cJxms6w76Haalkg=";
   };
 
   patches = [

From 3dc87b0bbf8512be458ca6d3a8a087abfa200c13 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Mon, 13 Apr 2026 22:50:45 +0200
Subject: [PATCH 316/336] lazygit: 0.61.0 -> 0.61.1

Changelog: https://github.com/jesseduffield/lazygit/releases/tag/v0.61.1
Diff: https://github.com/jesseduffield/lazygit/compare/v0.61.0...v0.61.1
---
 pkgs/by-name/la/lazygit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index 1f6a1fe5e186..beec696add34 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lazygit";
-  version = "0.61.0";
+  version = "0.61.1";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazygit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ=";
+    hash = "sha256-sFmOHsYs39i4mSH/CnetWFBQBviv5QsP0qfCSkaEJZE=";
   };
 
   vendorHash = null;

From 17983e8ee9358a57ad4f64984daf077b091e7eb7 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Feb 2026 08:40:43 -0600
Subject: [PATCH 317/336] license_finder: migrate to by-name

---
 pkgs/{development/tools => by-name/li}/license_finder/Gemfile   | 0
 .../tools => by-name/li}/license_finder/Gemfile.lock            | 0
 .../{development/tools => by-name/li}/license_finder/gemset.nix | 0
 .../default.nix => by-name/li/license_finder/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{development/tools => by-name/li}/license_finder/Gemfile (100%)
 rename pkgs/{development/tools => by-name/li}/license_finder/Gemfile.lock (100%)
 rename pkgs/{development/tools => by-name/li}/license_finder/gemset.nix (100%)
 rename pkgs/{development/tools/license_finder/default.nix => by-name/li/license_finder/package.nix} (100%)

diff --git a/pkgs/development/tools/license_finder/Gemfile b/pkgs/by-name/li/license_finder/Gemfile
similarity index 100%
rename from pkgs/development/tools/license_finder/Gemfile
rename to pkgs/by-name/li/license_finder/Gemfile
diff --git a/pkgs/development/tools/license_finder/Gemfile.lock b/pkgs/by-name/li/license_finder/Gemfile.lock
similarity index 100%
rename from pkgs/development/tools/license_finder/Gemfile.lock
rename to pkgs/by-name/li/license_finder/Gemfile.lock
diff --git a/pkgs/development/tools/license_finder/gemset.nix b/pkgs/by-name/li/license_finder/gemset.nix
similarity index 100%
rename from pkgs/development/tools/license_finder/gemset.nix
rename to pkgs/by-name/li/license_finder/gemset.nix
diff --git a/pkgs/development/tools/license_finder/default.nix b/pkgs/by-name/li/license_finder/package.nix
similarity index 100%
rename from pkgs/development/tools/license_finder/default.nix
rename to pkgs/by-name/li/license_finder/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aacd720403d5..bfa69674080b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5713,8 +5713,6 @@ with pkgs;
 
   edb = libsForQt5.callPackage ../development/tools/misc/edb { };
 
-  license_finder = callPackage ../development/tools/license_finder { };
-
   # NOTE: Override and set useIcon = false to use Awk instead of Icon.
   fffuu = haskell.lib.compose.justStaticExecutables (
     haskellPackages.callPackage ../tools/misc/fffuu { }

From 10b8c4da5184bc5815b79f8d27e464f79356c3e4 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Feb 2026 08:44:34 -0600
Subject: [PATCH 318/336] license_finder: 7.0.1 -> 7.2.1

---
 pkgs/by-name/li/license_finder/Gemfile.lock | 14 ++++++----
 pkgs/by-name/li/license_finder/gemset.nix   | 31 ++++++++++++++-------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/li/license_finder/Gemfile.lock b/pkgs/by-name/li/license_finder/Gemfile.lock
index 9adea6fc73ff..9a93db190583 100644
--- a/pkgs/by-name/li/license_finder/Gemfile.lock
+++ b/pkgs/by-name/li/license_finder/Gemfile.lock
@@ -1,17 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    license_finder (7.0.1)
+    csv (3.3.5)
+    license_finder (7.2.1)
       bundler
+      csv (~> 3.2)
       rubyzip (>= 1, < 3)
       thor (~> 1.2)
       tomlrb (>= 1.3, < 2.1)
       with_env (= 1.1.0)
       xml-simple (~> 1.1.9)
-    rexml (3.2.5)
-    rubyzip (2.3.2)
-    thor (1.2.1)
-    tomlrb (2.0.1)
+    rexml (3.4.4)
+    rubyzip (2.4.1)
+    thor (1.5.0)
+    tomlrb (2.0.4)
     with_env (1.1.0)
     xml-simple (1.1.9)
       rexml
@@ -23,4 +25,4 @@ DEPENDENCIES
   license_finder
 
 BUNDLED WITH
-   2.1.4
+   2.7.2
diff --git a/pkgs/by-name/li/license_finder/gemset.nix b/pkgs/by-name/li/license_finder/gemset.nix
index fad868d54e4a..47ebf87d1915 100644
--- a/pkgs/by-name/li/license_finder/gemset.nix
+++ b/pkgs/by-name/li/license_finder/gemset.nix
@@ -1,6 +1,17 @@
 {
+  csv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
+      type = "gem";
+    };
+    version = "3.3.5";
+  };
   license_finder = {
     dependencies = [
+      "csv"
       "rubyzip"
       "thor"
       "tomlrb"
@@ -11,50 +22,50 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0sig4ifxzvcz3fwjnz93dpv61v6sxpmlknj5f8n112ragrbcj8hb";
+      sha256 = "057ghx449d70bakmn3fjr4x6f4rq4cj61l9gnww0c5sbnqcsv7hp";
       type = "gem";
     };
-    version = "7.0.1";
+    version = "7.2.1";
   };
   rexml = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+      sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
       type = "gem";
     };
-    version = "3.2.5";
+    version = "3.4.4";
   };
   rubyzip = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+      sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
       type = "gem";
     };
-    version = "2.3.2";
+    version = "2.4.1";
   };
   thor = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
+      sha256 = "0wsy88vg2mazl039392hqrcwvs5nb9kq8jhhrrclir2px1gybag3";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.5.0";
   };
   tomlrb = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0a83cb5xpyzlr651d46rk5xgq37s46hs9nfqy9baawzs31hm9k2g";
+      sha256 = "168v339gqaly00i4zqg2ag2h10r3rl7999d0cqrrpb63gaa7fbr6";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.0.4";
   };
   with_env = {
     groups = [ "default" ];

From 3cf8d643c3a305ab9713198c14205b92dbd2baef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 20:59:31 +0000
Subject: [PATCH 319/336] elementsd: 23.3.2 -> 23.3.3

---
 pkgs/applications/blockchains/elements/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix
index 3252b1095731..daa9ccd0e04a 100644
--- a/pkgs/applications/blockchains/elements/default.nix
+++ b/pkgs/applications/blockchains/elements/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = if withGui then "elements" else "elementsd";
-  version = "23.3.2";
+  version = "23.3.3";
 
   src = fetchFromGitHub {
     owner = "ElementsProject";
     repo = "elements";
     rev = "elements-${finalAttrs.version}";
-    sha256 = "sha256-NLLM+stYOXcnAjEfXRerjvgMXM8jFSOyZhu/A0ZTnRw=";
+    sha256 = "sha256-u0/IVOr6ivN7SrM44NPNqs0yPBDqElD79pKcn+384B4=";
   };
 
   nativeBuildInputs = [

From 397ffc81e65ec8780f87579e566833d74d776562 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 19 Jan 2026 09:54:41 -0600
Subject: [PATCH 320/336] gnuplot: migrate to by-name, switch to finalAttrs,
 and remove Qt-specific mkDerivation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This refactor performs a mechanical migration of gnuplot to the by-name
layout and updates the derivation to the modern finalAttrs style.

Key changes:

* Move gnuplot from pkgs/tools/graphics/gnuplot/ to pkgs/by-name/gn/gnuplot/
  and rename set-gdfontpath-from-fontconfig.sh accordingly.

* Replace the old `rec { ... }` form with `stdenv.mkDerivation (finalAttrs: { ... })`
  following current Nixpkgs conventions.

* Remove the unused mkDerivation argument and stop switching the derivation
  function based on `withQt`. gnuplot does not require libsForQt5.mkDerivation;
  Qt support is handled entirely through inputs and configure flags.

* Replace qttools/qtbase/qtsvg with libsForQt5.qttools/qtbase/qtsvg when
  `withQt = true`.

* Convert `${pname}-${version}` to `${finalAttrs.version}` and update
  `sha256` → `hash`.

* Add by-name variants gnuplot_qt and gnuplot_aquaterm using override
  wrappers.

* Remove the old top-level aliases for gnuplot, gnuplot_qt, and
  gnuplot_aquaterm from all-packages.nix; by-name exposure now handles them.

This change is purely structural and does not modify gnuplot’s build
behaviour beyond adopting the standard finalAttrs pattern.
---
 .../gn/gnuplot/package.nix}                   | 21 ++++++++-----------
 .../gnuplot/set-gdfontpath-from-fontconfig.sh |  0
 pkgs/by-name/gn/gnuplot_aquaterm/package.nix  |  7 +++++++
 pkgs/by-name/gn/gnuplot_qt/package.nix        |  7 +++++++
 pkgs/top-level/all-packages.nix               |  7 -------
 5 files changed, 23 insertions(+), 19 deletions(-)
 rename pkgs/{tools/graphics/gnuplot/default.nix => by-name/gn/gnuplot/package.nix} (90%)
 rename pkgs/{tools/graphics => by-name/gn}/gnuplot/set-gdfontpath-from-fontconfig.sh (100%)
 create mode 100644 pkgs/by-name/gn/gnuplot_aquaterm/package.nix
 create mode 100644 pkgs/by-name/gn/gnuplot_qt/package.nix

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/by-name/gn/gnuplot/package.nix
similarity index 90%
rename from pkgs/tools/graphics/gnuplot/default.nix
rename to pkgs/by-name/gn/gnuplot/package.nix
index 8a1fb92d513c..2a9c7f13d07d 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/by-name/gn/gnuplot/package.nix
@@ -28,22 +28,19 @@
   gnused,
   coreutils,
   withQt ? false,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
+  qt5,
 }:
 
 let
   withX = !aquaterm && !stdenv.hostPlatform.isDarwin;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnuplot";
   version = "6.0.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnuplot/gnuplot-${version}.tar.gz";
-    sha256 = "sha256-RY2UdpYl5z1fYjJQD0nLrcsrGDOA1D0iZqD5cBrrnFs=";
+    url = "mirror://sourceforge/gnuplot/gnuplot-${finalAttrs.version}.tar.gz";
+    hash = "sha256-RY2UdpYl5z1fYjJQD0nLrcsrGDOA1D0iZqD5cBrrnFs=";
   };
 
   nativeBuildInputs = [
@@ -52,8 +49,8 @@ stdenv.mkDerivation rec {
     texinfo
   ]
   ++ lib.optionals withQt [
-    qttools
-    wrapQtAppsHook
+    qt5.qttools
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -74,8 +71,8 @@ stdenv.mkDerivation rec {
     libxaw
   ]
   ++ lib.optionals withQt [
-    qtbase
-    qtsvg
+    qt5.qtbase
+    qt5.qtsvg
   ]
   ++ lib.optional withWxGTK wxwidgets_3_2;
 
@@ -131,4 +128,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     mainProgram = "gnuplot";
   };
-}
+})
diff --git a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh b/pkgs/by-name/gn/gnuplot/set-gdfontpath-from-fontconfig.sh
similarity index 100%
rename from pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh
rename to pkgs/by-name/gn/gnuplot/set-gdfontpath-from-fontconfig.sh
diff --git a/pkgs/by-name/gn/gnuplot_aquaterm/package.nix b/pkgs/by-name/gn/gnuplot_aquaterm/package.nix
new file mode 100644
index 000000000000..b98f0473a1f5
--- /dev/null
+++ b/pkgs/by-name/gn/gnuplot_aquaterm/package.nix
@@ -0,0 +1,7 @@
+{
+  gnuplot,
+}:
+
+gnuplot.override {
+  aquaterm = true;
+}
diff --git a/pkgs/by-name/gn/gnuplot_qt/package.nix b/pkgs/by-name/gn/gnuplot_qt/package.nix
new file mode 100644
index 000000000000..dc503dd2a923
--- /dev/null
+++ b/pkgs/by-name/gn/gnuplot_qt/package.nix
@@ -0,0 +1,7 @@
+{
+  gnuplot,
+}:
+
+gnuplot.override {
+  withQt = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aacd720403d5..8259d7508ad5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2401,13 +2401,6 @@ with pkgs;
   };
   gnupg = gnupg24;
 
-  gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { };
-
-  gnuplot_qt = gnuplot.override { withQt = true; };
-
-  # must have AquaTerm installed separately
-  gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
-
   gnused = callPackage ../tools/text/gnused { };
 
   gnutar = callPackage ../tools/archivers/gnutar { };

From 69a1867947bceb5a9c20f573e6e1412fe29d9b1a Mon Sep 17 00:00:00 2001
From: Ignacio Perez <ignacio@feuer.me>
Date: Mon, 13 Apr 2026 22:59:46 +0200
Subject: [PATCH 321/336] maintainers: add _0xErwin1

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1b2fcb922bec..cfb89d05573b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -140,6 +140,13 @@
     github = "0xd61";
     githubId = 8351869;
   };
+  _0xErwin1 = {
+    email = "ignacio@feuer.me";
+    name = "Ignacio Perez";
+    github = "0xErwin1";
+    githubId = 67933444;
+    keys = [ { fingerprint = "B39E B98E 8860 DAFB 0567  0073 A614 B7D2 5134 987A"; } ];
+  };
   _0xMillyByte = {
     email = "emilia.daelman@gmail.com";
     name = "Emilia Daelman";

From 6c3c0d8107dc410e172723e716ca2c2bf1b05511 Mon Sep 17 00:00:00 2001
From: Ignacio Perez <ignacio@feuer.me>
Date: Fri, 30 Jan 2026 08:52:31 -0300
Subject: [PATCH 322/336] cartero: add _0xErwin1 to maintainers

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

diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix
index a80124417b7b..6eac5f87ae69 100644
--- a/pkgs/by-name/ca/cartero/package.nix
+++ b/pkgs/by-name/ca/cartero/package.nix
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       aleksana
       amerino
+      _0xErwin1
     ];
     platforms = lib.platforms.linux;
   };

From 8040d2213e1cc6d674ac21b33af772070bf105c1 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 15 Jan 2026 09:20:15 -0600
Subject: [PATCH 323/336] formiko: migrate to by-name, switch to PEP 517, and
 update GTK deps

Move formiko to pkgs/by-name and modernize its Python and GTK
packaging.

Changes:
- enable PEP 517 with `pyproject = true`
- add explicit `build-system = [ python3Packages.setuptools ]`
- switch to python3Packages.buildPythonApplication
- move pygobject3 to `dependencies`
- replace gtksourceview (GTKSourceView 3) with gtksourceview4
- use explicit python3Packages.* references
- replace deprecated sha256 with hash
- remove manual wiring from all-packages.nix

This brings formiko in line with current by-name, PEP 517, and GTK
packaging conventions.
---
 .../fo/formiko/package.nix}                   | 28 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  6 ----
 2 files changed, 17 insertions(+), 17 deletions(-)
 rename pkgs/{applications/editors/formiko/default.nix => by-name/fo/formiko/package.nix} (65%)

diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/by-name/fo/formiko/package.nix
similarity index 65%
rename from pkgs/applications/editors/formiko/default.nix
rename to pkgs/by-name/fo/formiko/package.nix
index d2f0fc1791b6..cc639774d6ce 100644
--- a/pkgs/applications/editors/formiko/default.nix
+++ b/pkgs/by-name/fo/formiko/package.nix
@@ -1,46 +1,52 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
   wrapGAppsHook3,
   gobject-introspection,
   gtk3,
-  docutils,
-  gtksourceview,
+  gtksourceview4,
   gtkspell3,
   librsvg,
-  pygobject3,
   webkitgtk_4_1,
 }:
 
-buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "formiko";
   version = "1.5.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ondratu";
     repo = "formiko";
     tag = finalAttrs.version;
-    sha256 = "sha256-slfpkckCvxHJ/jlBP7QAhzaf9TAcS6biDQBZcBTyTKI=";
+    hash = "sha256-slfpkckCvxHJ/jlBP7QAhzaf9TAcS6biDQBZcBTyTKI=";
   };
 
+  build-system = [
+    python3Packages.setuptools
+  ];
+
   nativeBuildInputs = [
     wrapGAppsHook3
     gobject-introspection
     gtk3
   ];
-  propagatedBuildInputs = [
-    docutils
+
+  buildInputs = [
     gobject-introspection
     gtk3
-    gtksourceview
+    gtksourceview4
     gtkspell3
     librsvg
-    pygobject3
     webkitgtk_4_1
   ];
 
+  dependencies = [
+    python3Packages.pygobject3
+    python3Packages.docutils
+  ];
+
   # Needs a display
   doCheck = false;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aacd720403d5..5cca5121f4cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9498,12 +9498,6 @@ with pkgs;
     pname = "floorp-bin";
   };
 
-  formiko =
-    with python3Packages;
-    callPackage ../applications/editors/formiko {
-      inherit buildPythonApplication;
-    };
-
   inherit
     ({
       freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };

From 4b065c03d8650f6e2304d58845c68d06bd0faf4a Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Mon, 13 Apr 2026 23:03:38 +0200
Subject: [PATCH 324/336] go-away: use buildGo125Module

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

diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix
index 55b31be7e04b..1336e28df751 100644
--- a/pkgs/by-name/go/go-away/package.nix
+++ b/pkgs/by-name/go/go-away/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
-  buildGoModule,
+  # tinygo currently only supports Go <=1.25
+  buildGo125Module,
   fetchFromGitea,
   nix-update-script,
 
@@ -13,7 +14,7 @@
   tinygo,
 }:
 
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "go-away";
   version = "0.7.0";
 

From defff9f32746ad847b0a170c13637d13a1fc600a Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Thu, 5 Mar 2026 10:27:29 +0800
Subject: [PATCH 325/336] avogadrolibs: migrate to by-name

---
 .../default.nix => by-name/av/avogadrolibs/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/science/chemistry/avogadrolibs/default.nix => by-name/av/avogadrolibs/package.nix} (100%)

diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/by-name/av/avogadrolibs/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
rename to pkgs/by-name/av/avogadrolibs/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aacd720403d5..128c06d12fd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11404,8 +11404,6 @@ with pkgs;
 
   ### SCIENCE/CHEMISTY
 
-  avogadrolibs = callPackage ../development/libraries/science/chemistry/avogadrolibs { };
-
   molequeue = libsForQt5.callPackage ../development/libraries/science/chemistry/molequeue { };
 
   avogadro2 = callPackage ../applications/science/chemistry/avogadro2 { };

From 207a37af3d5302582d99d7b668c2257773664a40 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Thu, 5 Mar 2026 10:41:01 +0800
Subject: [PATCH 326/336] molequeue: migrate to by-name

---
 .../mo/molequeue/package.nix}                  | 18 ++++++++++--------
 pkgs/top-level/all-packages.nix                |  2 --
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename pkgs/{development/libraries/science/chemistry/molequeue/default.nix => by-name/mo/molequeue/package.nix} (79%)

diff --git a/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/pkgs/by-name/mo/molequeue/package.nix
similarity index 79%
rename from pkgs/development/libraries/science/chemistry/molequeue/default.nix
rename to pkgs/by-name/mo/molequeue/package.nix
index 33aa58bd73df..a6475b67ae16 100644
--- a/pkgs/development/libraries/science/chemistry/molequeue/default.nix
+++ b/pkgs/by-name/mo/molequeue/package.nix
@@ -3,27 +3,27 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qttools,
-  wrapQtAppsHook,
+  qt5,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "molequeue";
   version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "molequeue";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-+NoY8YVseFyBbxc3ttFWiQuHQyy1GN8zvV1jGFjmvLg=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qttools ];
+  buildInputs = [ qt5.qttools ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
@@ -33,9 +33,11 @@ stdenv.mkDerivation rec {
   # Fix the broken CMake files to use the correct paths
   postInstall = ''
     substituteInPlace $out/lib/cmake/molequeue/MoleQueueConfig.cmake \
-      --replace "$out/" ""
+      --replace-fail "$out/" ""
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Desktop integration of high performance computing resources";
     mainProgram = "molequeue";
@@ -44,4 +46,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     license = lib.licenses.bsd3;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 128c06d12fd9..433e88ed0b99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11404,8 +11404,6 @@ with pkgs;
 
   ### SCIENCE/CHEMISTY
 
-  molequeue = libsForQt5.callPackage ../development/libraries/science/chemistry/molequeue { };
-
   avogadro2 = callPackage ../applications/science/chemistry/avogadro2 { };
 
   libxc_7 = pkgs.libxc.override { version = "7.0.0"; };

From 9309cdf32700c43207537012f604541f7f3bc0b4 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Thu, 5 Mar 2026 10:41:39 +0800
Subject: [PATCH 327/336] avogadro2: migrate to by-name

---
 .../avogadro2/default.nix => by-name/av/avogadro2/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/chemistry/avogadro2/default.nix => by-name/av/avogadro2/package.nix} (100%)

diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/by-name/av/avogadro2/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/avogadro2/default.nix
rename to pkgs/by-name/av/avogadro2/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 433e88ed0b99..1fde13e51249 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11404,8 +11404,6 @@ with pkgs;
 
   ### SCIENCE/CHEMISTY
 
-  avogadro2 = callPackage ../applications/science/chemistry/avogadro2 { };
-
   libxc_7 = pkgs.libxc.override { version = "7.0.0"; };
 
   molbar = with python3Packages; toPythonApplication molbar;

From e40686a0def0601c828e45ceafb357cf2cfb6df6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 21:30:25 +0000
Subject: [PATCH 328/336] millisecond: 0.2.1 -> 0.2.3

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

diff --git a/pkgs/by-name/mi/millisecond/package.nix b/pkgs/by-name/mi/millisecond/package.nix
index 201d9f274435..56bfe14f0e3b 100644
--- a/pkgs/by-name/mi/millisecond/package.nix
+++ b/pkgs/by-name/mi/millisecond/package.nix
@@ -23,13 +23,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "millisecond";
-  version = "0.2.1";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "gaheldev";
     repo = "Millisecond";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2jGmL/bNta84x7/U5iX+sIlZyzqlcT62oLmfu4f8fiA=";
+    hash = "sha256-zoobnsBUg6Bky2Rhh7qEM+MxjpaR4eF+pEkhGMizuSM=";
   };
 
   strictDeps = true;

From 7845d8993662976ef4f76d5532e7d5b0664048b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 21:39:01 +0000
Subject: [PATCH 329/336] terraform-providers.grafana_grafana: 4.29.0 -> 4.31.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 67018d55cd5c..1c0954e3b4b1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -472,13 +472,13 @@
     "vendorHash": "sha256-yOM4JcQxAvYAFPyAFfjJn4FK8pEXF3I55ddMTkijn9c="
   },
   "grafana_grafana": {
-    "hash": "sha256-eYVNiyD3hFxE9dqlyfsOZBaX6xVec0uPAuquOdxg78A=",
+    "hash": "sha256-szkdeprCEbrtZkoNzS6/FlICPsZpB+fgvAovNk8LXLM=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v4.29.0",
+    "rev": "v4.31.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-9fBGjh/kstnMHi9aWQoq0tqJfDWoKHESlQwBoRA+8oA="
+    "vendorHash": "sha256-xcKcXakpjBQCy5JqWsXnDDQeR+53tyRxWeoLkxsStcs="
   },
   "gridscale_gridscale": {
     "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=",

From 36bddcd1a5dcb2eea9e0731fd88138a4edd3147d Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 13 Apr 2026 17:44:48 -0400
Subject: [PATCH 330/336] chiri: fix mainProgram on non-darwin

The binary was still called `Chiri` on non-darwin platforms, so it needs
to be renamed to `chiri` so that `nix run nixpkgs#chiri` runs without
warnings from nix.
---
 pkgs/by-name/ch/chiri/package.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ch/chiri/package.nix b/pkgs/by-name/ch/chiri/package.nix
index 335ab3719767..fdb6d7adc99e 100644
--- a/pkgs/by-name/ch/chiri/package.nix
+++ b/pkgs/by-name/ch/chiri/package.nix
@@ -88,10 +88,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
     pnpm build
   '';
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/bin
-    makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri"
-  '';
+  postInstall =
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        mkdir -p $out/bin
+        makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri"
+      ''
+    else
+      ''
+        mv $out/bin/Chiri $out/bin/chiri
+        substituteInPlace $out/share/applications/Chiri.desktop \
+          --replace-fail "Exec=Chiri" "Exec=chiri"
+      '';
 
   doCheck = false;
 

From 01e707f7552db84d00de44d8fcedaed23382fd9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 21:53:01 +0000
Subject: [PATCH 331/336] nitrotpm-tools: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/by-name/ni/nitrotpm-tools/package.nix b/pkgs/by-name/ni/nitrotpm-tools/package.nix
index cbf9a5882ab8..b913d8c32343 100644
--- a/pkgs/by-name/ni/nitrotpm-tools/package.nix
+++ b/pkgs/by-name/ni/nitrotpm-tools/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nitrotpm-tools";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "NitroTPM-Tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZTASHHa+LQ/hNaM0qfsaGdNwkZQQZnR9+f05DHbviLw=";
+    hash = "sha256-Jnv1ZKRs59eXnW/O6UCZLIhQolQ9LZjJI6+SqXVws5Q=";
   };
 
-  cargoHash = "sha256-z0b0bLKrnLdMfGKp9aIg3DPW3MJnEhjy9GjCYy44TTQ=";
+  cargoHash = "sha256-ckygzrbDzzjL2eBktAHdbA40E7HDeR8S5rZCbbuVIW0=";
 
   nativeBuildInputs = [
     pkg-config

From fcd966222373e7722954f2ae01fbdd083dcbf831 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 14 Apr 2026 00:02:24 +0200
Subject: [PATCH 332/336] servo: fix feature flag

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

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index c5546d7ee9e3..5bc40b4f28e4 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   # Builds with additional features for aarch64, see https://github.com/servo/servo/issues/36819
   buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [
-    "servo_allocator/use-system-allocator"
+    "servo-allocator/use-system-allocator"
   ];
 
   env.NIX_CFLAGS_COMPILE = toString (

From c462991f1a648979ade1615c0307fa05cdc829b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 22:33:10 +0000
Subject: [PATCH 333/336] go-httpbin: 2.21.0 -> 2.22.0

---
 pkgs/by-name/go/go-httpbin/package.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix
index 81bbb2938593..74e956d4ac45 100644
--- a/pkgs/by-name/go/go-httpbin/package.nix
+++ b/pkgs/by-name/go/go-httpbin/package.nix
@@ -2,19 +2,20 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
   nixosTests,
   nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "go-httpbin";
-  version = "2.21.0";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner = "mccutchen";
     repo = "go-httpbin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QJskXXieiFr406WI8gGtgcoL4pHEVzNOwM6JyYk+0EA=";
+    hash = "sha256-+DeBJoi7bXuXx3HcO9bdGlCXiaETwsS4OawVBi3Q57o=";
   };
 
   vendorHash = null;
@@ -24,17 +25,14 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   # tests are flaky
   doCheck = false;
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-    $out/bin/go-httpbin --help &> /dev/null
-    runHook postInstallCheck
-  '';
 
   passthru = {
     tests = { inherit (nixosTests) go-httpbin; };

From 56180d957ed93ed57dcf5cca117e294590cd39bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 23:06:02 +0000
Subject: [PATCH 334/336] codebook: 0.3.36 -> 0.3.37

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

diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index dfb00ab2f3bd..28dc5721b772 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.3.36";
+  version = "0.3.37";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nME4B9z66Xvnll37jkNBMmswFk3oYGA9rSLTJufOo1s=";
+    hash = "sha256-1eZ9HzGK/Zyjb0ffGZc08DKqwMtUh6Ei04vAtgCOQoc=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-mHGuhTGMWWgaLJe71GxgWBwmRcEZGZAQgvJb4TQOKrw=";
+  cargoHash = "sha256-lWl2E5I/1Qj5TvQfxBfNsMYIIpL+yGlrA7YVokKwtqQ=";
 
   env = {
     CARGO_PROFILE_RELEASE_LTO = "fat";

From 5715c23f408af18a3b558c2106f326ea7c7af24c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 14 Apr 2026 01:09:40 +0200
Subject: [PATCH 335/336] go-httpbin: enable tests

---
 pkgs/by-name/go/go-httpbin/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix
index 74e956d4ac45..a8703a0248f8 100644
--- a/pkgs/by-name/go/go-httpbin/package.nix
+++ b/pkgs/by-name/go/go-httpbin/package.nix
@@ -28,8 +28,7 @@ buildGoModule (finalAttrs: {
     "-X main.version=${finalAttrs.version}"
   ];
 
-  # tests are flaky
-  doCheck = false;
+  __darwinAllowLocalNetworking = true;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From b1f2768ca17c2c651dc5a2dc4eb81cbbfc471641 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 14 Apr 2026 01:26:38 +0200
Subject: [PATCH 336/336] sigsum: fix build

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

diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix
index 8a0eb178efb6..6af6bdd11282 100644
--- a/pkgs/by-name/si/sigsum/package.nix
+++ b/pkgs/by-name/si/sigsum/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitLab,
   versionCheckHook,
   nix-update-script,
 }:
 
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "sigsum";
   version = "0.14.0";