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 01/40] 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 02/40] 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 03/40] 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 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 04/40] 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 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 05/40] 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 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 06/40] 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 07/40] 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 861de83e8e45a1aff9de842a507d955e4afda28c Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 27 Mar 2026 19:35:25 +0800
Subject: [PATCH 08/40] 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 09/40] 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 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 10/40] 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 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 11/40] 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 12/40] 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 13/40] 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 14/40] 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 15/40] 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 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 16/40] =?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 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 17/40] 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 18/40] 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 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 19/40] 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 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 20/40] 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 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 21/40] 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 bc38febc42278a4570f08c6f1d2467eddeb6498f Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@protonmail.com>
Date: Sun, 12 Apr 2026 15:44:34 +0200
Subject: [PATCH 22/40] 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 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 23/40] 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 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 24/40] 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 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 25/40] 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 26/40] 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 27/40] 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 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 28/40] 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 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 29/40] 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 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 30/40] 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 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 31/40] 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 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 32/40] 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 33/40] 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 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 34/40] 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 35/40] 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 36/40] 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 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 37/40] 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 38/40] 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 39/40] 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 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 40/40] 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 { };