From f4b2fb6091a75d417f4ab9d7b5a550be1c302c0f Mon Sep 17 00:00:00 2001
From: Nathan Henrie <nate@n8henrie.com>
Date: Mon, 13 Apr 2026 07:39:30 -0600
Subject: [PATCH 01/97] zeal: fix build in aarch64-darwin

Fixes https://github.com/NixOS/nixpkgs/issues/509569
---
 pkgs/by-name/ze/zeal/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix
index d8138090e767..94ea145d5056 100644
--- a/pkgs/by-name/ze/zeal/package.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -11,6 +11,7 @@
   libpthread-stubs,
   libxcb-keysyms,
   qt6,
+  fetchpatch,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "zeal";
@@ -23,6 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-FGg89bluN2IJJtkjwPa6dC83CBLdOr+LW5ArUKp4awk=";
   };
 
+  patches = [
+    # https://github.com/zealdocs/zeal/issues/1813
+    # Can likely remove with 0.9
+    (fetchpatch {
+      name = "fix-activateShortcut-protected.patch";
+      url = "https://github.com/zealdocs/zeal/commit/f3714111ecad65ddedde43fc7c4f8c5bd240ff64.patch";
+      hash = "sha256-DKTvanO14NRFhiHayJIWXWO7gQSRyjCQ1XFAiEN86XI=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules

From d31e7cc5c16b8025fe1cd9155e9b0ba51d7a1cf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 May 2026 16:54:53 +0000
Subject: [PATCH 02/97] rambox: 2.5.2 -> 2.6.3

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

diff --git a/pkgs/by-name/ra/rambox/package.nix b/pkgs/by-name/ra/rambox/package.nix
index 1e5631700bcd..caebad10f982 100644
--- a/pkgs/by-name/ra/rambox/package.nix
+++ b/pkgs/by-name/ra/rambox/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "rambox";
-  version = "2.5.2";
+  version = "2.6.3";
 
   src = fetchurl {
     url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
-    hash = "sha256-sx/XLrsDIt2cF4xv/J5i1ZTMf7eHsccBjPEMJ/WISmg=";
+    hash = "sha256-YVLT+6o2Py796LBgN7ZgMiigbjBFGyTNaG/bSwJYAXk=";
   };
 
   desktopItem = makeDesktopItem {

From 0f906ee9b43802e9c40053e5af8240faac534aa3 Mon Sep 17 00:00:00 2001
From: Bad3r <25513724+Bad3r@users.noreply.github.com>
Date: Fri, 8 May 2026 21:42:21 +0300
Subject: [PATCH 03/97] nomachine-client: 9.4.14 -> 9.5.7

The 9.4.14 tarball is no longer hosted at download.nomachine.com; the
old URL now redirects to the vendor homepage and breaks fetchurl. Bump
to the current upstream release. Both x86_64 and i686 release tarballs
use build suffix _2.

Hashes recomputed via nix-prefetch-url against
https://download.nomachine.com/download/9.5/Linux/.
---
 pkgs/by-name/no/nomachine-client/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/no/nomachine-client/package.nix b/pkgs/by-name/no/nomachine-client/package.nix
index 8ee51201e3ce..0f9a0f6653e9 100644
--- a/pkgs/by-name/no/nomachine-client/package.nix
+++ b/pkgs/by-name/no/nomachine-client/package.nix
@@ -9,10 +9,10 @@
   libpulseaudio,
 }:
 let
-  versionMajor = "9.4";
-  versionMinor = "14";
-  versionBuild_x86_64 = "1";
-  versionBuild_i686 = "1";
+  versionMajor = "9.5";
+  versionMinor = "7";
+  versionBuild_x86_64 = "2";
+  versionBuild_i686 = "2";
 in
 stdenv.mkDerivation rec {
   pname = "nomachine-client";
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
-        sha256 = "sha256-tLL8l/UgTiVzGs+mwJeRUlVA8lH72JVogBOEpaSr2AY=";
+        sha256 = "sha256-8f4ZL3Ko5VunojXLvTS9P3oB+ZVCSYIA0GIjM8VpUO4=";
       }
     else if stdenv.hostPlatform.system == "i686-linux" then
       fetchurl {
         url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
-        sha256 = "sha256-pPvg8MCrpCsQiiglRxHHl9wVyndI9JTluX/mwah3wwQ=";
+        sha256 = "sha256-Yr0bw7PW34Nga8vj3TxdFFyDiVVnHJ6lBdNskOyQ8m8=";
       }
     else
       throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";

From b3b54a73f479d5b67eeb4b075f65e8dc59570150 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 17:53:50 +0000
Subject: [PATCH 04/97] kubectl-gadget: 0.51.0 -> 0.52.0

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

diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix
index 026813e019fe..20047fda5c07 100644
--- a/pkgs/by-name/ku/kubectl-gadget/package.nix
+++ b/pkgs/by-name/ku/kubectl-gadget/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-gadget";
-  version = "0.51.0";
+  version = "0.52.0";
 
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-14X+NCxsmyBhWOJMczZUBFJO1DiVQxDO46RwHGJsUVg=";
+    hash = "sha256-WcIPubDzj3LPf1KUWfmxdlBGnG2x68hax/ZQKwSNifc=";
   };
 
-  vendorHash = "sha256-wau7qCtVwAVfNI/Dpon2b8gkepCODLXQMZsYiYU2tSM=";
+  vendorHash = "sha256-aEzzXcsM3D+Sp6LBms5+RzWirdC5iFvN2IiwbOXCrEw=";
 
   env.CGO_ENABLED = 0;
 

From aaae6a5e0aad750c476f413d1dad877e32bea68e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 20:39:19 +0000
Subject: [PATCH 05/97] python3Packages.keystoneauth1: 5.13.1 -> 5.14.0

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

diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
index e15f2a9ca200..6730b6cf2510 100644
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -27,12 +27,12 @@
 
 buildPythonPackage rec {
   pname = "keystoneauth1";
-  version = "5.13.1";
+  version = "5.14.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4BHkesPzxnH/rjNQXAlVSGUMwZ2rf2rzsupb0YyY8Mk=";
+    hash = "sha256-e5QghNPbJ90oXBMlPN/uELBb4ENtscAeFdx0SQIZen8=";
   };
 
   build-system = [ setuptools ];

From d6d58a85e1bf786da503abab9c7a0e5f5c50f982 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 24 Apr 2026 20:19:39 +0300
Subject: [PATCH 06/97] make-derivation: remove no longer valid comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The comment claimed configureFlags is "sometimes a string, sometimes
null, and sometimes a list" — the normalization it referenced was
removed long ago; configureFlags is always a list now.
---
 pkgs/stdenv/generic/make-derivation.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index e1680f07cfa4..0f3bc38352ab 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -702,7 +702,6 @@ let
           propagatedBuildInputs = propagatedHostTargetOutputs;
           depsTargetTargetPropagated = propagatedTargetTargetOutputs;
 
-          # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
           configureFlags =
             configureFlags
             ++ (

From 20b7f2410bd1ee9bc1f654262da601985f623567 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 02:51:03 +0300
Subject: [PATCH 07/97] lib/customisation: reduce // merges in extendDerivation

Fold the 'all' attribute into the listToAttrs call alongside the outputs, so commonAttrs builds from drv // listToAttrs(...) // passthru // { drvPath; outPath; } instead of four separate merges with a standalone 'all' attrset.

Also convert remaining optionalAttrs to nullable attr names in extendDerivation, overrideDerivation, and makeOverridable.

Per-derivation // merges drop from 4 to 3.
---
 lib/customisation.nix | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index e9e88aff7cb5..5db9275aadc7 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -401,7 +401,25 @@ rec {
     condition: passthru: drv:
     let
       commonAttrs =
-        drv // (listToAttrs outputsList) // { all = map (x: x.value) outputsList; } // passthru;
+        drv
+        // listToAttrs (
+          outputsList
+          ++ [
+            {
+              name = "all";
+              value = map (x: x.value) outputsList;
+            }
+          ]
+        )
+        // passthru
+        // {
+          drvPath =
+            assert condition;
+            drv.drvPath;
+          outPath =
+            assert condition;
+            drv.outPath;
+        };
 
       outputsList = map (outputName: {
         name = outputName;
@@ -423,15 +441,7 @@ rec {
         };
       }) (drv.outputs or [ "out" ]);
     in
-    commonAttrs
-    // {
-      drvPath =
-        assert condition;
-        drv.drvPath;
-      outPath =
-        assert condition;
-        drv.outPath;
-    };
+    commonAttrs;
 
   /**
     Strip a derivation of all non-essential attributes, returning

From a42becdd920c50b0d0d4169f3510c9c49f6d8998 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 02:51:12 +0300
Subject: [PATCH 08/97] stdenv/generic: replace // optionalAttrs with nullable
 attr names

Convert 3 optionalAttrs in the stdenv derivation call to nullable
attribute names: allowedRequisites, contentAddressedByDefault, and
isDarwin sandbox/impureHostDeps.
---
 pkgs/stdenv/generic/default.nix | 111 +++++++++++++++-----------------
 1 file changed, 52 insertions(+), 59 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 8d7f00032bfd..4bc40de7dbd4 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -94,71 +94,64 @@ let
 
     in
     # The stdenv that we are producing.
-    derivation (
-      lib.optionalAttrs (allowedRequisites != null) {
-        allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs ++ defaultBuildInputs;
-      }
-      // lib.optionalAttrs config.contentAddressedByDefault {
-        __contentAddressed = true;
-        outputHashAlgo = "sha256";
-        outputHashMode = "recursive";
-      }
-      // {
-        inherit name pname version;
-        inherit disallowedRequisites;
+    derivation {
+      ${if allowedRequisites != null then "allowedRequisites" else null} =
+        allowedRequisites ++ defaultNativeBuildInputs ++ defaultBuildInputs;
+      ${if config.contentAddressedByDefault then "__contentAddressed" else null} = true;
+      ${if config.contentAddressedByDefault then "outputHashAlgo" else null} = "sha256";
+      ${if config.contentAddressedByDefault then "outputHashMode" else null} = "recursive";
+      inherit name pname version;
+      inherit disallowedRequisites;
 
-        # Nix itself uses the `system` field of a derivation to decide where to
-        # build it. This is a bit confusing for cross compilation.
-        inherit (buildPlatform) system;
+      # Nix itself uses the `system` field of a derivation to decide where to
+      # build it. This is a bit confusing for cross compilation.
+      inherit (buildPlatform) system;
 
-        builder = shell;
+      builder = shell;
 
-        args = [
-          "-e"
-          ./builder.sh
-        ];
+      args = [
+        "-e"
+        ./builder.sh
+      ];
 
-        setup = setupScript;
+      setup = setupScript;
 
-        # We pretty much never need rpaths on Darwin, since all library path references
-        # are absolute unless we go out of our way to make them relative (like with CF)
-        # TODO: This really wants to be in stdenv/darwin but we don't have hostPlatform
-        # there (yet?) so it goes here until then.
-        preHook =
-          preHook
-          + lib.optionalString buildPlatform.isDarwin ''
-            export NIX_DONT_SET_RPATH_FOR_BUILD=1
-          ''
-          + lib.optionalString (hostPlatform.isDarwin || (!hostPlatform.isElf && !hostPlatform.isMacho)) ''
-            export NIX_DONT_SET_RPATH=1
-            export NIX_NO_SELF_RPATH=1
-          ''
-          + lib.optionalString (hostPlatform.isDarwin && hostPlatform.isMacOS) ''
-            export MACOSX_DEPLOYMENT_TARGET=${hostPlatform.darwinMinVersion}
-          ''
-        # TODO this should be uncommented, but it causes stupid mass rebuilds due to
-        # `pkgsCross.*.buildPackages` not being the same, resulting in cross-compiling
-        # for a target rebuilding all of `nativeBuildInputs` for that target.
-        #
-        # I think the best solution would just be to fixup linux RPATHs so we don't
-        # need to set `-rpath` anywhere.
-        # + lib.optionalString targetPlatform.isDarwin ''
-        #   export NIX_DONT_SET_RPATH_FOR_TARGET=1
-        # ''
+      # We pretty much never need rpaths on Darwin, since all library path references
+      # are absolute unless we go out of our way to make them relative (like with CF)
+      # TODO: This really wants to be in stdenv/darwin but we don't have hostPlatform
+      # there (yet?) so it goes here until then.
+      preHook =
+        preHook
+        + lib.optionalString buildPlatform.isDarwin ''
+          export NIX_DONT_SET_RPATH_FOR_BUILD=1
+        ''
+        + lib.optionalString (hostPlatform.isDarwin || (!hostPlatform.isElf && !hostPlatform.isMacho)) ''
+          export NIX_DONT_SET_RPATH=1
+          export NIX_NO_SELF_RPATH=1
+        ''
+        + lib.optionalString (hostPlatform.isDarwin && hostPlatform.isMacOS) ''
+          export MACOSX_DEPLOYMENT_TARGET=${hostPlatform.darwinMinVersion}
+        ''
+      # TODO this should be uncommented, but it causes stupid mass rebuilds due to
+      # `pkgsCross.*.buildPackages` not being the same, resulting in cross-compiling
+      # for a target rebuilding all of `nativeBuildInputs` for that target.
+      #
+      # I think the best solution would just be to fixup linux RPATHs so we don't
+      # need to set `-rpath` anywhere.
+      # + lib.optionalString targetPlatform.isDarwin ''
+      #   export NIX_DONT_SET_RPATH_FOR_TARGET=1
+      # ''
+      ;
+
+      inherit
+        initialPath
+        shell
+        defaultNativeBuildInputs
+        defaultBuildInputs
         ;
-
-        inherit
-          initialPath
-          shell
-          defaultNativeBuildInputs
-          defaultBuildInputs
-          ;
-      }
-      // lib.optionalAttrs buildPlatform.isDarwin {
-        __sandboxProfile = stdenvSandboxProfile;
-        __impureHostDeps = __stdenvImpureHostDeps;
-      }
-    )
+      ${if buildPlatform.isDarwin then "__sandboxProfile" else null} = stdenvSandboxProfile;
+      ${if buildPlatform.isDarwin then "__impureHostDeps" else null} = __stdenvImpureHostDeps;
+    }
 
     // {
 

From 77d67d4b7646a82ddb27b76056a930b1425e9928 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 02:51:21 +0300
Subject: [PATCH 09/97] cc-wrapper: replace // optionalAttrs with nullable attr
 names

Inline optionalAttrs for Go passthru attrs and fallback_sdk.
Replace mapAttrs+optionalString for Darwin env vars with direct
optionalString calls, eliminating intermediate attrset and // merge.
---
 pkgs/build-support/cc-wrapper/default.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 103e5e9f5994..fd857d0c152d 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -453,13 +453,12 @@ stdenvNoCC.mkDerivation {
     inherit nixSupport;
 
     inherit defaultHardeningFlags;
-  }
-  // optionalAttrs cc.langGo or false {
+
     # So gccgo looks more like go for buildGoModule
-
-    inherit (targetPlatform.go) GOOS GOARCH GOARM;
-
-    CGO_ENABLED = 1;
+    ${if cc.langGo or false then "GOOS" else null} = targetPlatform.go.GOOS;
+    ${if cc.langGo or false then "GOARCH" else null} = targetPlatform.go.GOARCH;
+    ${if cc.langGo or false then "GOARM" else null} = targetPlatform.go.GOARM;
+    ${if cc.langGo or false then "CGO_ENABLED" else null} = 1;
   };
 
   dontBuild = true;
@@ -995,14 +994,12 @@ stdenvNoCC.mkDerivation {
     inherit darwinPlatformForCC;
     default_hardening_flags_str = toString defaultHardeningFlags;
     inherit useMacroPrefixMap;
-  }
-  // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
     # These will become empty strings when not targeting Darwin.
-    inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;
-  }
-  // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
+    darwinMinVersion = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinMinVersion;
+    darwinMinVersionVariable = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinMinVersionVariable;
     # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
-    fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
+    ${if stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null then "fallback_sdk" else null} =
+      apple-sdk.__spliced.buildTarget or apple-sdk;
   };
 
   meta =

From ce3c5727ee5268e3aa0e574d2fbc2a579a358f01 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 02:51:35 +0300
Subject: [PATCH 10/97] bintools-wrapper: replace // optionalAttrs with
 nullable attr names

Same pattern as cc-wrapper: inline mapAttrs+optionalString for Darwin
env vars and replace optionalAttrs for fallback_sdk.
---
 pkgs/build-support/bintools-wrapper/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index b97eb905bd31..1a9ce996c0dd 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -468,19 +468,14 @@ stdenvNoCC.mkDerivation {
       libc_lib
       ;
     default_hardening_flags_str = toString defaultHardeningFlags;
-  }
-  // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
     # These will become empty strings when not targeting Darwin.
-    inherit (targetPlatform)
-      darwinPlatform
-      darwinSdkVersion
-      darwinMinVersion
-      darwinMinVersionVariable
-      ;
-  }
-  // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
+    darwinPlatform = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinPlatform;
+    darwinSdkVersion = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinSdkVersion;
+    darwinMinVersion = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinMinVersion;
+    darwinMinVersionVariable = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinMinVersionVariable;
     # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
-    fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
+    ${if stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null then "fallback_sdk" else null} =
+      apple-sdk.__spliced.buildTarget or apple-sdk;
   };
 
   meta =

From 702420055d73abe212e13be26b3b191997613426 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 02:51:36 +0300
Subject: [PATCH 11/97] top-level/stage: replace // optionalAttrs with nullable
 attr names

Convert 2 optionalAttrs: Darwin extraBuildInputs in stdenvNoCC
override, and !isSupported stdenv override in pkgsi686Linux.
---
 pkgs/top-level/stage.nix | 47 +++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 048ab88854ed..ac56e93e344e 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -54,15 +54,13 @@ in
 
   # `stdenv` without a C compiler. Passing in this helps avoid infinite
   # recursions, and may eventually replace passing in the full stdenv.
-  stdenvNoCC ? stdenv.override (
-    {
-      cc = null;
-      hasCC = false;
-    }
+  stdenvNoCC ? stdenv.override {
+    cc = null;
+    hasCC = false;
     # Darwin doesn’t need an SDK in `stdenvNoCC`.  Dropping it shrinks the closure
     # size down from ~1 GiB to ~83 MiB, which is a considerable reduction.
-    // lib.optionalAttrs stdenv.hostPlatform.isDarwin { extraBuildInputs = [ ]; }
-  ),
+    ${if stdenv.hostPlatform.isDarwin then "extraBuildInputs" else null} = [ ];
+  },
 
   # This is used because stdenv replacement and the stdenvCross do benefit from
   # the overridden configuration provided by the user, as opposed to the normal
@@ -218,26 +216,21 @@ let
       if !config.allowAliases || isSupported then
         nixpkgsFun {
           overlays = [
-            (
-              self': super':
-              {
-                pkgsi686Linux = super';
-              }
-              // lib.optionalAttrs (!isSupported) {
-                # Overrides pkgsi686Linux.stdenv.mkDerivation to produce only broken derivations,
-                # when used on a non x86_64-linux platform in CI.
-                # TODO: Remove this, once pkgsi686Linux can become a variant.
-                stdenv = super'.stdenv // {
-                  mkDerivation =
-                    args:
-                    (super'.stdenv.mkDerivation args).overrideAttrs (prevAttrs: {
-                      meta = prevAttrs.meta or { } // {
-                        broken = true;
-                      };
-                    });
-                };
-              }
-            )
+            (self': super': {
+              pkgsi686Linux = super';
+              # Overrides pkgsi686Linux.stdenv.mkDerivation to produce only broken derivations,
+              # when used on a non x86_64-linux platform in CI.
+              # TODO: Remove this, once pkgsi686Linux can become a variant.
+              ${if !isSupported then "stdenv" else null} = super'.stdenv // {
+                mkDerivation =
+                  args:
+                  (super'.stdenv.mkDerivation args).overrideAttrs (prevAttrs: {
+                    meta = prevAttrs.meta or { } // {
+                      broken = true;
+                    };
+                  });
+              };
+            })
           ]
           ++ overlays;
           ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = {

From fbfe0b610e06300f78646a08cb7171e3a2853447 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 02:51:37 +0300
Subject: [PATCH 12/97] rust/hooks: replace // optionalAttrs with nullable attr
 names

Convert 5 identical optionalAttrs (stdenv.isLinux) for testCross
in cargo{Build,Check,Install,Nextest,Setup}Hook passthru.tests.
---
 pkgs/build-support/rust/hooks/default.nix | 25 +++++++++--------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix
index 0814f78edfef..1cfb56f785c0 100644
--- a/pkgs/build-support/rust/hooks/default.nix
+++ b/pkgs/build-support/rust/hooks/default.nix
@@ -26,9 +26,8 @@
     };
     passthru.tests = {
       test = tests.rust-hooks.cargoBuildHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
     };
   } ./cargo-build-hook.sh;
 
@@ -40,9 +39,8 @@
     };
     passthru.tests = {
       test = tests.rust-hooks.cargoCheckHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
     };
   } ./cargo-check-hook.sh;
 
@@ -53,9 +51,8 @@
     };
     passthru.tests = {
       test = tests.rust-hooks.cargoInstallHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
     };
   } ./cargo-install-hook.sh;
 
@@ -67,9 +64,8 @@
     };
     passthru.tests = {
       test = tests.rust-hooks.cargoNextestHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
     };
   } ./cargo-nextest-hook.sh;
 
@@ -106,9 +102,8 @@
 
     passthru.tests = {
       test = tests.rust-hooks.cargoSetupHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
     };
   } ./cargo-setup-hook.sh;
 

From 18e7551efc7beca866fd2cfa3092d9386eb1dd34 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 03:34:41 +0300
Subject: [PATCH 13/97] buildenv: replace // optionalAttrs with nullable attr
 names

Convert 2 optionalAttrs (args ? nativeBuildInputs, args ? buildInputs) in the compatArgs block into nullable attribute names in a single attrset.
---
 pkgs/build-support/buildenv/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 13ab910ab6b8..797126aa7644 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -86,13 +86,10 @@ lib.makeOverridable (
         buildInputs ? null,
       }@args:
       let
-        compatArgs =
-          lib.optionalAttrs (args ? nativeBuildInputs) {
-            inherit nativeBuildInputs;
-          }
-          // lib.optionalAttrs (args ? buildInputs) {
-            inherit buildInputs;
-          };
+        compatArgs = {
+          ${if args ? nativeBuildInputs then "nativeBuildInputs" else null} = nativeBuildInputs;
+          ${if args ? buildInputs then "buildInputs" else null} = buildInputs;
+        };
       in
       compatArgs
       // derivationArgs

From 9f677545c91d129167101cd48c0f28b5954c1671 Mon Sep 17 00:00:00 2001
From: Maevi <me@maevi.net>
Date: Tue, 19 May 2026 14:06:32 +0200
Subject: [PATCH 14/97] subunit: 1.4.5 -> 1.4.6

---
 pkgs/by-name/su/subunit/package.nix                 |  4 ++--
 pkgs/development/python-modules/subunit/default.nix | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/su/subunit/package.nix b/pkgs/by-name/su/subunit/package.nix
index 4d5a762858e1..73c6735484e3 100644
--- a/pkgs/by-name/su/subunit/package.nix
+++ b/pkgs/by-name/su/subunit/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "subunit";
-  version = "1.4.5";
+  version = "1.4.6";
 
   src = fetchFromGitHub {
     owner = "testing-cabal";
     repo = "subunit";
     tag = finalAttrs.version;
-    hash = "sha256-yM5mlYV7KyPRzPhnbDYBFLn4uiwxFFEotX2r6KcKAwA=";
+    hash = "sha256-vV/mmVruUH2siyOZOYiEQhjFgQ+xyS1EEbx5SS3Y5tA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix
index 5c72895951c4..810b053d2b00 100644
--- a/pkgs/development/python-modules/subunit/default.nix
+++ b/pkgs/development/python-modules/subunit/default.nix
@@ -11,6 +11,7 @@
   hypothesis,
   iso8601,
   pytestCheckHook,
+  pyyaml,
   setuptools,
   testscenarios,
   testtools,
@@ -50,14 +51,15 @@ buildPythonPackage {
     hypothesis
     fixtures
     pytestCheckHook
+    pyyaml
   ];
 
-  enabledTestPaths = [ "python/subunit" ];
+  enabledTestPaths = [ "python/tests" ];
 
   disabledTestPaths = [
     # these tests require testtools and don't work with pytest
-    "python/subunit/tests/test_output_filter.py"
-    "python/subunit/tests/test_test_protocol.py"
-    "python/subunit/tests/test_test_protocol2.py"
+    "python/tests/test_output_filter.py"
+    "python/tests/test_test_protocol.py"
+    "python/tests/test_test_protocol2.py"
   ];
 }

From 5699029b4ba1334c499a856fb934309725ffde3b Mon Sep 17 00:00:00 2001
From: Vinetos <contact+git@vinetos.fr>
Date: Tue, 19 May 2026 21:30:17 +0200
Subject: [PATCH 15/97] python3Packages.openstacksdk: 4.10.0 -> 4.13.0

Rebuild packages from sources and update it to 4.13.0
---
 .../python-modules/openstacksdk/default.nix   | 73 ++++++++++++-------
 .../openstacksdk/fix-pyproject.patch          | 19 +++++
 .../python-modules/openstacksdk/tests.nix     | 59 ++++++++-------
 3 files changed, 94 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/development/python-modules/openstacksdk/fix-pyproject.patch

diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix
index 0910addc0717..3a074800cc7a 100644
--- a/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/pkgs/development/python-modules/openstacksdk/default.nix
@@ -1,54 +1,68 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
   callPackage,
-  fetchPypi,
-  platformdirs,
+  pbr,
+  setuptools,
+
+  # direct
   cryptography,
   dogpile-cache,
   jmespath,
   jsonpatch,
   keystoneauth1,
   munch,
-  openstackdocstheme,
   os-service-types,
-  pbr,
+  platformdirs,
   psutil,
   pyyaml,
-  requestsexceptions,
-  setuptools,
+
+  # docs
   sphinxHook,
+  openstackdocstheme,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "openstacksdk";
-  version = "4.10.0";
+  version = "4.13.0";
   pyproject = true;
 
-  outputs = [
-    "out"
-    "man"
-  ];
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Xd6a4/HiQRqH/1ey142lP6yOrp5brI5YcJJ8ti3fwDM=";
+  src = fetchFromGitHub {
+    owner = "openstack";
+    repo = "openstacksdk";
+    tag = finalAttrs.version;
+    hash = "sha256-nMpUNLz7OosoGd5rozWcOcOEf3jdEHo5dhxmOv0xONw=";
   };
 
+  patches = [
+    ./fix-pyproject.patch
+  ];
+
   postPatch = ''
     # Disable rsvgconverter not needed to build manpage
     substituteInPlace doc/source/conf.py \
       --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter',"
   '';
 
-  nativeBuildInputs = [
-    openstackdocstheme
-    sphinxHook
+  env.PBR_VERSION = finalAttrs.version;
+
+  build-system = [
+    pbr
+    setuptools
+  ];
+
+  outputs = [
+    "out"
+    "man"
   ];
 
   sphinxBuilders = [ "man" ];
 
-  build-system = [ setuptools ];
+  nativeBuildInputs = [
+    openstackdocstheme
+    sphinxHook
+  ];
 
   dependencies = [
     platformdirs
@@ -59,9 +73,7 @@ buildPythonPackage rec {
     keystoneauth1
     munch
     os-service-types
-    pbr
     psutil
-    requestsexceptions
     pyyaml
   ];
 
@@ -72,13 +84,20 @@ buildPythonPackage rec {
     tests = callPackage ./tests.nix { };
   };
 
-  pythonImportsCheck = [ "openstack" ];
+  # Non-exhaustive imports
+  pythonImportsCheck = [
+    "openstack"
+    "openstack.config.loader"
+    "openstack.compute.v2.server"
+    "openstack.test"
+  ];
 
   meta = {
-    description = "SDK for building applications to work with OpenStack";
-    mainProgram = "openstack-inventory";
-    homepage = "https://github.com/openstack/openstacksdk";
+    description = "SDK for building applications to work with OpenStack clouds.";
+    mainProgram = "openstack";
+    homepage = "https://docs.openstack.org/openstacksdk/latest/";
+    downloadPage = "https://github.com/openstack/openstacksdk/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     teams = [ lib.teams.openstack ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/openstacksdk/fix-pyproject.patch b/pkgs/development/python-modules/openstacksdk/fix-pyproject.patch
new file mode 100644
index 000000000000..9ac75f57d179
--- /dev/null
+++ b/pkgs/development/python-modules/openstacksdk/fix-pyproject.patch
@@ -0,0 +1,19 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 7c1c1ce58..4e9f3a493 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -33,8 +33,12 @@ Repository = "https://opendev.org/openstack/openstacksdk/"
+ # TODO(mordred) Move this to an OSC command at some point
+ openstack-inventory = "openstack.cloud.cmd.inventory:main"
+ 
++[tool.setuptools.package-data]
++"*" = ["**/*"]
++
+ [tool.setuptools.packages.find]
+-include = ["openstack"]
++where = ["."]
++include = ["openstack", "openstack.*"]
+ 
+ [tool.mypy]
+ python_version = "3.11"
+
diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix
index 8881cfbc51c8..b3f093652152 100644
--- a/pkgs/development/python-modules/openstacksdk/tests.nix
+++ b/pkgs/development/python-modules/openstacksdk/tests.nix
@@ -1,15 +1,14 @@
 {
   buildPythonPackage,
+  stestrCheckHook,
   ddt,
   hacking,
   jsonschema,
-  lib,
   openstacksdk,
   oslo-config,
   oslotest,
   prometheus-client,
   requests-mock,
-  stdenv,
   stestr,
   testscenarios,
 }:
@@ -23,6 +22,7 @@ buildPythonPackage {
   dontInstall = true;
 
   nativeCheckInputs = [
+    stestrCheckHook
     ddt
     hacking
     jsonschema
@@ -35,32 +35,31 @@ buildPythonPackage {
     testscenarios
   ];
 
-  checkPhase = ''
-    stestr run -e <(echo "
-    openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_available_wait
-    openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_inspect_failed
-    openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_wait
-    openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_wait_for_baremetal_node_lock_locked
-    openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force
-    openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_wait
-    openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396
-    openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait
-    openstack.tests.unit.test_resource.TestWaitForDelete.test_callback
-    openstack.tests.unit.test_resource.TestWaitForDelete.test_status
-    openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_callback
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_callback_without_progress
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_different_attribute
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_none
-    openstack.tests.unit.test_stats.TestStats.test_list_projects
-    openstack.tests.unit.test_stats.TestStats.test_projects
-    openstack.tests.unit.test_stats.TestStats.test_servers
-    openstack.tests.unit.test_stats.TestStats.test_servers_error
-    openstack.tests.unit.test_stats.TestStats.test_servers_no_detail
-    openstack.tests.unit.test_stats.TestStats.test_timeout
-    ")
-  '';
+  disabledTests = [
+    "openstack.tests.unit.config.test_config.TestConfig.test_force_ipv4_false"
+    "openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force"
+    "openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_wait"
+    "openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force"
+    "openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_wait"
+    "openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait"
+    "openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396"
+    "openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found"
+    "openstack.tests.unit.test_resource.TestWaitForDelete.test_status"
+    "openstack.tests.unit.test_resource.TestWaitForDelete.test_callback"
+    "openstack.tests.unit.test_resource.TestWaitForStatus.test_callback"
+    "openstack.tests.unit.test_resource.TestWaitForStatus.test_callback_without_progress"
+    "openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match"
+    "openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_none"
+    "openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none"
+    "openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_different_attribute"
+    "openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails"
+    "openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute"
+    "openstack.tests.unit.test_stats.TestStats.test_servers"
+    "openstack.tests.unit.test_stats.TestStats.test_servers_error"
+    "openstack.tests.unit.test_stats.TestStats.test_servers_no_detail"
+    "openstack.tests.unit.test_stats.TestStats.test_projects"
+    "openstack.tests.unit.test_stats.TestStats.test_list_projects"
+    "openstack.tests.unit.test_stats.TestStats.test_timeout"
+  ];
+
 }

From 9d8d19737f50e4908e48408fa106d5bad8f3cc7b Mon Sep 17 00:00:00 2001
From: Vinetos <contact+git@vinetos.fr>
Date: Tue, 19 May 2026 21:57:01 +0200
Subject: [PATCH 16/97] python3Packages.osc-lib: 4.5.0 -> 4.6.0

---
 .../python-modules/osc-lib/default.nix        | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix
index acb32b11140a..d36ea86e78f5 100644
--- a/pkgs/development/python-modules/osc-lib/default.nix
+++ b/pkgs/development/python-modules/osc-lib/default.nix
@@ -8,7 +8,6 @@
   oslo-i18n,
   oslo-utils,
   pbr,
-  pythonAtLeast,
   requests,
   requests-mock,
   setuptools,
@@ -19,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "osc-lib";
-  version = "4.5.0";
+  version = "4.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -57,18 +56,12 @@ buildPythonPackage rec {
 
   checkPhase =
     let
-      disabledTests =
-        lib.optionals stdenv.hostPlatform.isDarwin [
-          "osc_lib.tests.test_shell.TestShellCli.test_shell_args_cloud_public"
-          "osc_lib.tests.test_shell.TestShellCli.test_shell_args_precedence"
-          "osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_1"
-          "osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_2"
-        ]
-        ++ lib.optionals (pythonAtLeast "3.14") [
-          # Disable test incompatible with Python 3.14+
-          # See upstream issue: https://bugs.launchpad.net/python-openstackclient/+bug/2138684
-          "osc_lib.tests.utils.test_tags.TestTagHelps"
-        ];
+      disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+        "osc_lib.tests.test_shell.TestShellCli.test_shell_args_cloud_public"
+        "osc_lib.tests.test_shell.TestShellCli.test_shell_args_precedence"
+        "osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_1"
+        "osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_2"
+      ];
     in
     ''
       runHook preCheck

From 2602cc41d5cf14fd9c2fd47bafbddc185c365fb3 Mon Sep 17 00:00:00 2001
From: Vinetos <contact+git@vinetos.fr>
Date: Wed, 20 May 2026 07:29:07 +0200
Subject: [PATCH 17/97] python3Packages.python-openstackclient: 9.0.0 -> 10.0.0

---
 .../python-openstackclient/default.nix          |  7 +++++--
 .../python-openstackclient/fix-pyproject.patch  | 17 ++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index a3f49b0f63a3..b22d3b4ed7df 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   ddt,
+  hacking,
   installShellFiles,
   openstackdocstheme,
   osc-lib,
@@ -35,14 +36,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-openstackclient";
-  version = "9.0.0";
+  version = "10.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "python-openstackclient";
     tag = finalAttrs.version;
-    hash = "sha256-iqHm3vOENStdGI53Ggln/gWVnF3Lyomel9OFmwz2CJc=";
+    hash = "sha256-UczEgOtZz4roIFg1R6RDGg0tiiiT6lAgJCdgpmK0960=";
   };
 
   patches = [
@@ -76,12 +77,14 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     ddt
+    hacking
     requests-mock
     stestrCheckHook
   ];
 
   disabledTestsRegex = [
     "openstackclient.tests.unit.common.test_module.TestModuleList*"
+    "openstackclient.tests.unit.common.test_clientmanager.TestClientManager*"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch
index 4ce54df89254..f04adec52144 100644
--- a/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch
+++ b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch
@@ -1,18 +1,13 @@
 diff --git a/pyproject.toml b/pyproject.toml
-index 37fb8d0c..21571714 100644
+index 50d90b4c..b256bb2a 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -730,10 +730,9 @@ volume_transfer_request_show = "openstackclient.volume.v3.volume_transfer_reques
- volume_summary = "openstackclient.volume.v3.volume:VolumeSummary"
+@@ -776,7 +776,7 @@ volume_summary = "openstackclient.volume.v3.volume:VolumeSummary"
  volume_revert = "openstackclient.volume.v3.volume:VolumeRevertToSnapshot"
  
--[tool.setuptools]
--packages = [
--    "openstackclient"
--]
-+[tool.setuptools.packages.find]
-+where = ["."]
-+include = ["openstackclient*"]
+ [tool.setuptools.packages.find]
+-include = ["openstackclient"]
++include = ["openstackclient", "openstackclient.*"]
  
  [tool.mypy]
- python_version = "3.10"
+ python_version = "3.11"
\ No newline at end of file

From feb2e1ae9644b191312fc0d865ce36cff98c08aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 02:41:10 +0000
Subject: [PATCH 18/97] python3Packages.oslo-config: 10.3.0 -> 10.4.0

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

diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
index 1a0353cab589..c6feeee18d67 100644
--- a/pkgs/development/python-modules/oslo-config/default.nix
+++ b/pkgs/development/python-modules/oslo-config/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "oslo-config";
-  version = "10.3.0";
+  version = "10.4.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "oslo_config";
     inherit version;
-    hash = "sha256-xAWkCosFqpe7XCS7C4SZgaelt9VjBN9AYyciMSxY6so=";
+    hash = "sha256-KuPgJZNHTs17ZOxOsRSCrbTJKKeCZ7yCD1w/gCQLGXo=";
   };
 
   postPatch = ''

From e59bb9e25a4123f3b0b806219928609227c2c8bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 06:13:13 +0000
Subject: [PATCH 19/97] amp-cli: 0.0.1779094967-g3f6594 ->
 0.0.1779772576-g751b94

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

diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 1132acdd5c01..239b591eb560 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -27,7 +27,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "amp-cli";
-  version = "0.0.1779094967-g3f6594";
+  version = "0.0.1779772576-g751b94";
 
   src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system};
 
@@ -79,10 +79,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         url = "https://static.ampcode.com/cli/${finalAttrs.version}/amp-${platform}.gz";
         hash =
           {
-            x86_64-linux = "sha256-ZBqt8UWDY0SlYOOrJZib+UXdZ1cQxyRNp3T7fr+gcNs=";
-            aarch64-linux = "sha256-qztHMb4EJBOuEQh0OZ33dqx/MUy5LEPgLry6h+rmwVo=";
-            x86_64-darwin = "sha256-meedgFtc+DA4NoR0XJuLSX/gmiMKCZLACfPBbk6wfLk=";
-            aarch64-darwin = "sha256-0v3yM9zQ6ToWBHyPvrmPTP0lfPb1tCoAd6eNgHs3ZkM=";
+            x86_64-linux = "sha256-y3o+GOeyH8daz+CdPNs6nWYJ3Ss+x/KtQ6FaIvBviCc=";
+            aarch64-linux = "sha256-FviFU+T1pTmQLFliV/xl/ihdoSx8EnxM7QW8l7igVYI=";
+            x86_64-darwin = "sha256-9fJ/p6v/TLxIs2TIwwT+c3yio16tpoEYWR+B60sKFcU=";
+            aarch64-darwin = "sha256-EDksMRB1odiv6+t7ZH+76dnjq7t+5i0UQ6m2h8qt0y4=";
           }
           .${system'};
       }

From 011471c7f24920fb29e18124da24232d9faf29b0 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Tue, 26 May 2026 13:28:16 +0100
Subject: [PATCH 20/97] fetchgit: disable git maintenance

By default, Git commands will trigger background processes to perform
repository maintenance.  As of Git v2.54.0, and in particular as of
452b12c2e0 (builtin/maintenance: use "geometric" strategy by default,
2026-02-24), Git has changed the strategy it uses to decide whether
maintenance needs performing, and as a result will kick off background
maintenance processes much more often.

These background processes will potentially change the contents of the
`.git` directory while `nix-prefetch-git` is deleting it.  This results in
effectively random failures, when files are added to the `.git`
directory during the `rm -rf` operation (causing it to fail) or after
the operation has completed (causing the `.git` directory to be
recreated and resulting in a FOD hash mismatch).

This also causes problems for the determinism of Git's own tests.
They've resolved this in 09505b1115 (t: fix races caused by background
maintenance, 2026-02-24) by having the maintenance processes run in the
foreground.  The discussion in that commit explains they considered just
disabling maintenance entirely, but opted for the foreground option
because disabling maintenance would mean the tests looked even less like
how most Git users work with Git.

`nix-prefetch-git` is nothing like most Git users.  In almost every
case, the `.git` directory will be deleted during or immediately after
the script is called.  The repositories certainly don't benefit from
ongoing maintenance.  To avoid the non-determinism created by the
background maintenance processes, just disable maintenance entirely.

This is done with `git config` after initialising the repository, rather
than `git config --global` earlier in the script, as `git config
--global` will fail if `fetchgit` was called with a `gitConfig`
argument.

It would be possible to set this option with
`GIT_CONFIG_[COUNT|KEY_<n>|VALUE_<n>]` environment variables; I've opted
against that because (a) they're less familiar to most people who might
want to come to edit this script in future and (b) because if someone is
using those values themselves via `impureEnvVars` or similar, making our
configuration play nicely with someone else's would require some fairly
complex logic.

I haven't made this a configurable option: any use of `nix-prefetch-git`
will run with maintenance disabled, as I cannot think of a use case
where it would be useful.  If there is such a use case, it would be
straightforward to extend `nix-prefetch-git` and `fetchgit` to allow
users to change the behaviour.

Fixes #524215.
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index d3788d9447ad..f2d36f54a2d5 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -123,6 +123,10 @@ fi
 init_remote(){
     local url=$1
     clean_git init --initial-branch=master
+    # Disable maintenance: it's not useful for a short-lived clone, and
+    # background maintenance causes non-deterministic builds.
+    # https://github.com/NixOS/nixpkgs/issues/524215
+    clean_git config maintenance.auto false
     clean_git remote add origin "$url"
     if [ -n "$sparseCheckout" ]; then
         git config remote.origin.partialclonefilter "blob:none"

From 4556da0e90320c23e73c0959c6a815798d2c52c5 Mon Sep 17 00:00:00 2001
From: oliwia <24637207+kkanden@users.noreply.github.com>
Date: Tue, 26 May 2026 17:34:26 +0200
Subject: [PATCH 21/97] wayle: 0.3.0 -> 0.4.1

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

diff --git a/pkgs/by-name/wa/wayle/package.nix b/pkgs/by-name/wa/wayle/package.nix
index 266cd09b3ee8..2cf3af213b01 100644
--- a/pkgs/by-name/wa/wayle/package.nix
+++ b/pkgs/by-name/wa/wayle/package.nix
@@ -21,7 +21,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wayle";
-  version = "0.3.0";
+  version = "0.4.1";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "wayle-rs";
     repo = "wayle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4hnbv31BWu6KbdSHphHnpl80R0ByxS0RxsM5uqtNnCU=";
+    hash = "sha256-gTvjGvS9jWijB7xVMTZZkltGfqreKtXanZlt1ZgFiC4=";
   };
 
-  cargoHash = "sha256-sXoqNF7hzE97PkRMBnxVFNPa92CgD5gYeMd0RmzPJzY=";
+  cargoHash = "sha256-iMtX/MNPzjXJG9ebDDdyQrLeqmW9idoty1vjhGLjT/E=";
 
   nativeBuildInputs = [
     copyDesktopItems

From 089ef3cffbcc5cf9b8f2a9cbc62151442ecc080b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 15:52:48 +0000
Subject: [PATCH 22/97] cloudfox: 2.0.4 -> 2.0.5

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

diff --git a/pkgs/by-name/cl/cloudfox/package.nix b/pkgs/by-name/cl/cloudfox/package.nix
index c203d19d54dc..6801098500ae 100644
--- a/pkgs/by-name/cl/cloudfox/package.nix
+++ b/pkgs/by-name/cl/cloudfox/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloudfox";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "BishopFox";
     repo = "cloudfox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6GP6NwgBesU9bN997pfQ3jdHeimxOIyBBmiP/v6RT94=";
+    hash = "sha256-KuS7uQCSY/3FuLwvBlZY+tjYuDdNd+OkwKpQLyv8U5I=";
   };
 
   vendorHash = "sha256-RO/Xn8gDqCWVfI0yFuqHBj4rYh/fIMAJ80kKFj1ZFwI=";

From 850a612bd592b6f2c89390e035340ca0d8b643a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 16:02:26 +0000
Subject: [PATCH 23/97] clickhouse-backup: 2.6.43 -> 2.7.0

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

diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix
index 313641ace631..f99699bf65b1 100644
--- a/pkgs/by-name/cl/clickhouse-backup/package.nix
+++ b/pkgs/by-name/cl/clickhouse-backup/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "clickhouse-backup";
-  version = "2.6.43";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "Altinity";
     repo = "clickhouse-backup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1A14tWehOZkmwpuciOxbpKKQbaaOGXh+I8PnqDoCNIE=";
+    hash = "sha256-+dNiW7CzwOdJSCY62tNSxX8CikUcae0aDIUEGIDZ5wU=";
   };
 
-  vendorHash = "sha256-pIbQzXTKsfZeIdwS+/4wG2IA0LCTPaP4mDsxKNtcAuU=";
+  vendorHash = "sha256-RVvBonVGj7V6FgwhXhlaJiVvHgH1306iymVR0eI45+8=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"

From 9f6b87804e3f53ad290ee77168f3b65165d361d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 16:06:28 +0000
Subject: [PATCH 24/97] bee: 2.7.1 -> 2.8.0

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

diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix
index ad055a9d2859..d1e380341837 100644
--- a/pkgs/by-name/be/bee/package.nix
+++ b/pkgs/by-name/be/bee/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "bee";
-  version = "2.7.1";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "ethersphere";
     repo = "bee";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-C9kaTaqpMbJmgr+pxHZ9RjBEnzm1ykQLCItI0uoebBI=";
+    hash = "sha256-34HbSsLWEwG2H2HlLl9TfuL0cy86TnegVK3b9dPdieQ=";
   };
 
-  vendorHash = "sha256-AtyC7I1sr+uNRi6fNoOJ7QVmCB16iXOZacYDQBauBI0=";
+  vendorHash = "sha256-KJ5W2VW7q+1JxyBUcqsRxGzYE4cOADxm/Gu1oVvr3R4=";
 
   subPackages = [ "cmd/bee" ];
 

From 4c2bf20679a71dfe13bbc5761aaee8da82749284 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 16:47:40 +0000
Subject: [PATCH 25/97] cine: 1.3.1 -> 1.4.1

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

diff --git a/pkgs/by-name/ci/cine/package.nix b/pkgs/by-name/ci/cine/package.nix
index b91d84a52a41..bfacf5d33111 100644
--- a/pkgs/by-name/ci/cine/package.nix
+++ b/pkgs/by-name/ci/cine/package.nix
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "cine";
-  version = "1.3.1";
+  version = "1.4.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "diegopvlk";
     repo = "Cine";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QYNtLTgpyQonmTsLnkwPRxQ14loirii09lJiPdooyOI=";
+    hash = "sha256-XB7DrFASIivCDvcNnuiVRI4xnkj0rOzHnD5z1AugGdQ=";
     fetchSubmodules = true;
   };
 

From 109fd85d863082902b7692f7a7b68538f47bc077 Mon Sep 17 00:00:00 2001
From: Vinetos <contact+git@vinetos.fr>
Date: Tue, 26 May 2026 19:29:50 +0200
Subject: [PATCH 26/97] python3Packages.python-otcextensions: 0.32.29 -> 0.34.1

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

diff --git a/pkgs/development/python-modules/python-otcextensions/default.nix b/pkgs/development/python-modules/python-otcextensions/default.nix
index 56b435ffc307..851dfa1d5722 100644
--- a/pkgs/development/python-modules/python-otcextensions/default.nix
+++ b/pkgs/development/python-modules/python-otcextensions/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "python-otcextensions";
-  version = "0.32.29";
+  version = "0.34.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opentelekomcloud";
     repo = "python-otcextensions";
     tag = version;
-    hash = "sha256-hqxCnIfVJPnlwree0+kY9iXXjPMoGd06tVT+yT6rex8=";
+    hash = "sha256-zD7kvm1/GrhwokXK1I35g2HMD6kUU87MnmQ37GtSO2Q=";
   };
 
   env.PBR_VERSION = version;

From 46f3fb8ab20365cb1c1b5391d169ed42fcda8d61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 18:25:33 +0000
Subject: [PATCH 27/97] your_spotify: 1.19.0 -> 1.20.0

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

diff --git a/pkgs/by-name/yo/your_spotify/package.nix b/pkgs/by-name/yo/your_spotify/package.nix
index 6ff861fb86e2..ad88f3d79da1 100644
--- a/pkgs/by-name/yo/your_spotify/package.nix
+++ b/pkgs/by-name/yo/your_spotify/package.nix
@@ -14,20 +14,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "your_spotify_server";
-  version = "1.19.0";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "Yooooomi";
     repo = "your_spotify";
     tag = finalAttrs.version;
-    hash = "sha256-zyvTahfOq7KXgVqD178hrlqO7YjsjLyuw+pm6PMhJt0=";
+    hash = "sha256-0XGq4UVaNN1gTJLta0o9DnQwGwJ+S7HlGFY6DPAdGKY=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-KI5ZFU8u1R4QKTXn6mGVi+ziAocgOyyutKqmUOIn+dI=";
+    hash = "sha256-j6COg8Q0uj+5TjN/BUVst2UMhXLT3drLWUzdG/x51rk=";
   };
 
   nativeBuildInputs = [

From c5aa66a532673d2372e2c5f2659f67eb6a4be908 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 18:49:07 +0000
Subject: [PATCH 28/97] deck: 1.60.0 -> 1.62.0

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

diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix
index 102284256aa2..aef439d2f520 100644
--- a/pkgs/by-name/de/deck/package.nix
+++ b/pkgs/by-name/de/deck/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "deck";
-  version = "1.60.0";
+  version = "1.62.0";
 
   src = fetchFromGitHub {
     owner = "Kong";
     repo = "deck";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5L1kY8EE3+IGP20fL1oBbc7rWqHcseyw+qYKND4AnMg=";
+    hash = "sha256-0XluNSLZ1yly/hfBvV9xOVROyS7dtK348fFdT2Iplsg=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
   ];
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-C6JqlW50vJVmwEPOtljgPxRWcJ12IpTzGVCHVC57+J0=";
+  vendorHash = "sha256-77fkJJB/aHdxX2NItiwMAyVyH/OPE7N00PSTYHG0szA=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd deck \

From b51984a59c550efbf8c16ac38276aa049221e49c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 19:11:49 +0000
Subject: [PATCH 29/97] slirp4netns: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/by-name/sl/slirp4netns/package.nix b/pkgs/by-name/sl/slirp4netns/package.nix
index 59381cf14cdf..6948c0f6d618 100644
--- a/pkgs/by-name/sl/slirp4netns/package.nix
+++ b/pkgs/by-name/sl/slirp4netns/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "slirp4netns";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "slirp4netns";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-dPhUr9GdujTpUsnfvZDp8eOBQwlzqwtwziII2QWD4JA=";
+    sha256 = "sha256-/ZnlWv5kSkYMiO2mTs6mY70QGBm0FsIDyd+gGaVK9rs=";
   };
 
   nativeBuildInputs = [

From c95c43a334d007dc6316702de1723129f2c14ca5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 19:36:09 +0000
Subject: [PATCH 30/97] python3Packages.coiled: 1.134.0 -> 1.134.1

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

diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index c3e7a7319b87..8f85506a9a1b 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "coiled";
-  version = "1.134.0";
+  version = "1.134.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-frU9QzSYhEDrruxwSGuhX/VVCuQdI2cFg+G0QQmOHaU=";
+    hash = "sha256-uGXgj2QZOMik9ZJD8wMppJKsJPXdI0ipPuxwB5pHZos=";
   };
 
   build-system = [

From b45880b585a68c201f7cfa44046907f635d1955c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 20:29:47 +0000
Subject: [PATCH 31/97] kubernetes-helmPlugins.helm-s3: 0.17.1 -> 0.17.2

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

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
index 9c5df0a60b87..716c8859c301 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "helm-s3";
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchFromGitHub {
     owner = "hypnoglow";
     repo = "helm-s3";
     rev = "v${version}";
-    hash = "sha256-c3UbtNReSfhSAl0ioaP1DUsKNSZ4nng9X8oOPkx0eC4=";
+    hash = "sha256-ivaREH6IiNNfgah45jITzl50miDJ34BlzWwMEdKAbjg=";
   };
 
-  vendorHash = "sha256-VdrlSZpMak3F8CH5aDPDWk3SyX/zbBRmaMyFaeF7fKM=";
+  vendorHash = "sha256-F01BWnCAZ9IJgbHgnmlB2f/MTqu0mWcidCPDdTqzhUg=";
 
   # NOTE: Remove the install and upgrade hooks.
   postPatch = ''

From d02e7ee209badc450954ce0966467cf648259d60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 20:46:06 +0000
Subject: [PATCH 32/97] heimdall-proxy: 0.17.14 -> 0.17.15

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

diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix
index c11e0b9e9a8c..1de10cf63b80 100644
--- a/pkgs/by-name/he/heimdall-proxy/package.nix
+++ b/pkgs/by-name/he/heimdall-proxy/package.nix
@@ -4,7 +4,7 @@
   lib,
 }:
 let
-  version = "0.17.14";
+  version = "0.17.15";
 in
 buildGoModule {
   pname = "heimdall-proxy";
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "dadrus";
     repo = "heimdall";
     tag = "v${version}";
-    hash = "sha256-q7V5RT1Q+0ERvyQ8wD63C8NMkgoPHBFMuogXZItVdKw=";
+    hash = "sha256-NuSoLULwS634FPLr8bvcLXIIO3zL9nSFcMkjriuE6G8=";
   };
 
-  vendorHash = "sha256-AholpbV7FTD6HutOFlO7YSATv/0fsGHyKrpINMCuegw=";
+  vendorHash = "sha256-mGsV453mv36Gw5XtLRcBlhXkOpXDLGS3bEpt8oZeb1M=";
 
   tags = [ "sqlite" ];
 

From c5f3c68c3c5a526f22c09a849d28ab0219a92e98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 20:53:59 +0000
Subject: [PATCH 33/97] harbor-cli: 0.0.20 -> 0.0.22

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

diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index da71e8309da2..ca02e4fae725 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.20";
+  version = "0.0.22";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZpRnRxBF2N+sIvpQBxAFrMIJsZiqWTzcgygHoR+uXPc=";
+    hash = "sha256-QgI5ET5mS/vZb6a4kuTZzllUWKjbawgzknWkDgGNEi0=";
   };
 
-  vendorHash = "sha256-1Aj3QHQcswOmzeazk3Fr8gSP1VTok2U/NK3mCPSPC6o=";
+  vendorHash = "sha256-Iy+Kf0Kf1yuFk+shbomT0Z1zMvAbdWT4vLshAjlqvck=";
 
   excludedPackages = [
     "dagger"

From 3d0133b6d7da10a86c79b42b5aeec2922e60c768 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 21:36:07 +0000
Subject: [PATCH 34/97] coroot: 1.20.2 -> 1.21.0

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

diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix
index aa3966a12955..cdd09acb65e1 100644
--- a/pkgs/by-name/co/coroot/package.nix
+++ b/pkgs/by-name/co/coroot/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "coroot";
-  version = "1.20.2";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-c+O0nV9b1hSKP+/atJpUihr8ZkMNCwIok4Ldmm+ivmA=";
+    hash = "sha256-TF1Z4IXXTGWkx6oH3MAE+I1AJ+jO7X8Py9lMQwritMc=";
   };
 
   vendorHash = "sha256-npMQah59pJqF6wgD2dlEleneIZbP/atDGEpjjb+KCpI=";

From 1611d8c227d8fc0e499d99165dfdebcdc9b0fd4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 21:47:01 +0000
Subject: [PATCH 35/97] blightmud-tts: 5.6.1 -> 5.7.0

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

diff --git a/pkgs/by-name/bl/blightmud/package.nix b/pkgs/by-name/bl/blightmud/package.nix
index c40a2e9ce116..1c881017d540 100644
--- a/pkgs/by-name/bl/blightmud/package.nix
+++ b/pkgs/by-name/bl/blightmud/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "blightmud";
-  version = "5.6.1";
+  version = "5.7.0";
 
   src = fetchFromGitHub {
     owner = "blightmud";
     repo = "blightmud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fwWyQq6rb8qSR7aiQagOodkQRqanUJA2uH5I/Z1XfAA=";
+    hash = "sha256-M+tbV8zuwnwwv335ljKIq0UIsSkb4SQnJnOtOhL25N8=";
   };
 
-  cargoHash = "sha256-4JArgwNFjnGwyEnWdjZkUlahloQu+C8qF9QyYo8s1jQ=";
+  cargoHash = "sha256-EWI+k+q8JdyZDw+k2pM1mRkfBDQH0IsuzgrTECLrHt0=";
 
   postPatch = ''
     substituteInPlace Cargo.toml --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"'

From 1f830a85bab013cc76c27862fe2c9cbbe124e927 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 23:07:34 +0000
Subject: [PATCH 36/97] python3Packages.sqlalchemy-continuum: 1.5.2 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
index bdb39bd50153..715244c77036 100644
--- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy-continuum";
-  version = "1.5.2";
+  version = "1.6.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "sqlalchemy_continuum";
     inherit version;
-    hash = "sha256-JXHW62FWvIVir7OS/d3rS7MeRKH9HzeIy2Je/i9pbGM=";
+    hash = "sha256-S+K2bFuVH9zPONpbRcVvZPRbdlb+afVjEL9yNUj2Evw=";
   };
 
   build-system = [ setuptools ];

From b3ef17d14b13b36b90affc0b8d98080ac4d5d063 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 May 2026 23:52:56 +0000
Subject: [PATCH 37/97] mcporter: 0.11.1 -> 0.11.3

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

diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix
index 02f62f804dfa..68cfd3f26480 100644
--- a/pkgs/by-name/mc/mcporter/package.nix
+++ b/pkgs/by-name/mc/mcporter/package.nix
@@ -15,20 +15,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mcporter";
-  version = "0.11.1";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "steipete";
     repo = "mcporter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fhIU5z0H6piHNNHSQ3UQW6IqCdpCTjTxngT7AwQm5S0=";
+    hash = "sha256-xBH0OMrAQ3eVqBczzJnbaxbBLo2mRc6cCZBb5w4SkhI=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-TZfEoUSjba8cRz6L9uY2PGskYsR7S/xAahiKLd8dhFM=";
+    hash = "sha256-Ga1M3SQBaQnODQXh4+AXQ0FVCr7e8wPpbaV1ffQYNLM=";
   };
 
   nativeBuildInputs = [

From a6d7bb96eec96c6ac30662554553df930d6a7572 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 00:24:57 +0000
Subject: [PATCH 38/97] aws-vault: 7.10.7 -> 7.10.8

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

diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index be3e2d934b63..202043dd687b 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "aws-vault";
-  version = "7.10.7";
+  version = "7.10.8";
 
   src = fetchFromGitHub {
     owner = "ByteNess";
     repo = "aws-vault";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lpk19VhnhC+aKutThzHGUKq4bveFm+Jn64/eqL+/lrE=";
+    hash = "sha256-h7/OGylN2FOC5ESsOV4JHVFZjG7Qv7JHOVlfqqpSWbE=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-Qxgi6wa5NZ8hseLSlFa52WWH1BiB04YZmoqk7KRdVuk=";
+  vendorHash = "sha256-FzA58f2aBNs3OG+o0XpKiAbwe7w3GsBTo7h83gkfRSE=";
 
   nativeBuildInputs = [
     installShellFiles

From ec54f4f4db67c7d4f5ca33a27b9ac3ad6363fa0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 00:51:47 +0000
Subject: [PATCH 39/97] transcribe: 9.50.1 -> 9.51.1

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

diff --git a/pkgs/by-name/tr/transcribe/package.nix b/pkgs/by-name/tr/transcribe/package.nix
index c891adb4768e..f03254a6a08f 100644
--- a/pkgs/by-name/tr/transcribe/package.nix
+++ b/pkgs/by-name/tr/transcribe/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "transcribe";
-  version = "9.50.1";
+  version = "9.51.1";
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchzip {
         url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz";
-        sha256 = "sha256-FdaUglemrnLC2uSmKDgrYLCPB7Uu/pzp+oA+Zj/9W/s=";
+        sha256 = "sha256-RgiclfufwWDr21NGIfc3/PgYJBBoTwiu9TxLgTU9Pgk=";
       }
     else
       throw "Platform not supported";

From f0aeeedf78b19a85b5edb7b21888aedfae197576 Mon Sep 17 00:00:00 2001
From: Chenglun Hu <chenglunhu@gmail.com>
Date: Wed, 27 May 2026 08:51:53 +0800
Subject: [PATCH 40/97] dufs: 0.45.0 -> 0.46.0

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

diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix
index 76404706156b..3feeb18d54e3 100644
--- a/pkgs/by-name/du/dufs/package.nix
+++ b/pkgs/by-name/du/dufs/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dufs";
-  version = "0.45.0";
+  version = "0.46.0";
 
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = "dufs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-83lFnT4eRYaBe4e2o6l6AGQycm/oK96n5DXutBNvBsE=";
+    hash = "sha256-Be7aJ5Bo5JSMcyyWsZ3ZamQ691TSIO4Ylxzil7UNJxk=";
   };
 
-  cargoHash = "sha256-WdjqG2URtloh5OnpBBnEWHD3WKGkCKLDcCyWRVGIXto=";
+  cargoHash = "sha256-H2ew+sb60UnXe3Dls9MSKwAk4hT/yLSbgZz6pVOkHQQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b1e9dd7f55c272c0169654646ba2f5de03cf0195 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 00:53:28 +0000
Subject: [PATCH 41/97] limine-full: 12.3.0 -> 12.3.1

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

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index ab4921dcd5ca..61977a5e4d1f 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -47,14 +47,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "12.3.0";
+  version = "12.3.1";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-3lMqcsCC0jP/UMkXscsQPQjlL6rkuJ6WRJFpXZ+sJDw=";
+    hash = "sha256-orkotxbusV4giozDLkUZuLZAHNS4GZnfj+EXi5tSRWU=";
   };
 
   enableParallelBuilding = true;

From b0a6e50913ed83b077f74be51b72d0953620929d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 03:06:21 +0000
Subject: [PATCH 42/97] luminous-ttv: 0.5.12 -> 0.5.13

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

diff --git a/pkgs/by-name/lu/luminous-ttv/package.nix b/pkgs/by-name/lu/luminous-ttv/package.nix
index 3fc2a6e8b461..3fd4564d6983 100644
--- a/pkgs/by-name/lu/luminous-ttv/package.nix
+++ b/pkgs/by-name/lu/luminous-ttv/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "luminous-ttv";
-  version = "0.5.12";
+  version = "0.5.13";
 
   src = fetchFromGitHub {
     owner = "AlyoshaVasilieva";
     repo = "luminous-ttv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uTfbFSK7vwt+zLWN5EdudPnmJvg5F4U8Zx6CLV8fePc=";
+    hash = "sha256-kwhaobSXE/i1WUDfBaLVEsZVSORxRU6Imdul+T043RU=";
   };
 
-  cargoHash = "sha256-4Tv4FO2PSH9G9u5L3Y/LknslwbWpzURSv/Yq4ICzgpo=";
+  cargoHash = "sha256-EIvPQNPWH2IH2Ll5tSsS3cj592jxWljXc1z4LGGZC6I=";
 
   meta = {
     description = "Rust server to retrieve and relay a playlist for Twitch livestreams/VODs";

From 63af74e43b2bbb397a1cc714d48a991d3ed07659 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 04:29:29 +0000
Subject: [PATCH 43/97] python3Packages.dvc-ssh: 4.2.2 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix
index 85c58dff073a..4f4073e87714 100644
--- a/pkgs/development/python-modules/dvc-ssh/default.nix
+++ b/pkgs/development/python-modules/dvc-ssh/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dvc-ssh";
-  version = "4.2.2";
+  version = "4.3.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "dvc_ssh";
     inherit (finalAttrs) version;
-    hash = "sha256-T6yTLF8ivZRE2H1Oez/9bAnMjlbZjrPG1LRDAdNTUBc=";
+    hash = "sha256-NgfzEZW5WmDaP85apROMvITy545CHse9z94xC/Jw9OA=";
   };
 
   pythonRemoveDeps = [

From 4df49b1c4eb9133da6825a1b8ebc4aa79cdd1b99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 05:42:52 +0000
Subject: [PATCH 44/97] postcss: 8.5.14 -> 8.5.15

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

diff --git a/pkgs/by-name/po/postcss/package.nix b/pkgs/by-name/po/postcss/package.nix
index a36c7e74a4b4..892f258becd4 100644
--- a/pkgs/by-name/po/postcss/package.nix
+++ b/pkgs/by-name/po/postcss/package.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "postcss";
-  version = "8.5.14";
+  version = "8.5.15";
 
   src = fetchFromGitHub {
     owner = "postcss";
     repo = "postcss";
     tag = finalAttrs.version;
-    hash = "sha256-5cBSl5gMJz73v6ynzcLhv/f2Rr7Ei9xzJAVeZHgXS/Q=";
+    hash = "sha256-HNMGYdp6s1flnV71eUc1oH/lw9nARlCOZPs2kRDZ1qI=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-XLFSpq0V49Lp2bVvHc3X0w+Qwj/duZFTey/vu/Nt9Jk=";
+    hash = "sha256-lpp5YHemVI+LVO+g/OXvcEUGBhmfeSith9uhbnyT6Ac=";
   };
 
   dontBuild = true;

From cf41ddcbb4848e045d5828530d87d23ce6ff1cfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 06:58:02 +0000
Subject: [PATCH 45/97] google-alloydb-auth-proxy: 1.14.4 -> 1.15.0

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

diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
index 649339d31bc8..ed38fe104e89 100644
--- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
+++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "google-alloydb-auth-proxy";
-  version = "1.14.4";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "alloydb-auth-proxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hY9mIcl5IJ34/nqiHe/Q2J2lJsDGvkhltCdSHltagSk=";
+    hash = "sha256-TNb5rXKpVfqi4aPdB1qlQFVnxmcblrgmODeZtmS4XgA=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-JRKRJJLP+8g075o++g/A/YyceKjVM9QHOkmszVutbEM=";
+  vendorHash = "sha256-j+jMwkW2yNEEd7TA5gUNRgKOOrm4w4U3ZfP7yErd13M=";
 
   checkFlags = [
     "-short"

From 424ebacd17f45e0ddb099e91d7d71dee1033c110 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 08:39:04 +0000
Subject: [PATCH 46/97] python3Packages.symbolic: 13.0.0 -> 13.1.0

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

diff --git a/pkgs/development/python-modules/symbolic/default.nix b/pkgs/development/python-modules/symbolic/default.nix
index 9a75f9362431..ecae005811b9 100644
--- a/pkgs/development/python-modules/symbolic/default.nix
+++ b/pkgs/development/python-modules/symbolic/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "symbolic";
-  version = "13.0.0";
+  version = "13.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -23,12 +23,12 @@ buildPythonPackage rec {
     tag = version;
     # the `py` directory is not included in the tarball, so we fetch the source via git instead
     forceFetchGit = true;
-    hash = "sha256-pxN0aQaM0Z7l4ZsmzTmXpJYkxzl11sBtcDXl5zbP9zI=";
+    hash = "sha256-PjvbEJ+YJjdjrNdlPF0wJfZzK4jCzySm6RmufQLtmRA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-WY5FG+XOPnhrrP7+YUljpAo74IeZ8grWvXvV1Y14FVg=";
+    hash = "sha256-5dElAOrg6aEcDrUFIwYRhJ3KeldstiZdvT99UNZn5yI=";
   };
 
   nativeBuildInputs = [

From 1ce6c2770e8a09a9dde23abd1a46cde34fa6fca1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 27 May 2026 11:52:47 +0200
Subject: [PATCH 47/97] python3Packages.symbolic: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/symbolic/default.nix b/pkgs/development/python-modules/symbolic/default.nix
index ecae005811b9..9b4a69219131 100644
--- a/pkgs/development/python-modules/symbolic/default.nix
+++ b/pkgs/development/python-modules/symbolic/default.nix
@@ -12,7 +12,7 @@
   nix-update-script,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "symbolic";
   version = "13.1.0";
   pyproject = true;
@@ -20,14 +20,14 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "symbolic";
-    tag = version;
+    tag = finalAttrs.version;
     # the `py` directory is not included in the tarball, so we fetch the source via git instead
     forceFetchGit = true;
     hash = "sha256-PjvbEJ+YJjdjrNdlPF0wJfZzK4jCzySm6RmufQLtmRA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     hash = "sha256-5dElAOrg6aEcDrUFIwYRhJ3KeldstiZdvT99UNZn5yI=";
   };
 
@@ -60,8 +60,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for dealing with symbol files and more";
     homepage = "https://github.com/getsentry/symbolic";
-    changelog = "https://github.com/getsentry/symbolic/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/getsentry/symbolic/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ defelo ];
   };
-}
+})

From 4dc5ccb246ee1718497b1c2caccef06b1005e252 Mon Sep 17 00:00:00 2001
From: Eric Roberts <eric@ericroberts.dev>
Date: Wed, 27 May 2026 11:00:02 +0000
Subject: [PATCH 48/97] karakeep: 0.31.0 -> 0.32.0

---
 pkgs/by-name/ka/karakeep/package.nix                      | 6 +++---
 .../ka/karakeep/patches/dont-lock-pnpm-version.patch      | 8 +-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix
index c4c19194f9ef..31c3823c1ff2 100644
--- a/pkgs/by-name/ka/karakeep/package.nix
+++ b/pkgs/by-name/ka/karakeep/package.nix
@@ -18,13 +18,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "karakeep";
-  version = "0.31.0";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner = "karakeep-app";
     repo = "karakeep";
     tag = "cli/v${finalAttrs.version}";
-    hash = "sha256-++aNTkLOkwgkzRxg/WdrHfchXQwUUir0qqmb7WfdZJ0=";
+    hash = "sha256-P88DQi0T7tmBH7cjs8/Hz77bU0oG7u67XPoLsdePNhI=";
   };
 
   patches = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     };
 
     fetcherVersion = 3;
-    hash = "sha256-+MbKG0h3cD0kZua0OkdQsUeTjAY4ysK41KXUSaOSKHA=";
+    hash = "sha256-aT4JPx3iYw4kw8GHXKWMnelSVT0q2S3PK8DgSCQCyKQ=";
   };
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch
index 43a546386af8..b9e5609b33f0 100644
--- a/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch
+++ b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch
@@ -5,12 +5,6 @@ requirement.
 ---
 --- a/package.json
 +++ b/package.json
-@@ -32,7 +32,7 @@
-     "turbo": "^2.1.2"
-   },
-   "prettier": "@karakeep/prettier-config",
+@@ -40 +40 @@
 -  "packageManager": "pnpm@9.15.9",
 +  "packageManager": "pnpm",
-   "pnpm": {
-     "patchedDependencies": {
-       "xcode@3.0.1": "patches/xcode@3.0.1.patch"

From 815856b996f6a6e6851740bb7c37b39614a5211c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 11:23:21 +0000
Subject: [PATCH 49/97] drawterm: 0-unstable-2026-05-09 ->
 0-unstable-2026-05-26

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

diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index b1e84bd04dee..58e89e83ca24 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "drawterm";
-  version = "0-unstable-2026-05-09";
+  version = "0-unstable-2026-05-26";
 
   src = fetchFrom9Front {
     owner = "plan9front";
     repo = "drawterm";
-    rev = "234c4a4eb4811794701d38b8557ef04b861402c0";
-    hash = "sha256-7Q8JImv8PO7kPb47sl2ElwgTBPzm6hsJ3s4Vq0Xe9F4=";
+    rev = "0385fd3dc0343c4c882096c60558b01f61260736";
+    hash = "sha256-OiGliIVMUpFaNkMn15qaYdBsU429Q0RUw68lqTOu880=";
   };
 
   enableParallelBuilding = true;

From 2aabfbbca90c104c58feba91268f40a552d8c135 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 24 May 2026 00:10:54 +0700
Subject: [PATCH 50/97] python3Packages.item-synchronizer: relax bidict and
 bubop bounds

---
 .../python-modules/item-synchronizer/default.nix         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/item-synchronizer/default.nix b/pkgs/development/python-modules/item-synchronizer/default.nix
index 5b4e55349971..85f0332c71da 100644
--- a/pkgs/development/python-modules/item-synchronizer/default.nix
+++ b/pkgs/development/python-modules/item-synchronizer/default.nix
@@ -19,12 +19,13 @@ buildPythonPackage rec {
     hash = "sha256-+mviKtCLlJhYV576Q07kcFJvtls5qohKSrqZtBqE/s4=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml --replace-fail 'bidict = "^0.21.4"' 'bidict = "^0.23"'
-  '';
-
   nativeBuildInputs = [ poetry-core ];
 
+  pythonRelaxDeps = [
+    "bidict"
+    "bubop"
+  ];
+
   propagatedBuildInputs = [
     bidict
     bubop

From 442080f1fd857ed69e1e5327f9f0399750492910 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 11:46:14 +0000
Subject: [PATCH 51/97] chhoto-url: 7.0.4 -> 7.1.5

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

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 9df908763dcd..0cbef07a654c 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "7.0.4";
+  version = "7.1.5";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-ntI2jWV1kS8ojbkhLaZhxkjK5ZNYOp9MIbzHpnCyEu0=";
+    hash = "sha256-TREBriuK7k3ZBDkdQ5gGdptWCG/5UOdhoWcOj1Ppd/8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-tkPMlJqkQzFYItPPYW5kqLiymlNZPkwj0j/2Zj4Ysc8=";
+  cargoHash = "sha256-S+fWxhPRB+JZPjWQkww9VYtYfc9vnXCZgUZTu+ND1So=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From bdda4e340ec0c16f36e8727a67597532332f846f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 12:36:15 +0000
Subject: [PATCH 52/97] certspotter: 0.24.0 -> 0.24.1

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

diff --git a/pkgs/by-name/ce/certspotter/package.nix b/pkgs/by-name/ce/certspotter/package.nix
index ed1079a472c3..369b70cc1886 100644
--- a/pkgs/by-name/ce/certspotter/package.nix
+++ b/pkgs/by-name/ce/certspotter/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "certspotter";
-  version = "0.24.0";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "SSLMate";
     repo = "certspotter";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OmukbtHOvyfjRb7WdAc3A3I5FlWmQD515dNeJ5JiJ0k=";
+    hash = "sha256-yV0IiTHGEMsdTafrw/juu/vsCq/Ofoxik7vS2huwIKw=";
   };
 
-  vendorHash = "sha256-F7qNpvjWqywPPLTKw90bfy6V83/LMQcV+Gml2n1Wd2A=";
+  vendorHash = "sha256-JA/HZrbeauCD0TA2Egy49nYWXHqVRkOs9OmgaAR1z/c=";
 
   ldflags = [
     "-s"

From 828b906bebabaca1de1cb114c0e51dade4dee8a1 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 1 May 2026 18:38:21 +0200
Subject: [PATCH 53/97] requireFile: set `unfree` license by default

This avoids unfixable Hydra failures like
https://hydra.nixos.org/build/327183659.
---
 doc/release-notes/rl-2611.section.md            | 2 ++
 pkgs/build-support/trivial-builders/default.nix | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index 33805fc50055..7aa7fd8f5b6c 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -13,6 +13,8 @@
 - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details.
 - `python3Packages.django-health-check` has been updated to major version 4. See its [migration guide](https://codingjoe.dev/django-health-check/migrate-to-v4/) and [changelog](https://github.com/codingjoe/django-health-check/releases/tag/4.0.0) for breaking changes.
 
+- `requireFile` now sets `meta.license = lib.licenses.unfree` by default. Users of `requireFile`-based derivations that preserve this default will need to explicitly allow their evaluation as described in [](#sec-allow-unfree).
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 2174846b986c..19c8248d3218 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -908,6 +908,7 @@ rec {
         url ? null,
         message ? null,
         hashMode ? "flat",
+        meta ? { },
       }@args:
       assert (message != null) || (url != null);
       assert (sha256 != null) || (sha1 != null) || (hash != null);
@@ -951,6 +952,10 @@ rec {
           printf '%s' ${lib.escapeShellArg msg}
           exit 1
         '';
+        meta = {
+          license = lib.licenses.unfree;
+        }
+        // meta;
       }
       // (lib.optionalAttrs (name == null) {
         # The case of providing `url`, but not `name`. This has

From a4c95800a7b3da5c3b0c6ad933bd71ff4438dc83 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 19 May 2026 23:17:57 +0200
Subject: [PATCH 54/97] rcu: set correct `meta.license` for source tarball

`requireFile` now sets `meta.license` to `lib.licenses.unfree` by
default.
---
 pkgs/by-name/rc/rcu/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index 701f9c6c7129..389126e2ce29 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -34,6 +34,10 @@ python3Packages.buildPythonApplication rec {
         name = "rcu-${version}-source.tar.gz";
         hash = "sha256-9YhhsLqAcevjJmENWVWfA1ursPz3mgFz8mzLLSNlXVM=";
         url = "https://www.davisr.me/projects/rcu/";
+        meta = {
+          # `requireFile` sets `lib.licenses.unfree` by default
+          inherit (meta) license;
+        };
       };
     in
     runCommand "${src-tarball.name}-unpacked" { } ''

From 009aa0c9169f1576d2a684fdd4ebbdba856eb3a7 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 12 May 2026 20:11:36 +0200
Subject: [PATCH 55/97] doc: clarify effect of `meta.hydraPlatforms` on reverse
 dependencies

---
 doc/stdenv/meta.chapter.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md
index a88683ed37b7..a510dd1489ce 100644
--- a/doc/stdenv/meta.chapter.md
+++ b/doc/stdenv/meta.chapter.md
@@ -151,6 +151,8 @@ The list of Nix platform types for which the [Hydra](https://github.com/nixos/hy
 }
 ```
 
+Note that this does not affect whether reverse dependencies of the package are built on Hydra.
+
 ### `broken` {#var-meta-broken}
 
 If set to `true`, the package is marked as "broken", meaning that it won’t show up in [search.nixos.org](https://search.nixos.org/packages), and cannot be built or installed unless [explicitly allowed](#sec-allow-broken).

From 934f4b0b848f3f46dea6947982cdca4f24f9bedd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 13:06:10 +0000
Subject: [PATCH 56/97] xlsxsql: 0.4.0 -> 0.5.3

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

diff --git a/pkgs/by-name/xl/xlsxsql/package.nix b/pkgs/by-name/xl/xlsxsql/package.nix
index c62ddec50109..d7c072aaf0c5 100644
--- a/pkgs/by-name/xl/xlsxsql/package.nix
+++ b/pkgs/by-name/xl/xlsxsql/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "xlsxsql";
-  version = "0.4.0";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "xlsxsql";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OmNYrohWs4l7cReTBB6Ha9VuKPit1+P7a4QKhYwK5g8=";
+    hash = "sha256-07Gnw1Y8TyxoOMMevnx4tGyk6k7n4o3gDaOPshsmcSE=";
   };
 
-  vendorHash = "sha256-Zrt4NMoQePvipFyYpN+Ipgl2D6j/thCPhrQy4AbXOfQ=";
+  vendorHash = "sha256-3r7KY6boNYd2tJjMExiTZD1ZxQhm2UlP/Gyic8XMGrw=";
 
   ldflags = [
     "-X main.version=v${finalAttrs.version}"

From c10e868a28a9e06fba753fe13f05aa685aba1b05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 13:15:39 +0000
Subject: [PATCH 57/97] python3Packages.azure-mgmt-resource-deployments:
 1.0.0b1 -> 1.0.0b2

---
 .../azure-mgmt-resource-deployments/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix b/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix
index 27dec75acb88..77c8e0cc6f95 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-resource-deployments";
-  version = "1.0.0b1";
+  version = "1.0.0b2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "azure_mgmt_resource_deployments";
     inherit version;
-    hash = "sha256-c1m0JliCbn5/8T5tuwxJDpX8yV28oiTSuFz3GtdTXx0=";
+    hash = "sha256-RVBRTFK4uwZH213SRLSUs0gl0cV8CRph0RZOGQQOw+I=";
   };
 
   build-system = [ setuptools ];

From e5d373f0e5dcc593a8f0417d35b159f9408aa4d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 13:28:38 +0000
Subject: [PATCH 58/97] matrix-authentication-service: 1.16.0 -> 1.17.0

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

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 5fb3113b66b5..9d063b4fa960 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-authentication-service";
-  version = "1.16.0";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pyL2QhvycaGBYgelsHK5Ces195Z1aY2XZyecsPXO/X4=";
+    hash = "sha256-/3NgMZ0B+B0BHPBi/vuiCS6xi70wgNKCZH0hTpkWi+U=";
   };
 
-  cargoHash = "sha256-gvG6+strULIewJgFdGg3fJ2mjUVjgi9/Q7pDredYuiU=";
+  cargoHash = "sha256-aZSnQmOwqo0OG3XXM5eups0cKNs80j/nAsZB5tnWUrY=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";

From 068b43a4eb72468c7ec962d6ffc4416ee7cd0ff7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 13:33:10 +0000
Subject: [PATCH 59/97] rbspy: 0.46.0 -> 0.48.0

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

diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix
index cc238e1e181b..ce9b4ee80264 100644
--- a/pkgs/by-name/rb/rbspy/package.nix
+++ b/pkgs/by-name/rb/rbspy/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rbspy";
-  version = "0.46.0";
+  version = "0.48.0";
 
   src = fetchFromGitHub {
     owner = "rbspy";
     repo = "rbspy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TC/0Y/+4rUO+cvZttgJCmDym47bRWW3TvZhJ6MFU+7U=";
+    hash = "sha256-OUbKCD+Q7eAK3Yf/qDGD472Xk6w+vN1GhpCSN7n3epE=";
   };
 
-  cargoHash = "sha256-dxloiguD1u/6khqeorBaozxdLnJiE7KL4/oU4uxJmIU=";
+  cargoHash = "sha256-WZ3XDBx0mXw63X1DritVXjI7wB2BedZsVm2UUvcVThA=";
 
   doCheck = true;
 

From 67685980f758788bc4554622135b0dee1b0caf03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 13:42:56 +0000
Subject: [PATCH 60/97] nerdctl: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/by-name/ne/nerdctl/package.nix b/pkgs/by-name/ne/nerdctl/package.nix
index cc520bd2c1c8..911ada7a81f2 100644
--- a/pkgs/by-name/ne/nerdctl/package.nix
+++ b/pkgs/by-name/ne/nerdctl/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nerdctl";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "nerdctl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DCAgxqjJruoSTTZqWKOrz/6ZbOubGi4B7tdf2Kg/UGc=";
+    hash = "sha256-DsMLSHA+q8nsIpzOA84C3hCSGILansSx24l7z2unSj8=";
   };
 
-  vendorHash = "sha256-gOpzsPq0w+85KKa3QMKb+rWuRSfbCFECfHB3PadJNE8=";
+  vendorHash = "sha256-x2u708zdmAHdrEaA/fretPuHKNbDVsiK6u/fZIa+Dhc=";
 
   nativeBuildInputs = [
     makeWrapper

From 9d27c9e5c7255608819f14c08a9a63ba3c9f81a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 15:06:59 +0000
Subject: [PATCH 61/97] gat: 0.27.2 -> 0.27.3

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

diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix
index 2baf051172c4..13a2fc1ad455 100644
--- a/pkgs/by-name/ga/gat/package.nix
+++ b/pkgs/by-name/ga/gat/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gat";
-  version = "0.27.2";
+  version = "0.27.3";
 
   src = fetchFromGitHub {
     owner = "koki-develop";
     repo = "gat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3qm9kvAL522QCK7nXIWywdHFfxeuCJ9pukpd2ehIBis=";
+    hash = "sha256-PCHCBYflW+wUYzwlMOSno/xG5UX34QM9aG0RaCtC9h0=";
   };
 
-  vendorHash = "sha256-4RswVTjVF9pF7u94BbYIP0ukaKkPrTriSbPHOhhrJuI=";
+  vendorHash = "sha256-tFEir5386McMi5i6Mk/6B4KPZhEucOcWAO2jECouDDg=";
 
   env.CGO_ENABLED = 0;
 

From 72a53bd58f36d2f0b7893acdc3058ce787a6fbda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 15:22:39 +0000
Subject: [PATCH 62/97] notesnook: 3.3.19 -> 3.3.20

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

diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix
index 493258addfc9..3733c8d2fe55 100644
--- a/pkgs/by-name/no/notesnook/package.nix
+++ b/pkgs/by-name/no/notesnook/package.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "notesnook";
-  version = "3.3.19";
+  version = "3.3.20";
 
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "Unsupported system: ${system}";
@@ -27,10 +27,10 @@ let
     url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
     hash =
       {
-        x86_64-linux = "sha256-l4+SeM6KXLICbHzoIpotwdCkbCaPV83TT8mlvc+Z0Qs=";
-        aarch64-linux = "sha256-9yWClJWI/1F8QGkUQCsPQcqbAqjC+JM4jXA8SmpoKNQ=";
-        x86_64-darwin = "sha256-LAsCRRLAZ0bsHkitXHE4jF6+tgSm0HnWNKG3bSKLy+0=";
-        aarch64-darwin = "sha256-GkhO6iCn+CrLDGhKBGyogm0dNvpAPZS0xH/ED5oSN2U=";
+        x86_64-linux = "sha256-4TMQAs4ovBc2HFPxu0aNGZpA+N/xUBgcforJqT7jSCg=";
+        aarch64-linux = "sha256-royjfwu8bU6FJY3M18c0fRoRoM1dwWzhkuftdZ/XKeI=";
+        x86_64-darwin = "sha256-iqZbOlSkCXMsDYUsImAVROeKb11Rj6vKVbyTDGayfzY=";
+        aarch64-darwin = "sha256-ozPAwuM3mTq8r9iD+kKAXzeb8Z5xYaMBbHyXx4UEhY8=";
       }
       .${system} or throwSystem;
   };

From f656289c9860a42f9bcb9cdb6cdd763bafe7a178 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 15:28:45 +0000
Subject: [PATCH 63/97] rumdl: 0.1.94 -> 0.2.2

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

diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix
index 41b3b9329ae4..0d6df5d2caa4 100644
--- a/pkgs/by-name/ru/rumdl/package.nix
+++ b/pkgs/by-name/ru/rumdl/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rumdl";
-  version = "0.1.94";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "rvben";
     repo = "rumdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q5Dbw1BaDrNcg+xtCog7rWwweZi6qtDsjtq19vJWZck=";
+    hash = "sha256-ID0PtTV+++baTbbaYoaB4lJvFxhW4m9gWeOB11xuY34=";
   };
 
-  cargoHash = "sha256-s2/8z/v+bQISwaQdl6nOocMK0M173eSVw1yC3mCzp9k=";
+  cargoHash = "sha256-EUIpv4CaxYTfDdXCpb8BMBGGAI6o4lY2aqY30uJquFA=";
 
   cargoBuildFlags = [
     "--bin=rumdl"

From c44f63784d7108144fe800278f343964c43f0650 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 16:00:44 +0000
Subject: [PATCH 64/97] python3Packages.qcelemental: 0.50.0rc3 -> 0.50.1

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

diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix
index 4cd63dd9c6b7..fd47af85989b 100644
--- a/pkgs/development/python-modules/qcelemental/default.nix
+++ b/pkgs/development/python-modules/qcelemental/default.nix
@@ -19,12 +19,12 @@
 
 buildPythonPackage rec {
   pname = "qcelemental";
-  version = "0.50.0rc3";
+  version = "0.50.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-caQmd7zoDzyd4YT9c5J/7oz2eEbhWpirgZHcnOTwz7k=";
+    hash = "sha256-QELCSkpSYxd/Hbhz2ln572l/P8TZvUg8zsv7fZBFNUk=";
   };
 
   build-system = [

From 44ff0600f26a4ce02f3d50b50eeead7ee0c86feb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 16:14:01 +0000
Subject: [PATCH 65/97] prometheus-opnsense-exporter: 0.0.15 -> 0.0.16

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

diff --git a/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix b/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix
index 36edb7161b4a..fde2a1178185 100644
--- a/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "prometheus-opnsense-exporter";
-  version = "0.0.15";
+  version = "0.0.16";
 
   src = fetchFromGitHub {
     owner = "AthennaMind";
     repo = "opnsense-exporter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CvEnW0IQ7VyrPBRmwUHWcJy7nfQB7iDacUOw+QCnRo8=";
+    hash = "sha256-oAQm2bxcDQfqTdtVtot1Dk2MkFqG5wVxeERie5DRoOQ=";
   };
 
   ldflags = [

From 5f904917237e7c7da53d7ef9d9cbb53ba8f20cab Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 27 May 2026 16:26:42 +0000
Subject: [PATCH 66/97] mistral-vibe: 2.11.0 -> 2.11.1

Diff: https://github.com/mistralai/mistral-vibe/compare/v2.11.0...v2.11.1

Changelog: https://github.com/mistralai/mistral-vibe/blob/v2.11.1/CHANGELOG.md
---
 pkgs/by-name/mi/mistral-vibe/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix
index f29d326ddb85..d9e96df5b6b4 100644
--- a/pkgs/by-name/mi/mistral-vibe/package.nix
+++ b/pkgs/by-name/mi/mistral-vibe/package.nix
@@ -28,7 +28,7 @@ let
 in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mistral-vibe";
-  version = "2.11.0";
+  version = "2.11.1";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "mistralai";
     repo = "mistral-vibe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s0mgWOKO+kKwJivnZw2IJRhGRET000ApvuhK6OovIIw=";
+    hash = "sha256-7JVX2FmAJi9h6a3p4+X1Kpn0lrKAmNR1Vmr9i4N6Sl8=";
   };
 
   build-system = with python3Packages; [

From 7d921ccb348b80191ead9783b2fb85834c3e0a95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 17:16:24 +0000
Subject: [PATCH 67/97] python3Packages.paddlex: 3.5.2 -> 3.6.1

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

diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix
index d4b6ad23d11b..c9b2b304b5df 100644
--- a/pkgs/development/python-modules/paddlex/default.nix
+++ b/pkgs/development/python-modules/paddlex/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "paddlex";
-  version = "3.5.2";
+  version = "3.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PaddlePaddle";
     repo = "PaddleX";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q6JVv+7HC/HtEK/LgKhld29tMrk0KY+h9c5VGDfHyvE=";
+    hash = "sha256-GKYymu7+rgD+cpWb7P+/dJlbONepsZJu4XyFYFH3olU=";
   };
 
   build-system = [

From cdb15d6b9f1a7614feec27f847e5a93eb1c2c247 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 21 Apr 2026 08:44:19 -0500
Subject: [PATCH 68/97] drbd: migrate to by-name

linuxPackages.drbd: migrate to by-name
---
 pkgs/{os-specific/linux => by-name/dr}/drbd/driver.nix          | 0
 .../linux/drbd/utils.nix => by-name/dr/drbd/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 pkgs/top-level/linux-kernels.nix                                | 2 +-
 4 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{os-specific/linux => by-name/dr}/drbd/driver.nix (100%)
 rename pkgs/{os-specific/linux/drbd/utils.nix => by-name/dr/drbd/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/by-name/dr/drbd/driver.nix
similarity index 100%
rename from pkgs/os-specific/linux/drbd/driver.nix
rename to pkgs/by-name/dr/drbd/driver.nix
diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/by-name/dr/drbd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/drbd/utils.nix
rename to pkgs/by-name/dr/drbd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af50d8cea080..4f2b40617728 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8278,8 +8278,6 @@ with pkgs;
 
   dmraid = callPackage ../os-specific/linux/dmraid { lvm2 = lvm2_dmeventd; };
 
-  drbd = callPackage ../os-specific/linux/drbd/utils.nix { };
-
   # unstable until the first 1.x release
   fwts = callPackage ../os-specific/linux/fwts { };
 
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index fe8ebd43504f..1c674c91fda0 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -619,7 +619,7 @@ in
 
         hpuefi-mod = callPackage ../os-specific/linux/hpuefi-mod { };
 
-        drbd = callPackage ../os-specific/linux/drbd/driver.nix { };
+        drbd = callPackage ../by-name/dr/drbd/driver.nix { };
 
         nullfsvfs = callPackage ../os-specific/linux/nullfsvfs { };
 

From 505e8321d8e11970b06bc3ea3759ae5e0286cc96 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Wed, 27 May 2026 15:11:18 +0200
Subject: [PATCH 69/97] github-runner: Disable node20 runtime by default

Node.js 20 is now EOL, see https://github.com/NixOS/nixpkgs/issues/515284
Remove it from the default list of runtimes, but keep the support around
as long as upstream supports it.
---
 .../services/continuous-integration/github-runner/options.nix   | 1 -
 pkgs/by-name/gi/github-runner/package.nix                       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix
index 23436c2adf71..e571a96ccb86 100644
--- a/nixos/modules/services/continuous-integration/github-runner/options.nix
+++ b/nixos/modules/services/continuous-integration/github-runner/options.nix
@@ -289,7 +289,6 @@
                   "node24"
                 ]);
               default = [
-                "node20"
                 "node24"
               ];
               description = ''
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 6999b71a8a44..c38f27abb913 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -17,7 +17,7 @@
   runtimeShell,
   # List of Node.js runtimes the package should support
   nodeRuntimes ? [
-    "node20"
+    # Node.js 20.x has reached EOL and is marked as insecure in Nixpkgs, thus omitted here
     "node24"
   ],
   nodejs_20,

From 063bacf73dd6bc704a013d69bad8e9447e11fd0e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 27 May 2026 18:16:44 +0000
Subject: [PATCH 70/97] python3Packages.openai-whisper: cleanup

---
 .../python-modules/openai-whisper/default.nix            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix
index b15bcefd1503..0fa011ac0a75 100644
--- a/pkgs/development/python-modules/openai-whisper/default.nix
+++ b/pkgs/development/python-modules/openai-whisper/default.nix
@@ -26,15 +26,16 @@
   writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "whisper";
   version = "20250625";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "whisper";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Zn2HUCor1eCJBP7q0vpffqhw5SNguz8zCGoPgdt6P+c=";
   };
 
@@ -76,11 +77,11 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/openai/whisper/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/openai/whisper/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "General-purpose speech recognition model";
     mainProgram = "whisper";
     homepage = "https://github.com/openai/whisper";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ MayNiklas ];
   };
-}
+})

From 677e97015aab4501a7544b79c37647ece54d5673 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 18:24:20 +0000
Subject: [PATCH 71/97] zwave-js-ui: 11.18.0 -> 11.19.0

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

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index 2c3c99413f41..392c809c3202 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.18.0";
+  version = "11.19.0";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-qQdfU4jOPaHVA9ropmLapS17ng1PDZpAZdhfBTsOPec=";
+    hash = "sha256-hn5Y5ADAybwSK5hv3J7qlyjPztD6QRB4oq9JTuLg9Vk=";
   };
-  npmDepsHash = "sha256-i9qb/QwqgYfIUh2Nn5yYLRqq0ioVE+g+vt7sSNvnws8=";
+  npmDepsHash = "sha256-hHalQUYj2T6AnxU0/EcbobY5UxgwvaS2NAy95FASTCk=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

From 5eebcdb3e13be8ddc4fcbbb80e0b0d9422883279 Mon Sep 17 00:00:00 2001
From: Malix - Alix Brunet <alixbrunetcontact@gmail.com>
Date: Wed, 27 May 2026 20:21:14 +0200
Subject: [PATCH 72/97] treewide: update nix-darwin link

---
 .github/ISSUE_TEMPLATE/02_bug_report_darwin.yml  | 2 +-
 doc/packages/darwin-builder.section.md           | 2 +-
 nixos/doc/manual/development/modular-services.md | 2 +-
 pkgs/by-name/fi/fish/package.nix                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
index ee55ec060aa1..8f3eef22f07f 100644
--- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
+++ b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
@@ -100,7 +100,7 @@ body:
     attributes:
       label: "Are you using nix-darwin?"
       description: |
-        [`nix-darwin`](https://github.com/LnL7/nix-darwin) is a set of NixOS-like modules for macOS systems. Depending on your issue, this information may be relevant.
+        [`nix-darwin`](https://github.com/nix-darwin/nix-darwin) is a set of NixOS-like modules for macOS systems. Depending on your issue, this information may be relevant.
       options:
         - "Yes, I am using nix-darwin."
         - "No, I am not using nix-darwin."
diff --git a/doc/packages/darwin-builder.section.md b/doc/packages/darwin-builder.section.md
index da46e0ee8f7d..6dc598fbcc88 100644
--- a/doc/packages/darwin-builder.section.md
+++ b/doc/packages/darwin-builder.section.md
@@ -89,7 +89,7 @@ Note that if the builder is running and you have created the above ssh conf file
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
-    darwin.url = "github:lnl7/nix-darwin/master";
+    darwin.url = "github:nix-darwin/nix-darwin/master";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
   };
 
diff --git a/nixos/doc/manual/development/modular-services.md b/nixos/doc/manual/development/modular-services.md
index c616b51fa933..1fd1fbcfc5ef 100644
--- a/nixos/doc/manual/development/modular-services.md
+++ b/nixos/doc/manual/development/modular-services.md
@@ -6,7 +6,7 @@ Status: in development. This functionality is new in NixOS 25.11, and significan
 Traditionally, NixOS services were defined using sets of options *in* modules, not *as* modules. This made them non-modular, resulting in problems with composability, reuse, and portability.
 
 A configuration management framework is an application of `evalModules` with the `class` and `specialArgs` input attribute set to particular values.
-NixOS is such a configuration management framework, and so are [Home Manager](https://github.com/nix-community/home-manager) and [`nix-darwin`](https://github.com/lnl7/nix-darwin).
+NixOS is such a configuration management framework, and so are [Home Manager](https://github.com/nix-community/home-manager) and [`nix-darwin`](https://github.com/nix-darwin/nix-darwin).
 
 The service management component of a configuration management framework is the set of module options that connects Nix expressions with the underlying service (or process) manager.
 For NixOS this is the module wrapping [`systemd`](https://systemd.io/), on `nix-darwin` this is the module wrapping [`launchd`](https://en.wikipedia.org/wiki/Launchd).
diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index b4dcdc21337b..a991b9b5683c 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -185,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: {
     #
     # See:
     #
-    # * <https://github.com/LnL7/nix-darwin/issues/122>
+    # * <https://github.com/nix-darwin/nix-darwin/issues/122>
     # * <https://github.com/fish-shell/fish-shell/issues/7142>
     ./nix-darwin-path.patch
 

From c608b346a0a15108e2b901a68c6a61bbb138eb35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 18:32:59 +0000
Subject: [PATCH 73/97] python3Packages.cloup: 3.0.9 -> 3.1.0

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

diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix
index 5944b23fca21..7770ae9a70ef 100644
--- a/pkgs/development/python-modules/cloup/default.nix
+++ b/pkgs/development/python-modules/cloup/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "cloup";
-  version = "3.0.9";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UZ9STTxkBA5JoIZrX8C/1q8+rA09aksrULM6sCR9stc=";
+    hash = "sha256-Y3weYo/pjz8gpeRNpZGnK0K/VNfUUnGQvzntX2SvdYU=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From b27ee09e7d0dc21a216ccdb0a866619046e3e993 Mon Sep 17 00:00:00 2001
From: Thorsten Weber <cpt.chaos83@googlemail.com>
Date: Wed, 27 May 2026 20:35:18 +0200
Subject: [PATCH 74/97] libredwg: 0.13.4 -> 0.13.4.8200

Update to latest pre-release to fix multiple security vulnerabilities:

- CVE-2026-9500: heap-buffer-overflow in decode.c (decompress_R2004_section)
- CVE-2026-9501: heap-buffer-overflow in decode.c (read_2004_compressed_section)
- CVE-2026-9502: heap-buffer-overflow in decode.c (decompress_R2004_section)
- CVE-2026-9503: heap-buffer-overflow in decode.c (decompress_R2004_section)
- CVE-2026-9504: null pointer dereference in dwggrep.c (main)
- CVE-2026-9529: heap-buffer-overflow in decode.c (decompress_R2004_section)
- CVE-2026-9530: heap-buffer-overflow in decode.c (decompress_R2004_section)
- CVE-2026-9605: heap-buffer-overflow in decode.c (decompress_R2004_section)

Individual backports were not feasible as the decompressor was significantly
refactored on upstream's main branch between 0.13.4 and the fixes.
---
 pkgs/by-name/li/libredwg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libredwg/package.nix b/pkgs/by-name/li/libredwg/package.nix
index 3f79fd9f2722..bccfc12f072d 100644
--- a/pkgs/by-name/li/libredwg/package.nix
+++ b/pkgs/by-name/li/libredwg/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libredwg";
-  version = "0.13.4";
+  version = "0.13.4.8200";
 
   src = fetchFromGitHub {
     owner = "LibreDWG";
     repo = "libredwg";
     tag = finalAttrs.version;
-    hash = "sha256-FeDQCByFGKfHJDOPQA92GslXZ33nhGfB6/63t2TeugE=";
+    hash = "sha256-HaQvJyuEeaTfuUJbmlV4qcfXiLdHJ2vO4EGInwAKJYk=";
     fetchSubmodules = true;
   };
 

From 38a3008d08b7991edadf8c12404c97d049a48573 Mon Sep 17 00:00:00 2001
From: Skye Soss <skye@soss.website>
Date: Sun, 17 May 2026 22:56:55 -0500
Subject: [PATCH 75/97] dnsi: init at 0.2.0

---
 pkgs/by-name/dn/dnsi/package.nix | 37 ++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/dn/dnsi/package.nix

diff --git a/pkgs/by-name/dn/dnsi/package.nix b/pkgs/by-name/dn/dnsi/package.nix
new file mode 100644
index 000000000000..1779c0c4f051
--- /dev/null
+++ b/pkgs/by-name/dn/dnsi/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dnsi";
+  version = "0.2.0";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "NLnetLabs";
+    repo = "dnsi";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HWYn3IHUoH3248ZGCU9JKO3BALZqxiaNX1Q2+bHjw0A=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  cargoHash = "sha256-uIW7EDL2ulg6qDizjw5iHtc5HqyEZDBoXJxWHZOmoqo=";
+
+  postInstall = ''
+    installManPage doc/*.1
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Command line tool to investigate the Domain Name System";
+    mainProgram = "dnsi";
+    homepage = "https://nlnetlabs.nl/projects/domain/dnsi/";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.skyesoss ];
+  };
+})

From c2d4a104caea4fca5f879796c568bb28a8f945db Mon Sep 17 00:00:00 2001
From: Skye Soss <skye@soss.website>
Date: Sun, 17 May 2026 23:06:06 -0500
Subject: [PATCH 76/97] dnst: init at 0.2.0-alpha2

---
 pkgs/by-name/dn/dnst/package.nix | 51 ++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/dn/dnst/package.nix

diff --git a/pkgs/by-name/dn/dnst/package.nix b/pkgs/by-name/dn/dnst/package.nix
new file mode 100644
index 000000000000..1d14757abe54
--- /dev/null
+++ b/pkgs/by-name/dn/dnst/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  openssl,
+  installShellFiles,
+  makeWrapper,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dnst";
+  version = "0.2.0-alpha2";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "NLnetLabs";
+    repo = "dnst";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-OpyOnBddbIdnJLchY5y2oMqK5JSXCTF8cC5KstJ7pnc=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+    makeWrapper
+  ];
+  buildInputs = [ openssl ];
+
+  cargoHash = "sha256-y048tMh5wBjAB7I8FK3pETn0j9S/h893JZb9sbOBdbo=";
+
+  postInstall = ''
+    mkdir -p $out/libexec
+    mv $out/bin/ldns $out/libexec
+    for tool in key2ds keygen notify nsec3-hash signzone; do
+      makeWrapper $out/libexec/ldns $out/bin/ldns-$tool --add-flag ldns-$tool
+    done
+
+    installManPage doc/manual/build/man/*.1
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Toolset to assist DNS operators with zone and nameserver maintenance";
+    mainProgram = "dnst";
+    homepage = "https://nlnetlabs.nl/projects/domain/dnst/";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.skyesoss ];
+  };
+})

From de8720477e1078c45f71bb98346dae24884062ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 18:56:44 +0000
Subject: [PATCH 77/97] terraform-providers.hashicorp_google: 7.32.0 -> 7.33.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2d9972961ee1..bc9d866bde6a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -580,13 +580,13 @@
     "vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU="
   },
   "hashicorp_google": {
-    "hash": "sha256-EXE9etM8gPdrWriF2HJmD5QZY9tDU8dgsusqnvupnKI=",
+    "hash": "sha256-Aj6eAquHfntl2682UedJ4b6DNPuGr+4aeNo++L76mEA=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v7.32.0",
+    "rev": "v7.33.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-xCWhCYD+YKyEB55uMm2p+eCtSlg65nSfGFMlX0qIiMQ="
+    "vendorHash": "sha256-qSiOXUfoNaG2+Fu7QvP9uafZp0CMvJJBzaKluCf1g+4="
   },
   "hashicorp_google-beta": {
     "hash": "sha256-EpXR8MOvW6S8XhaKvRQ3BOgdvLmv2WrVLaOvu60eE60=",

From 6f917118f8bc358659ce8e5d9fce17f0812bafc4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 27 May 2026 20:58:36 +0200
Subject: [PATCH 78/97] pretix: 2026.4.1 -> 2026.4.2

https://pretix.eu/about/en/blog/20260527-release-2026-4-2/
https://github.com/pretix/pretix/compare/v2026.4.1...v2026.4.2

Fixes: CVE-2026-9712
---
 pkgs/by-name/pr/pretix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index b0cd94ad313b..9cd89e0d4528 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -51,13 +51,13 @@ let
   };
 
   pname = "pretix";
-  version = "2026.4.1";
+  version = "2026.4.2";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     tag = "v${version}";
-    hash = "sha256-afqhPiTg1g2rnJOl8yFYq/p2/fIxpfTp/3jbTXpiRZQ=";
+    hash = "sha256-OECVdtPnr7qqLriPZWOyRm6ZqU8yO+SYzU69zaO+9rU=";
   };
 
   npmDeps = buildNpmPackage {

From 8a6342311999d8d62c3ec7244baa7d139872eb4a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 27 May 2026 15:10:44 -0400
Subject: [PATCH 79/97] beamMinimal27Packages.erlang: fix build failure from
 ignored DOC_TARGETS

Assisted-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 pkgs/development/interpreters/erlang/generic-builder.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 646bf961f038..0e9e7f645289 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -114,6 +114,11 @@ stdenv.mkDerivation {
   # disksup requires a shell
   postPatch = ''
     substituteInPlace lib/os_mon/src/disksup.erl --replace-fail '"sh ' '"${runtimeShell} '
+  ''
+  # https://github.com/erlang/otp/issues/11151
+  + lib.optionalString (!wxSupport && major == "27") ''
+    substituteInPlace lib/wx/doc/Makefile \
+      --replace-fail $'ifneq ($(CAN_BUILD_DRIVER), true)\nDOC_TARGETS=\nendif\n' ""
   '';
 
   debugInfo = enableDebugInfo;

From da7bb00e34ff61cdbee0bbded8da9fa54de08a3c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 27 May 2026 21:24:45 +0200
Subject: [PATCH 80/97] python3Packages.cloup: modernize

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

diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix
index 7770ae9a70ef..3c932709ae66 100644
--- a/pkgs/development/python-modules/cloup/default.nix
+++ b/pkgs/development/python-modules/cloup/default.nix
@@ -7,19 +7,19 @@
   setuptools-scm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cloup";
   version = "3.1.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Y3weYo/pjz8gpeRNpZGnK0K/VNfUUnGQvzntX2SvdYU=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [ click ];
+  dependencies = [ click ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -28,11 +28,12 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/janLuke/cloup";
     description = "Click extended with option groups, constraints, aliases, help themes";
-    changelog = "https://github.com/janluke/cloup/releases/tag/v${version}";
+    changelog = "https://github.com/janluke/cloup/releases/tag/v${finalAttrs.version}";
     longDescription = ''
-      Enriches Click with option groups, constraints, command aliases, help sections for subcommands, themes for --help and other stuff.
+      Enriches Click with option groups, constraints, command aliases, help sections for
+      subcommands, themes for --help and other stuff.
     '';
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})

From df2fdb2e93ed5a2709cb2962ec1515238bc51c13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 19:25:13 +0000
Subject: [PATCH 81/97] prometheus-pushgateway: 1.11.2 -> 1.11.3

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

diff --git a/pkgs/by-name/pr/prometheus-pushgateway/package.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
index 6a4fde312dfb..6ac732ad6d51 100644
--- a/pkgs/by-name/pr/prometheus-pushgateway/package.nix
+++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pushgateway";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "pushgateway";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Mc4yEd9CRfLZ4ZpcMnwQpoIXQpUerdxYD90FWRBzS20=";
+    sha256 = "sha256-qrXMKDV3BU5tZchWNj26l7Eh5Pxc+FZIV3AtLxV9TsM=";
   };
 
-  vendorHash = "sha256-O/Vgn3WC0ZzRy5L/m0qR970joGtqQWWlmethoHAypgY=";
+  vendorHash = "sha256-EjTjXNRsYSeu4Ze1D3ZAiuPcdIbtqYAzQRQxXMxj5ts=";
 
   ldflags = [
     "-s"

From 753ae7435d209ec525730a567678246737405b26 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 27 May 2026 21:44:59 +0200
Subject: [PATCH 82/97] evcc: 0.307.1 -> 0.307.2

https://github.com/evcc-io/evcc/releases/tag/0.307.2
---
 pkgs/by-name/ev/evcc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 4f0fb2d03d03..d5c47afcac89 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "0.307.1";
+  version = "0.307.2";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-ED+mRcnkerdPFjEhxH3fBr8GcH0geLVnjnejpNqNBdI=";
+    hash = "sha256-c9SbPF3JCngd4/j8lVS6lGTonj2qdIrTy34+WBsAk0I=";
   };
 
   vendorHash = "sha256-sOyx1Ev0UfoI6mOQAWide19Sg/MWJ8VUVftN9psNq5U=";

From f830e6112b4dbdb98cb7668cd291ea07ffc288e8 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 27 May 2026 12:47:02 -0700
Subject: [PATCH 83/97] rustPlatform.importCargoLock: download crates from
 static.crates.io

The crates.io API server's 1 req/sec rate limit currently surfaces as
intermittent HTTP 403 errors when vendoring lockfiles. Switch to the CDN
endpoint as recommended by upstream (rust-lang/crates.io#13482), mirroring
the fix already applied to fetchCargoVendor in #512735.

fetchurl is content-addressed by sha256, so the URL change does not affect
any downstream store paths.

Fixes #524979
---
 pkgs/build-support/rust/import-cargo-lock.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix
index 9c172c7842f8..e9ebedfe98a4 100644
--- a/pkgs/build-support/rust/import-cargo-lock.nix
+++ b/pkgs/build-support/rust/import-cargo-lock.nix
@@ -130,7 +130,10 @@ let
     };
 
   registries = {
-    "https://github.com/rust-lang/crates.io-index" = "https://crates.io/api/v1/crates";
+    # Use static.crates.io (CDN) instead of crates.io/api to avoid the 1 req/sec
+    # rate limit on the API servers, which currently returns intermittent 403s.
+    # See https://github.com/rust-lang/crates.io/issues/13482
+    "https://github.com/rust-lang/crates.io-index" = "https://static.crates.io/crates";
   }
   // extraRegistries;
 

From 52d14b80e511e181f0022739556fc071497b521c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 16:57:16 +0000
Subject: [PATCH 84/97] mydumper: 0.21.1-1 -> 1.0.1-1

---
 pkgs/by-name/my/mydumper/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix
index a90f076f3abf..8df8242fa52c 100644
--- a/pkgs/by-name/my/mydumper/package.nix
+++ b/pkgs/by-name/my/mydumper/package.nix
@@ -22,13 +22,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mydumper";
-  version = "0.21.1-1";
+  version = "1.0.1-1";
 
   src = fetchFromGitHub {
     owner = "mydumper";
     repo = "mydumper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6x0d1Ywgy6kkfDs3KsS6pRK0/3z9Ur7klO8xMTsoDPI=";
+    hash = "sha256-lYm5avkqX6QLq4zj+B1LivDeQMVVQgL4OcXgX0snuA0=";
     # as of mydumper v0.16.5-1, mydumper extracted its docs into a submodule
     fetchSubmodules = true;
   };
@@ -68,16 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
     "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql"
   ];
 
-  env.NIX_CFLAGS_COMPILE = (
-    if stdenv.hostPlatform.isDarwin then
-      toString [
-        "-Wno-error=format"
-        "-Wno-error=sometimes-uninitialized"
-      ]
-    else
-      "-Wno-error=maybe-uninitialized"
-  );
-
   postPatch = ''
     # as of mydumper v0.14.5-1, mydumper tries to install its config to /etc
     substituteInPlace CMakeLists.txt\

From 57076ba5390b6f7a06c142f62e829870d492f7cd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 27 May 2026 23:02:44 +0300
Subject: [PATCH 85/97] gamescope: 3.16.23 -> 3.16.24

---
 pkgs/by-name/ga/gamescope/package.nix        | 20 +++++----------
 pkgs/by-name/ga/gamescope/shaders-path.patch | 26 ++++++++++----------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 575250041433..4cf8e072e10b 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -47,6 +47,7 @@
   lcms,
   lib,
   luajit,
+  catch2_3,
   makeBinaryWrapper,
   nix-update-script,
   enableExecutable ? true,
@@ -62,14 +63,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gamescope";
-  version = "3.16.23";
+  version = "3.16.24";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "gamescope";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-q9AZTe6fBgJBt5/c3x8PVrnDF+MtRmQ1OWZq9ZsSe/M=";
+    hash = "sha256-+4jEQAUGKOFJkLUJHIz1hVx7kbt+wMhLcbboiz0PC/E=";
   };
 
   patches = [
@@ -85,14 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-O358ScIIndfkc1S0A8g2jKvFWoCzcXB/g6lRJamqOI4=";
     })
 
-    # Backport upstream patch for wlroots fixing build with libinput 1.31
-    (fetchpatch {
-      url = "https://github.com/misyltoad/wlroots/compare/54e844748029d4874e14d0c086d50092c04c8899...c08d99437ec8bb56a703f04ad1ef199502c62d10.diff";
-      stripLen = 1;
-      extraPrefix = "subprojects/wlroots/";
-      hash = "sha256-q2zekWNn111lX8N938y8HjREvlNMtdCLJ4RveX9z8u8=";
-    })
-
     # Pending upstream patch to support stb_image_resize2.h
     # See: https://github.com/ValveSoftware/gamescope/pull/2130
     (fetchpatch {
@@ -104,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
   # We can't substitute the patch itself because substituteAll is itself a derivation,
   # so `placeholder "out"` ends up pointing to the wrong place
   postPatch = ''
-    substituteInPlace src/reshade_effect_manager.cpp --replace-fail "@out@" "$out"
+    substituteInPlace src/Utils/DirHelpers.cpp --replace-fail "@out@" "$out"
 
     # Patching shebangs in the main `libdisplay-info` build
     patchShebangs subprojects/libdisplay-info/tool/gen-search-table.py
@@ -160,10 +153,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     wayland
     wayland-protocols
-    vulkan-loader
-  ]
-  ++ lib.optionals enableWsi [
     vulkan-headers
+    vulkan-loader
+    catch2_3
   ]
   ++ lib.optionals enableExecutable (
     wlroots_0_19.buildInputs
diff --git a/pkgs/by-name/ga/gamescope/shaders-path.patch b/pkgs/by-name/ga/gamescope/shaders-path.patch
index bbdaf21a2e6f..ac07a324a1d2 100644
--- a/pkgs/by-name/ga/gamescope/shaders-path.patch
+++ b/pkgs/by-name/ga/gamescope/shaders-path.patch
@@ -1,13 +1,13 @@
-diff --git a/src/reshade_effect_manager.cpp b/src/reshade_effect_manager.cpp
-index 3597ca1..de45250 100644
---- a/src/reshade_effect_manager.cpp
-+++ b/src/reshade_effect_manager.cpp
-@@ -34,7 +34,7 @@ static std::string GetLocalUsrDir()
-
- static std::string GetUsrDir()
- {
--    return "/usr";
-+    return "@out@";
- }
-
- static LogScope reshade_log("gamescope_reshade");
+diff --git a/src/Utils/DirHelpers.cpp b/src/Utils/DirHelpers.cpp
+index df0cf34..2b82176 100644
+--- a/src/Utils/DirHelpers.cpp
++++ b/src/Utils/DirHelpers.cpp
+@@ -25,7 +25,7 @@ namespace gamescope {
+ 
+     std::string GetUsrDir()
+     {
+-        return "/usr";
++        return "@out@";
+     }
+ 
+     std::string_view GetConfigDir()

From e99fa03fb72fffe217abf9bf90194df55751ea2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 21:07:44 +0000
Subject: [PATCH 86/97] ytsub: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/by-name/yt/ytsub/package.nix b/pkgs/by-name/yt/ytsub/package.nix
index 58ea052b356e..50e2a404f267 100644
--- a/pkgs/by-name/yt/ytsub/package.nix
+++ b/pkgs/by-name/yt/ytsub/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ytsub";
-  version = "0.9.0";
+  version = "0.10.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "sarowish";
     repo = "ytsub";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6qPNSkUAj11Rut/Wx724UsFdRLwZh2Z+ZC7837CeNeQ=";
+    hash = "sha256-CrYRQ+0WJ6VDG+Y4J0Wk22wcNb+0SxhRbzPJRXQNTjs=";
   };
 
-  cargoHash = "sha256-RHOG43LTI3K0VzEpGsdSKheL1fjIZ1TyB6FCgoInUm8=";
+  cargoHash = "sha256-8p2//37ATU9d3kMq0tM6Pr+wqbrfOh8Z4fxgwhU4rpA=";
 
   buildInputs = [ sqlite ];
 

From ba05b2e628bb964106f277c7c6c65229040aa4f4 Mon Sep 17 00:00:00 2001
From: Elliot Berman <eberman@anduril.com>
Date: Wed, 27 May 2026 14:16:55 -0700
Subject: [PATCH 87/97] dmidecode: add mainProgram attribute

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

diff --git a/pkgs/by-name/dm/dmidecode/package.nix b/pkgs/by-name/dm/dmidecode/package.nix
index c91077f5fb71..81fae125c9df 100644
--- a/pkgs/by-name/dm/dmidecode/package.nix
+++ b/pkgs/by-name/dm/dmidecode/package.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = [ ];
+    mainProgram = "dmidecode";
   };
 })

From 1baaf56394dbfc67c4c39694228bdbc21ff02f05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 21:18:21 +0000
Subject: [PATCH 88/97] python3Packages.llm-gemini: 0.31 -> 0.32

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

diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix
index be958bb5b333..2bacb0d7460b 100644
--- a/pkgs/development/python-modules/llm-gemini/default.nix
+++ b/pkgs/development/python-modules/llm-gemini/default.nix
@@ -15,14 +15,14 @@
 }:
 buildPythonPackage rec {
   pname = "llm-gemini";
-  version = "0.31";
+  version = "0.32";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-gemini";
     tag = version;
-    hash = "sha256-GEbn/7QWm+sxYHHfsXYwQwqw7aDk2NCUht1GMmDxEvk=";
+    hash = "sha256-h8aZvkZNDj7Vcc1HZ7mHVYk99Upoeazp0ET6yeRiySo=";
   };
 
   build-system = [ setuptools ];

From bc7100df6cf423be35cff1cda3d782fd413ef670 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 21:36:09 +0000
Subject: [PATCH 89/97] libretro.flycast: 0-unstable-2026-05-15 ->
 0-unstable-2026-05-22

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

diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index 5cff6401bbe1..57c9cd8c7f47 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2026-05-15";
+  version = "0-unstable-2026-05-22";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "3e60beb69e557287c704dc310f42286258d68a2b";
-    hash = "sha256-Ew3YjR92NnbvGoNFhSZSNNeSrMMWEeUAfnJSp6/tnIY=";
+    rev = "bb304918f8d9f1d2c1e80ccabfa86806ef70bcfa";
+    hash = "sha256-ZtPXCv1nte0Z39jvZremR9POSanz+MZbkzqFXtoZLqc=";
     fetchSubmodules = true;
   };
 

From 2c044ef431ad5794a6cc4ab1a3b7cbc46c679d5f Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 27 May 2026 17:45:54 -0400
Subject: [PATCH 90/97] google-chrome: 148.0.7778.178 -> 148.0.7778.215

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

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 9cd4d80d1cd5..9d4a2a7506e8 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -184,11 +184,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "148.0.7778.178";
+    version = "148.0.7778.215";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-3iuKxcuwt/+BIcUqC715hbeRLhUjepNU1GbB3daIokI=";
+      hash = "sha256-IyKMotjgwLJ9AKAl+gE86DWd0GCtQoBjvbbvBiYULSQ=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -302,11 +302,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "148.0.7778.179";
+    version = "148.0.7778.216";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/adxxii2zvsza6zjfnjbfh6fn4tqq_148.0.7778.179/GoogleChrome-148.0.7778.179.dmg";
-      hash = "sha256-QBHyF222wnaEmI79CQFOXQl5WkRNwneCYd/JFNMEEWU=";
+      url = "http://dl.google.com/release2/chrome/ac3wy6ujyaf3yzk7hqzmyw4nopha_148.0.7778.216/GoogleChrome-148.0.7778.216.dmg";
+      hash = "sha256-NauJr7eRVb5q1s38WXijxBAhJ2RryfrrlBc9oBg5HH4=";
     };
 
     dontPatch = true;

From 3b0e4f9cbdbddc848cab70d0849dc7c9e3dcef51 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 27 May 2026 17:50:52 -0400
Subject: [PATCH 91/97] gh: 2.92.0 -> 2.93.0

Diff: https://github.com/cli/cli/compare/v2.92.0...v2.93.0

Changelog: https://github.com/cli/cli/releases/tag/v2.93.0
---
 pkgs/by-name/gh/gh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 040823be21be..75907d8c9ea5 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -10,7 +10,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "gh";
-  version = "2.92.0";
+  version = "2.93.0";
 
   __structuredAttrs = true;
 
@@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
     owner = "cli";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/7EiX4ZZPhSNgY/D5OVOako/c0ujHq05GMj3UB11bqQ=";
+    hash = "sha256-r/+JFdMOUIb32St+VkUw+Q7Lb2L6IiPczmONFE4hwDw=";
   };
 
-  vendorHash = "sha256-pBLRCIRjN3VoXbTFSq+R9/N3uAUCEjvPtk8LKKKS51s=";
+  vendorHash = "sha256-eMPcla1XKfq+zBb633Zz4cn820FWuEaRrXQJ1TQ8Lkg=";
 
   nativeBuildInputs = [
     installShellFiles

From 99cfc03f72efe65b07a1ce1dd548d05fc202a91a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 27 May 2026 21:52:09 +0000
Subject: [PATCH 92/97] python3Packages.speechrecognition: cleanup, fix on
 darwin

---
 .../speechrecognition/default.nix             | 56 +++++++++++++------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix
index 5b4fa1d28b36..cb82eeea2a30 100644
--- a/pkgs/development/python-modules/speechrecognition/default.nix
+++ b/pkgs/development/python-modules/speechrecognition/default.nix
@@ -2,31 +2,49 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  cacert,
-  cohere,
-  faster-whisper,
+
   flac,
-  google-cloud-speech,
-  groq,
-  httpx,
-  openai-whisper,
-  openai,
-  pocketsphinx,
-  pyaudio,
-  pytest-httpserver,
-  pytestCheckHook,
-  requests,
-  respx,
+
+  # build-system
   setuptools,
-  soundfile,
+
+  # dependencies
   standard-aifc,
   typing-extensions,
+
+  # optional-dependencies
+  # assemblyai
+  requests,
+  # audio
+  pyaudio,
+  # cohere
+  cohere,
+  # faster-whisper
+  faster-whisper,
+  # google-cloud
+  google-cloud-speech,
+  # grok
+  groq,
+  httpx,
+  # openai
+  openai,
+  # pocketsphinx
+  pocketsphinx,
+  # whisper-local
+  openai-whisper,
+  soundfile,
+
+  # tests
+  pytest-httpserver,
+  pytestCheckHook,
+  respx,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "speechrecognition";
   version = "3.16.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Uberi";
@@ -35,8 +53,8 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-5BTwUzo2U7/VwmEqldxXddt/ByKebZKY1KhCEoIb9F8=";
   };
 
+  # Remove Bundled binaries
   postPatch = ''
-    # Remove Bundled binaries
     rm speech_recognition/flac-*
     rm -r third-party
 
@@ -75,12 +93,12 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     groq
+    pocketsphinx
     pytest-httpserver
     pytestCheckHook
-    pocketsphinx
     respx
   ]
-  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
   pythonImportsCheck = [ "speech_recognition" ];
 
@@ -94,6 +112,8 @@ buildPythonPackage (finalAttrs: {
     "tests/recognizers/test_vosk.py"
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Speech recognition module for Python, supporting several engines and APIs, online and offline";
     homepage = "https://github.com/Uberi/speech_recognition";

From 28dfeb7daf28059c6e1d79914ee516f5cbfc7875 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 27 May 2026 21:54:41 +0000
Subject: [PATCH 93/97] mistral-vibe: 2.11.1 -> 2.12.1

Diff: https://github.com/mistralai/mistral-vibe/compare/v2.11.1...v2.12.1

Changelog: https://github.com/mistralai/mistral-vibe/blob/v2.12.1/CHANGELOG.md
---
 pkgs/by-name/mi/mistral-vibe/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix
index d9e96df5b6b4..3c8025e22034 100644
--- a/pkgs/by-name/mi/mistral-vibe/package.nix
+++ b/pkgs/by-name/mi/mistral-vibe/package.nix
@@ -28,7 +28,7 @@ let
 in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mistral-vibe";
-  version = "2.11.1";
+  version = "2.12.1";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "mistralai";
     repo = "mistral-vibe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7JVX2FmAJi9h6a3p4+X1Kpn0lrKAmNR1Vmr9i4N6Sl8=";
+    hash = "sha256-aMh1gVTsK8rDe9DVGjFci40OizCln4lDKCN/Vz+6vAs=";
   };
 
   build-system = with python3Packages; [

From 0fe11f170a70bab16bf743db485dd11f78abb9a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 22:00:15 +0000
Subject: [PATCH 94/97] lux-cli: 0.29.2 -> 0.30.1

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

diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index 9d242d59460f..ecc9c31e0886 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lux-cli";
 
-  version = "0.29.2";
+  version = "0.30.1";
 
   src = fetchFromGitHub {
     owner = "lumen-oss";
     repo = "lux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x1sq83rtY3oiL6h4MO6GSyAItj7CX5/25DwXMhXefAU=";
+    hash = "sha256-sp1lNdPJuHfXvq3TYdQ7MJCZVpL8EyJEN9K/u7hnkYg=";
   };
 
   buildAndTestSubdir = "lux-cli";
 
-  cargoHash = "sha256-Z9WC14DMK13UCWDm1nGpN9UXY9wpFJkB21nkI2y77bw=";
+  cargoHash = "sha256-RqHONrfNwnOwuri0LmViFfJThiwLWqyA9eEBrdsYWrc=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From b6b31116d8f6054f9771c9bc2f00d679ff2aade1 Mon Sep 17 00:00:00 2001
From: Cass <44643640+cxandru@users.noreply.github.com>
Date: Wed, 27 May 2026 16:12:14 +0200
Subject: [PATCH 95/97] zoom-us: add libxcb-util to FHS dependencies

Fixes #524832
---
 pkgs/by-name/zo/zoom-us/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 607fd14740d6..c22987044c21 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -197,8 +197,9 @@ let
       pkgs.libxrandr
       pkgs.libxrender
       pkgs.libxtst
-      pkgs.libxcb
       pkgs.libxshmfence
+      pkgs.libxcb
+      pkgs.libxcb-util
       pkgs.libxcb-cursor
       pkgs.libxcb-image
       pkgs.libxcb-keysyms

From 50ddfa179db462f9a19e2fc8cda3b2a19783a5f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 23:03:13 +0000
Subject: [PATCH 96/97] terraform-providers.baidubce_baiducloud: 1.23.1 ->
 1.23.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2d9972961ee1..e943889b65a5 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -101,11 +101,11 @@
     "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
   },
   "baidubce_baiducloud": {
-    "hash": "sha256-MsnOxJ9FlX+rh7BGL1FkOVDfdPqwPZFDc4YeU33mqCE=",
+    "hash": "sha256-+doYnLRuseR5YtqMJeoxJtnb0UGBx+UgZ7S1sOLiF68=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.23.1",
+    "rev": "v1.23.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From be57cfbe2be4572acd24df73eb6a743023c22f41 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 27 May 2026 19:57:06 -0400
Subject: [PATCH 97/97] opentofu: 1.12.0 -> 1.12.1

Diff: https://github.com/opentofu/opentofu/compare/v1.12.0...v1.12.1

Changelog: https://github.com/opentofu/opentofu/blob/v1.12.1/CHANGELOG.md
---
 pkgs/by-name/op/opentofu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix
index 22afac3969d4..bb65a9ea549a 100644
--- a/pkgs/by-name/op/opentofu/package.nix
+++ b/pkgs/by-name/op/opentofu/package.nix
@@ -16,16 +16,16 @@
 let
   package = buildGoModule rec {
     pname = "opentofu";
-    version = "1.12.0";
+    version = "1.12.1";
 
     src = fetchFromGitHub {
       owner = "opentofu";
       repo = "opentofu";
       tag = "v${version}";
-      hash = "sha256-ciT5GOeL+09dnwdrRpFQBAhWVvpSBQQjJKJvNdVqjCw=";
+      hash = "sha256-zD1oYHftqBrHGgF8QDHe+2VSfuKLi8ZhocD+0pL9mlI=";
     };
 
-    vendorHash = "sha256-ZcsZv4MLcrVUNoK/NewfwDWUpMdgxO/f2DkyTjUqCK4=";
+    vendorHash = "sha256-fsAdTkCU1C6iCKMRc+NRKqfHJ5FczUISfO+g4wGnMJw=";
     ldflags = [
       "-s"
       "-w"