From f5aec270fb433ea953c60e571da8ae691c5bd69e Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@mattmoriarity.com>
Date: Sun, 20 Jul 2025 08:50:41 -0600
Subject: [PATCH 01/93] igir: add mjm as maintainer

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

diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix
index 38bf62bf443c..5e089d33b562 100644
--- a/pkgs/by-name/ig/igir/package.nix
+++ b/pkgs/by-name/ig/igir/package.nix
@@ -41,7 +41,7 @@ buildNpmPackage rec {
     homepage = "https://igir.io";
     changelog = "https://github.com/emmercm/igir/releases/tag/${src.rev}";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ mjm ];
     platforms = platforms.linux;
   };
 }

From 1e3e107fb7df82a6c00e9cb929fdf1cfc1853af6 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 28 Apr 2025 19:38:23 +0200
Subject: [PATCH 02/93] electron-fiddle: 0.36.6 -> 0.36.6-unstable-2025-07-17,
 bump electron

---
 pkgs/by-name/el/electron-fiddle/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/el/electron-fiddle/package.nix b/pkgs/by-name/el/electron-fiddle/package.nix
index 0848072bc5eb..43e2699a7c6d 100644
--- a/pkgs/by-name/el/electron-fiddle/package.nix
+++ b/pkgs/by-name/el/electron-fiddle/package.nix
@@ -1,13 +1,13 @@
 {
   buildFHSEnv,
-  electron_33,
+  electron_36,
   fetchFromGitHub,
   fetchYarnDeps,
   fetchurl,
   git,
   lib,
   makeDesktopItem,
-  nodejs_20,
+  nodejs,
   stdenvNoCC,
   util-linux,
   yarnBuildHook,
@@ -17,17 +17,17 @@
 
 let
   pname = "electron-fiddle";
-  version = "0.36.5";
-  electron = electron_33;
-  nodejs = nodejs_20;
+  version = "0.36.5-unstable-2025-07-17";
 
   src = fetchFromGitHub {
     owner = "electron";
     repo = "fiddle";
-    tag = "v${version}";
-    hash = "sha256-Fo7rXnufJ26WijnplWswdeCGJitkvTDboOggUfrz1Hw=";
+    rev = "0f3cd3007a336562a3c49ce95469022e6a729121"; # a revision that uses electron_36 instead of electron_33
+    hash = "sha256-1q8bDpEPrQNbngrGZj6/AQFFo06ED6uJ4Z/XVg6KNXw=";
   };
 
+  electron = electron_36;
+
   # As of https://github.com/electron/fiddle/pull/1316 this is fetched
   # from the network and has no stable hash.  Grab an old version from
   # the repository.
@@ -42,7 +42,7 @@ let
 
     offlineCache = fetchYarnDeps {
       yarnLock = "${src}/yarn.lock";
-      hash = "sha256-eZ/g2cP6M0zWhF14go0sIC+UuzTo9Gl4KsPBGzJU3FQ=";
+      hash = "sha256-n6rzi4VohVaX+IIE1NITDsxXGyw0Z6Fx1WJb15YT9Sg=";
     };
 
     nativeBuildInputs = [

From 1e20a5082396cace9e9beca3adbe60347b18b00f Mon Sep 17 00:00:00 2001
From: guilherme-n-l <acc.guilhermenl@gmail.com>
Date: Wed, 23 Jul 2025 14:02:59 -0300
Subject: [PATCH 03/93] maintainers: add guilhermenl

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 84c9a040d1ae..ef48cac1d29a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9640,6 +9640,12 @@
     githubId = 9705357;
     name = "Guillaume Bouchard";
   };
+  guilhermenl = {
+    email = "acc.guilhermenl@gmail.com";
+    github = "guilherme-n-l";
+    githubId = 95086304;
+    name = "Guilherme Lima";
+  };
   GuillaumeDesforges = {
     email = "aceus02@gmail.com";
     github = "GuillaumeDesforges";

From 05c9cbdbc5d7f338b2327a0ce9c6d3aa82a4efbb Mon Sep 17 00:00:00 2001
From: guilherme-n-l <acc.guilhermenl@gmail.com>
Date: Wed, 23 Jul 2025 14:03:21 -0300
Subject: [PATCH 04/93] xdcc-cli: init at 0.1.0

xdcc-cli: parameter shortcuts + nix-update-script
---
 pkgs/by-name/xd/xdcc-cli/package.nix | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/xd/xdcc-cli/package.nix

diff --git a/pkgs/by-name/xd/xdcc-cli/package.nix b/pkgs/by-name/xd/xdcc-cli/package.nix
new file mode 100644
index 000000000000..4997f9f44467
--- /dev/null
+++ b/pkgs/by-name/xd/xdcc-cli/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "xdcc-cli";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "jreiml";
+    repo = "xdcc-cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rPMerxQLB+/S3FtM4e5lCk0yAOUtWRhA8debwxbqmNI=";
+  };
+
+  cargoHash = "sha256-qAQkKGyLEUR4Pf5KVjqBsdyFxsgD/docRWKrQsf7KVo=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "CLI tool for downloading files using XDCC written in Rust";
+    homepage = "https://github.com/jreiml/xdcc-cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ guilhermenl ];
+    platforms = lib.platforms.unix;
+    mainProgram = "xdcc-cli";
+  };
+})

From d8fd3576e9c7c315228b712a2f89ad006e87d609 Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@mattmoriarity.com>
Date: Sun, 20 Jul 2025 08:51:15 -0600
Subject: [PATCH 05/93] igir: 2.11.0 -> 4.1.1

---
 pkgs/by-name/ig/igir/package.nix | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix
index 5e089d33b562..5c8a2ad74767 100644
--- a/pkgs/by-name/ig/igir/package.nix
+++ b/pkgs/by-name/ig/igir/package.nix
@@ -7,20 +7,27 @@
   # at lib/node_modules/igir/node_modules/7zip-bin/linux/x64/7za
   autoPatchelfHook,
   stdenv,
+
+  libusb1,
+  libuv,
+  libz,
+  lz4,
+  sdl2-compat,
+  systemd,
 }:
 
 buildNpmPackage rec {
   pname = "igir";
-  version = "2.11.0";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "emmercm";
     repo = "igir";
     rev = "v${version}";
-    hash = "sha256-NG0ZP8LOm7fZVecErTuLOfbp1yvXwHnwPkWTBzUJXWE=";
+    hash = "sha256-f/3XIBFMxSPwJpfZTBhuznU/psChfnQEwZASOoH4Ij0=";
   };
 
-  npmDepsHash = "sha256-ADIEzr6PkGaJz27GKSVyTsrbz5zbud7BUb+OXPtP1Vo=";
+  npmDepsHash = "sha256-qPyS2F5jt1C5SZxvRuyPX4+TkYZKTffcekanWtH82EY=";
 
   # I have no clue why I have to do this
   postPatch = ''
@@ -29,7 +36,15 @@ buildNpmPackage rec {
 
   nativeBuildInputs = [ autoPatchelfHook ];
 
-  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    libusb1
+    libuv
+    libz
+    lz4
+    sdl2-compat
+    systemd
+  ];
 
   # from lib/node_modules/igir/node_modules/@node-rs/crc32-linux-x64-musl/crc32.linux-x64-musl.node
   # Irrelevant to our use

From e26067cc621f74f3c1b25224b0afe3d799eb2dc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 10:25:26 +0000
Subject: [PATCH 06/93] python3Packages.xdis: 6.1.4 -> 6.1.5

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

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index ae87c83a9f6e..fbcc080390ae 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "xdis";
-  version = "6.1.4";
+  version = "6.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "rocky";
     repo = "python-xdis";
     tag = version;
-    hash = "sha256-thgHaxEEXmkrJlkl9kF6ocKRrnWOuESTxQrdtM+uH1o=";
+    hash = "sha256-KbWgA2RGmkzpsPBg2+hcpwHUCgEv7RWS3i5sswtROVE=";
   };
 
   build-system = [

From 7084774c15b902265bd0341aa5b469c1922468c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 10:38:34 +0000
Subject: [PATCH 07/93] python3Packages.msgraph-sdk: 1.38.0 -> 1.39.0

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

diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix
index 22472ccacea0..4ac8afea0c43 100644
--- a/pkgs/development/python-modules/msgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/msgraph-sdk/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "msgraph-sdk";
-  version = "1.38.0";
+  version = "1.39.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
     tag = "v${version}";
-    hash = "sha256-wHned9jggwEooSTtWc06bCE2WW15eAH1lvi3cbOUyJw=";
+    hash = "sha256-cT87lI28K7z4nSD35vqfroAtnZD/A0ECTNVz5vIG8R4=";
   };
 
   build-system = [ flit-core ];

From 0e4c2dedd6f62ff8cadf2573efe26e6d15dca6a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 10:57:09 +0000
Subject: [PATCH 08/93] ruffle: 0-nightly-2025-07-19 -> 0-nightly-2025-07-27

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

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index ac5f0dc1fa7c..adc2951d9443 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -21,16 +21,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0-nightly-2025-07-19";
+  version = "0-nightly-2025-07-27";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
     tag = lib.strings.removePrefix "0-" finalAttrs.version;
-    hash = "sha256-2EDKnuWE1VHsw7UkMCbmREVRsB1CgwrxnC1x2lvCi+0=";
+    hash = "sha256-t15htXX+j2xEtOgGiqcCjG5F/17DnqnvEx0dxL3DRw4=";
   };
 
-  cargoHash = "sha256-BRfljhOQ9X4LBQ14tLmd6M3N19nOMwk3AC02iclATm4=";
+  cargoHash = "sha256-xrlcn18ryK7PrR/KfBKN0ot+h06nj4cl2Gx4Dm1RyqU=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
   env =

From dcdb8fed6917b9f926b6a21ef3c20f915c95f3dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 11:51:52 +0000
Subject: [PATCH 09/93] brev-cli: 0.6.311 -> 0.6.312

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

diff --git a/pkgs/by-name/br/brev-cli/package.nix b/pkgs/by-name/br/brev-cli/package.nix
index 474f2266a878..1f0a6a6f3f81 100644
--- a/pkgs/by-name/br/brev-cli/package.nix
+++ b/pkgs/by-name/br/brev-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "brev-cli";
-  version = "0.6.311";
+  version = "0.6.312";
 
   src = fetchFromGitHub {
     owner = "brevdev";
     repo = "brev-cli";
     rev = "v${version}";
-    sha256 = "sha256-XKXIDnqAmWUDiwjvNV/mmGyxkScuz3YJ2DpMcRhwLKU=";
+    sha256 = "sha256-IeX+SvNcz0S/gdInVM8fwA7TEDTMoJO8rSwCqK2rKoE=";
   };
 
   vendorHash = "sha256-7MXZVdpsPHfHk8hNZM2CT0FW8gTKt3oUap7CTVYMNfI=";

From 8d98d1229bc1f0ddcbdec03a294d1ed7ce520ef0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 12:26:49 +0000
Subject: [PATCH 10/93] chatbox: 1.15.0 -> 1.15.2

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

diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix
index c23611227e4e..87cabe193265 100644
--- a/pkgs/by-name/ch/chatbox/package.nix
+++ b/pkgs/by-name/ch/chatbox/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "chatbox";
-  version = "1.15.0";
+  version = "1.15.2";
 
   src = fetchurl {
     url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
-    hash = "sha256-TtYKOCnMuStoPSQfwXfLFli+qv2NVgiXJPCYylCgs6A=";
+    hash = "sha256-KxL073BIfZfjFndwtkDNXwlt1xny76BMV9CQF3x7ATQ=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From ce76beed2fd00a240e6d32d4d9a2704e22b2d6fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 14:19:40 +0000
Subject: [PATCH 11/93] jbrowse: 3.6.3 -> 3.6.4

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

diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix
index 0dd1d933c89e..c91d08bed669 100644
--- a/pkgs/by-name/jb/jbrowse/package.nix
+++ b/pkgs/by-name/jb/jbrowse/package.nix
@@ -6,11 +6,11 @@
 
 let
   pname = "jbrowse";
-  version = "3.6.3";
+  version = "3.6.4";
 
   src = fetchurl {
     url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage";
-    sha256 = "sha256-J+9SE7yWQanKjweLKWPwStOJOg6SxoIoC5jtl+ekEtI=";
+    sha256 = "sha256-oSxSW6kZ68iQBdR4Uxd9yiU2S/8bLamXje9FDgahuv4=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 28db0bbb72f3c32bb75b993db3c2d766afc1321e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 16:42:53 +0000
Subject: [PATCH 12/93] oci-cli: 3.62.2 -> 3.63.0

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

diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index e26f5a2f4410..8d43945a4dda 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.62.2";
+  version = "3.63.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${version}";
-    hash = "sha256-QLvHQwKNS5yr3ZNyQIK2nTgDZ+BKAd0K+H6e63bI4PM=";
+    hash = "sha256-29jEfzS/hJQKX6P3VL/Wy+0/3DFmOKFj4RTTGkVhXXM=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From a34f00feb107fc87a33bc5ee982d0a33d2510498 Mon Sep 17 00:00:00 2001
From: Maxime Brunet <max@brnt.mx>
Date: Sun, 27 Jul 2025 13:49:49 -0300
Subject: [PATCH 13/93] vectorcode: use makeWrapperArgs to prefix PYTHONPATH

---
 pkgs/by-name/ve/vectorcode/package.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix
index dd25882cbf16..9be1cb1e58ea 100644
--- a/pkgs/by-name/ve/vectorcode/package.nix
+++ b/pkgs/by-name/ve/vectorcode/package.nix
@@ -160,15 +160,12 @@ python.pkgs.buildPythonApplication rec {
     installShellCompletion vectorcode.{bash,zsh}
   '';
 
-  postFixup = ''
-    wrapProgram $out/bin/vectorcode \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
-      --set PATH ${
-        lib.makeBinPath [
-          python
-        ]
-      };
-  '';
+  makeWrapperArgs = [
+    "--prefix"
+    "PYTHONPATH"
+    ":"
+    "$PYTHONPATH"
+  ];
 
   pythonImportsCheck = [ "vectorcode" ];
 

From 8800a2f531d4c96df11e9ecbaba4872bf1c91539 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 16:55:31 +0000
Subject: [PATCH 14/93] terraform-providers.google: 6.44.0 -> 6.45.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 7b0a8a2da750..feec86b380cb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -516,13 +516,13 @@
     "vendorHash": "sha256-G325isVj6JKs58i59V/A51vE8mzgxk/1EqSVvb6TiH4="
   },
   "google": {
-    "hash": "sha256-la+jN1muZqAqgR2emDhB71L01gAVtH60OLZ199h6Cq0=",
+    "hash": "sha256-YwSl33ST8kvnVg5hr7PCSfEO0xRDRVvTEU3KEMfiIIg=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v6.44.0",
+    "rev": "v6.45.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-s5tShmcGeY/PivF2soP0PWZp9MlqYt9yvsjrNArqYGk="
+    "vendorHash": "sha256-n6UUSCQt3mJESEfqVHX4sfr1XqOXu+u7Qejjps6RmBs="
   },
   "google-beta": {
     "hash": "sha256-O+rAH2VzDEr+uwyAAg74oS/HeytPLOm+1LTC7aswhIA=",

From 34f9932c8d9c15d86e1f2e5c1f3234018e6ebb10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 18:02:43 +0000
Subject: [PATCH 15/93] tscli: 0.0.13 -> 0.0.15

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

diff --git a/pkgs/by-name/ts/tscli/package.nix b/pkgs/by-name/ts/tscli/package.nix
index 1236438d282a..229b420c8e48 100644
--- a/pkgs/by-name/ts/tscli/package.nix
+++ b/pkgs/by-name/ts/tscli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "tscli";
-  version = "0.0.13";
+  version = "0.0.15";
 
   src = fetchFromGitHub {
     owner = "jaxxstorm";
     repo = "tscli";
     tag = "v${version}";
-    hash = "sha256-KncOCrpu0/72Nf9dOErKT45PxPECS50+wokO10sGUXc=";
+    hash = "sha256-RsWpZYRb/6ZpOio5te7qokGJeTlSmu/MH+BVoQVbkNw=";
   };
 
-  vendorHash = "sha256-FmJoKADhcHk5mWjcXxXb7VszZhFfGWmBKUGxUjvA64U=";
+  vendorHash = "sha256-RELJJN2ldcUkbyskitg1y6vakdQ6mRkmT7Y25TS2sz8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 89685f0a0cfe0bcd61caa2cd948eb0205f935794 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 18:35:58 +0000
Subject: [PATCH 16/93] xcrawl3r: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/by-name/xc/xcrawl3r/package.nix b/pkgs/by-name/xc/xcrawl3r/package.nix
index c81aba9fd2d5..3434d5bd5a71 100644
--- a/pkgs/by-name/xc/xcrawl3r/package.nix
+++ b/pkgs/by-name/xc/xcrawl3r/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "xcrawl3r";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "hueristiq";
     repo = "xcrawl3r";
     tag = version;
-    hash = "sha256-Ojm5cBeXRtDGQfbDweLlD1V12PYJHxVbO2g1X1Wt/B8=";
+    hash = "sha256-U5Gu04QR8ZYIUbUwP6k7PfAp1Dz4u2RUVGqamV14BEk=";
   };
 
-  vendorHash = "sha256-rBKpYB7t9zdduqZA1VwCBp+kXpB8nABhTo+IaoOE8bE=";
+  vendorHash = "sha256-GZy7AMhrgswWS4dWRcMW5WF2IVDPeg8ZERizRQi7tZ4=";
 
   ldflags = [
     "-s"

From d179728f9a408cb3a85cffccd325f1c3e220476e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 18:42:08 +0000
Subject: [PATCH 17/93] xsubfind3r: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/by-name/xs/xsubfind3r/package.nix b/pkgs/by-name/xs/xsubfind3r/package.nix
index 69262896eec8..3801cb5f4c20 100644
--- a/pkgs/by-name/xs/xsubfind3r/package.nix
+++ b/pkgs/by-name/xs/xsubfind3r/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "xsubfind3r";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "hueristiq";
     repo = "xsubfind3r";
     tag = version;
-    hash = "sha256-S89X/701BNzT1BJUsGvylBuiuUCf0zpWqp6p6ZHIzyo=";
+    hash = "sha256-whe7GXstGj2Yh/UtpNAh71WwnRU9aEHtS0diW0m9QXs=";
   };
 
-  vendorHash = "sha256-Jl533DNno0XxjjPvGUVbyYt8fSfHNYKzQwOAmo1IpWw=";
+  vendorHash = "sha256-cYutO+N974ZJE/UJiYS0ZuWqRKlfDgEL5qqsejBptcs=";
 
   ldflags = [
     "-s"

From 73f350ac3c7309ce69000356281c118d99fa8122 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 19:23:58 +0000
Subject: [PATCH 18/93] nzbhydra2: 7.15.3 -> 7.16.0

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

diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
index 506480481313..8c83f4116a4a 100644
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nzbhydra2";
-  version = "7.15.3";
+  version = "7.16.0";
 
   src = fetchzip {
     url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
-    hash = "sha256-zVRiJ2giwxeNDVBCpYpkAmMn+kf2c9+YbAkUn7LOkkM=";
+    hash = "sha256-BgMTR4vj+JTzxJDPJhpvkYjTav68O7d1POXDMbQMOvQ=";
     stripRoot = false;
   };
 

From caac0b38589d2f53851500777b54c193d2191deb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 20:04:57 +0000
Subject: [PATCH 19/93] cnspec: 11.63.0 -> 11.64.0

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

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 28f6c42b5eb5..f58a77b69fa6 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.63.0";
+  version = "11.64.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-o5JqWPI4S1ic/L1A/AXl32g3RTmcxoR+Cmx2dxJoorA=";
+    hash = "sha256-AJ7aw21UyvOGCLEnhTHPklyDWkBAnK/Vhvvg4UDOoH4=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-FOT30kp15TRvnziBis3n9CvBfzgUEKCLAU+gCSH3vA8=";
+  vendorHash = "sha256-nmHs5ZHULENCyW+3giyPTO+pzbnGgGwFuVqgIfuCQi4=";
 
   subPackages = [ "apps/cnspec" ];
 

From d1c6d00c2ab1f34744ed86aa83e23a242b8ddd52 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 26 Jul 2025 21:03:49 -0700
Subject: [PATCH 20/93] python313Packages.python-join-api: init at 0.0.9

---
 .../python-join-api/default.nix               | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-join-api/default.nix

diff --git a/pkgs/development/python-modules/python-join-api/default.nix b/pkgs/development/python-modules/python-join-api/default.nix
new file mode 100644
index 000000000000..7d40949ba733
--- /dev/null
+++ b/pkgs/development/python-modules/python-join-api/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  flask,
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "python-join-api";
+  version = "0.0.9";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-FGqOqOd9VVH9hxMqYH7M10W+g5tpImxs+K4AHJJZRaE=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    flask
+    requests
+  ];
+
+  pythonImportsCheck = [ "pyjoin" ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "Python API for interacting with Join by joaoapps";
+    homepage = "https://github.com/nkgilley/python-join-api";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 29db1042e5a6..a9503f80d74f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14568,6 +14568,8 @@ self: super: with self; {
 
   python-jenkins = callPackage ../development/python-modules/python-jenkins { };
 
+  python-join-api = callPackage ../development/python-modules/python-join-api { };
+
   python-jose = callPackage ../development/python-modules/python-jose { };
 
   python-json-logger = callPackage ../development/python-modules/python-json-logger { };

From aa3ccb51b4b0d04107449cc71706089e4b7f26c8 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 26 Jul 2025 21:04:00 -0700
Subject: [PATCH 21/93] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8e1af9be886f..abad6f049f12 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2852,7 +2852,8 @@
       ++ hdate.optional-dependencies.astral;
     "joaoapps_join" =
       ps: with ps; [
-      ]; # missing inputs: python-join-api
+        python-join-api
+      ];
     "juicenet" =
       ps: with ps; [
       ];

From 5e84f4cb0f45b93d61e63d4ad8fe3624b05c6d0c Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 26 Jul 2025 21:27:29 -0700
Subject: [PATCH 22/93] python313Packages.pymonoprice: init at 0.5

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

diff --git a/pkgs/development/python-modules/pymonoprice/default.nix b/pkgs/development/python-modules/pymonoprice/default.nix
new file mode 100644
index 000000000000..d1e878ab473e
--- /dev/null
+++ b/pkgs/development/python-modules/pymonoprice/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pyserial,
+  pyserial-asyncio-fast,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pymonoprice";
+  version = "0.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "etsinko";
+    repo = "pymonoprice";
+    tag = version;
+    hash = "sha256-kyFOWG/Jvn+h9ludzd2Zul9/lkwPxReH76nnDIGD+fM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pyserial
+    pyserial-asyncio-fast
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "pymonoprice" ];
+
+  meta = {
+    description = "Python 3 interface implementation for Monoprice 6 zone amplifier";
+    homepage = "https://github.com/etsinko/pymonoprice";
+    changelog = "https://github.com/etsinko/pymonoprice/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 29db1042e5a6..412a184340a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13267,6 +13267,8 @@ self: super: with self; {
 
   pymongo-inmemory = callPackage ../development/python-modules/pymongo-inmemory { };
 
+  pymonoprice = callPackage ../development/python-modules/pymonoprice { };
+
   pymoo = callPackage ../development/python-modules/pymoo { };
 
   pymorphy2 = callPackage ../development/python-modules/pymorphy2 { };

From 19de23bc7fb9ce67908e4ac6d4d7b8e0db33b19c Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 26 Jul 2025 21:27:37 -0700
Subject: [PATCH 23/93] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8e1af9be886f..ff950a4ae1ad 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3693,7 +3693,8 @@
       ];
     "monoprice" =
       ps: with ps; [
-      ]; # missing inputs: pymonoprice
+        pymonoprice
+      ];
     "monzo" =
       ps: with ps; [
         monzopy
@@ -7318,6 +7319,7 @@
     "modem_callerid"
     "modern_forms"
     "mold_indicator"
+    "monoprice"
     "monzo"
     "moon"
     "mopeka"

From 74bb1e77f9de1be03e3abbed8e91c5a75a929c1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 20:17:12 +0000
Subject: [PATCH 24/93] terraform-providers.rootly: 3.4.0 -> 3.5.1

---
 .../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 4861dc40bf33..fa01281a7f62 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1120,13 +1120,13 @@
     "vendorHash": "sha256-xo0alLK3fccbKRG5bN1G7orDsP47I3ySAzpZ9O0f2Fg="
   },
   "rootly": {
-    "hash": "sha256-H9+9HPLmhis7UDq4Jizh+0d+tdj0PT57uv/mjymmizQ=",
+    "hash": "sha256-Lpysy/BQHYEWhTNcLvBY6C6o1G/PhKzxPe4qUHhPWmM=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v3.4.0",
+    "rev": "v3.5.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-EZbYkyeQdroVJj3a7T7MICU4MSimB+ZqI2Yg9PNUcV0="
+    "vendorHash": "sha256-75GQmp/ybD+VugrrB8qTbP3OPHy3eyBGe5u7CM7CRcc="
   },
   "routeros": {
     "hash": "sha256-ciQsBvpX6gWnDPt9O1SGrVVgNCvAHBPCaLfVlPxrSAY=",

From 6fac1f69471a2068ab4a976780886b2362fd7daa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 20:37:21 +0000
Subject: [PATCH 25/93] ada: 3.2.6 -> 3.2.7

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

diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix
index 43d5dda26514..7f641a452ad0 100644
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ada";
-  version = "3.2.6";
+  version = "3.2.7";
 
   src = fetchFromGitHub {
     owner = "ada-url";
     repo = "ada";
     tag = "v${version}";
-    hash = "sha256-h5/D/Msp5Zg58YFQ/viQVYlMQSXQTWU2YHkSPvtQwyA=";
+    hash = "sha256-IDJgrjmIqhnIZuzBAckowpmhRypb1a1NB1P5YZz4E1A=";
   };
 
   nativeBuildInputs = [ cmake ];

From ef9448f13d6fb8cd7e69631e3443be73b3a7ade8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 21:53:20 +0000
Subject: [PATCH 26/93] terraform-providers.acme: 2.34.0 -> 2.35.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 4861dc40bf33..2fa0e34ca6a5 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -18,13 +18,13 @@
     "vendorHash": null
   },
   "acme": {
-    "hash": "sha256-GHS8CRu89cd6RMMbEB8ct27w2w4lWdKTbvoihaVpexQ=",
+    "hash": "sha256-69oNqBonJ22Jf27NYGpY31NVwdv8YDwxUyRyMeln8LY=",
     "homepage": "https://registry.terraform.io/providers/vancluever/acme",
     "owner": "vancluever",
     "repo": "terraform-provider-acme",
-    "rev": "v2.34.0",
+    "rev": "v2.35.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-tGfA5LMXECGsu5BIIeMb1+ze7T84Gyrn4h+IzcI79OA="
+    "vendorHash": "sha256-7SXAAJwIkdt96lWhkKKmbP6Fqkcn8puPUrTy1pXnI1c="
   },
   "age": {
     "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",

From 65abcd2a5dace76ef63adbab2eab7ada322b8862 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 23:02:37 +0000
Subject: [PATCH 27/93] python3Packages.license-expression: 30.4.3 -> 30.4.4

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

diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix
index 977c377cb88a..f7b5610ef1c2 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/pkgs/development/python-modules/license-expression/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "license-expression";
-  version = "30.4.3";
+  version = "30.4.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "aboutcode-org";
     repo = "license-expression";
     tag = "v${version}";
-    hash = "sha256-e/pu2Mhy3E4ddGUGkVF7M9UFlB1IlXDPTReSh5gKwbE=";
+    hash = "sha256-Bgkm0nhu/jeqtg3444R2encCtfzd7xnwyCXlZWaYSQ0=";
   };
 
   dontConfigure = true;

From 2c674a7d3a6945fb145d70162f9c4b6fddc42848 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 23:53:04 +0000
Subject: [PATCH 28/93] gruvbox-gtk-theme: 0-unstable-2025-04-24 ->
 0-unstable-2025-07-21

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

diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
index be9c5eb58abe..146a7e839b1f 100644
--- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
@@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-04-24";
+    version = "0-unstable-2025-07-21";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Gruvbox-GTK-Theme";
-      rev = "fbced4ba03975dadd1d74d6b73cccdcbbd5e8b90";
-      hash = "sha256-zhY3uwvtHNKNrdWiD5Le/AMz1lgV39K/RNhFGnIMpzg=";
+      rev = "b1cfcc8a3b461f227c8a89dee17a80ed8f6656f4";
+      hash = "sha256-QFXaAtgH30aP1+/rNobntTAMfwh+AAb26FyZgElVdC4=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From b148f01950975662590b691b4cdcd631755bbc7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 00:25:03 +0000
Subject: [PATCH 29/93] terraform-providers.tfe: 0.68.0 -> 0.68.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 4861dc40bf33..adc6f808d038 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1345,11 +1345,11 @@
     "vendorHash": null
   },
   "tfe": {
-    "hash": "sha256-gT5KOJZJG8cZs1Dcn31bfKLC8zvkG62tn4sZuH9ieGk=",
+    "hash": "sha256-Gut7HzjBZIrv9PLNBkSwnGfBKymlJ07GTFKtwiLIGSg=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.68.0",
+    "rev": "v0.68.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-tf78FT9JD5IVswgDB3Yug1NZQvo8NDqjPEAfF3gg93w="
   },

From 34e95f8347c03cfd175ce4e6cdc409a61cba0b94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 01:16:58 +0000
Subject: [PATCH 30/93] findomain: 9.0.4 -> 10.0.1

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

diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix
index 5166b76daa43..20e7f61d8690 100644
--- a/pkgs/by-name/fi/findomain/package.nix
+++ b/pkgs/by-name/fi/findomain/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "findomain";
-  version = "9.0.4";
+  version = "10.0.1";
 
   src = fetchFromGitHub {
     owner = "findomain";
     repo = "findomain";
     tag = version;
-    hash = "sha256-5jbKDMULig6j3D5KEQQrHWtsc59x0Tj6n/7kwK/8IME=";
+    hash = "sha256-qMSVj+qhrx1LPuXWXKzo0v4yirNW2x/o/blNkSVU3Tg=";
   };
 
-  cargoHash = "sha256-4+nRQ8HL4dQMCgeSOrgkaRj0E4HPAC3Nm82AEr1KWJo=";
+  cargoHash = "sha256-uYhCTjVzkW8menf67pnZfYCMIcNZadoGJvtDmsDDxP8=";
 
   nativeBuildInputs = [
     installShellFiles

From a9986bde480524a3636c3dbc6f2b2f15177db661 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 02:45:23 +0000
Subject: [PATCH 31/93] xray: 25.2.21 -> 25.7.26

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

diff --git a/pkgs/by-name/xr/xray/package.nix b/pkgs/by-name/xr/xray/package.nix
index f59b6c858e1e..f9795582181e 100644
--- a/pkgs/by-name/xr/xray/package.nix
+++ b/pkgs/by-name/xr/xray/package.nix
@@ -15,16 +15,16 @@
 
 buildGoModule rec {
   pname = "xray";
-  version = "25.2.21";
+  version = "25.7.26";
 
   src = fetchFromGitHub {
     owner = "XTLS";
     repo = "Xray-core";
     rev = "v${version}";
-    hash = "sha256-1KJ6YUYpOHp9AFSDmbPWqcyRdf/4XNQtuT9oiNcKRnU=";
+    hash = "sha256-oPB4OngMDUk+HURDoUhIZ6SGQ0gII740PjgjP2fUK/k=";
   };
 
-  vendorHash = "sha256-PUZ0ntG3D09FNC8QhIFShhZLLdTT9CgAimrBy/WLKAw=";
+  vendorHash = "sha256-AmY9q0I0S7Xki9mgCJn/nV4Y9Ra6MDgnma2iPnoWQhg=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From ca28859d29ba6ba01be4f03656c16dc165f183a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 03:24:28 +0000
Subject: [PATCH 32/93] python3Packages.llm-gemini: 0.23 -> 0.24

---
 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 9f72e8452f08..3b89a6066a38 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.23";
+  version = "0.24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-gemini";
     tag = version;
-    hash = "sha256-e+l7YjMJi+ZtkaBQUXT9364F7ncQO476isSm8uMCCB0=";
+    hash = "sha256-pMPAfRhcvKoxvtbkmtT3L7EvBg9WsNVOP6wFjbyqncw=";
   };
 
   build-system = [ setuptools ];

From e732b776095df835428af3aaf0bb8afbdfcdf894 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 03:41:06 +0000
Subject: [PATCH 33/93] terraform-providers.minio: 3.6.1 -> 3.6.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 4861dc40bf33..3a99ec4148f5 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -831,11 +831,11 @@
     "vendorHash": "sha256-oipY2hwgRrntCxxHPyH06e8p+0fKfAQwhh2iBI4RGHQ="
   },
   "minio": {
-    "hash": "sha256-DRWzgVp01qTvyf30GgxWx9/RvjAfoNu3SXZQVQ1jYa0=",
+    "hash": "sha256-hvttrw+7wqcCRyYdGhQvRvP1oDbAGmtR5UpcGx8LMgk=",
     "homepage": "https://registry.terraform.io/providers/aminueza/minio",
     "owner": "aminueza",
     "repo": "terraform-provider-minio",
-    "rev": "v3.6.1",
+    "rev": "v3.6.2",
     "spdx": "AGPL-3.0",
     "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
   },

From 135d2de3aa8dbace5f9fa963e6397b42bc7c8566 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 04:14:45 +0000
Subject: [PATCH 34/93] xdg-ninja: 0.2.0.2-unstable-2025-06-07 ->
 0.2.0.2-unstable-2025-07-25

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

diff --git a/pkgs/by-name/xd/xdg-ninja/package.nix b/pkgs/by-name/xd/xdg-ninja/package.nix
index 99ff6598a35a..410bff0d45ae 100644
--- a/pkgs/by-name/xd/xdg-ninja/package.nix
+++ b/pkgs/by-name/xd/xdg-ninja/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "xdg-ninja";
-  version = "0.2.0.2-unstable-2025-06-07";
+  version = "0.2.0.2-unstable-2025-07-25";
 
   src = fetchFromGitHub {
     owner = "b3nj5m1n";
     repo = "xdg-ninja";
-    rev = "42ee421d2d532a75942f7395d20baddf23ed7164";
-    hash = "sha256-LIW49kWxfb/oVXkd4xUP6bsoBqcbdZSUjAZbDHVqPp0=";
+    rev = "611b3c43b56e994ed673b6953fa1c37c85765011";
+    hash = "sha256-yHILisO34m6XAeJ5GrxkxFUOPcAKOlpIsKYkQz9UfLc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a12a2456ec9dc6d3c7b7d91cb15a77bd3b315e33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 05:15:26 +0000
Subject: [PATCH 35/93] renode-dts2repl: 0-unstable-2025-07-08 ->
 0-unstable-2025-07-24

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

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index b4e78b219325..0f783ed5cb4d 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-07-08";
+  version = "0-unstable-2025-07-24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "9c75757b1de9e1bd93d1b1de5d516a65c481b026";
-    hash = "sha256-m3v/HQKDHhfmk7vjbSGxZiyAK2/5b8FVszJjNDHQj2Y=";
+    rev = "b94aaad8ad6cd3252160a11ac37f2bde8280d1b0";
+    hash = "sha256-Cdg3uyZC55ajUlghHkqoGGN/kZnjuHVxIEvo2LDua1Q=";
   };
 
   nativeBuildInputs = [

From b94b1d6db1babef7624def46e0b5508d0b012286 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 05:39:24 +0000
Subject: [PATCH 36/93] fwup: 1.13.1 -> 1.13.2

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

diff --git a/pkgs/by-name/fw/fwup/package.nix b/pkgs/by-name/fw/fwup/package.nix
index 337815611052..4a4c1419647b 100644
--- a/pkgs/by-name/fw/fwup/package.nix
+++ b/pkgs/by-name/fw/fwup/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fwup";
-  version = "1.13.1";
+  version = "1.13.2";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "sha256-lf8NCF+K47V55pUC4uNzCh5D454OQl5VruGfC6X5mJw=";
+    sha256 = "sha256-s9M734Ohf8kItoOdaxewk4Enbrm2wsT0M4Ak9+q3KA8=";
   };
 
   nativeBuildInputs = [

From 8cc59c3dae712e687a0e50ae219e8dc59b6222de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 05:53:36 +0000
Subject: [PATCH 37/93] lms: 3.67.0 -> 3.68.1

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

diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index 7c9b5623d91b..ad5014651679 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lms";
-  version = "3.67.0";
+  version = "3.68.1";
 
   src = fetchFromGitHub {
     owner = "epoupon";
     repo = "lms";
     rev = "v${version}";
-    hash = "sha256-jmdAZEtMIl2oLeNzgyceguCenPK/K6NJw5Yzv3T4pJs=";
+    hash = "sha256-BV1VeNTBED5I9OZlnLgiTLQsGK0HlQYSQykJJjQPn60=";
   };
 
   strictDeps = true;

From 6a4159f1ab2cad7edb38f96c6d07ba9921b17672 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 05:54:46 +0000
Subject: [PATCH 38/93] wdt: 1.27.1612021-unstable-2025-07-09 ->
 1.27.1612021-unstable-2025-07-23

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

diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix
index 95e12fd6b062..c9172aa03e7b 100644
--- a/pkgs/by-name/wd/wdt/package.nix
+++ b/pkgs/by-name/wd/wdt/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "wdt";
-  version = "1.27.1612021-unstable-2025-07-09";
+  version = "1.27.1612021-unstable-2025-07-23";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "wdt";
-    rev = "e4d03e392e90b8ff4d2a67da31d65405afd32db5";
-    sha256 = "sha256-epjZFTczJLmI5MgKLMVXhEhv9MYJCYWYOAkZcvqeBs0=";
+    rev = "9294400cb0f5f7a0eef7fdf009cc01f00a5917c1";
+    sha256 = "sha256-uDsHdha8JA2oue/SBej4lYFWEtaKcsVeNBhtZZBEPZI=";
   };
 
   nativeBuildInputs = [ cmake ];

From 45832cb2a827b2b6efaba0594759edd982997b83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 06:05:38 +0000
Subject: [PATCH 39/93] terraform-providers.turbot: 1.12.3 -> 1.12.4

---
 .../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 4861dc40bf33..d3585fb95c27 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1391,11 +1391,11 @@
     "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk="
   },
   "turbot": {
-    "hash": "sha256-B3zUTsxFnyhIsxI9K07V+gP/C22nMm6bonEpQIPCMp0=",
+    "hash": "sha256-ZcJMWeKp39wv/T8Kln052PHr4vGUYTDbuGAv9nb8U1c=",
     "homepage": "https://registry.terraform.io/providers/turbot/turbot",
     "owner": "turbot",
     "repo": "terraform-provider-turbot",
-    "rev": "v1.12.3",
+    "rev": "v1.12.4",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From c712665d82e64fd4c1886d81a38c0dd2fb646368 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 06:05:59 +0000
Subject: [PATCH 40/93] terraform-providers.tencentcloud: 1.82.11 -> 1.82.13

---
 .../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 4861dc40bf33..f565c80860b3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1336,11 +1336,11 @@
     "vendorHash": "sha256-PVN3oPT3cxsnWH03twbPSIIERGHCp3XAmcqrQAOULZ4="
   },
   "tencentcloud": {
-    "hash": "sha256-oHvmCNgGguKdu/LbTyRG/vl9+xGan1vR6T9Ej5MX9l4=",
+    "hash": "sha256-0sTuheQh9mpwGPsqXLH3dcLvTQcy7xti+y1k1eflL2k=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.11",
+    "rev": "v1.82.13",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From cb59d7dee2128bdd6934a82c23d1bdfedf69498e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 00:39:01 +0000
Subject: [PATCH 41/93] system76-power: 1.2.6 -> 1.2.7

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

diff --git a/pkgs/by-name/sy/system76-power/package.nix b/pkgs/by-name/sy/system76-power/package.nix
index ca2b1cfb5e9f..d83b9cfe5fbb 100644
--- a/pkgs/by-name/sy/system76-power/package.nix
+++ b/pkgs/by-name/sy/system76-power/package.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "system76-power";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-power";
     tag = finalAttrs.version;
-    hash = "sha256-TVrM54t6xDLMQAqZKpzSGh6M3/4ZCj99e2J/gotN0cc=";
+    hash = "sha256-ucNCZD1RJfgC0uVz28846Cghpg4/vJPtkE+rO0LaFmg=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libusb1
   ];
 
-  cargoHash = "sha256-mZy1iVyjUFeed5fnj1ASEJ+raAe2D0V8TO84fd0RuXM=";
+  cargoHash = "sha256-UiRaR0x8pD0ht5Ckbrxm8PzskT/iIKGLFCfyoY1ZEnQ=";
 
   postInstall = ''
     install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf

From ca824f078d31e7fdfbf85d90188fd3f9ff6ef0d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 06:33:51 +0000
Subject: [PATCH 42/93] terraform-providers.temporalcloud: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 4861dc40bf33..49ea2845dd42 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1327,11 +1327,11 @@
     "vendorHash": "sha256-V0dK5G3zheyyqexBud+9Hg9ExYI/9X1wuYx+lEn6pVg="
   },
   "temporalcloud": {
-    "hash": "sha256-FTvTp2Mf8uz0e+y7AprAxgMEllGJFbWiPCzDZ8jzdrc=",
+    "hash": "sha256-r5bkK+7phHxxImAQEgwekRiUuLxNzVGYSsb5OH8cx5c=",
     "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
     "owner": "temporalio",
     "repo": "terraform-provider-temporalcloud",
-    "rev": "v0.9.0",
+    "rev": "v0.9.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-PVN3oPT3cxsnWH03twbPSIIERGHCp3XAmcqrQAOULZ4="
   },

From 776840ad48d439777ffe2b13a8aaaff1c914140f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 06:35:08 +0000
Subject: [PATCH 43/93] cargo-shear: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index ae768fd1ddc5..624c648a6cbd 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -6,7 +6,7 @@
   cargo-shear,
 }:
 let
-  version = "1.4.0";
+  version = "1.4.1";
 in
 rustPlatform.buildRustPackage {
   pname = "cargo-shear";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "Boshen";
     repo = "cargo-shear";
     rev = "v${version}";
-    hash = "sha256-UJbYzyVEg1FxoebBVURwbugjAeE93dXM47lXUoonMLM=";
+    hash = "sha256-Ast944OrFyC6jHsL+aLp9zUK0hX7Xv+0EV1bH/PjDGA=";
   };
 
-  cargoHash = "sha256-ynxJbNrzuDlqa5elavO+faFDt90CoZsPoVODW8NlFcY=";
+  cargoHash = "sha256-NSBe42AGujyh3CSdJ9ON14IA9U63qNly96VMNbU+I84=";
 
   # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
   SHEAR_VERSION = version;

From 7d5b04ab57f66fd152b902b7d0520f6a38801aa8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 28 Jul 2025 09:20:38 +0200
Subject: [PATCH 44/93] cdncheck: 1.1.28 -> 1.1.29

Diff: https://github.com/projectdiscovery/cdncheck/compare/refs/tags/v1.1.28...refs/tags/v1.1.29

Changelog: https://github.com/projectdiscovery/cdncheck/releases/tag/v1.1.29
---
 pkgs/by-name/cd/cdncheck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 1a2bd0c3d0fd..3440b4d40554 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.1.28";
+  version = "1.1.29";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-DifV+AvVzC8wm3yjfWorAk8E0a7++Aq38UXxBQbHAPM=";
+    hash = "sha256-+R6IRMdkLVJ6rtkCQUMDc5scNWlv0rMa0urHhfiEwro=";
   };
 
   vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";

From ea05e38d71b360bbbddc91be72c712fe7d47139b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 28 Jul 2025 09:22:24 +0200
Subject: [PATCH 45/93] python313Packages.censys: 2.2.17 -> 2.2.18

Diff: https://github.com/censys/censys-python/compare/refs/tags/v2.2.17...refs/tags/v2.2.18

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

diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index cd194b0aa219..7947100b755f 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "censys";
-  version = "2.2.17";
+  version = "2.2.18";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "censys";
     repo = "censys-python";
     tag = "v${version}";
-    hash = "sha256-1V7IeaV7Ro1q5UyD2DDetunaRO2L4UbF1VODg5ktqKs=";
+    hash = "sha256-fHqDXqhjqfj8VBb7Od7wuUXAEHQBXwm5LAUPLM0oN2Q=";
   };
 
   build-system = [ poetry-core ];

From 489f0ced17665eaa737f03d4c8c4262e37a5fc80 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 28 Jul 2025 09:24:12 +0200
Subject: [PATCH 46/93] python313Packages.cwl-utils: 0.38 -> 0.39

Diff: https://github.com/common-workflow-language/cwl-utils/compare/refs/tags/v0.38...refs/tags/v0.39

Changelog: https://github.com/common-workflow-language/cwl-utils/releases/tag/v0.39
---
 pkgs/development/python-modules/cwl-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix
index 2bb0a6444896..26bfd8d38f5f 100644
--- a/pkgs/development/python-modules/cwl-utils/default.nix
+++ b/pkgs/development/python-modules/cwl-utils/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cwl-utils";
-  version = "0.38";
+  version = "0.39";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "common-workflow-language";
     repo = "cwl-utils";
     tag = "v${version}";
-    hash = "sha256-goeMlyHYiS4JLOVBFjcLSzdYrdoIZ904hJHFPGZyxKo=";
+    hash = "sha256-qmvFr+zUZxwFqC4mfdktcS4hrNhJnxvWmdSJSswJ874=";
   };
 
   build-system = [ setuptools ];

From b23b91fe528703c599fa06456723ba0c73262815 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 08:21:45 +0000
Subject: [PATCH 47/93] terraform-providers.alicloud: 1.253.0 -> 1.254.0

---
 .../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 4861dc40bf33..9443f9ba2557 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -54,11 +54,11 @@
     "vendorHash": "sha256-sf6gCPsKnBVjMsCw7ZA4BKt9GAGtAcgU7vRZN8xzN9Q="
   },
   "alicloud": {
-    "hash": "sha256-HXrE/EsxTPH6lO2jpxz9Mkr6/eSodfLK9Akpv6wGUK0=",
+    "hash": "sha256-OXLqn7D4Len8EYxwl/coKeh+bBAx4uVzfgiNFJ1Tcrg=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.253.0",
+    "rev": "v1.254.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-Ww4l3ffnx0CB+wnQfaiHI+25JtnNsGaTCsmXfd54R4g="
   },

From 0fa2824f5736efe22cdd514a0e742dab54388996 Mon Sep 17 00:00:00 2001
From: Arsenii Zorin <me@wrb.bz>
Date: Mon, 28 Jul 2025 11:35:31 +0300
Subject: [PATCH 48/93] pulumi-bin: 3.185.0 -> 3.186.0

---
 pkgs/tools/admin/pulumi-bin/data.nix | 162 +++++++++++++--------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index 69f217e41cf8..45c19b912675 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.185.0";
+  version = "3.186.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.185.0-linux-x64.tar.gz";
-        sha256 = "0r7gsjk3gvvczirnpzrmrpbacmbkfq49wqydvcgwz96b1yhg3y2g";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.186.0-linux-x64.tar.gz";
+        sha256 = "0ybg8dp8n0k46xhslj9h49mvw4hnl5h86w1kllcm579pn402lnm0";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.41.0-linux-amd64.tar.gz";
@@ -33,8 +33,8 @@
         sha256 = "1fwfvjjds143f79a9qjpr5vycahy11cd7zydrqgaan9q2djp3kq3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-linux-amd64.tar.gz";
-        sha256 = "0jlaj3pz5j0hgnqdg2b1xw9cwlr4i5pvir8flhwvw222nsah15yv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.2-linux-amd64.tar.gz";
+        sha256 = "0ivwl6j8ws22lhw4w94450pbri6lvxg3san1hy3bs2gdhp4p7xcz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-linux-amd64.tar.gz";
@@ -77,8 +77,8 @@
         sha256 = "13s55pl27q8lxlizzdz73i1h4cvi4pvszfns9jk8wsh2kc1h1qxz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-linux-amd64.tar.gz";
-        sha256 = "0v9hw2m3vz3b9g1mabxmy0j863p51kwj9gkjfrsrabs80glz72ii";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-amd64.tar.gz";
+        sha256 = "192bz3xl0hiy3k68fgcb9mw6j1hb6ngrahf53h8zb7agikzwiy3m";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-linux-amd64.tar.gz";
@@ -89,8 +89,8 @@
         sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.0-linux-amd64.tar.gz";
-        sha256 = "027im101l9b3g7k4hp0mdcvwyb5fj6409k9a6zq0riv6598zf5ch";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.1-linux-amd64.tar.gz";
+        sha256 = "1rgkab1ira6jpgk0vzby5vp4bvymsz8ysb4q7lnb4zgb19yrd682";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-amd64.tar.gz";
@@ -105,8 +105,8 @@
         sha256 = "192gnwf3kzhy3lzy3d1kvdggrjk9ixi9phq44x35w2pizh13xazn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.10-linux-amd64.tar.gz";
-        sha256 = "0k6y5ci7ikj4h164syizhxg257nkpg0p265y9ibvri3z6hbqjrw4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-linux-amd64.tar.gz";
+        sha256 = "0sawhhcmnhgwdv3wl05z65parmrc74mgk2cpyhgp0hcvbpgagknj";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-linux-amd64.tar.gz";
@@ -117,16 +117,16 @@
         sha256 = "0j73752fpljn2gydw1jzp8dknrvx2qcldjjqmd7yigf9spbnagj5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-linux-amd64.tar.gz";
-        sha256 = "0izzpyjizzz4hlv6rnz3l8f4lgyfgxkf67hrxn6ph8zhzs3cgvh4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-linux-amd64.tar.gz";
+        sha256 = "1n3ndir2n1pq4mmnbkiqvv0rf3w4dgz3a9b221vimsi2lks212kw";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.2.0-linux-amd64.tar.gz";
-        sha256 = "0vqhixxcl1axi68gz2kaj1gdnalxja1fdsqkm16pyci2hd5sxbbq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.3.0-linux-amd64.tar.gz";
+        sha256 = "1az2j303s5f2h3hrkg7d0wjbkg6kcbj1kw7i3b2scslksvk3pf3g";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.0-linux-amd64.tar.gz";
-        sha256 = "1ix96j8x02s4zci3jqhsyj3zknkk74019ywqj6c4mwd6jp078zva";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.1-linux-amd64.tar.gz";
+        sha256 = "1br6v7ypkvpgkrw4a5bjv5qpwici80aksz4cin5c7fnh1ic96cha";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz";
@@ -137,8 +137,8 @@
         sha256 = "11rpismkdrbvcmfcx49i8wh7c959dm9hm6h6zbw1y0fllqyhhiqv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.0-linux-amd64.tar.gz";
-        sha256 = "04lwij6x37ly0lxvcv7nd5r9l54y6s5ajiyz6nkj4y8x8qdifsrx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.1-linux-amd64.tar.gz";
+        sha256 = "1cwmszvx6q63pdwyv96aphcz42b8vh574x0p02g5qas2d06ynhik";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.1.0-linux-amd64.tar.gz";
@@ -153,8 +153,8 @@
         sha256 = "14ga54m7xakk5r8bvxhqh88fh6zvd07rsg5gsria0rcganf9kwd6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.9-linux-amd64.tar.gz";
-        sha256 = "1gza6gr44wwj1d4yqyrg4clsvpgd38y6mdmnj4afy2ad4b6phpq5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-linux-amd64.tar.gz";
+        sha256 = "0pbf995jvp3fkvnqdv2ds0zf3yr88rh61i9q4ab7b3141hsghvha";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz";
@@ -163,8 +163,8 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.185.0-darwin-x64.tar.gz";
-        sha256 = "15xpa6fpqqkmji5lvxc5cpbwxnq9idrbfk9afahr6qgkab4p7yrr";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.186.0-darwin-x64.tar.gz";
+        sha256 = "0dc8y8z724w35rlz4mjr4gqswpx3vbx6bhiii29ycrakgvs0a8dj";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.41.0-darwin-amd64.tar.gz";
@@ -191,8 +191,8 @@
         sha256 = "0knw6l997znyk6x05i7f5haaxl40jpm0vwhhf11rypqhl16k5019";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-darwin-amd64.tar.gz";
-        sha256 = "1nvznxmdpb92s7c3fi8arz8kyzwdnvhhy8j4j9s5sqw5bn13bm3a";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.2-darwin-amd64.tar.gz";
+        sha256 = "09rn3w7fxkzf2g9rapk52c92039dfrrgx914pkcafg74cs3920ik";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-darwin-amd64.tar.gz";
@@ -235,8 +235,8 @@
         sha256 = "0vr71abg73xh8b7j7w2gb4c18f72jsz9pzg2ihr29a18mdx9l78b";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-darwin-amd64.tar.gz";
-        sha256 = "00286346z1ws7ffghnz7c9rvjcd66nq6gmmxwlwgqiz6d02z5pv3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-amd64.tar.gz";
+        sha256 = "0bsfi36kihw2334gs39z9gwm6gwr0bypbcx7wfckj5zzml94jg6y";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-darwin-amd64.tar.gz";
@@ -247,8 +247,8 @@
         sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.0-darwin-amd64.tar.gz";
-        sha256 = "0f4xqg4v1qqnkb40gbvkda2b46kr6n96c79qp8swx0gi7ainw0ps";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.1-darwin-amd64.tar.gz";
+        sha256 = "1wpqvj9rd57q1jlgry99ibyhrdqh8qz3ynckqlj61ipf4lr0z80z";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-amd64.tar.gz";
@@ -263,8 +263,8 @@
         sha256 = "11341v1nkr2y0pj3k9d79xwqgwjwxdh4y2zg04qqjrdrikv36n85";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.10-darwin-amd64.tar.gz";
-        sha256 = "0iy1j33527g9r62q53lcy6h9016nr75cf7pp9kys7agxifbvskp6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-darwin-amd64.tar.gz";
+        sha256 = "18hxq1kmaxb6xjajcm84zjc3crpaqh412mkrs0xai97p3pbdfkzn";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-darwin-amd64.tar.gz";
@@ -275,16 +275,16 @@
         sha256 = "1pfkqfviizl1n0kvnm90r02vrnmda0k4a7bhy52dask4vvb3g387";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-darwin-amd64.tar.gz";
-        sha256 = "1yj0ciikakxmnrv9dwplp31dcldb4s7asnhg2603zh8wip8ggya2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-darwin-amd64.tar.gz";
+        sha256 = "1b3znzx5m20xlvmgj9njmip7q32fs6hm62zfckra73bqh2mc9492";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.2.0-darwin-amd64.tar.gz";
-        sha256 = "0g4jm9yfvvywbrsg9k2bv09ni4z2wybg7abdl3ym0vpw4zq6lldw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.3.0-darwin-amd64.tar.gz";
+        sha256 = "0l7pq5biv5p1m9mdwd1mx2cmak0d71j7dgbkdnvwmcvgqapvl1hz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.0-darwin-amd64.tar.gz";
-        sha256 = "0j1hmij36s9gz15gpdrzr6xbdfsv481hn0am4km4s2wi0y92vk0m";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.1-darwin-amd64.tar.gz";
+        sha256 = "1b78ygzv4xnfl9j2h2a9mj10s7mvd706wr1dmqbkha1fcdrlqrm9";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz";
@@ -295,8 +295,8 @@
         sha256 = "1fgrnw3vhclfld28rdg6rkr21gfp1q8bxdbkrsim5lvzi80ih18s";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.0-darwin-amd64.tar.gz";
-        sha256 = "0mvnhpqv8v80lc79h7pdd5a8r60nhfg0znz7h1pj3rii2zx4c8fs";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.1-darwin-amd64.tar.gz";
+        sha256 = "1864rxhdwxqx31kkvfid7n91ia5in6x7q9dqql79kpf9v89zhbcy";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.1.0-darwin-amd64.tar.gz";
@@ -311,8 +311,8 @@
         sha256 = "1i5nlxkbzmjxlkcxbf35vvffz8y4f9vnh7bwnvqd31s1ccxv8f89";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.9-darwin-amd64.tar.gz";
-        sha256 = "16hl7116bc3h1ssq2c3h8v0d83q71wi0z6w94p94h30b9ficznk6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-darwin-amd64.tar.gz";
+        sha256 = "1h43zanz810i2p0x12hp60r6k5rfkr5lvh49l32090xj1v6cr8la";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz";
@@ -321,8 +321,8 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.185.0-linux-arm64.tar.gz";
-        sha256 = "1i5vcqfmi79n7d6rqn0xgqzzqyiawjb044fvkwx6541kqwxw0pil";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.186.0-linux-arm64.tar.gz";
+        sha256 = "0nfyig3w2k3xj9x5v0vcdxbdp87rr6iwg9ch8dh9nx4jqkch52ny";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.41.0-linux-arm64.tar.gz";
@@ -349,8 +349,8 @@
         sha256 = "10w4i3mqlxzvhy4bk7g9kz5bj8xv0yxh6b47n138lqxp8q1cc4yw";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-linux-arm64.tar.gz";
-        sha256 = "17ali0a6dwrmwka319ld7vwlrkhxic6yim21niphcda9gi9v1cs9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.2-linux-arm64.tar.gz";
+        sha256 = "0gvqc91xd2sk2w5zmvy11m5a92kgry43sajvnlwd8hx04byhlw2s";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-linux-arm64.tar.gz";
@@ -393,8 +393,8 @@
         sha256 = "1cn7n1na4igb69wi3yyxmhiai7p8c1qn47cgwpzqj1l279jjx2vk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-linux-arm64.tar.gz";
-        sha256 = "0ivqs7v2x5132r07i62crfckgifaf7kpqgkxl3wby0gdaac9z378";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-arm64.tar.gz";
+        sha256 = "1nfsgjfas5md9k67n90hcvcza7gg2iwp9wivmfzf49vz2k25iz44";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-linux-arm64.tar.gz";
@@ -405,8 +405,8 @@
         sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.0-linux-arm64.tar.gz";
-        sha256 = "19x8scaismr30dgfiaijn2mb0lnfv1z0vxa1gr8qn5w0yhl4qjhf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.1-linux-arm64.tar.gz";
+        sha256 = "189dxlwnzmygmclbaqlp599cfp7byg329fxjkp3nb8g05sij0407";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-arm64.tar.gz";
@@ -421,8 +421,8 @@
         sha256 = "17920c9wlaf5yg9q890ypc55d1h1yk8l1jbvgk97g9qdjsm7bia6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.10-linux-arm64.tar.gz";
-        sha256 = "14d75k7l23p0di75svdhrpqwkgd1wc88s535sgp3ry8zknirx3y9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-linux-arm64.tar.gz";
+        sha256 = "1gd9l1zdkg5faqlfvc5rl9gqchndxhxp742mx21hizhmp4rsv577";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-linux-arm64.tar.gz";
@@ -433,16 +433,16 @@
         sha256 = "12j121fv3n2p54cmqjbx7yc7p8hqi7sb7bf4pcz6v1mmzxfsfz1c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-linux-arm64.tar.gz";
-        sha256 = "1dwmbcg3i02nn1nfg7z4vx4622vpyzk9c1mgrishvv6mvm037fb1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-linux-arm64.tar.gz";
+        sha256 = "02jix4w49n9mal8wg6ixgxvnd865ml7zx0lnz6prckfrzgrj36ih";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.2.0-linux-arm64.tar.gz";
-        sha256 = "1aba8vd13790d8h29i9h5i7zlj5franbfj1l1minlp4vhxry3q6c";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.3.0-linux-arm64.tar.gz";
+        sha256 = "0p092madaspnpbxaf9fm8cfclfsaz7kb5vd9jjljihvmmhk90zkc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.0-linux-arm64.tar.gz";
-        sha256 = "0phigi7qydf2yqkiqi0gc1hhpx8fd2912d5y7g3s5yb5dblng21i";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.1-linux-arm64.tar.gz";
+        sha256 = "12xrcps6dw8z2alghbf7xjqmnpcf8bcgdqggdsmnyal61zpr2ghz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz";
@@ -453,8 +453,8 @@
         sha256 = "1dz5d91x40l1fh513b45bphfvx6pc7gzzb3n3h72ssmg2x09rf76";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.0-linux-arm64.tar.gz";
-        sha256 = "1vnsiq70y0nc4dq49kymwqn4pjhd987417qdnciwd8q91aqkgyy9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.1-linux-arm64.tar.gz";
+        sha256 = "1pl4kn79j8ha270q2vkx5rcapslx7yhxja13ssggn2api1zi4w6d";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.1.0-linux-arm64.tar.gz";
@@ -469,8 +469,8 @@
         sha256 = "08s8asqcl859sm7ifaysdk0d14bwyiridnk16f64k4prdiq6dqii";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.9-linux-arm64.tar.gz";
-        sha256 = "1r8vw8gyzzbsci405balmx582nm3cv0hs197g1wb53f989az555g";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-linux-arm64.tar.gz";
+        sha256 = "113czcq1fm2dywn8q5v1z5lyz4l30b1433hrdjnfkr8qwzxncr48";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz";
@@ -479,8 +479,8 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.185.0-darwin-arm64.tar.gz";
-        sha256 = "05089n198d3sf2w5ydb7n9kv1z0wapiqkkzpinavs1d0wsshlgr7";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.186.0-darwin-arm64.tar.gz";
+        sha256 = "0ihk3k2b06hjyspmhfsrv16ybm42zibf4qyw19r5r9spjknk70lg";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.41.0-darwin-arm64.tar.gz";
@@ -507,8 +507,8 @@
         sha256 = "0ndkxq2vpppq2ygq0b81w72hnx8sb6ckdhcrx62gp9nfq5ya8y69";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-darwin-arm64.tar.gz";
-        sha256 = "099z1by8w9vgna544d8q1v3gnp3jbssj01k75kck2sm13954idli";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.2-darwin-arm64.tar.gz";
+        sha256 = "0vp65ccimrzhbg3h7rq1p18rjwhb2b4s0y90wvan22nsvwnv5b0p";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-darwin-arm64.tar.gz";
@@ -551,8 +551,8 @@
         sha256 = "1kammj8rsawv2qjw7a01skf7qdzjgprfkapbgypfsqcmlsmphy93";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-darwin-arm64.tar.gz";
-        sha256 = "0ns88zd55p3pg8z8xs8jph9bv33s1alii4gnwd7gxc651gy7icrq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-arm64.tar.gz";
+        sha256 = "13il7mq0g853x1nllvxnhbhflrlqx8i11p4xkg46bvshay15xh9x";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-darwin-arm64.tar.gz";
@@ -563,8 +563,8 @@
         sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.0-darwin-arm64.tar.gz";
-        sha256 = "1gdj29kmh1r4cbkzsmfgsmssrpakzrn0wn6h9y9fb1k0i3i9x56l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.1-darwin-arm64.tar.gz";
+        sha256 = "0njqqjslzgdks3cjv8bgg915llrssz4zxvnmcxb30cx44141lkav";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-arm64.tar.gz";
@@ -579,8 +579,8 @@
         sha256 = "1lg4jqficsy58wyl52gwqx5ch1wmasnz96ipcyci79dlpz6dbksg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.10-darwin-arm64.tar.gz";
-        sha256 = "190mmw7sdw8rln9q5yv04hmn9b70cqd4piyhn8i23qf831irligr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-darwin-arm64.tar.gz";
+        sha256 = "0n1wmplyj2c5qhaq0gplphi8p2i7g4jwrnlwzkv0m1wixrlx3fw5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-darwin-arm64.tar.gz";
@@ -591,16 +591,16 @@
         sha256 = "1braby52wys2ddfbb99yhhn6n3izr4sc70b7jl6ryrb6b17qqk0f";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-darwin-arm64.tar.gz";
-        sha256 = "0iikysfqf03pm7mrg383nisgh5v01bxjvxyhl2cg8bj8nsjr4s2h";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-darwin-arm64.tar.gz";
+        sha256 = "1bb3bzybmfi5blagh13bm6q1avjbp80lmjdv4q5yc2dbfbs653xi";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.2.0-darwin-arm64.tar.gz";
-        sha256 = "0wxdhalnhid7b0p1qq7pvc1llp0x671vmw2x5k6hddpqslxzzwvy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.3.0-darwin-arm64.tar.gz";
+        sha256 = "1s5h9d6jlvj2dqid1pmil74vwb82n1a6f6w3dvspm63mwjrxdmbj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.0-darwin-arm64.tar.gz";
-        sha256 = "06777viblb473yynw00xkhry37771gaxyqafpma4drj5qiicgmfn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.1-darwin-arm64.tar.gz";
+        sha256 = "1n3p9y26q7qc3ji9l4yrzxkravmmfb3gvs7xj4lyfy1ll312dq4d";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz";
@@ -611,8 +611,8 @@
         sha256 = "0pywbp952p7n1gh1rwdxkk1nvp7ri4kzanvi4qs3ca1nw7dvalqy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.0-darwin-arm64.tar.gz";
-        sha256 = "07xq8ws4pqp4762lm8z17c798xm4rw4xkybqj7c76a319xnjcx33";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.1-darwin-arm64.tar.gz";
+        sha256 = "0mz13356yyml557s5bxm0f30ypxjkv399jn6bacy5isi7qlv4d01";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.1.0-darwin-arm64.tar.gz";
@@ -627,8 +627,8 @@
         sha256 = "0ilqpzcjfnj0496s5pagzsykp5sjxm1a72gxyp33pk5wjcic7la5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.9-darwin-arm64.tar.gz";
-        sha256 = "1ws5c2aki0r01y1m1bw9pnpvipbybhdffgmi82gp8mrbln1njbmw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-darwin-arm64.tar.gz";
+        sha256 = "1ga7zvw6przmkbcpi3vq081g4bh8p4bzrfhi3jyxd6kh4slb3g9d";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz";

From 44c9bfcc7df493365fea42bae387ada8f831450c Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 28 Jul 2025 10:36:54 +0200
Subject: [PATCH 49/93] euphonica: 0.94.1-alpha -> 0.96.1-beta

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

diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix
index 02a024b807a9..007714d76cd0 100644
--- a/pkgs/by-name/eu/euphonica/package.nix
+++ b/pkgs/by-name/eu/euphonica/package.nix
@@ -25,19 +25,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "euphonica";
-  version = "0.94.1-alpha";
+  version = "0.96.1-beta";
 
   src = fetchFromGitHub {
     owner = "htkhiem";
     repo = "euphonica";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1d2GZSTr0HnVC7D6T7LFeL8kXfwGBhjqZ3lC4ZjpOtM=";
+    hash = "sha256-MMrTabKE+zqVSmbjOg0NCsI47eSu1c73RnsPDgCbhCo=";
     fetchSubmodules = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-vb9THfSTN27rOfIlpCPkAJm+eLnh+RptOYWLS8hGDpw=";
+    hash = "sha256-zFGFmiPozfBSIYxCu4fHynb2eh9emfVPtj3grPAoZeA=";
   };
 
   nativeBuildInputs = [

From d52048e66de5c4726e22eadc9419223f0c050ffa Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 28 Jul 2025 16:53:27 +0800
Subject: [PATCH 50/93] python312Packages.pymatgen: fix disabledTestPaths

fix regression introduced in https://github.com/NixOS/nixpkgs/pull/424782
---
 pkgs/development/python-modules/pymatgen/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 7199ebbe1862..36e22e559e1a 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -169,10 +169,11 @@ buildPythonPackage rec {
     "test_timer"
   ];
 
-  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+  disabledTestPaths = [
     # We have not packaged moyopy yet.
     "tests/analysis/test_prototypes.py::test_get_protostructure_label_from_moyopy"
-
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Crash when running the pmg command
     # Critical error: required built-in appearance SystemAppearance not found
     "tests/cli/test_pmg_plot.py"

From ebaf7a33ecd7f43988fc5be1b1ecc6d72da2cb6b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 16:04:38 +0200
Subject: [PATCH 51/93] nixos/systemd: add settings.Manager option

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

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 536174daa08d..74badf346922 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -24,6 +24,7 @@ let
     mountToUnit
     automountToUnit
     sliceToUnit
+    attrsToSection
     ;
 
   upstreamSystemUnits = [
@@ -423,6 +424,29 @@ in
       '';
     };
 
+    settings.Manager = mkOption {
+      default = { };
+      defaultText = lib.literalExpression ''
+        {
+          DefaultIOAccounting = true;
+          DefaultIPAccounting = true;
+        }
+      '';
+      type = lib.types.submodule {
+        freeformType = types.attrsOf unitOption;
+      };
+      example = {
+        WatchdogDevice = "/dev/watchdog";
+        RuntimeWatchdogSec = "30s";
+        RebootWatchdogSec = "10min";
+        KExecWatchdogSec = "5min";
+      };
+      description = ''
+        Options for the global systemd service manager. See {manpage}`systemd-system.conf(5)` man page
+        for available options.
+      '';
+    };
+
     sleep.extraConfig = mkOption {
       default = "";
       type = types.lines;
@@ -664,6 +688,7 @@ in
           ''}
 
           ${cfg.extraConfig}
+          ${attrsToSection cfg.settings.Manager}
         '';
 
         "systemd/sleep.conf".text = ''

From f0b71eebdc0b099904f046e30be33eab93e292ab Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 28 Jul 2025 11:05:34 +0200
Subject: [PATCH 52/93] nixos/systemd: add boot.initrd.systemd.settings.Manager
 option

---
 nixos/modules/system/boot/systemd/initrd.nix | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index b76682e4d6f0..49ee4edec2f2 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -11,6 +11,7 @@ with lib;
 
 let
   inherit (utils) systemdUtils escapeSystemdPath;
+  inherit (systemdUtils.unitOptions) unitOption;
   inherit (systemdUtils.lib)
     generateUnits
     pathToUnit
@@ -21,6 +22,7 @@ let
     timerToUnit
     mountToUnit
     automountToUnit
+    attrsToSection
     ;
 
   cfg = config.boot.initrd.systemd;
@@ -171,6 +173,28 @@ in
       '';
     };
 
+    settings.Manager = mkOption {
+      default = { };
+      defaultText = lib.literalExpression ''
+        {
+          DefaultEnvironment = "PATH=/bin:/sbin";
+        }
+      '';
+      type = lib.types.submodule {
+        freeformType = types.attrsOf unitOption;
+      };
+      example = {
+        WatchdogDevice = "/dev/watchdog";
+        RuntimeWatchdogSec = "30s";
+        RebootWatchdogSec = "10min";
+        KExecWatchdogSec = "5min";
+      };
+      description = ''
+        Options for the global systemd service manager used in initrd. See {manpage}`systemd-system.conf(5)` man page
+        for available options.
+      '';
+    };
+
     managerEnvironment = mkOption {
       type =
         with types;
@@ -182,6 +206,11 @@ in
           ])
         );
       default = { };
+      defaultText = ''
+        {
+          PATH = "/bin:/sbin";
+        }
+      '';
       example = {
         SYSTEMD_LOG_LEVEL = "debug";
       };
@@ -460,6 +489,7 @@ in
           [Manager]
           DefaultEnvironment=PATH=/bin:/sbin
           ${cfg.extraConfig}
+          ${attrsToSection cfg.settings.Manager}
           ManagerEnvironment=${
             lib.concatStringsSep " " (
               lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment

From 222ee8fabfad815e6c988882defe282d1e79dc1a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 16:30:08 +0200
Subject: [PATCH 53/93] nixos/testing: migrate to systemd.settings.Manager

---
 nixos/modules/testing/test-instrumentation.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 80852be51f1d..89d3b9d5277c 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -115,7 +115,7 @@ in
           MaxLevelConsole=debug
         '';
 
-        extraConfig = config.systemd.extraConfig;
+        settings.Manager = config.systemd.settings.Manager;
       }
 
       (lib.mkIf cfg.initrdBackdoor {
@@ -210,13 +210,13 @@ in
       MaxLevelConsole=debug
     '';
 
-    systemd.extraConfig = ''
+    systemd.settings.Manager = {
       # Don't clobber the console with duplicate systemd messages.
-      ShowStatus=no
+      ShowStatus = false;
       # Allow very slow start
-      DefaultTimeoutStartSec=300
-      DefaultDeviceTimeoutSec=300
-    '';
+      DefaultTimeoutStartSec = 300;
+      DefaultDeviceTimeoutSec = 300;
+    };
     systemd.user.extraConfig = ''
       # Allow very slow start
       DefaultTimeoutStartSec=300

From 5077e5f1e88eddb87596a60a7e99575c6645d021 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 16:30:43 +0200
Subject: [PATCH 54/93] nixos/tests/systemd: migrate to
 systemd.settings.Manager

---
 nixos/tests/systemd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index f2ea77f2ed48..a39d9d9545a1 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -27,7 +27,9 @@
         };
       };
 
-      systemd.extraConfig = "DefaultEnvironment=\"XXX_SYSTEM=foo\"";
+      systemd.settings.Manager = {
+        DefaultEnvironment = "XXX_SYSTEM=foo";
+      };
       systemd.user.extraConfig = "DefaultEnvironment=\"XXX_USER=bar\"";
       services.journald.extraConfig = "Storage=volatile";
       test-support.displayManager.auto.user = "alice";

From 9142cadd5e46c9449f6e0e456625bf977fcfb2f5 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 17:05:12 +0200
Subject: [PATCH 55/93] nixos/pam: point to systemd.settings.Manager

---
 nixos/modules/security/pam.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 3eba6d4b519e..53e67873d200 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -1663,7 +1663,7 @@ in
         must be that described in {manpage}`limits.conf(5)`.
 
         Note that these limits do not apply to systemd services,
-        whose limits can be changed via {option}`systemd.extraConfig`
+        whose limits can be changed via {option}`systemd.settings.Manager`
         instead.
       '';
     };

From a48bc46a3eb284a94b2c1074ff11d91962d55c3b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 17:13:56 +0200
Subject: [PATCH 56/93] nixos/tests/switchTest: migrate to
 systemd.settings.Manager

---
 nixos/tests/switch-test.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix
index 18defdfc9d76..545cbe25f167 100644
--- a/nixos/tests/switch-test.nix
+++ b/nixos/tests/switch-test.nix
@@ -68,9 +68,9 @@ in
             echo "systemd 0" > $out/init-interface-version
           '';
 
-          modifiedSystemConf.configuration.systemd.extraConfig = ''
-            # Hello world!
-          '';
+          modifiedSystemConf.configuration.systemd.settings.Manager = {
+            DefaultEnvironment = "XXX_SYSTEM=foo";
+          };
 
           addedMount.configuration.virtualisation.fileSystems."/test" = {
             device = "tmpfs";

From 1a846a2fffb0041b978db145c3ec08f3982ae028 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 17:15:08 +0200
Subject: [PATCH 57/93] nixos/systemd: remove systemd.extraConfig

---
 nixos/modules/system/boot/systemd.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 74badf346922..fbdf963ead18 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -414,16 +414,6 @@ in
       '';
     };
 
-    extraConfig = mkOption {
-      default = "";
-      type = types.lines;
-      example = "DefaultLimitCORE=infinity";
-      description = ''
-        Extra config options for systemd. See {manpage}`systemd-system.conf(5)` man page
-        for available options.
-      '';
-    };
-
     settings.Manager = mkOption {
       default = { };
       defaultText = lib.literalExpression ''
@@ -687,7 +677,6 @@ in
             KExecWatchdogSec=${cfg.watchdog.kexecTime}
           ''}
 
-          ${cfg.extraConfig}
           ${attrsToSection cfg.settings.Manager}
         '';
 
@@ -883,5 +872,6 @@ in
       To forcibly reenable cgroup v1 support, you can set boot.kernelParams = [ "systemd.unified_cgroup_hierarchy=0" "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1" ].
       NixOS does not officially support this configuration and might cause your system to be unbootable in future versions. You are on your own.
     '')
+    (mkRemovedOptionModule [ "systemd" "extraConfig" ] "Use systemd.settings.Manager instead.")
   ];
 }

From 071ce0b44a70fdaab1b28bed8e06f44d3dc1430b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 28 Jul 2025 11:06:32 +0200
Subject: [PATCH 58/93] nixos/systemd: remove boot.initrd.systemd.extraConfig

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

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 49ee4edec2f2..905232b66864 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -141,6 +141,12 @@ in
       It only saved ~1MiB of initramfs size, but caused a few issues
       like unloadable kernel modules.
     '')
+    (lib.mkRemovedOptionModule [
+      "boot"
+      "initrd"
+      "systemd"
+      "extraConfig"
+    ] "Use boot.initrd.systemd.settings.Manager instead.")
   ];
 
   options.boot.initrd.systemd = {
@@ -163,16 +169,6 @@ in
       '';
     };
 
-    extraConfig = mkOption {
-      default = "";
-      type = types.lines;
-      example = "DefaultLimitCORE=infinity";
-      description = ''
-        Extra config options for systemd. See {manpage}`systemd-system.conf(5)` man page
-        for available options.
-      '';
-    };
-
     settings.Manager = mkOption {
       default = { };
       defaultText = lib.literalExpression ''
@@ -488,7 +484,6 @@ in
         "/etc/systemd/system.conf".text = ''
           [Manager]
           DefaultEnvironment=PATH=/bin:/sbin
-          ${cfg.extraConfig}
           ${attrsToSection cfg.settings.Manager}
           ManagerEnvironment=${
             lib.concatStringsSep " " (

From 5bc2d42ba9c84e805bcd388d9973f9f69da54925 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 28 Jul 2025 11:07:13 +0200
Subject: [PATCH 59/93] nixos/systemd: make
 boot.initrd.systemd.managerEnvironment affect
 boot.initrd.systemd.settings.Manager

---
 nixos/modules/system/boot/systemd/initrd.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 905232b66864..c2b1b1ab005c 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -475,6 +475,10 @@ in
       };
 
       managerEnvironment.PATH = "/bin:/sbin";
+      settings.Manager.ManagerEnvironment = lib.concatStringsSep " " (
+        lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment
+      );
+      settings.Manager.DefaultEnvironment = "PATH=/bin:/sbin";
 
       contents = {
         "/tmp/.keep".text = "systemd requires the /tmp mount point in the initrd cpio archive";
@@ -483,13 +487,7 @@ in
 
         "/etc/systemd/system.conf".text = ''
           [Manager]
-          DefaultEnvironment=PATH=/bin:/sbin
           ${attrsToSection cfg.settings.Manager}
-          ManagerEnvironment=${
-            lib.concatStringsSep " " (
-              lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment
-            )
-          }
         '';
 
         "/lib".source = "${config.system.build.modulesClosure}/lib";

From 897933fc9eacb221f3b0ec0f469ab199b4bb9d1d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 11:05:51 +0200
Subject: [PATCH 60/93] nixos/systemd: move systemd.managerEnvironment to
 systemd.settings.Manager.ManagerEnvironment

---
 nixos/modules/system/boot/systemd.nix | 54 ++++++++++++++-------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index fbdf963ead18..e8d4edc44397 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -386,26 +386,6 @@ in
       '';
     };
 
-    managerEnvironment = mkOption {
-      type =
-        with types;
-        attrsOf (
-          nullOr (oneOf [
-            str
-            path
-            package
-          ])
-        );
-      default = { };
-      example = {
-        SYSTEMD_LOG_LEVEL = "debug";
-      };
-      description = ''
-        Environment variables of PID 1. These variables are
-        *not* passed to started units.
-      '';
-    };
-
     enableCgroupAccounting = mkOption {
       default = true;
       type = types.bool;
@@ -424,6 +404,29 @@ in
       '';
       type = lib.types.submodule {
         freeformType = types.attrsOf unitOption;
+        options = {
+          ManagerEnvironment = mkOption {
+            type =
+              with types;
+              attrsOf (
+                nullOr (oneOf [
+                  str
+                  path
+                  package
+                ])
+              );
+            default = { };
+            example = {
+              SYSTEMD_LOG_LEVEL = "debug";
+            };
+            description = ''
+              Environment variables of PID 1. These variables are
+              *not* passed to started units.
+            '';
+            apply =
+              env: lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") env);
+          };
+        };
       };
       example = {
         WatchdogDevice = "/dev/watchdog";
@@ -652,11 +655,6 @@ in
 
         "systemd/system.conf".text = ''
           [Manager]
-          ManagerEnvironment=${
-            lib.concatStringsSep " " (
-              lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment
-            )
-          }
           ${optionalString cfg.enableCgroupAccounting ''
             DefaultCPUAccounting=yes
             DefaultIOAccounting=yes
@@ -747,7 +745,7 @@ in
       // listToAttrs (map (withName automountToUnit) cfg.automounts);
 
     # Environment of PID 1
-    systemd.managerEnvironment = {
+    systemd.settings.Manager.ManagerEnvironment = {
       # Doesn't contain systemd itself - everything works so it seems to use the compiled-in value for its tools
       # util-linux is needed for the main fsck utility wrapping the fs-specific ones
       PATH = lib.makeBinPath (
@@ -873,5 +871,9 @@ in
       NixOS does not officially support this configuration and might cause your system to be unbootable in future versions. You are on your own.
     '')
     (mkRemovedOptionModule [ "systemd" "extraConfig" ] "Use systemd.settings.Manager instead.")
+    (lib.mkRenamedOptionModule
+      [ "systemd" "managerEnvironment" ]
+      [ "systemd" "settings.Manager" "ManagerEnvironment" ]
+    )
   ];
 }

From 583a98175b1e35de1be2b9bd00cecca4d1ceacf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 09:24:37 +0000
Subject: [PATCH 61/93] cve-prioritizer: 1.9.0 -> 1.10.1

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

diff --git a/pkgs/by-name/cv/cve-prioritizer/package.nix b/pkgs/by-name/cv/cve-prioritizer/package.nix
index dde4e6415855..5d69b4995bf3 100644
--- a/pkgs/by-name/cv/cve-prioritizer/package.nix
+++ b/pkgs/by-name/cv/cve-prioritizer/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cve-prioritizer";
-  version = "1.9.0";
+  version = "1.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TURROKS";
     repo = "CVE_Prioritizer";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-FJN/AM4NFctMszzIBdvww7OtC7fimb++tbtRZ77ll5c=";
+    tag = "v${version}";
+    hash = "sha256-Yy5jVpxb3e2lCpxMaxDdXBGh8by5lmGi+G+kJguA3AA=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Vulnerability patching with CVSS, EPSS, and CISA's Known Exploited Vulnerabilities";
     homepage = "https://github.com/TURROKS/CVE_Prioritizer";
-    changelog = "https://github.com/TURROKS/CVE_Prioritizer/releases/tag/v${version}";
+    changelog = "https://github.com/TURROKS/CVE_Prioritizer/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cve-prioritizer";

From 4d3ab0e8d39d50cdf1472fa33834e1947b139fc8 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 16:56:38 +0200
Subject: [PATCH 62/93] nixos/systemd: make systemd.managerEnvironment affect
 systemd.settings.Manager

---
 nixos/modules/system/boot/systemd.nix | 52 +++++++++++++--------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index e8d4edc44397..a27a86bf834e 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -386,6 +386,26 @@ in
       '';
     };
 
+    managerEnvironment = mkOption {
+      type =
+        with types;
+        attrsOf (
+          nullOr (oneOf [
+            str
+            path
+            package
+          ])
+        );
+      default = { };
+      example = {
+        SYSTEMD_LOG_LEVEL = "debug";
+      };
+      description = ''
+        Environment variables of PID 1. These variables are
+        *not* passed to started units.
+      '';
+    };
+
     enableCgroupAccounting = mkOption {
       default = true;
       type = types.bool;
@@ -404,29 +424,6 @@ in
       '';
       type = lib.types.submodule {
         freeformType = types.attrsOf unitOption;
-        options = {
-          ManagerEnvironment = mkOption {
-            type =
-              with types;
-              attrsOf (
-                nullOr (oneOf [
-                  str
-                  path
-                  package
-                ])
-              );
-            default = { };
-            example = {
-              SYSTEMD_LOG_LEVEL = "debug";
-            };
-            description = ''
-              Environment variables of PID 1. These variables are
-              *not* passed to started units.
-            '';
-            apply =
-              env: lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") env);
-          };
-        };
       };
       example = {
         WatchdogDevice = "/dev/watchdog";
@@ -745,7 +742,7 @@ in
       // listToAttrs (map (withName automountToUnit) cfg.automounts);
 
     # Environment of PID 1
-    systemd.settings.Manager.ManagerEnvironment = {
+    systemd.managerEnvironment = {
       # Doesn't contain systemd itself - everything works so it seems to use the compiled-in value for its tools
       # util-linux is needed for the main fsck utility wrapping the fs-specific ones
       PATH = lib.makeBinPath (
@@ -761,6 +758,9 @@ in
         config.boot.extraSystemdUnitPaths != [ ]
       ) "${builtins.concatStringsSep ":" config.boot.extraSystemdUnitPaths}:";
     };
+    systemd.settings.Manager.ManagerEnvironment = lib.concatStringsSep " " (
+      lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment
+    );
 
     system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [
       "DEVTMPFS"
@@ -871,9 +871,5 @@ in
       NixOS does not officially support this configuration and might cause your system to be unbootable in future versions. You are on your own.
     '')
     (mkRemovedOptionModule [ "systemd" "extraConfig" ] "Use systemd.settings.Manager instead.")
-    (lib.mkRenamedOptionModule
-      [ "systemd" "managerEnvironment" ]
-      [ "systemd" "settings.Manager" "ManagerEnvironment" ]
-    )
   ];
 }

From 493f1339b026de47fdaca57f37d881530795935d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 16:57:49 +0200
Subject: [PATCH 63/93] nixos/systemd: move systemd.watchdog.* to
 systemd.settings.Manager

---
 nixos/modules/system/boot/systemd.nix | 136 +++++++++++++-------------
 nixos/tests/systemd.nix               |  11 +--
 2 files changed, 74 insertions(+), 73 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a27a86bf834e..b5e22b07dce6 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -424,6 +424,60 @@ in
       '';
       type = lib.types.submodule {
         freeformType = types.attrsOf unitOption;
+        options = {
+          WatchdogDevice = mkOption {
+            type = types.nullOr types.path;
+            default = null;
+            example = "/dev/watchdog";
+            description = ''
+              The path to a hardware watchdog device which will be managed by systemd.
+              If not specified, systemd will default to `/dev/watchdog`.
+            '';
+          };
+
+          RuntimeWatchdogSec = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            example = "30s";
+            description = ''
+              The amount of time which can elapse before a watchdog hardware device
+              will automatically reboot the system.
+
+              Valid time units include "ms", "s", "min", "h", "d", and "w";
+              see {manpage}`systemd.time(7)`.
+            '';
+          };
+
+          RebootWatchdogSec = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            example = "10m";
+            description = ''
+              The amount of time which can elapse after a reboot has been triggered
+              before a watchdog hardware device will automatically reboot the system.
+              If left `null`, systemd will use its default of 10 minutes;
+              see {manpage}`systemd-system.conf(5)`.
+
+              Valid time units include "ms", "s", "min", "h", "d", and "w";
+              see also {manpage}`systemd.time(7)`.
+            '';
+          };
+
+          KExecWatchdogSec = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            example = "10m";
+            description = ''
+              The amount of time which can elapse when `kexec` is being executed before
+              a watchdog hardware device will automatically reboot the system. This
+              option should only be enabled if `reloadTime` is also enabled;
+              see {manpage}`kexec(8)`.
+
+              Valid time units include "ms", "s", "min", "h", "d", and "w";
+              see also {manpage}`systemd.time(7)`.
+            '';
+          };
+        };
       };
       example = {
         WatchdogDevice = "/dev/watchdog";
@@ -471,59 +525,6 @@ in
         by other NixOS modules.
       '';
     };
-
-    watchdog.device = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      example = "/dev/watchdog";
-      description = ''
-        The path to a hardware watchdog device which will be managed by systemd.
-        If not specified, systemd will default to `/dev/watchdog`.
-      '';
-    };
-
-    watchdog.runtimeTime = mkOption {
-      type = types.nullOr types.str;
-      default = null;
-      example = "30s";
-      description = ''
-        The amount of time which can elapse before a watchdog hardware device
-        will automatically reboot the system.
-
-        Valid time units include "ms", "s", "min", "h", "d", and "w";
-        see {manpage}`systemd.time(7)`.
-      '';
-    };
-
-    watchdog.rebootTime = mkOption {
-      type = types.nullOr types.str;
-      default = null;
-      example = "10m";
-      description = ''
-        The amount of time which can elapse after a reboot has been triggered
-        before a watchdog hardware device will automatically reboot the system.
-        If left `null`, systemd will use its default of 10 minutes;
-        see {manpage}`systemd-system.conf(5)`.
-
-        Valid time units include "ms", "s", "min", "h", "d", and "w";
-        see also {manpage}`systemd.time(7)`.
-      '';
-    };
-
-    watchdog.kexecTime = mkOption {
-      type = types.nullOr types.str;
-      default = null;
-      example = "10m";
-      description = ''
-        The amount of time which can elapse when `kexec` is being executed before
-        a watchdog hardware device will automatically reboot the system. This
-        option should only be enabled if `reloadTime` is also enabled;
-        see {manpage}`kexec(8)`.
-
-        Valid time units include "ms", "s", "min", "h", "d", and "w";
-        see also {manpage}`systemd.time(7)`.
-      '';
-    };
   };
 
   ###### implementation
@@ -659,19 +660,6 @@ in
             DefaultIPAccounting=yes
           ''}
           DefaultLimitCORE=infinity
-          ${optionalString (cfg.watchdog.device != null) ''
-            WatchdogDevice=${cfg.watchdog.device}
-          ''}
-          ${optionalString (cfg.watchdog.runtimeTime != null) ''
-            RuntimeWatchdogSec=${cfg.watchdog.runtimeTime}
-          ''}
-          ${optionalString (cfg.watchdog.rebootTime != null) ''
-            RebootWatchdogSec=${cfg.watchdog.rebootTime}
-          ''}
-          ${optionalString (cfg.watchdog.kexecTime != null) ''
-            KExecWatchdogSec=${cfg.watchdog.kexecTime}
-          ''}
-
           ${attrsToSection cfg.settings.Manager}
         '';
 
@@ -871,5 +859,21 @@ in
       NixOS does not officially support this configuration and might cause your system to be unbootable in future versions. You are on your own.
     '')
     (mkRemovedOptionModule [ "systemd" "extraConfig" ] "Use systemd.settings.Manager instead.")
+    (lib.mkRenamedOptionModule
+      [ "systemd" "watchdog" "device" ]
+      [ "systemd" "settings" "Manager" "WatchdogDevice" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "systemd" "watchdog" "runtimeTime" ]
+      [ "systemd" "settings" "Manager" "RuntimeWatchdogSec" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "systemd" "watchdog" "rebootTime" ]
+      [ "systemd" "settings" "Manager" "RebootWatchdogSec" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "systemd" "watchdog" "kexecTime" ]
+      [ "systemd" "settings" "Manager" "KExecWatchdogSec" ]
+    )
   ];
 }
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index a39d9d9545a1..1209a90cbc43 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -29,6 +29,10 @@
 
       systemd.settings.Manager = {
         DefaultEnvironment = "XXX_SYSTEM=foo";
+        WatchdogDevice = "/dev/watchdog";
+        RuntimeWatchdogSec = "30s";
+        RebootWatchdogSec = "10min";
+        KExecWatchdogSec = "5min";
       };
       systemd.user.extraConfig = "DefaultEnvironment=\"XXX_USER=bar\"";
       services.journald.extraConfig = "Storage=volatile";
@@ -88,13 +92,6 @@
         '';
       };
 
-      systemd.watchdog = {
-        device = "/dev/watchdog";
-        runtimeTime = "30s";
-        rebootTime = "10min";
-        kexecTime = "5min";
-      };
-
       environment.etc."systemd/system-preset/10-testservice.preset".text = ''
         disable ${config.systemd.services.testservice1.name}
       '';

From 62acc59148037c85c71c5e9819e696c8c20c30e3 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 17:21:21 +0200
Subject: [PATCH 64/93] nixos/systemd: move systemd.watchdog.* to
 systemd.settings.Manager

---
 nixos/modules/system/boot/systemd.nix | 54 ---------------------------
 1 file changed, 54 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index b5e22b07dce6..dc8072521715 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -424,60 +424,6 @@ in
       '';
       type = lib.types.submodule {
         freeformType = types.attrsOf unitOption;
-        options = {
-          WatchdogDevice = mkOption {
-            type = types.nullOr types.path;
-            default = null;
-            example = "/dev/watchdog";
-            description = ''
-              The path to a hardware watchdog device which will be managed by systemd.
-              If not specified, systemd will default to `/dev/watchdog`.
-            '';
-          };
-
-          RuntimeWatchdogSec = mkOption {
-            type = types.nullOr types.str;
-            default = null;
-            example = "30s";
-            description = ''
-              The amount of time which can elapse before a watchdog hardware device
-              will automatically reboot the system.
-
-              Valid time units include "ms", "s", "min", "h", "d", and "w";
-              see {manpage}`systemd.time(7)`.
-            '';
-          };
-
-          RebootWatchdogSec = mkOption {
-            type = types.nullOr types.str;
-            default = null;
-            example = "10m";
-            description = ''
-              The amount of time which can elapse after a reboot has been triggered
-              before a watchdog hardware device will automatically reboot the system.
-              If left `null`, systemd will use its default of 10 minutes;
-              see {manpage}`systemd-system.conf(5)`.
-
-              Valid time units include "ms", "s", "min", "h", "d", and "w";
-              see also {manpage}`systemd.time(7)`.
-            '';
-          };
-
-          KExecWatchdogSec = mkOption {
-            type = types.nullOr types.str;
-            default = null;
-            example = "10m";
-            description = ''
-              The amount of time which can elapse when `kexec` is being executed before
-              a watchdog hardware device will automatically reboot the system. This
-              option should only be enabled if `reloadTime` is also enabled;
-              see {manpage}`kexec(8)`.
-
-              Valid time units include "ms", "s", "min", "h", "d", and "w";
-              see also {manpage}`systemd.time(7)`.
-            '';
-          };
-        };
       };
       example = {
         WatchdogDevice = "/dev/watchdog";

From 69e833f187993396b1bcaf0fc8792497fe95c9d6 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 17:22:20 +0200
Subject: [PATCH 65/93] nixos/systemd: set DefaultLimitCORE in
 systemd.settings.Manager explicitly

---
 nixos/modules/system/boot/systemd.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index dc8072521715..9f7a5b57916a 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -424,6 +424,15 @@ in
       '';
       type = lib.types.submodule {
         freeformType = types.attrsOf unitOption;
+        options = {
+          DefaultLimitCORE = mkOption {
+            type = types.nullOr types.str;
+            default = "infinity";
+            description = ''
+              Default for the maximum size of core files created by services.
+            '';
+          };
+        };
       };
       example = {
         WatchdogDevice = "/dev/watchdog";
@@ -605,7 +614,6 @@ in
             DefaultBlockIOAccounting=yes
             DefaultIPAccounting=yes
           ''}
-          DefaultLimitCORE=infinity
           ${attrsToSection cfg.settings.Manager}
         '';
 

From 9c429f004d100ff895b9b08432bdab38b5a73fb6 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 17:23:04 +0200
Subject: [PATCH 66/93] nixos/systemd: remove obsolete definition for
 DefaultLimitCORE

The limit was introduced in 2016 in 840f3230a202e40a4107c4ce0ccb910be69c2792,
and broken iin 2019 in bafc25691596caf2f6e034cbe5933fdd90a92b6a. Since then,
it is the exact same as systemd itself sets as default.
---
 nixos/modules/system/boot/systemd.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 9f7a5b57916a..0da75aa40b03 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -424,15 +424,6 @@ in
       '';
       type = lib.types.submodule {
         freeformType = types.attrsOf unitOption;
-        options = {
-          DefaultLimitCORE = mkOption {
-            type = types.nullOr types.str;
-            default = "infinity";
-            description = ''
-              Default for the maximum size of core files created by services.
-            '';
-          };
-        };
       };
       example = {
         WatchdogDevice = "/dev/watchdog";

From 265152f770a8ccd503bd93f5638d0c68aff82536 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 17:23:50 +0200
Subject: [PATCH 67/93] nixos/systemd: explicitly set
 systemd.settings.Manager.Default*Accounting

---
 nixos/modules/system/boot/systemd.nix | 38 ++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 0da75aa40b03..c5317b1c40af 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -424,6 +424,38 @@ in
       '';
       type = lib.types.submodule {
         freeformType = types.attrsOf unitOption;
+        options = {
+          DefaultCPUAccounting = mkOption {
+            type = types.bool;
+            default = cfg.enableCgroupAccounting;
+            defaultText = lib.literalExpression "config.systemd.enableCgroupAccounting";
+            description = "Turn on CPU usage accounting";
+          };
+
+          DefaultIOAccounting = mkOption {
+            type = types.bool;
+            default = cfg.enableCgroupAccounting;
+            defaultText = lib.literalExpression "config.systemd.enableCgroupAccounting";
+            description = "Turn on Block I/O accounting.";
+          };
+
+          DefaultBlockIOAccounting = mkOption {
+            type = types.bool;
+            default = cfg.enableCgroupAccounting;
+            defaultText = lib.literalExpression "config.systemd.enableCgroupAccounting";
+            description = "(Deprecated since systemd 252).";
+          };
+
+          DefaultIPAccounting = mkOption {
+            type = types.bool;
+            default = cfg.enableCgroupAccounting;
+            defaultText = lib.literalExpression "config.systemd.enableCgroupAccounting";
+            description = ''
+              If true, turns on IPv4 and IPv6 network traffic accounting for packets sent or received by the unit. When
+              this option is turned on, all IPv4 and IPv6 sockets created by any process are accounted for.
+            '';
+          };
+        };
       };
       example = {
         WatchdogDevice = "/dev/watchdog";
@@ -599,12 +631,6 @@ in
 
         "systemd/system.conf".text = ''
           [Manager]
-          ${optionalString cfg.enableCgroupAccounting ''
-            DefaultCPUAccounting=yes
-            DefaultIOAccounting=yes
-            DefaultBlockIOAccounting=yes
-            DefaultIPAccounting=yes
-          ''}
           ${attrsToSection cfg.settings.Manager}
         '';
 

From f47b100763688781069914595aaf9261d426672a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 15:13:26 +0200
Subject: [PATCH 68/93] nixos/systemd: remove obsolete DefaultBlockIOAccounting
 option

This option is now being ignored by systemd,
so we do not need to explicitly define it.
---
 nixos/modules/system/boot/systemd.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c5317b1c40af..c1eb904134cf 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -439,13 +439,6 @@ in
             description = "Turn on Block I/O accounting.";
           };
 
-          DefaultBlockIOAccounting = mkOption {
-            type = types.bool;
-            default = cfg.enableCgroupAccounting;
-            defaultText = lib.literalExpression "config.systemd.enableCgroupAccounting";
-            description = "(Deprecated since systemd 252).";
-          };
-
           DefaultIPAccounting = mkOption {
             type = types.bool;
             default = cfg.enableCgroupAccounting;

From 231c14276631a2f9530c9af93f27616abd3bfb69 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 17:24:22 +0200
Subject: [PATCH 69/93] nixos/systemd: remove obsolete DefaultCPUAccounting
 option

This option is made uncondiotional in systemd 258 [1].
Earlier, it defaulted to true on kernels newer than 4.15,
which applies to all supported nixos kernels.
This means removing the option does not change behavior.

[1] https://github.com/systemd/systemd/commit/29da53dde32a0097134f6c3ba5fb5220dd6e5423
---
 nixos/modules/system/boot/systemd.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c1eb904134cf..c158f1bab429 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -425,13 +425,6 @@ in
       type = lib.types.submodule {
         freeformType = types.attrsOf unitOption;
         options = {
-          DefaultCPUAccounting = mkOption {
-            type = types.bool;
-            default = cfg.enableCgroupAccounting;
-            defaultText = lib.literalExpression "config.systemd.enableCgroupAccounting";
-            description = "Turn on CPU usage accounting";
-          };
-
           DefaultIOAccounting = mkOption {
             type = types.bool;
             default = cfg.enableCgroupAccounting;

From 84cbe9dce4bab8d3172fef22c496cfd9d6aa5815 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 28 Jul 2025 11:09:49 +0200
Subject: [PATCH 70/93] nixos/netdata: remove cgroup accounting enable

cgroup accounting is enabled by default, and the option is scheduled for removal.
---
 nixos/modules/services/monitoring/netdata.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index b7c8f4b42ba9..24abc3d9ac12 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -412,8 +412,6 @@ in
       });
     };
 
-    systemd.enableCgroupAccounting = true;
-
     security.wrappers = {
       "apps.plugin" = {
         source = "${cfg.package}/libexec/netdata/plugins.d/apps.plugin.org";

From fad6dbb9e67642a8daec2cfb9533dc899ec6531a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 20 Jul 2025 18:08:51 +0200
Subject: [PATCH 71/93] nixos/systemd: remove enableCgroupAccounting option

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

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c158f1bab429..f543142a60ec 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -406,14 +406,6 @@ in
       '';
     };
 
-    enableCgroupAccounting = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable cgroup accounting; see {manpage}`cgroups(7)`.
-      '';
-    };
-
     settings.Manager = mkOption {
       default = { };
       defaultText = lib.literalExpression ''
@@ -424,24 +416,6 @@ in
       '';
       type = lib.types.submodule {
         freeformType = types.attrsOf unitOption;
-        options = {
-          DefaultIOAccounting = mkOption {
-            type = types.bool;
-            default = cfg.enableCgroupAccounting;
-            defaultText = lib.literalExpression "config.systemd.enableCgroupAccounting";
-            description = "Turn on Block I/O accounting.";
-          };
-
-          DefaultIPAccounting = mkOption {
-            type = types.bool;
-            default = cfg.enableCgroupAccounting;
-            defaultText = lib.literalExpression "config.systemd.enableCgroupAccounting";
-            description = ''
-              If true, turns on IPv4 and IPv6 network traffic accounting for packets sent or received by the unit. When
-              this option is turned on, all IPv4 and IPv6 sockets created by any process are accounted for.
-            '';
-          };
-        };
       };
       example = {
         WatchdogDevice = "/dev/watchdog";
@@ -703,9 +677,13 @@ in
         config.boot.extraSystemdUnitPaths != [ ]
       ) "${builtins.concatStringsSep ":" config.boot.extraSystemdUnitPaths}:";
     };
-    systemd.settings.Manager.ManagerEnvironment = lib.concatStringsSep " " (
-      lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment
-    );
+    systemd.settings.Manager = {
+      ManagerEnvironment = lib.concatStringsSep " " (
+        lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment
+      );
+      DefaultIOAccounting = lib.mkDefault true;
+      DefaultIPAccounting = lib.mkDefault true;
+    };
 
     system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [
       "DEVTMPFS"
@@ -832,5 +810,9 @@ in
       [ "systemd" "watchdog" "kexecTime" ]
       [ "systemd" "settings" "Manager" "KExecWatchdogSec" ]
     )
+    (mkRemovedOptionModule [
+      "systemd"
+      "enableCgroupAccounting"
+    ] "To disable cgroup accounting, disable systemd.settings.Manager.*Accounting directly.")
   ];
 }

From 6cd6573d41643a989a7e3f11fc3b4d2fd5484720 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 21 Jul 2025 08:51:59 +0200
Subject: [PATCH 72/93] nixos/doc/rl-2511: document rfc42 conversion for
 systemd.extraConfig

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index b03412275d90..ee3df919cf4c 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -141,6 +141,13 @@
 
 - `libvirt` now supports using `nftables` backend.
 
+- `systemd.extraConfig` and `boot.initrd.systemd.extraConfig` was converted to RFC42-style `systemd.settings.Manager` and `boot.initrd.systemd.settings.Manager` respectively.
+  - `systemd.watchdog.runtimeTime` was renamed to `systemd.settings.Manager.RuntimeWatchdogSec`
+  - `systemd.watchdog.device` was renamed to `systemd.settings.Manager.WatchdogDevice`
+  - `systemd.watchdog.rebootTime` was renamed to `systemd.settings.Manager.RebootWatchdogSec`
+  - `systemd.watchdog.kexecTime` was renamed to `systemd.settings.Manager.KExecWatchdogSec`
+  - `systemd.enableCgroupAccounting` was removed. Cgroup accounting now needs to be disabled directly using `systemd.settings.Manager.*Accounting`.
+
 - `services.ntpd-rs` now performs configuration validation.
 
 - `services.postsrsd` now automatically integrates with the local Postfix instance, when enabled. This behavior can disabled using the [services.postsrsd.configurePostfix](#opt-services.postsrsd.configurePostfix) option.

From ca071030417f2474791cf6c4c970d36ce06d0193 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 09:42:04 +0000
Subject: [PATCH 73/93] namespace-cli: 0.0.431 -> 0.0.433

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

diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index d9a1c2c535d3..5d0ca1e0bdea 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "namespace-cli";
-  version = "0.0.431";
+  version = "0.0.433";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${version}";
-    hash = "sha256-huMJCStwmvPkvAEp0FnC3B4z9KqSRMWUd3KJ61WNREE=";
+    hash = "sha256-ZkRo6tPYJk3ym7LDkucnoLTbmCRJ7nup4zB/7wY6dTc=";
   };
 
   vendorHash = "sha256-/JFiCflhJsu8Tkkw0Pqj0iOauVXXLaNuPRK524YVN98=";

From c49832e84be5eb1406a70eac07278f56a6cb307b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 11:48:09 +0000
Subject: [PATCH 74/93] terraform-providers.mongodbatlas: 1.38.0 -> 1.39.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 4861dc40bf33..3bb68eb6b20d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -840,13 +840,13 @@
     "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
   },
   "mongodbatlas": {
-    "hash": "sha256-ZmQw87cBWt8bfLTkeEAopVBEoLCvyAXb001mWK6SnZE=",
+    "hash": "sha256-Lv0LwvQZTtZ2ZaNDJSQFVRDFtM23mnihV4XOBIxL5Bc=",
     "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
     "owner": "mongodb",
     "repo": "terraform-provider-mongodbatlas",
-    "rev": "v1.38.0",
+    "rev": "v1.39.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-r874TWc0OCXMin2VYHmOSg4sBjIgCxJUiykw+A7oMsk="
+    "vendorHash": "sha256-6ZxrQGYX15TpCTQ/Oxe4NL/XlgdqmWBm53JEuMv8KQg="
   },
   "namecheap": {
     "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",

From 18550f4943908c3c8e7139855b5c51b35f62cada Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 12:04:40 +0000
Subject: [PATCH 75/93] python3Packages.multitasking: 0.0.11 -> 0.0.12

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

diff --git a/pkgs/development/python-modules/multitasking/default.nix b/pkgs/development/python-modules/multitasking/default.nix
index e5880849da73..edfbece090b1 100644
--- a/pkgs/development/python-modules/multitasking/default.nix
+++ b/pkgs/development/python-modules/multitasking/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "multitasking";
-  version = "0.0.11";
+  version = "0.0.12";
   format = "setuptools";
 
   # GitHub source releases aren't tagged
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TWvDzGX5stynL7Wnh4UKiNro9iDCs2rptVJI5RvNYCY=";
+    hash = "sha256-L7ovqO2MS4XiJ8XdfcQcfWWN47byR5JzFhdaVzSbhNE=";
   };
 
   doCheck = false; # No tests included

From 0d89dd479570ce8084fc35cc34342518a877a92e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 14:43:50 +0000
Subject: [PATCH 76/93] schemat: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/by-name/sc/schemat/package.nix b/pkgs/by-name/sc/schemat/package.nix
index 76905a869b73..d15226c28f31 100644
--- a/pkgs/by-name/sc/schemat/package.nix
+++ b/pkgs/by-name/sc/schemat/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "schemat";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "schemat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GthDo45Kmz7ZNwFZGGhTcyDn8+g6QUbaVv8M46tm+Qs=";
+    hash = "sha256-JOrBQvrnA/qSmI+jJjGjcxEWFDCfiUmtJaZPI3N0rMk=";
   };
 
-  cargoHash = "sha256-g18k/wyZqeunTHnLnfOTh4I0NlbgNya5y3EZVyY1B1c=";
+  cargoHash = "sha256-zGP8m05g6zEQ/dx9ChLhUCM2x9q3bltPW+9ku05rzCE=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 196a27ed487b96c4c12f9b3e8af3f2b6eb387f4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 15:32:23 +0000
Subject: [PATCH 77/93] phpPackages.phing: 3.0.1 -> 3.1.0

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

diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix
index 324c7eba9676..6edfcbe0426a 100644
--- a/pkgs/development/php-packages/phing/default.nix
+++ b/pkgs/development/php-packages/phing/default.nix
@@ -8,16 +8,16 @@
 (php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject2
   (finalAttrs: {
     pname = "phing";
-    version = "3.0.1";
+    version = "3.1.0";
 
     # Upstream no longer provides the composer.lock in their release artifact
     src = fetchgit {
       url = "https://github.com/phingofficial/phing";
       tag = finalAttrs.version;
-      hash = "sha256-eVDHwG8UPvQPrhD3KuO4ZONsnGGbclVs4kNVG+Ac1/E=";
+      hash = "sha256-gY6ocmkd7eJIMaBrewfxYL7gTr+1qNHTkuAp+w9ApUU=";
     };
 
-    vendorHash = "sha256-os5ljzAAxpFfpfAlYNboIj0VX8/otI14JbjV8FSo0yg=";
+    vendorHash = "sha256-3frpoQzHtJA2/jJpZT+yIRatEwiY6LIUGzEZBa8hXbM=";
 
     nativeInstallCheckInputs = [
       versionCheckHook

From 49df97fd79787e8111190916e3d25590346c9697 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 28 Jul 2025 16:41:13 +0200
Subject: [PATCH 78/93] python3Packages.bytewax: disable on python3.13, cleanup

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

diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix
index af9d0540db5f..ac39958242fb 100644
--- a/pkgs/development/python-modules/bytewax/default.nix
+++ b/pkgs/development/python-modules/bytewax/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+  pythonAtLeast,
 
   # build-system
   cmake,
@@ -30,9 +30,10 @@
 buildPythonPackage rec {
   pname = "bytewax";
   version = "0.21.1";
-  format = "pyproject";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  # error: the configured Python interpreter version (3.13) is newer than PyO3's maximum supported version (3.12)
+  disabled = pythonAtLeast "3.13";
 
   src = fetchFromGitHub {
     owner = "bytewax";
@@ -100,12 +101,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "bytewax" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python Stream Processing";
     homepage = "https://github.com/bytewax/bytewax";
     changelog = "https://github.com/bytewax/bytewax/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       mslingsby
       kfollesdal
     ];

From e362bff9a3541b66413594874135d3cb720f0e59 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 28 Jul 2025 17:06:13 +0200
Subject: [PATCH 79/93] python3Packages.smolagents: temporary fix for
 transformers compat

Broken by #428429.
---
 pkgs/development/python-modules/smolagents/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index 99e9b4a00784..1a1d4f3e90e2 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -62,6 +62,15 @@ buildPythonPackage rec {
     hash = "sha256-ING+C2MACKFto+1FON5OGFgzLf8SM99ViTdADzNzQLw=";
   };
 
+  # TODO: remove at the next release
+  # ImportError: cannot import name 'require_soundfile' from 'transformers.testing_utils'
+  # Caused by: https://github.com/huggingface/transformers/commit/1ecd52e50a31e7c344c32564e0484d7e9a0f2256
+  # Fixed in: https://github.com/huggingface/smolagents/pull/1625
+  postPatch = ''
+    substituteInPlace tests/test_types.py \
+      --replace-fail "require_soundfile" "require_torchcodec"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From 3dec076d7800ce00c874f90a7cf60f57c7c61dd6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 28 Jul 2025 18:13:48 +0200
Subject: [PATCH 80/93] python3Packages.txtai: fix

---
 .../python-modules/txtai/default.nix          | 29 ++++++-------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix
index e4ea71c3eedc..d0596d94aaee 100644
--- a/pkgs/development/python-modules/txtai/default.nix
+++ b/pkgs/development/python-modules/txtai/default.nix
@@ -224,6 +224,7 @@ let
       graph
       model
       pipeline-audio
+      pipeline-data
       pipeline-image
       pipeline-llm
       pipeline-text
@@ -289,26 +290,8 @@ buildPythonPackage {
   ++ optional-dependencies.api
   ++ optional-dependencies.similarity;
 
-  enabledTestPaths = [
-    "test/python/test*.py"
-  ];
-
-  # The deselected paths depend on the huggingface hub and should be run as a passthru test
-  # disabledTestPaths won't work as the problem is with the classes containing the tests
-  # (in other words, it fails on __init__)
-  disabledTestPaths = [
-    "test/python/testagent.py"
-    "test/python/testcloud.py"
-    "test/python/testconsole.py"
-    "test/python/testembeddings.py"
-    "test/python/testgraph.py"
-    "test/python/testapi/testapiembeddings.py"
-    "test/python/testapi/testapipipelines.py"
-    "test/python/testapi/testapiworkflow.py"
-    "test/python/testdatabase/testclient.py"
-    "test/python/testdatabase/testduckdb.py"
-    "test/python/testdatabase/testencoder.py"
-    "test/python/testworkflow.py"
+  pytestFlagsArray = [
+    "test/python/*"
   ];
 
   disabledTests = [
@@ -316,6 +299,12 @@ buildPythonPackage {
     "testInvalidTar"
     "testInvalidZip"
     # Downloads from Huggingface
+    "TestAgent"
+    "TestCloud"
+    "TestConsole"
+    "TestEmbeddings"
+    "TestGraph"
+    "TestWorkflow"
     "testPipeline"
     "testVectors"
     # Not finding sqlite-vec despite being supplied

From 353d0c5434c9dc7a4b76ed1924913bbb3e482ade Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 28 Jul 2025 19:48:10 +0200
Subject: [PATCH 81/93] ncmpcpp: fix finding boost

See other commits with the same message.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/nc/ncmpcpp/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/nc/ncmpcpp/package.nix b/pkgs/by-name/nc/ncmpcpp/package.nix
index d9343c17ccc7..af22c8f658be 100644
--- a/pkgs/by-name/nc/ncmpcpp/package.nix
+++ b/pkgs/by-name/nc/ncmpcpp/package.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
     (lib.withFeature visualizerSupport "fftw")
     (lib.enableFeature clockSupport "clock")
     (lib.withFeature taglibSupport "taglib")
+    (lib.withFeatureAs true "boost" boost.dev)
   ];
 
   nativeBuildInputs = [

From e101a4fbbebce34cef9ea8e69ead535b5667fec1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 17:59:02 +0000
Subject: [PATCH 82/93] terraform-providers.kafka: 0.10.3 -> 0.12.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 4861dc40bf33..ad323b371c60 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -696,13 +696,13 @@
     "vendorHash": "sha256-ctd9V5EXL0c9b4aJ47nfjhqCMTewL55IkjkQ39ShoUk="
   },
   "kafka": {
-    "hash": "sha256-NiAbUZ+ZMRLXm/WLrfj0ZjbPft4jZhdwLBhFIE4PjeI=",
+    "hash": "sha256-Onyy+KgmgLYk3J1P4rhHDJ7uEb+9jbywkY7lbfdQ2Vs=",
     "homepage": "https://registry.terraform.io/providers/Mongey/kafka",
     "owner": "Mongey",
     "repo": "terraform-provider-kafka",
-    "rev": "v0.10.3",
+    "rev": "v0.12.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-57V/0JIsq+pqbWmg3iZ0s8t8iD2Xtipy08I/+ZJCkNc="
+    "vendorHash": "sha256-kkaNv+c6IGAW+amSSycjBmUCFXBeQrcF5Jmvtl8bXAE="
   },
   "kafka-connect": {
     "hash": "sha256-XMGpK22Ww8swvfrnbClxjErVmkBKX3dxdlkjgNJHlCE=",

From 1475c1abfc08aa91c3239a34a634842f9a484d3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 18:08:02 +0000
Subject: [PATCH 83/93] tflint: 0.58.0 -> 0.58.1

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

diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index 2ca672dc742b..45dc9d696097 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "tflint";
-  version = "0.58.0";
+  version = "0.58.1";
 in
 buildGoModule {
   inherit pname version;
@@ -20,10 +20,10 @@ buildGoModule {
     owner = "terraform-linters";
     repo = "tflint";
     tag = "v${version}";
-    hash = "sha256-AaY2UghPvYveZ4xtUphPOnnoA6FcyO9Y2Uzz3bN8Q8I=";
+    hash = "sha256-1SuNcqU8JtMypoltbNBZHZZi78jvbbAD+nmj2v8NU5g=";
   };
 
-  vendorHash = "sha256-lmV23xDzBaMxV4MQeatX4sF0UwDZBlekdW21CMGtIqs=";
+  vendorHash = "sha256-8sHiCEtVs+rUnmJ9NPYJJcr4sDlFaEWklE3JaoXEu9w=";
 
   doCheck = false;
 

From 2355f7f83bef9cf62fb9fe8d59df0fd8a5d32b7b Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 28 Jul 2025 10:06:52 -0700
Subject: [PATCH 84/93] python3Packages.spacy: add sarahec as maintainer

---
 pkgs/development/python-modules/spacy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 8c76a932c8bd..fdae52c0fcb9 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -142,7 +142,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/explosion/spaCy";
     changelog = "https://github.com/explosion/spaCy/releases/tag/release-v${version}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ sarahec ];
     mainProgram = "spacy";
   };
 }

From 99f9086ffedf0a2ad9d2222a677c577cb1a6c236 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 28 Jul 2025 10:40:11 -0700
Subject: [PATCH 85/93] python3Packages.spacy: disable test that expects
 external (missing/outdated) files

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

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index fdae52c0fcb9..a3730425ef92 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -113,6 +113,11 @@ buildPythonPackage rec {
     "test_download_compatibility"
     "test_validate_compatibility_table"
     "test_project_assets"
+    "test_find_available_port"
+
+    # Tests for presence of outdated (and thus missing) spacy models
+    # https://github.com/explosion/spaCy/issues/13856
+    "test_registry_entries"
   ];
 
   pythonImportsCheck = [ "spacy" ];

From 913b9abf02226efc75feaf88e7d05a9e5716ba69 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 28 Jul 2025 10:42:14 -0700
Subject: [PATCH 86/93] python3Packages.spacy: allow local networking on Darwin

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

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index a3730425ef92..fef2482b2661 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -142,6 +142,8 @@ buildPythonPackage rec {
     tests.annotation = callPackage ./annotation-test { };
   };
 
+  __darwinAllowLocalNetworking = true; # needed for test_find_available_port
+
   meta = {
     description = "Industrial-strength Natural Language Processing (NLP)";
     homepage = "https://github.com/explosion/spaCy";

From 9c331745fd233e07cf69c1df0f0ed5da4ae051d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 21:06:26 +0000
Subject: [PATCH 87/93] klog-rs: 0.4.2 -> 0.5.0

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

diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix
index 94be554149fa..ad378068f39a 100644
--- a/pkgs/by-name/kl/klog-rs/package.nix
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "klog-rs";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "tobifroe";
     repo = "klog";
     rev = version;
-    hash = "sha256-X7VUbn2DQx4Wo526COGAp0IFPPhh1vObxP/b6oYFWG4=";
+    hash = "sha256-dPFxjSq5P7MyXUAugZqPEYRJ2VcFuVs774f3AKdH7kk=";
   };
 
-  cargoHash = "sha256-veE992wYv8SwAbvaqe3nVymxTbaMYEDWtLnisnyNOn4=";
+  cargoHash = "sha256-9dJ2MCAd6DhNaqgUtuBifMbTTZoCoLNLjyR9b0fwfcc=";
   checkFlags = [
     # this integration test depends on a running kubernetes cluster
     "--skip=k8s::tests::test_get_pod_list"

From 240fc3e24feb186c5d3f3ffe2d07c11bb1c29a89 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Mon, 28 Jul 2025 17:57:26 -0400
Subject: [PATCH 88/93] ethersync: 0.6.0 -> 0.7.0

NLnet project.

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

diff --git a/pkgs/by-name/et/ethersync/package.nix b/pkgs/by-name/et/ethersync/package.nix
index 6a0ce6607327..49b88c9281e0 100644
--- a/pkgs/by-name/et/ethersync/package.nix
+++ b/pkgs/by-name/et/ethersync/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ethersync";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "ethersync";
     repo = "ethersync";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dHV4+WxNdEvRZK8WNK0qp9f43Y9oSUtlXrq/mI0yWls=";
+    hash = "sha256-Swh8C8FMjPdIFpHOsNb3W9W7JAZGzPXHXTwwnr1gFok=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/daemon";
 
-  cargoHash = "sha256-uKtJp4RD0YbOmtzbxebpYQxlBmP+5k88d+76hT4cTI8=";
+  cargoHash = "sha256-ZgbxaEtsaBQLl9PJbo1O2wA3OxEfPKRl3KkFvR4c97Q=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From 04fb07600ce743915429c5b79e3dc9fff140d1b0 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Mon, 28 Jul 2025 17:58:12 -0400
Subject: [PATCH 89/93] ethersync: add ngi team

NLnet project. We should be informed when something changes ;).

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/et/ethersync/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/et/ethersync/package.nix b/pkgs/by-name/et/ethersync/package.nix
index 49b88c9281e0..26659ce92301 100644
--- a/pkgs/by-name/et/ethersync/package.nix
+++ b/pkgs/by-name/et/ethersync/package.nix
@@ -33,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     downloadPage = "https://github.com/ethersync/ethersync";
     changelog = "https://github.com/ethersync/ethersync/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.agpl3Plus;
+    teams = [ lib.teams.ngi ];
     maintainers = with lib.maintainers; [
       prince213
       ethancedwards8

From 2ba00a0dcb8ff5006b28897cd10db35f58131db1 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Mon, 28 Jul 2025 18:02:35 -0400
Subject: [PATCH 90/93] vimPlugins.ethersync: init at 0.7.0

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 2349fb07befb..78e4de437b10 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -133,6 +133,8 @@
   # search-and-replace.nvim dependencies
   fd,
   sad,
+  # ethersync vim plugin
+  ethersync,
 }:
 self: super:
 let
@@ -1127,6 +1129,17 @@ in
     '';
   };
 
+  ethersync = buildVimPlugin rec {
+    inherit (ethersync)
+      pname
+      version
+      src
+      meta
+      ;
+
+    sourceRoot = "${src.name}/nvim-plugin";
+  };
+
   executor-nvim = super.executor-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
   };

From 2a469e7d0b11ff22b7fe3d183d3dcb92067c3a7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 10:28:10 +0000
Subject: [PATCH 91/93] python3Packages.scikit-hep-testdata: 0.5.4 -> 0.5.8

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

diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix
index 05c443811252..f3ec89b963ca 100644
--- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix
+++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-hep-testdata";
-  version = "0.5.4";
+  version = "0.5.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "scikit-hep-testdata";
     tag = "v${version}";
-    hash = "sha256-LDOBd+0Aw/x9qW30Tb0B9AlhckOkJhY+Mx4ERkvDbJc=";
+    hash = "sha256-NAb+2AwU6BwPkgYr0WQn47hdeS+cRLgYckcDT2/dHpU=";
   };
 
   build-system = [ setuptools-scm ];

From 7278edf95bb824f253e7c393d98b1d6984536ee1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Jul 2025 01:50:43 +0200
Subject: [PATCH 92/93] pim6sd: 0-unstable-2019-05-31 -> 0-unstable-2024-12-14

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

diff --git a/pkgs/by-name/pi/pim6sd/package.nix b/pkgs/by-name/pi/pim6sd/package.nix
index 9ed9c6413fc3..d05f5ad4c261 100644
--- a/pkgs/by-name/pi/pim6sd/package.nix
+++ b/pkgs/by-name/pi/pim6sd/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "pim6sd";
-  version = "0-unstable-2019-05-31";
+  version = "0-unstable-2024-12-14";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "pim6sd";
-    rev = "fa3909529981dd705ba9ead0517222c30c581a4e";
-    sha256 = "0x7dyark2mp9xqz9cnmmgaf0z143vxn2835clllpji4ylg77zdjw";
+    rev = "9fd332d92af4fe8c92a70c1b6c2048ffddb0e48a";
+    hash = "sha256-iTukxjo63Smk6wX8SQsi49iNLpmxeN9JSkBZB5aBMaQ=";
   };
 
   nativeBuildInputs = [
@@ -24,12 +24,12 @@ stdenv.mkDerivation {
     flex
   ];
 
-  meta = with lib; {
+  meta = {
     description = "PIM for IPv6 sparse mode daemon";
     homepage = "https://github.com/troglobit/pim6sd";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ hexa ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ hexa ];
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pim6sd.x86_64-darwin
   };
 }

From a3890363c1155bf8393bf329673c49d10e5f61ea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Jul 2025 01:58:33 +0200
Subject: [PATCH 93/93] steck: 0.7.0 -> 0.8.0

https://github.com/supakeen/steck/compare/v0.7.0...v0.8.0
---
 pkgs/servers/pinnwand/steck.nix | 40 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix
index d6098aa6d9d7..626215039d8e 100644
--- a/pkgs/servers/pinnwand/steck.nix
+++ b/pkgs/servers/pinnwand/steck.nix
@@ -2,32 +2,27 @@
   lib,
   pkgs,
   python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
   nixosTests,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "steck";
-  version = "0.7.0";
-  format = "setuptools";
+  version = "0.8.0";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1a3l427ibwck9zzzy1sp10hmjgminya08i4r9j4559qzy7lxghs1";
+  src = fetchFromGitHub {
+    owner = "supakeen";
+    repo = "steck";
+    tag = "v${version}";
+    hash = "sha256-5Spops8ERQ7TgFYH7n+c4hKdIQfjjujKaGhmhfAszgQ=";
   };
 
-  postPatch = ''
-    cat setup.py
-    substituteInPlace setup.py \
-      --replace 'click>=7.0,<8.0' 'click' \
-      --replace 'termcolor>=1.1.0,<2.0.0' 'termcolor'
-  '';
-
-  nativeBuildInputs = with python3Packages; [
-    setuptools
+  build-system = with python3Packages; [
+    poetry-core
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     pkgs.git
     appdirs
     click
@@ -37,16 +32,19 @@ python3Packages.buildPythonApplication rec {
     toml
   ];
 
-  # tests are not in pypi package
-  doCheck = false;
+  pythonRelaxDeps = [ "termcolor" ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+  ];
 
   passthru.tests = nixosTests.pinnwand;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/supakeen/steck";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     description = "Client for pinnwand pastebin";
     mainProgram = "steck";
-    maintainers = with maintainers; [ hexa ];
+    maintainers = with lib.maintainers; [ hexa ];
   };
 }