From 5a0333fc63e9f4c8451918512d53d21d625e3465 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 16 Jul 2025 10:26:09 +0200
Subject: [PATCH 001/109] hatchet: init at 0.6.0

---
 pkgs/by-name/ha/hatchet/package.nix | 49 +++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/ha/hatchet/package.nix

diff --git a/pkgs/by-name/ha/hatchet/package.nix b/pkgs/by-name/ha/hatchet/package.nix
new file mode 100644
index 000000000000..2ce6d5ecab85
--- /dev/null
+++ b/pkgs/by-name/ha/hatchet/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "hatchet";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "simagix";
+    repo = "hatchet";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-m/TuO5Z4Pc2Hruxb2uRwKcccUQjExnGOt3A0fqXVt5s=";
+  };
+
+  vendorHash = "sha256-FbwwAeK9L6yIVZEBN1Ay5PB2D89vQNjbtMG5pI5jAAw=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=v${finalAttrs.version}"
+    "-X main.repo=${finalAttrs.src.owner}/${finalAttrs.src.repo}"
+  ];
+
+  postInstall = "mv $out/bin/main $out/bin/${finalAttrs.meta.mainProgram}";
+
+  # the tests are using fixture files not available from the git repo.
+  doCheck = false;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/simagix/hatchet";
+    changelog = "https://github.com/simagix/hatchet/releases/tag/${finalAttrs.src.tag}";
+    description = "MongoDB JSON Log Analyzer";
+    maintainers = with lib.maintainers; [ aduh95 ];
+    license = lib.licenses.asl20;
+    mainProgram = "hatchet";
+  };
+})

From 1e1c03fc1fec1e963af1df19a085dfb5f20870f8 Mon Sep 17 00:00:00 2001
From: Calum MacRae <hi@cmacr.ae>
Date: Thu, 4 Sep 2025 10:31:09 +0100
Subject: [PATCH 002/109] victoriatraces: init at 0.2.0

---
 pkgs/by-name/vi/victoriatraces/package.nix | 63 ++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/vi/victoriatraces/package.nix

diff --git a/pkgs/by-name/vi/victoriatraces/package.nix b/pkgs/by-name/vi/victoriatraces/package.nix
new file mode 100644
index 000000000000..6c18d0ca0035
--- /dev/null
+++ b/pkgs/by-name/vi/victoriatraces/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  nixosTests,
+  withServer ? true,
+  withVtInsert ? false,
+  withVtSelect ? false,
+  withVtStorage ? false,
+  withVtGen ? false,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "VictoriaTraces";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "VictoriaMetrics";
+    repo = "VictoriaTraces";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-b4/ix191xtW2HpczfRbez2gibgGx7jBRm0hvuP/rTpA=";
+  };
+
+  vendorHash = null;
+
+  subPackages =
+    lib.optionals withServer [ "app/victoria-traces" ]
+    ++ lib.optionals withVtInsert [ "app/vtinsert" ]
+    ++ lib.optionals withVtSelect [ "app/vtselect" ]
+    ++ lib.optionals withVtStorage [ "app/vtstorage" ]
+    ++ lib.optionals withVtGen [ "app/vtgen" ];
+
+  postPatch = ''
+    # Allow older go versions
+    substituteInPlace go.mod \
+      --replace-fail "go 1.24.6" "go ${finalAttrs.passthru.go.version}"
+  '';
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/VictoriaMetrics/VictoriaTraces/lib/buildinfo.Version=${finalAttrs.version}"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  passthru = {
+    tests = {
+      inherit (nixosTests) victoriatraces;
+    };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    homepage = "https://docs.victoriametrics.com/victoriatraces/";
+    description = "Fast open-source observability solution for distributed traces";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ cmacrae ];
+    changelog = "https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/${finalAttrs.src.tag}";
+    mainProgram = "victoria-traces";
+  };
+})

From 4a09f3a1f5814effce52574399c2b7e9579a0b8f Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 11 Sep 2025 14:28:44 +0200
Subject: [PATCH 003/109] crates-lsp: init at 0.4.2

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

diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix
new file mode 100644
index 000000000000..c920b271c568
--- /dev/null
+++ b/pkgs/by-name/cr/crates-lsp/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "crates-lsp";
+  version = "0.4.2";
+
+  src = fetchFromGitHub {
+    owner = "MathiasPius";
+    repo = "crates-lsp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-s42nWQC2tD7vhQNPdTQNRokwXqeBhELidVYTlos+No0=";
+  };
+
+  cargoHash = "sha256-XqUWcbaOZXRWzIvL9Kbo6Unl0rmeGxHO4+674uHukAs=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Language Server implementation for Cargo.toml";
+    homepage = "https://github.com/MathiasPius/crates-lsp";
+    license = with lib.licenses; [ mit ];
+
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "aarch64-darwin"
+      "x86_64-darwin"
+      "x86_64-windows"
+    ];
+    maintainers = with lib.maintainers; [ steveej ];
+    mainProgram = "crates-lsp";
+  };
+})

From f924064b5e32d0eab3b11d8452ba35eed9d230d4 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 14 Sep 2025 10:49:14 -0400
Subject: [PATCH 004/109] clipper2: 1.5.3 -> 1.5.4

Diff: https://github.com/AngusJohnson/Clipper2/compare/Clipper2_1.5.3...Clipper2_1.5.4

Release notes: https://github.com/AngusJohnson/Clipper2/releases/tag/Clipper2_1.5.4
---
 pkgs/by-name/cl/clipper2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/clipper2/package.nix b/pkgs/by-name/cl/clipper2/package.nix
index 3785fba4c8a1..46c4bbfacae4 100644
--- a/pkgs/by-name/cl/clipper2/package.nix
+++ b/pkgs/by-name/cl/clipper2/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clipper2";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "AngusJohnson";
     repo = "Clipper2";
     rev = "Clipper2_${version}";
-    hash = "sha256-6lvzU93+UnArEtRe2mJ4YB16+5sDCrBcPzljNAEFt8M=";
+    hash = "sha256-2vZXxT5hISz2xbWbvYNGTrq9QovTjNwUK103iVtz8ok=";
   };
 
   sourceRoot = "${src.name}/CPP";

From 5930fa7e644f26f80bf6bfd7652612fc782ca0a9 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 14 Sep 2025 10:51:50 -0400
Subject: [PATCH 005/109] clipper2: add passthru.updateScript

Hopefully helps prevent r-ryantm from making mistakes like in 413003.
---
 pkgs/by-name/cl/clipper2/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/cl/clipper2/package.nix b/pkgs/by-name/cl/clipper2/package.nix
index 46c4bbfacae4..febf7b4a8a28 100644
--- a/pkgs/by-name/cl/clipper2/package.nix
+++ b/pkgs/by-name/cl/clipper2/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,6 +29,8 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=ON"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Polygon Clipping and Offsetting - C++ Only";
     longDescription = ''

From d71d93c5ed2e55f362b522e19c63a6a51d0b568a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Sep 2025 16:14:07 +0000
Subject: [PATCH 006/109] diesel-cli: 2.2.12 -> 2.3.0

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

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 0bca3c4a0999..10b3970ee94d 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.2.12";
+  version = "2.3.0";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-cBufd4HwNffkK2VDPMMUT1qZfgKNa6XKpxT5QlQesyc=";
+    hash = "sha256-s/RJ83TuW42MIYgKXq5tlqJ73u0aucuXrR8bFArqT5A=";
   };
 
-  cargoHash = "sha256-CmzUe/R9iFU//u0/FxMonYWyx0EJnI/blUktYN/eNe8=";
+  cargoHash = "sha256-XmWrXLOYm7y7+0mqT0WSmT6LhHAPA9UbGODlluBKyZw=";
 
   nativeBuildInputs = [
     installShellFiles

From 2a57b635ff090176b2c7fdad2b5d679b8163af6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Sep 2025 12:39:18 +0000
Subject: [PATCH 007/109] rspamd: 3.12.1 -> 3.13.0

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

diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index af18cd8ed5ce..00329d94048d 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -39,13 +39,13 @@ assert (!withHyperscan) || (!withVectorscan);
 
 stdenv.mkDerivation rec {
   pname = "rspamd";
-  version = "3.12.1";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
     rev = version;
-    hash = "sha256-bAkT0msUkgGkjAIlF7lnJbimBKW1NSn2zjkCj3ErJ1I=";
+    hash = "sha256-0qX/rvcEXxzr/PGL2A59T18Mfcalrjz0KJpEWBKJsZg=";
   };
 
   hardeningEnable = [ "pie" ];

From 70ca6c738779eb77e68f8f4950e5ed8c31837780 Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Thu, 18 Sep 2025 01:26:41 +0000
Subject: [PATCH 008/109] shader-slang: 2025.16.1 -> 2025.17

Changelog: https://github.com/shader-slang/slang/releases/tag/v2025.17
---
 pkgs/by-name/sh/shader-slang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index bbbf97d396a0..1c7494078a59 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shader-slang";
-  version = "2025.16.1";
+  version = "2025.17";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9kCqE/jwnQrwbKXdcY3rp8YoPju+/ZupH1HBc5qu53o=";
+    hash = "sha256-JmDInquZlyGG7LivZ4792Ef7IazntgwOwAheNILT+HI=";
     fetchSubmodules = true;
   };
 

From 2742fcd734b774e0e60f2b45768e23d7bc72ac98 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 18 Sep 2025 18:06:20 -0400
Subject: [PATCH 009/109] maintainers: remove MGlolenstine

---
 maintainers/maintainer-list.nix                  | 7 -------
 pkgs/by-name/be/beebeep/package.nix              | 2 +-
 pkgs/by-name/ca/cargo-ndk/package.nix            | 2 +-
 pkgs/by-name/fe/fermyon-spin/package.nix         | 2 +-
 pkgs/by-name/li/libaal/package.nix               | 2 +-
 pkgs/by-name/pi/picoprobe-udev-rules/package.nix | 2 +-
 pkgs/by-name/pi/pizarra/package.nix              | 2 +-
 7 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8483c23a6a1d..6c2fa39286fa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16590,13 +16590,6 @@
     githubId = 71893;
     name = "Michael Maclean";
   };
-  mglolenstine = {
-    email = "mglolenstine@gmail.com";
-    github = "MGlolenstine";
-    githubId = 9406770;
-    matrix = "@mglolenstine:matrix.org";
-    name = "MGlolenstine";
-  };
   mgregoire = {
     email = "gregoire@martinache.net";
     github = "M-Gregoire";
diff --git a/pkgs/by-name/be/beebeep/package.nix b/pkgs/by-name/be/beebeep/package.nix
index ed9138531aaa..46685ced4f12 100644
--- a/pkgs/by-name/be/beebeep/package.nix
+++ b/pkgs/by-name/be/beebeep/package.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     mainProgram = "beebeep";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ mglolenstine ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-ndk/package.nix b/pkgs/by-name/ca/cargo-ndk/package.nix
index 3586de5b19f7..e211eee2c96d 100644
--- a/pkgs/by-name/ca/cargo-ndk/package.nix
+++ b/pkgs/by-name/ca/cargo-ndk/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ mglolenstine ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix
index 396f348e2133..8773f26f6d5e 100644
--- a/pkgs/by-name/fe/fermyon-spin/package.nix
+++ b/pkgs/by-name/fe/fermyon-spin/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = with licenses; [ asl20 ];
     mainProgram = "spin";
-    maintainers = with maintainers; [ mglolenstine ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/li/libaal/package.nix b/pkgs/by-name/li/libaal/package.nix
index 8e3535d90f6b..b51ff4b1c231 100644
--- a/pkgs/by-name/li/libaal/package.nix
+++ b/pkgs/by-name/li/libaal/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.namesys.com/";
     description = "Support library for Reiser4";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ mglolenstine ];
+    maintainers = with lib.maintainers; [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/by-name/pi/picoprobe-udev-rules/package.nix b/pkgs/by-name/pi/picoprobe-udev-rules/package.nix
index 8397d34d16b4..8d81c86e3d7e 100644
--- a/pkgs/by-name/pi/picoprobe-udev-rules/package.nix
+++ b/pkgs/by-name/pi/picoprobe-udev-rules/package.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
     description = "Picoprobe udev rules list";
     platforms = platforms.linux;
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ mglolenstine ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/pi/pizarra/package.nix b/pkgs/by-name/pi/pizarra/package.nix
index 1f112ae8d4d9..12c7baae2809 100644
--- a/pkgs/by-name/pi/pizarra/package.nix
+++ b/pkgs/by-name/pi/pizarra/package.nix
@@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://pizarra.categulario.xyz/en/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ mglolenstine ];
+    maintainers = with maintainers; [ ];
   };
 }

From d13fd57381d6f1cf9e2946ab5c9f42a713af8c4f Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 19 Sep 2025 19:29:09 -0400
Subject: [PATCH 010/109] sauce-connect: 5.2.2 -> 5.3.0; fix updateScript to
 work on aarch64-linux

---
 pkgs/by-name/sa/sauce-connect/package.nix | 8 ++++----
 pkgs/by-name/sa/sauce-connect/update.sh   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sa/sauce-connect/package.nix b/pkgs/by-name/sa/sauce-connect/package.nix
index 3e550fa0aa8c..27f558f8f3ae 100644
--- a/pkgs/by-name/sa/sauce-connect/package.nix
+++ b/pkgs/by-name/sa/sauce-connect/package.nix
@@ -9,21 +9,21 @@
 
 stdenv.mkDerivation rec {
   pname = "sauce-connect";
-  version = "5.2.2";
+  version = "5.3.0";
 
   passthru = {
     sources = {
       x86_64-linux = fetchurl {
         url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_linux.x86_64.tar.gz";
-        hash = "sha256-JyQkXp7/jrgWEKNPHUw/exXc5nqjejHWsy3IiEJ5gqU=";
+        hash = "sha256-7DeGVdRtbgwpDpt7txuYLmf7R6KYeneMOGPH0B1PTIQ=";
       };
       aarch64-linux = fetchurl {
         url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_linux.aarch64.tar.gz";
-        hash = "sha256-8EZjqid4/r2p8jZxQiI1x1IyDFXHwWDbmCOVXdnmmgs=";
+        hash = "sha256-3fUB0KLFEmSzRlYSZhJ3VP4QJC/S1R2Iyk3+o82sNRg=";
       };
       x86_64-darwin = fetchurl {
         url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_darwin.all.zip";
-        hash = "sha256-E4S7hbLSnRd5M/yOiUyPasYNg7ZmQ10S6fyn9Qs1BFk=";
+        hash = "sha256-nSmDenuel+L4HKhDEHMirGwKj0A7plIXAqf+T7Agc3A=";
       };
       aarch64-darwin = passthru.sources.x86_64-darwin;
     };
diff --git a/pkgs/by-name/sa/sauce-connect/update.sh b/pkgs/by-name/sa/sauce-connect/update.sh
index 1c6f10b33046..38ab992a3eb3 100755
--- a/pkgs/by-name/sa/sauce-connect/update.sh
+++ b/pkgs/by-name/sa/sauce-connect/update.sh
@@ -19,7 +19,7 @@ all_versions=$(jq --exit-status --raw-output \
     '.all_downloads | to_entries[] | select(.value | has("linux") and has("osx")) | .key' \
     <<< "$response")
 latest_version=$(sort --version-sort <<< "$all_versions" | tail -n 1)
-for platform in x86_64-linux x86_64-darwin; do
+for platform in x86_64-linux aarch64-linux x86_64-darwin; do
     update-source-version sauce-connect "$latest_version" \
         --ignore-same-version \
         --source-key="passthru.sources.$platform"

From 9df99ccd5aaf1b7de34e272222770bdcdb562997 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 19 Sep 2025 20:20:46 -0400
Subject: [PATCH 011/109] tinyssh: 20250201 -> 20250501

Changelog: https://github.com/janmojzis/tinyssh/releases/tag/20250501
---
 pkgs/by-name/ti/tinyssh/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ti/tinyssh/package.nix b/pkgs/by-name/ti/tinyssh/package.nix
index 1599baf96d33..254afaa63513 100644
--- a/pkgs/by-name/ti/tinyssh/package.nix
+++ b/pkgs/by-name/ti/tinyssh/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tinyssh";
-  version = "20250201";
+  version = "20250501";
 
   src = fetchFromGitHub {
     owner = "janmojzis";
     repo = "tinyssh";
     tag = finalAttrs.version;
-    hash = "sha256-HX531QjRrDG4dshqzR03naZptUYnoZLEdv/CGpKOaD0=";
+    hash = "sha256-72UHCJ8XaJ2lwXAOnLlhDUQOEElFkyCVswgFtYEuxPA=";
   };
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";

From f63102c090ba4b1fce05c9d106267b6b34e6ab43 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 19 Sep 2025 20:44:38 -0400
Subject: [PATCH 012/109] vipsdisp: 3.1.0 -> 4.1.2

* Diff: https://github.com/jcupitt/vipsdisp/compare/refs/tags/v3.1.0...refs/tags/v4.1.2
* Changelog: https://github.com/jcupitt/vipsdisp/blob/v4.1.2/CHANGELOG.md
---
 pkgs/by-name/vi/vipsdisp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vipsdisp/package.nix b/pkgs/by-name/vi/vipsdisp/package.nix
index f7cd36737c27..9a162ed5cc63 100644
--- a/pkgs/by-name/vi/vipsdisp/package.nix
+++ b/pkgs/by-name/vi/vipsdisp/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vipsdisp";
-  version = "3.1.0";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "jcupitt";
     repo = "vipsdisp";
     tag = "v${version}";
-    hash = "sha256-3HciPvem8ySIW/H7d5M71lQV9mBcT6ZlpF3yo8BXsPE=";
+    hash = "sha256-9L8l/afD6phq8T3ReYqQQgD1CztW5gw0MME23Ut/lEE=";
   };
 
   postPatch = ''

From 131dee7df4ddb36ff84328a27503d745857e6b7d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 19 Sep 2025 21:34:52 -0400
Subject: [PATCH 013/109] hsd: 7.0.1 -> 8.0.0

Diff: https://github.com/handshake-org/hsd/compare/v7.0.1...v8.0.0

Changelog: https://github.com/handshake-org/hsd/blob/v8.0.0/CHANGELOG.md
---
 doc/release-notes/rl-2511.section.md | 2 ++
 pkgs/by-name/hs/hsd/package.nix      | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 2ae1b246f392..f56f741d58b3 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -143,6 +143,8 @@
 
 - `telegram-desktop` packages now uses `Telegram` for its binary. The previous name was `telegram-desktop`. This is due to [an upstream decision](https://github.com/telegramdesktop/tdesktop/commit/56ff5808a3d766f892bc3c3305afb106b629ef6f) to make the name consistent with other platforms.
 
+- `hsd` has been upgraded to version 8. See [their changelog](https://github.com/handshake-org/hsd/blob/v8.0.0/docs/release-notes/release-notes-8.x.md) for important instructions before upgrading.
+
 - `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatible due to major API changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.
   Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md.
 
diff --git a/pkgs/by-name/hs/hsd/package.nix b/pkgs/by-name/hs/hsd/package.nix
index 96d516ee90ca..eb17054c5e70 100644
--- a/pkgs/by-name/hs/hsd/package.nix
+++ b/pkgs/by-name/hs/hsd/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "hsd";
-  version = "7.0.1";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "handshake-org";
     repo = "hsd";
     rev = "v${version}";
-    hash = "sha256-bmvoykpaYQDWLYKOwgKZ1V6ivzDJFM1Yo+ATkzKTP2s=";
+    hash = "sha256-7hF8cJf9Oewfg5WvNpqQSrBZjpnERcdDAaxixOdArpo=";
   };
 
-  npmDepsHash = "sha256-qM1oPTKffJHlHWhF5huCBPmBSajiYstjhC2GB/iMQ7E=";
+  npmDepsHash = "sha256-fO8ia0FwNvMMVBUO22gUNImkXY3kjdUjQIP7s5MOJDs=";
 
   nativeBuildInputs = [
     python3

From 13c1f279264aa4c4338680c231a2c45ef9843efe Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 19 Sep 2025 21:52:27 -0400
Subject: [PATCH 014/109] apktool: 2.11.1 -> 2.12.1

Diff: https://bitbucket.org/iBotPeaches/apktool/branches/compare/v2.12.1%0DNone

Changelog: https://github.com/iBotPeaches/Apktool/releases/tag/v2.12.1
---
 pkgs/by-name/ap/apktool/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ap/apktool/package.nix b/pkgs/by-name/ap/apktool/package.nix
index e8f32d5aff44..f3064b23077a 100644
--- a/pkgs/by-name/ap/apktool/package.nix
+++ b/pkgs/by-name/ap/apktool/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation rec {
   pname = "apktool";
-  version = "2.11.1";
+  version = "2.12.1";
 
   src = fetchurl {
     urls = [
       "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
       "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
     ];
-    hash = "sha256-VtWcUk/HZCY7qNNFdU2Nr1WxiHgYsVzTtZT1VdJJ4ts=";
+    hash = "sha256-Zs9FJKSkWn9WVn0Issm27CN7zdeM7mn9SlnIoCQ66vo=";
   };
 
   dontUnpack = true;

From dbb20db60058c26ac5e2a617d61dc41dc6a9e5d5 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 19 Sep 2025 22:30:38 -0400
Subject: [PATCH 015/109] buildkite-agent-metrics: 5.9.13 -> 5.10.0

Diff: https://github.com/buildkite/buildkite-agent-metrics/compare/v5.9.13...v5.10.0
---
 pkgs/by-name/bu/buildkite-agent-metrics/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
index 1c416a848597..14cef84eab9c 100644
--- a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
+++ b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
@@ -5,7 +5,9 @@
 }:
 buildGoModule rec {
   pname = "buildkite-agent-metrics";
-  version = "5.9.13";
+  version = "5.10.0";
+
+  __darwinAllowLocalNetworking = true;
 
   outputs = [
     "out"
@@ -16,10 +18,10 @@ buildGoModule rec {
     owner = "buildkite";
     repo = "buildkite-agent-metrics";
     rev = "v${version}";
-    hash = "sha256-AVFQ3GP4YDQ6d9NSeol3Eobxzmoa9bRyCAKTsDbyZyQ=";
+    hash = "sha256-QE4IY1yU8X1zG+jf7eBWiSjN3HvDqr2Avhs3Bub+xB0=";
   };
 
-  vendorHash = "sha256-RQmxYxTcQn5VEy8Z96EtArYBnODmde1RlV4CA6fhbZA=";
+  vendorHash = "sha256-r088XQKYx0D0OVfz/nqhWL0LLCf4X13WqYikJKlLr3c=";
 
   postInstall = ''
     mkdir -p $lambda/bin

From e8076041b7ab3964b3481a8fee6394c205076872 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 19 Sep 2025 23:55:15 -0400
Subject: [PATCH 016/109] zarf: 0.57.0 -> 0.62.0

Diff: https://github.com/zarf-dev/zarf/compare/refs/tags/v0.57.0...refs/tags/v0.62.0
---
 pkgs/by-name/za/zarf/package.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix
index c88cec9f3e7e..ce5773a6edc3 100644
--- a/pkgs/by-name/za/zarf/package.nix
+++ b/pkgs/by-name/za/zarf/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "zarf";
-  version = "0.57.0";
+  version = "0.62.0";
 
   src = fetchFromGitHub {
     owner = "zarf-dev";
     repo = "zarf";
     tag = "v${version}";
-    hash = "sha256-KcBF3Iw3hiQ25UHaCCvsU5HOYWVE2b5RpeyprZ8omAA=";
+    hash = "sha256-mabp4G7LbtOmIVEmOK/YhjTX/RRM8ObAS6YXTJe2P/U=";
   };
 
-  vendorHash = "sha256-SgXOBLw2vtVsgLIcoYQTz1npQwzj99X/GnnqqSsmb10=";
+  vendorHash = "sha256-As7xDEo+bMslv9Xd6CbHTqvf2XaXmO6Gp3f9+xD3kNU=";
   proxyVendor = true;
 
   nativeBuildInputs = [ installShellFiles ];
@@ -43,13 +43,17 @@ buildGoModule rec {
     "k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z"
   ];
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    export K9S_LOGS_DIR=$(mktemp -d)
-    installShellCompletion --cmd zarf \
-      --bash <($out/bin/zarf completion bash) \
-      --fish <($out/bin/zarf completion fish) \
-      --zsh  <($out/bin/zarf completion zsh)
-  '';
+  # Breaks with sandbox on Darwin because it wants to read /etc/protocols
+  postInstall =
+    lib.optionalString
+      ((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && !stdenv.buildPlatform.isDarwin)
+      ''
+        export K9S_LOGS_DIR=$(mktemp -d)
+        installShellCompletion --cmd zarf \
+          --bash <($out/bin/zarf completion bash) \
+          --fish <($out/bin/zarf completion fish) \
+          --zsh  <($out/bin/zarf completion zsh)
+      '';
 
   meta = with lib; {
     description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev";

From b8424a3b3ace68ad1fa6b4e0ed07eb84346f6ffe Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 13:37:52 +0000
Subject: [PATCH 017/109] imgproxy: 3.28.0 -> 3.30.0

Diff: https://github.com/imgproxy/imgproxy/compare/v3.28.0...v3.30.0

Changelog: https://github.com/imgproxy/imgproxy/blob/v3.30.0/CHANGELOG.md
---
 pkgs/by-name/im/imgproxy/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix
index 599a1c41b572..4232cdf92f29 100644
--- a/pkgs/by-name/im/imgproxy/package.nix
+++ b/pkgs/by-name/im/imgproxy/package.nix
@@ -11,16 +11,18 @@
 
 buildGoModule rec {
   pname = "imgproxy";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchFromGitHub {
     owner = "imgproxy";
     repo = "imgproxy";
-    hash = "sha256-aI+rWXt+tioHFGBJk/RkYeo7JaV+10jurx7YKX448Yk=";
+    hash = "sha256-vT+Nyjx2TTOCzosCV/EfMLEnyT6RCebBFNu0/IRuwak=";
     rev = "v${version}";
   };
 
-  vendorHash = "sha256-L18vxiFXBlKeipMm1N/c+F+zHDQYN5CHjYwa4xi9I3s=";
+  vendorHash = "sha256-0NIsaSMOBenDCGvnGdLB60sp08EaC/CezWogxTrcDdY=";
+
+  __darwinAllowLocalNetworking = true;
 
   nativeBuildInputs = [
     pkg-config

From 32cafb840ec83e12ffedd1f9ef2197b878a4a15e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 10:10:18 -0400
Subject: [PATCH 018/109] azure-storage-azcopy: 10.29.2 -> 10.30.1

Diff: https://github.com/Azure/azure-storage-azcopy/compare/refs/tags/v10.29.2...refs/tags/v10.30.1

Changelog: https://github.com/Azure/azure-storage-azcopy/releases/tag/v10.30.1
---
 pkgs/by-name/az/azure-storage-azcopy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix
index fd6b6246a65a..2e46e4172aee 100644
--- a/pkgs/by-name/az/azure-storage-azcopy/package.nix
+++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.29.2";
+  version = "10.30.1";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
     tag = "v${version}";
-    hash = "sha256-wLErYkiN5V6aZx6Vztr3Gk5XB+aOo9de5QjEbwDLBXg=";
+    hash = "sha256-lHgOQ9Ff3RSi49peDETx98QMnLrANfBvkAx8c+ubiG0=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-Aq38kpgQ1NQQVkF0hjMLzvK8HvxfzYARbeWmsc54Ldg=";
+  vendorHash = "sha256-WTsngwFA4J1CuAePKwPew/FZNrHJ9IoDCQFv63WAlzo=";
 
   doCheck = false;
 

From 768ac0b0ed41e4d935c94149502f9411eff35179 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 10:34:39 -0400
Subject: [PATCH 019/109] vcluster: 0.26.0 -> 0.28.0

Release notes: [v0.27.0](https://github.com/loft-sh/vcluster/releases/tag/v0.27.0)
and [v0.28.0](https://github.com/loft-sh/vcluster/releases/tag/v0.28.0)

Diff: https://github.com/loft-sh/vcluster/compare/v0.26.0...v0.28.0
---
 pkgs/by-name/vc/vcluster/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix
index c2308ccfe660..510f51d0d618 100644
--- a/pkgs/by-name/vc/vcluster/package.nix
+++ b/pkgs/by-name/vc/vcluster/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "vcluster";
-  version = "0.26.0";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "loft-sh";
     repo = "vcluster";
     tag = "v${version}";
-    hash = "sha256-NLZmtiQ4fM5iKjdvV4TsTed9sOSpQH6KYctsSJJ8Mdk=";
+    hash = "sha256-ddt9UDLKlC16ki+D35Ct1uvygeFb++fNeHVps0vCsPA=";
   };
 
   vendorHash = null;

From 253878d9108377775ca6448566b5f33dc91d95a6 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 12:29:21 -0400
Subject: [PATCH 020/109] sointu: fix passthru.updateScript

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

diff --git a/pkgs/by-name/so/sointu/package.nix b/pkgs/by-name/so/sointu/package.nix
index cda2e244d14a..123dd1f43b53 100644
--- a/pkgs/by-name/so/sointu/package.nix
+++ b/pkgs/by-name/so/sointu/package.nix
@@ -47,7 +47,9 @@ buildGoModule {
     "cmd/sointu-play"
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
 
   meta = {
     description = "Fork of 4klang that can target 386, amd64 and WebAssembly";

From 32d3aba150fb3ff9a55b8c291fc1e01518b30ba7 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 12:38:15 -0400
Subject: [PATCH 021/109] cef-binary: 139.0.17 -> 140.1.14

---
 pkgs/development/libraries/libcef/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 5fcd3a1ebd63..c809df245d09 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -92,14 +92,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcef";
-  version = "139.0.17";
-  gitRevision = "6c347eb";
-  chromiumVersion = "139.0.7258.31";
+  version = "140.1.14";
+  gitRevision = "eb1c06e";
+  chromiumVersion = "140.0.7339.185";
   buildType = "Release";
 
   srcHash = selectSystem {
-    aarch64-linux = "sha256-wTBPGunl1j4PlB5K6jzGtRusLIgOLlKtcQxaZmVr1zc=";
-    x86_64-linux = "sha256-kRMO8DP4El1qytDsAZBdHvR9AAHXce90nPdyfJailBg=";
+    aarch64-linux = "sha256-psgs+RcEYWKN4NneU4eVIaV2b7y+doxdPs9QWsN8dTA=";
+    x86_64-linux = "sha256-CDVzU+GIAU6hEutot90GMlAS8xEqD3uNLppgGq9d4mE=";
   };
 
   src = fetchurl {

From d49b890f1701eaf4640a76890ee2e0d360bbcd8e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 20 Sep 2025 18:51:45 +0200
Subject: [PATCH 022/109] libsidplayfp: 2.15.0 -> 2.15.1

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

diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index 69811579dfc4..563f7ed66f67 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   makeFontsConf,
-  nix-update-script,
+  gitUpdater,
   testers,
   autoreconfHook,
   docSupport ? true,
@@ -19,14 +19,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsidplayfp";
-  version = "2.15.0";
+  version = "2.15.1";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-rK7Il8WE4AJbn7GKn21fXr1o+DDdyOjfJ0saeqcZ5Pg=";
+    hash = "sha256-wnbQy0PHHpkgNm3SC7GZyxSAUYd5eexVY9Dg1oiCjRo=";
   };
 
   outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
@@ -85,7 +85,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    updateScript = nix-update-script { };
+    updateScript = gitUpdater {
+      rev-prefix = "v";
+    };
   };
 
   meta = {

From 759058bd4512aa44c43ead9b134214e6905fc28f Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 14:27:50 -0400
Subject: [PATCH 023/109] sublime-music: drop

[Upstream end-of-maintenance announcement (2024-12-24)](https://sumnerevans.com/posts/projects/sublime-music-eom/)
---
 doc/release-notes/rl-2511.section.md      |   2 +
 pkgs/by-name/su/sublime-music/package.nix | 109 ----------------------
 pkgs/top-level/aliases.nix                |   1 +
 3 files changed, 3 insertions(+), 109 deletions(-)
 delete mode 100644 pkgs/by-name/su/sublime-music/package.nix

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 2ae1b246f392..719570cee967 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -87,6 +87,8 @@
 
 - `purple-matrix` has been removed, since it has been unmaintained since April 2022 and upstream does not recommend using it anymore.
 
+- `sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead.
+
 - The default Android NDK version has been raised to 27, and the default SDK version to 35.
   NDK 21–26 have been removed, as they are end‐of‐life.
 
diff --git a/pkgs/by-name/su/sublime-music/package.nix b/pkgs/by-name/su/sublime-music/package.nix
deleted file mode 100644
index 9084a747b94e..000000000000
--- a/pkgs/by-name/su/sublime-music/package.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-  gobject-introspection,
-  gtk3,
-  pango,
-  wrapGAppsHook3,
-  chromecastSupport ? false,
-  serverSupport ? false,
-  keyringSupport ? true,
-  notifySupport ? true,
-  libnotify,
-  networkSupport ? true,
-  networkmanager,
-  fetchpatch,
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "sublime-music";
-  version = "0.12.0-unstable-2024-01-06";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "sublime-music";
-    repo = "sublime-music";
-    rev = "0b4ba69a7ff7ad2dfcb0a264587921f323030766";
-    hash = "sha256-NoJ50n/AjM738ebQ/Wccwp2l0sC3VBvKovJvDhDa5SU=";
-  };
-
-  patches = [
-    # Fix loadfile command https://github.com/sublime-music/sublime-music/pull/461
-    (fetchpatch {
-      url = "https://github.com/sublime-music/sublime-music/commit/1d107fec2ac7f83e0c49bab663273b31c9072411.patch";
-      hash = "sha256-fUss4kqlFiXRr37AIaeWEv/4Bpzx5xkW28OEnsjQqzY=";
-    })
-  ];
-
-  build-system = with python3.pkgs; [
-    flit-core
-  ];
-
-  nativeBuildInputs = [
-    gobject-introspection
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    gtk3
-    pango
-  ]
-  ++ lib.optional notifySupport libnotify
-  ++ lib.optional networkSupport networkmanager;
-
-  propagatedBuildInputs =
-    with python3.pkgs;
-    [
-      bleach
-      bottle
-      dataclasses-json
-      deepdiff
-      levenshtein
-      mpv
-      peewee
-      pychromecast
-      pygobject3
-      python-dateutil
-      requests
-      semver
-      thefuzz
-    ]
-    ++ lib.optional keyringSupport keyring;
-
-  nativeCheckInputs = with python3.pkgs; [
-    pytest-cov-stub
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # https://github.com/sublime-music/sublime-music/issues/439
-    "test_get_music_directory"
-  ];
-
-  pythonImportsCheck = [
-    "sublime_music"
-  ];
-
-  postInstall = ''
-    install -Dm444 sublime-music.desktop      -t $out/share/applications
-    install -Dm444 sublime-music.metainfo.xml -t $out/share/metainfo
-
-    for size in 16 22 32 48 64 72 96 128 192 512 1024; do
-        install -Dm444 logo/rendered/"$size".png \
-          $out/share/icons/hicolor/"$size"x"$size"/apps/sublime-music.png
-    done
-  '';
-
-  meta = {
-    description = "GTK3 Subsonic/Airsonic client";
-    homepage = "https://sublimemusic.app";
-    changelog = "https://github.com/sublime-music/sublime-music/blob/v${version}/CHANGELOG.rst";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [
-      albakham
-      sumnerevans
-    ];
-    mainProgram = "sublime-music";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 043041e28f8f..35e2a7515865 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2371,6 +2371,7 @@ mapAliases {
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
   strelka = throw "strelka depends on Python 2.6+, and does not support Python 3."; # Added 2025-03-17
   subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17
+  sublime-music = throw "`sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead."; # Added 2025-09-20
   substituteAll = throw "`substituteAll` has been removed. Use `replaceVars` instead."; # Added 2025-05-23
   substituteAllFiles = throw "`substituteAllFiles` has been removed. Use `replaceVars` for each file instead."; # Added 2025-05-23
   suidChroot = throw "'suidChroot' has been dropped as it was unmaintained, failed to build and had questionable security considerations"; # Added 2025-05-17

From 487a438206e05fd4919b3025c54d80dcb040e2bd Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 14:39:14 -0400
Subject: [PATCH 024/109] livekit-protocol: 1.0.12 -> 1.0.6

This is in fact an upgrade because the package incorrectly used the "rtc-"
version prefix for `src` but the `protocol-` version prefix for the updateScript.

Since this is the protocol; I assume we should use the protocol one.

Diff: https://github.com/livekit/python-sdks/compare/rtc-v1.0.12...protocol-v1.0.6
---
 .../development/python-modules/livekit-protocol/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix
index c2dfe95f1243..744f9fe7dc49 100644
--- a/pkgs/development/python-modules/livekit-protocol/default.nix
+++ b/pkgs/development/python-modules/livekit-protocol/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "livekit-protocol";
-  version = "1.0.12";
+  version = "1.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "python-sdks";
-    tag = "rtc-v${version}";
-    hash = "sha256-NfFlj44aRMA7oUXyIKljNdtb/2MLvjIJGcAvIGNbNxM=";
+    tag = "protocol-v${version}";
+    hash = "sha256-Sl/pAwiCS7sAY8VHJzSqm/Mj92NsO5NLuxQ/Y5GnaAw=";
   };
 
   pypaBuildFlags = [ "livekit-protocol" ];

From eb9071b6f230ae3c21347aca787d913aca6f9df0 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 16:45:10 -0400
Subject: [PATCH 025/109] crackql: standardize version number, add updateScript

---
 pkgs/by-name/cr/crackql/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cr/crackql/package.nix b/pkgs/by-name/cr/crackql/package.nix
index 7bbc573c3b77..c2f3eecfb47e 100644
--- a/pkgs/by-name/cr/crackql/package.nix
+++ b/pkgs/by-name/cr/crackql/package.nix
@@ -1,19 +1,20 @@
 {
   lib,
   fetchFromGitHub,
+  nix-update-script,
   python3,
 }:
 
 python3.pkgs.buildPythonApplication {
   pname = "crackql";
-  version = "unstable-20230818";
+  version = "1.0-unstable-2023-08-18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nicholasaleks";
     repo = "CrackQL";
-    # rev = "refs/tags/${version}";
-    # Switch to tag with the next update
+    # tag = version;
+    # Switch to tag (and remove the extraArgs from the updateScript) next update
     rev = "ac26a44c2dd201f65da0d1c3f95eaf776ed1b2dd";
     hash = "sha256-XlHbGkwdOV1nobjtQP/M3IIEuzXHBuwf52EsXf3MWoM=";
   };
@@ -33,6 +34,10 @@ python3.pkgs.buildPythonApplication {
     typing-extensions
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = with lib; {
     description = "GraphQL password brute-force and fuzzing utility";
     mainProgram = "crackql";

From 46633d7b89d011e3bcdde6f7799cb96aac601f66 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 18:04:56 -0400
Subject: [PATCH 026/109] python3Packages.nampa: fix updateScript

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

diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix
index 3b810808eb09..e096ea945a00 100644
--- a/pkgs/development/python-modules/nampa/default.nix
+++ b/pkgs/development/python-modules/nampa/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pythonOlder,
   setuptools,
+  unstableGitUpdater,
 }:
 
 buildPythonPackage rec {
@@ -27,6 +28,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "nampa" ];
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with lib; {
     description = "Python implementation of the FLIRT technology";
     homepage = "https://github.com/thebabush/nampa";

From 1378a89d06139eab041fccb0e698cd3bb51b03f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Sep 2025 00:11:44 +0000
Subject: [PATCH 027/109] hysteria: 2.6.2 -> 2.6.3

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

diff --git a/pkgs/by-name/hy/hysteria/package.nix b/pkgs/by-name/hy/hysteria/package.nix
index acecb559cead..beb1fc9bf1c7 100644
--- a/pkgs/by-name/hy/hysteria/package.nix
+++ b/pkgs/by-name/hy/hysteria/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "hysteria";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "apernet";
     repo = "hysteria";
     rev = "app/v${version}";
-    hash = "sha256-r8A1kY5zVIYLH4BmTF8BF135K5zQNBN0cvQpWI9SR2I=";
+    hash = "sha256-0gXvox+/HPeyLbpyVGgP+40bsAgZZWs7MrLkdMFcqX8=";
   };
 
-  vendorHash = "sha256-TWGHOn64QvIiH5gr+il98IdO7cheAjQs/VFVwm2jKWU=";
+  vendorHash = "sha256-inHWL8/ZpEMSEWhz1dwkjllN8oqNCEKAQdqvCoA6Vec=";
   proxyVendor = true;
 
   ldflags =

From e1e97d088ccbcba379264b89333d9a97ea7ebeff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Sep 2025 00:21:04 +0000
Subject: [PATCH 028/109] reaper: 7.45 -> 7.46

---
 pkgs/applications/audio/reaper/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 43af6ff67160..e9afb4640abc 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -38,17 +38,17 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "reaper";
-  version = "7.45";
+  version = "7.46";
 
   src = fetchurl {
     url = url_for_platform version stdenv.hostPlatform.qemuArch;
     hash =
       if stdenv.hostPlatform.isDarwin then
-        "sha256-plXLOJcQbZlSGPgNdjNEPS2pZ9almrmNzxYfhOZGXjg="
+        "sha256-uGWeaRl01rH7+RrMoqAv85EiKJ3/qUFiQVt1zILVJTQ="
       else
         {
-          x86_64-linux = "sha256-pOPL8HoAAFNDq6L3SC/OygDtqqYVvfkWwVA6qv1xZPs=";
-          aarch64-linux = "sha256-rclLjAiG8aLsVinghpPZJiPU4Iq5jQ6s2H0+du+a9Ts=";
+          x86_64-linux = "sha256-8XEy7IXjjw7WbPxpxFP30ivMgi0/iWbtljuYCQ2BzDI=";
+          aarch64-linux = "sha256-H+lvnpaKESad0DI9l1AexFxgwPi9EidVR1Gh6oITjHQ=";
         }
         .${stdenv.hostPlatform.system};
   };

From 06dcce749527e5dc440ddbd615df31adf52c22f2 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 20:21:40 -0400
Subject: [PATCH 029/109] escrotum: standardize version number, add
 updateScript

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

diff --git a/pkgs/by-name/es/escrotum/package.nix b/pkgs/by-name/es/escrotum/package.nix
index 87a42a0f18df..15092041d737 100644
--- a/pkgs/by-name/es/escrotum/package.nix
+++ b/pkgs/by-name/es/escrotum/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  nix-update-script,
   ffmpeg-full,
   gtk3,
   pango,
@@ -11,7 +12,7 @@
 
 python3Packages.buildPythonApplication {
   pname = "escrotum";
-  version = "unstable-2020-12-07";
+  version = "1.0.1-unstable-2020-12-07";
   format = "pyproject";
 
   src = fetchFromGitHub {
@@ -57,6 +58,10 @@ python3Packages.buildPythonApplication {
     cp man/escrotum.1 $man/share/man/man1/
   '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = with lib; {
     homepage = "https://github.com/Roger/escrotum";
     description = "Linux screen capture using pygtk, inspired by scrot";

From 3c49875cc6a10d2a238fdb6a21b36fe939c33ac8 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 20:09:36 -0400
Subject: [PATCH 030/109] python3Packages.inotify: unstable-2020-08-27 ->
 0.2.12

Diff: https://github.com/dsoprea/PyInotify/compare/f77596ae965e47124f38d7bd6587365924dcd8f7..0.2.12
---
 .../python-modules/inotify/default.nix        | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/inotify/default.nix b/pkgs/development/python-modules/inotify/default.nix
index b5e3fd5acff8..ae87d35f47aa 100644
--- a/pkgs/development/python-modules/inotify/default.nix
+++ b/pkgs/development/python-modules/inotify/default.nix
@@ -2,38 +2,34 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
+
+  build,
   setuptools,
+
+  nose2,
+  pytestCheckHook,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "inotify";
-  version = "unstable-2020-08-27";
+  version = "0.2.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dsoprea";
     repo = "PyInotify";
-    rev = "f77596ae965e47124f38d7bd6587365924dcd8f7";
-    hash = "sha256-X0gu4s1R/Kg+tmf6s8SdZBab2HisJl4FxfdwKktubVc=";
+    tag = version;
+    hash = "sha256-x6wvrwLDH/9UMTsAIHwCKR5Avv1givlJFFeBM//FOdg=";
   };
 
-  postPatch = ''
-    # Needed because assertEquals was removed in python 3.12
-    substituteInPlace tests/test_inotify.py \
-      --replace-fail "assertEquals" "assertEqual" \
-  '';
+  build-system = [
+    build
+    setuptools
+  ];
 
-  build-system = [ setuptools ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  # Disable these tests as they're flaky.
-  # The returned list can be in a different order, which causes the tests to fail.
-  disabledTests = [
-    "test__automatic_new_watches_on_new_paths"
-    "test__cycle"
-    "test__renames"
+  nativeCheckInputs = [
+    nose2
+    pytestCheckHook
   ];
 
   meta = {

From dbf5825d5647cb170bb18576f5d570daf3dd9eef Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 20:45:45 -0400
Subject: [PATCH 031/109] snapper-gui: 2020-10-20 -> 0.1-unstable-2022-06-26

Diff: https://github.com/ricardomv/snapper-gui/compare/f0c67abe0e10cc9e2ebed400cf80ecdf763fb1d1..191575084a4e951802c32a4177dc704cf435883a

A small update, but I'm really just doing it to add the updateScript and stop
the robot from making unneeded PRs.
---
 pkgs/by-name/sn/snapper-gui/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snapper-gui/package.nix b/pkgs/by-name/sn/snapper-gui/package.nix
index f053b72010b7..370cbe9fb920 100644
--- a/pkgs/by-name/sn/snapper-gui/package.nix
+++ b/pkgs/by-name/sn/snapper-gui/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  nix-update-script,
   python3,
   python3Packages,
   adwaita-icon-theme,
@@ -13,14 +14,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "snapper-gui";
-  version = "2020-10-20";
+  version = "0.1-unstable-2022-06-26";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "ricardomv";
     repo = "snapper-gui";
-    rev = "f0c67abe0e10cc9e2ebed400cf80ecdf763fb1d1";
-    sha256 = "13j4spbi9pxg69zifzai8ifk4207sn0vwh6vjqryi0snd5sylh7h";
+    rev = "191575084a4e951802c32a4177dc704cf435883a";
+    sha256 = "sha256-uy1oLJx4ERGc8OHzmPpnJX81jPB9ztrA0qbmm1UcmTY=";
   };
 
   nativeBuildInputs = [
@@ -44,6 +45,10 @@ python3Packages.buildPythonApplication {
     snapper
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = with lib; {
     description = "Graphical interface for snapper";
     mainProgram = "snapper-gui";

From 4ba4fae2b18a7dba40a01f7f238076470be71ca2 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 20:54:16 -0400
Subject: [PATCH 032/109] python3Packages.pyrad: set updateScript

Stops the robot from making downgrade PRs.
---
 pkgs/development/python-modules/pyrad/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix
index ec16ae14fcd2..33ac5586b71a 100644
--- a/pkgs/development/python-modules/pyrad/default.nix
+++ b/pkgs/development/python-modules/pyrad/default.nix
@@ -2,6 +2,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   lib,
+  nix-update-script,
   unittestCheckHook,
   poetry-core,
 }:
@@ -29,6 +30,10 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "pyrad" ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = {
     description = "Python RADIUS Implementation";
     homepage = "https://github.com/pyradius/pyrad";

From 99704729e56f3513840e1dab54c3df1568dd2bbc Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 21:18:40 -0400
Subject: [PATCH 033/109] sway-contrib.*: 0-unstable-2024-03-19 -> 1.11

Diff: https://github.com/OctopusET/sway-contrib/compare/5d33a290e3cac3f0fed38ff950939da28e3ebfd7..1.11
---
 pkgs/applications/misc/sway-contrib/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/sway-contrib/default.nix b/pkgs/applications/misc/sway-contrib/default.nix
index 04854aec5b09..f9242ed5d20e 100644
--- a/pkgs/applications/misc/sway-contrib/default.nix
+++ b/pkgs/applications/misc/sway-contrib/default.nix
@@ -18,12 +18,12 @@
 }:
 
 let
-  version = "0-unstable-2024-03-19";
+  version = "1.11";
   src = fetchFromGitHub {
     owner = "OctopusET";
     repo = "sway-contrib";
-    rev = "5d33a290e3cac3f0fed38ff950939da28e3ebfd7";
-    hash = "sha256-2qYxkXowSSzVcpsPO4JoUqaH/VUkOOWu1RKFXp1CXGs=";
+    tag = version;
+    hash = "sha256-/gWL0hA8hDjpK5YJxuZqmvo0zuVRQkhAkgHlI4JzNP8=";
   };
 
   meta = with lib; {
@@ -54,10 +54,10 @@ in
     ];
     buildInputs = [ bash ];
     installPhase = ''
-      installManPage grimshot.1
-      installShellCompletion --cmd grimshot grimshot-completion.bash
+      installManPage grimshot/grimshot.1
+      installShellCompletion --cmd grimshot grimshot/grimshot-completion.bash
 
-      install -Dm 0755 grimshot $out/bin/grimshot
+      install -Dm 0755 grimshot/grimshot $out/bin/grimshot
       wrapProgram $out/bin/grimshot --set PATH \
         "${
           lib.makeBinPath [

From cf2bc31ddee80e91a64cb686dec18edb87d32fd2 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 21:36:47 -0400
Subject: [PATCH 034/109] plecost: 1.1.4 -> 0-unstable-2022-08-03

Diff: https://github.com/iniqua/plecost/compare/aa40e504bee95cf731f0cc9f228bcf5fdfbe6194..4895e345d71bffe956be43530632e303dd379a5f

This is an upgrade. Because "the project's tagging system is incompatible with what we expect from versions",
we need to set the version to 0-unstable-date, then set the updater accordingly.
---
 pkgs/by-name/pl/plecost/package.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/pl/plecost/package.nix b/pkgs/by-name/pl/plecost/package.nix
index 02a466722abb..3be94e31681b 100644
--- a/pkgs/by-name/pl/plecost/package.nix
+++ b/pkgs/by-name/pl/plecost/package.nix
@@ -3,30 +3,22 @@
   python3Packages,
   fetchFromGitHub,
   fetchpatch,
+  unstableGitUpdater,
 }:
 
 python3Packages.buildPythonApplication {
   pname = "plecost";
-  version = "1.1.4";
+  version = "0-unstable-2022-08-03";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iniqua";
     repo = "plecost";
     # Release is untagged
-    rev = "aa40e504bee95cf731f0cc9f228bcf5fdfbe6194";
-    sha256 = "K8ESI2EOqH9zBDfSKgVcTKjCMdRhBiwltIbXDt1vF+M=";
+    rev = "4895e345d71bffe956be43530632e303dd379a5f";
+    hash = "sha256-cXXFLoiLZpo3qiAPztavns4EkOG2aC6UKMf0N4Eun/w=";
   };
 
-  patches = [
-    # Fix compatibility with aiohttp 3.x
-    # Merged - pending next release
-    (fetchpatch {
-      url = "https://github.com/iniqua/plecost/pull/34/commits/c09e7fab934f136f8fbc5f219592cf5fec151cf9.patch";
-      sha256 = "sha256-G7Poo3+d+PQTrg8PCrmsG6nMHt8CXgiuAu+ZNvK8oiw=";
-    })
-  ];
-
   build-system = with python3Packages; [ setuptools ];
 
   dependencies = with python3Packages; [
@@ -41,6 +33,8 @@ python3Packages.buildPythonApplication {
 
   pythonImportsCheck = [ "plecost_lib" ];
 
+  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+
   meta = with lib; {
     description = "Vulnerability fingerprinting and vulnerability finder for Wordpress blog engine";
     mainProgram = "plecost";

From ec59920f5f83bf53c93a6e3b572af9482ff318f1 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 21:47:29 -0400
Subject: [PATCH 035/109] python3Packages.verilogae: set updateScript

Stops spurious robot PRs.
---
 pkgs/development/python-modules/verilogae/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/verilogae/default.nix b/pkgs/development/python-modules/verilogae/default.nix
index b56db61dc137..2e159af68a70 100644
--- a/pkgs/development/python-modules/verilogae/default.nix
+++ b/pkgs/development/python-modules/verilogae/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  nix-update-script,
   setuptools-rust,
   rustPlatform,
   cargo,
@@ -60,6 +61,10 @@ buildPythonPackage rec {
 
   hardeningDisable = [ "pic" ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = {
     description = "Verilog-A tool useful for compact model parameter extraction";
     homepage = "https://man.sr.ht/~dspom/openvaf_doc/verilogae/";

From 6d7a5c9d33da9628dc7777f5f3477f97432a5c45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Sep 2025 02:00:21 +0000
Subject: [PATCH 036/109] saxon-he: 12.8 -> 12.9

---
 pkgs/development/libraries/java/saxon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index 0892bd2ddc7a..3d67b6cb515d 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -189,11 +189,11 @@ in
 
   saxon_12-he = common rec {
     pname = "saxon-he";
-    version = "12.8";
+    version = "12.9";
     jar = "saxon-he-${version}";
     src = fetchurl {
       url = github.downloadUrl version;
-      hash = "sha256-K6hRrseSW4giCBgsSMk2IwIF1VjjNWNrvkZia9gANZg=";
+      hash = "sha256-8olb7zeUESxlChWL4nw5qG6IwXF+u44OiAZ9HwdjXRI=";
     };
     updateScript = github.updateScript version;
     description = "Processor for XSLT 3.0, XPath 3.1, and XQuery 3.1";

From 97e15a7fccca0cd9e3d159178e98e41ea5ced7f9 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 22:29:51 -0400
Subject: [PATCH 037/109] cockpit: 346 -> 347

Changelog: https://cockpit-project.org/blog/cockpit-347.html
---
 pkgs/by-name/co/cockpit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index 87dfb5c3d95e..21219a0570ce 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -41,13 +41,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit";
-  version = "346";
+  version = "347";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit";
     tag = finalAttrs.version;
-    hash = "sha256-ZTVcZ1a43cwm8y74XKp9z8tqSK1wxlW9lfoLN/cSFcs=";
+    hash = "sha256-9jVtO97QdFe8pp6JmuftaKyVM/MnRCYCWLPLrtjgbJ8=";
     fetchSubmodules = true;
   };
 

From 91329622e46caea897e0415dcd0899075013a95b Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 23:33:25 -0400
Subject: [PATCH 038/109] pigeon: 1.1.0 -> 1.3.0

Diff: https://github.com/mna/pigeon/compare/v1.1.0...v1.3.0
---
 pkgs/by-name/pi/pigeon/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pigeon/package.nix b/pkgs/by-name/pi/pigeon/package.nix
index 6492341b8d8b..55b579186750 100644
--- a/pkgs/by-name/pi/pigeon/package.nix
+++ b/pkgs/by-name/pi/pigeon/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pigeon";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "mna";
     repo = "pigeon";
     rev = "v${version}";
-    hash = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg=";
+    hash = "sha256-rEkeB5NI51dsLOxd9RnJWmfUP78owOJl6j9t3nz277s=";
   };
 
-  vendorHash = "sha256-JbBXRkxnB7LeeWdBLIQvyjvWo0zZ1EOuEUPXxHWiq+E=";
+  vendorHash = "sha256-vaCgvj/n8MuktaZ2+tQVlQW0LrptQkEQK2qM+YwXXhg=";
 
   proxyVendor = true;
 

From 1d4e4fe41f9256aab5b81e84f00b43745150ff14 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 21 Sep 2025 10:13:40 -0400
Subject: [PATCH 039/109] google-guest-oslogin: 20230831.00 -> 20250821.00

Diff: https://github.com/GoogleCloudPlatform/guest-oslogin/compare/20230831.00...20250821.00
---
 pkgs/by-name/go/google-guest-oslogin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/go/google-guest-oslogin/package.nix b/pkgs/by-name/go/google-guest-oslogin/package.nix
index cf963b728d6f..f341178173e5 100644
--- a/pkgs/by-name/go/google-guest-oslogin/package.nix
+++ b/pkgs/by-name/go/google-guest-oslogin/package.nix
@@ -10,20 +10,20 @@
 
 stdenv.mkDerivation rec {
   pname = "google-guest-oslogin";
-  version = "20230831.00";
+  version = "20250821.00";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "guest-oslogin";
     rev = version;
-    sha256 = "sha256-9QCB94HVbeLjioJuSN1Aa+EqFncojPoWFxw5mS9bDGw=";
+    sha256 = "sha256-dvLr3rOzHs5gRbllxqmnkLlHUFYv9Hm2vz6AkwZoZy4=";
   };
 
   postPatch = ''
     # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles)
-    substituteInPlace src/pam/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d
+    substituteInPlace src/oslogin_utils.cc --replace-fail /var/google-sudoers.d /run/google-sudoers.d
     # fix "User foo not allowed because shell /bin/bash does not exist"
-    substituteInPlace src/include/compat.h --replace /bin/bash /run/current-system/sw/bin/bash
+    substituteInPlace src/include/compat.h --replace-fail /bin/bash /run/current-system/sw/bin/bash
   '';
 
   buildInputs = [

From b385068794dbcad930d9229bbc682e695afd4b6a Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 21 Sep 2025 14:57:04 -0400
Subject: [PATCH 040/109] nixos/google_oslogin: run as root

This is needed in order to read the files in /var/google-users.d, as the program
sets the permissions to 750 and the user and group to root.

See: https://github.com/GoogleCloudPlatform/guest-oslogin/blob/20250821.00/src/oslogin_utils.cc#L1337-L1338
---
 nixos/modules/security/google_oslogin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/google_oslogin.nix b/nixos/modules/security/google_oslogin.nix
index 61e62b47a7d4..9faa2851d9f3 100644
--- a/nixos/modules/security/google_oslogin.nix
+++ b/nixos/modules/security/google_oslogin.nix
@@ -77,7 +77,7 @@ in
       '';
     };
     services.openssh.authorizedKeysCommand = "/etc/ssh/authorized_keys_command_google_oslogin %u";
-    services.openssh.authorizedKeysCommandUser = "nobody";
+    services.openssh.authorizedKeysCommandUser = "root";
   };
 
 }

From a13786c829106be9b45e0da213f0ca6f04b045ff Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 21 Sep 2025 19:29:25 -0400
Subject: [PATCH 041/109] python3Packages.zc-buildout: 3.3 -> 4.1.12

Diff: https://github.com/buildout/buildout/compare/refs/tags/3.3...refs/tags/4.1.12
---
 pkgs/development/python-modules/zc-buildout/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zc-buildout/default.nix b/pkgs/development/python-modules/zc-buildout/default.nix
index fa947a007b2a..329d39e1f7a0 100644
--- a/pkgs/development/python-modules/zc-buildout/default.nix
+++ b/pkgs/development/python-modules/zc-buildout/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "zc-buildout";
-  version = "3.3";
+  version = "4.1.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "buildout";
     repo = "buildout";
     tag = version;
-    hash = "sha256-o/iMCc8Jf+jNCHu3OnbCxD+oukoH/b7SUsdm6traO7k=";
+    hash = "sha256-4MutmUuF4WdoD/wdhYtpVvOYBJEv+2JVkskmO6sz24U=";
   };
 
   build-system = [ setuptools ];

From 3ec1756f58ec34bb1729c7da87827322b200dc40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Sep 2025 00:31:24 +0000
Subject: [PATCH 042/109] subnetcalc: 2.6.4 -> 2.6.5

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

diff --git a/pkgs/by-name/su/subnetcalc/package.nix b/pkgs/by-name/su/subnetcalc/package.nix
index 4b63fe30957c..698382cecad2 100644
--- a/pkgs/by-name/su/subnetcalc/package.nix
+++ b/pkgs/by-name/su/subnetcalc/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "subnetcalc";
-  version = "2.6.4";
+  version = "2.6.5";
 
   src = fetchFromGitHub {
     owner = "dreibh";
     repo = "subnetcalc";
     tag = "subnetcalc-${finalAttrs.version}";
-    hash = "sha256-FpDbU9kqen+NsJd8bSMUkTeq441+BXTKx/xKwcEBk10=";
+    hash = "sha256-Zv1qrox1Yg6qNg81QVXPZkB5lElaPICue+hc5muzI5Q=";
   };
 
   nativeBuildInputs = [

From bf6b16d9436fb6ac6fbda122484ae9ccb03e073c Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 22 Sep 2025 10:34:08 +0800
Subject: [PATCH 043/109] wox: 2.0.0-beta.4 -> 2.0.0-beta.5

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

diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix
index 90e105a18de2..01bcf523ee47 100644
--- a/pkgs/by-name/wo/wox/package.nix
+++ b/pkgs/by-name/wo/wox/package.nix
@@ -2,13 +2,13 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  flutter332,
+  flutter335,
   keybinder3,
   nodejs,
   pnpm_9,
   python3Packages,
   writableTmpDirAsHomeHook,
-  buildGo125Module,
+  buildGoModule,
   pkg-config,
   autoPatchelfHook,
   xorg,
@@ -22,13 +22,13 @@
 }:
 
 let
-  version = "2.0.0-beta.4";
+  version = "2.0.0-beta.5";
 
   src = fetchFromGitHub {
     owner = "Wox-launcher";
     repo = "Wox";
     tag = "v${version}";
-    hash = "sha256-KOndb8snDk1BwOontI5G9wnBBvO8KV85YF5zzp95t/M=";
+    hash = "sha256-ZuKsIWooLqGeEex8uRiMVYVxnAJyiQt0soZ9OP6+qq0=";
   };
 
   metaCommon = {
@@ -38,7 +38,7 @@ let
     maintainers = with lib.maintainers; [ ];
   };
 
-  ui-flutter = flutter332.buildFlutterApplication {
+  ui-flutter = flutter335.buildFlutterApplication {
     pname = "wox-ui-flutter";
     inherit version src;
 
@@ -97,7 +97,7 @@ let
     meta = metaCommon;
   });
 
-  plugin-python = python3Packages.buildPythonApplication rec {
+  plugin-python = python3Packages.buildPythonApplication {
     pname = "wox-plugin";
     inherit version src;
     pyproject = true;
@@ -109,7 +109,7 @@ let
     meta = metaCommon;
   };
 
-  plugin-host-python = python3Packages.buildPythonApplication rec {
+  plugin-host-python = python3Packages.buildPythonApplication {
     pname = "wox-plugin-host-python";
     inherit version src;
     pyproject = true;
@@ -137,7 +137,7 @@ let
     };
   };
 in
-buildGo125Module {
+buildGoModule {
   pname = "wox";
   inherit version src;
 

From d2366aa38fc1933abcf44f5739c84fc69eda19ab Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Mon, 22 Sep 2025 10:47:36 +0200
Subject: [PATCH 044/109] sdrplay: add darwin support

- Support darwin
- Update version to 3.15.1
---
 pkgs/by-name/sd/sdrplay/darwin.nix  | 56 ++++++++++++++++++
 pkgs/by-name/sd/sdrplay/linux.nix   | 54 +++++++++++++++++
 pkgs/by-name/sd/sdrplay/package.nix | 90 +++++++++++------------------
 3 files changed, 145 insertions(+), 55 deletions(-)
 create mode 100644 pkgs/by-name/sd/sdrplay/darwin.nix
 create mode 100644 pkgs/by-name/sd/sdrplay/linux.nix

diff --git a/pkgs/by-name/sd/sdrplay/darwin.nix b/pkgs/by-name/sd/sdrplay/darwin.nix
new file mode 100644
index 000000000000..06b1a8bc9736
--- /dev/null
+++ b/pkgs/by-name/sd/sdrplay/darwin.nix
@@ -0,0 +1,56 @@
+{
+  pname,
+  version,
+  src,
+  meta,
+  lib,
+  stdenv,
+  xar,
+  cpio,
+  libusb1,
+  fixDarwinDylibNames,
+}:
+stdenv.mkDerivation {
+  inherit
+    pname
+    version
+    src
+    meta
+    ;
+
+  nativeBuildInputs = [
+    xar
+    cpio
+    fixDarwinDylibNames
+  ];
+
+  unpackPhase = ''
+    xar -xf $src
+    zcat SDRplayAPI.pkg/Payload | cpio -i
+  '';
+
+  dontBuild = true;
+
+  env = {
+    majorVersion = lib.versions.major version;
+    majorMinorVersion = lib.versions.majorMinor version;
+  };
+
+  installPhase = ''
+    root="$PWD/Library/SDRplayAPI/${version}"
+
+    mkdir -p $out/{bin,lib}
+
+    cp "$root/bin/sdrplay_apiService" "$out/bin"
+    cp -r "$root/include" "$out/include"
+
+    lib="$out/lib/libsdrplay_api.$majorMinorVersion.dylib"
+    cp "$root/lib/libsdrplay_api.so.$majorMinorVersion" "$lib"
+    ln -s "$lib" "$out/lib/libsdrplay_api.$majorVersion.dylib"
+    ln -s "$lib" "$out/lib/libsdrplay_api.dylib"
+  '';
+
+  postFixup = ''
+    install_name_tool -add_rpath "${lib.getLib libusb1}/lib" $out/bin/sdrplay_apiService
+  '';
+}
diff --git a/pkgs/by-name/sd/sdrplay/linux.nix b/pkgs/by-name/sd/sdrplay/linux.nix
new file mode 100644
index 000000000000..1f5393b5df5e
--- /dev/null
+++ b/pkgs/by-name/sd/sdrplay/linux.nix
@@ -0,0 +1,54 @@
+{
+  pname,
+  version,
+  src,
+  meta,
+  stdenv,
+  lib,
+  fetchurl,
+  autoPatchelfHook,
+  udev,
+  libusb1,
+}:
+let
+  arch = stdenv.hostPlatform.qemuArch;
+in
+stdenv.mkDerivation rec {
+  inherit
+    pname
+    version
+    src
+    meta
+    ;
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+
+  buildInputs = [
+    libusb1
+    udev
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  unpackPhase = ''
+    sh "$src" --noexec --target source
+  '';
+
+  sourceRoot = "source";
+
+  dontBuild = true;
+
+  env = {
+    majorVersion = lib.versions.major version;
+    majorMinorVersion = lib.versions.majorMinor version;
+  };
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib,include}
+    libName="libsdrplay_api"
+    cp "${arch}/$libName.so.$majorMinorVersion" $out/lib/
+    ln -s "$out/lib/$libName.so.$majorMinorVersion" "$out/lib/$libName.so.$majorVersion"
+    ln -s "$out/lib/$libName.so.$majorVersion" "$out/lib/$libName.so"
+    cp "${arch}/sdrplay_apiService" $out/bin/
+    cp -r inc/* $out/include/
+  '';
+}
diff --git a/pkgs/by-name/sd/sdrplay/package.nix b/pkgs/by-name/sd/sdrplay/package.nix
index c3532f5fe4ea..5e0803478891 100644
--- a/pkgs/by-name/sd/sdrplay/package.nix
+++ b/pkgs/by-name/sd/sdrplay/package.nix
@@ -1,79 +1,59 @@
 {
+  callPackage,
+  fetchurl,
   stdenv,
   lib,
-  fetchurl,
-  autoPatchelfHook,
-  udev,
-  libusb1,
 }:
+
 let
-  arch =
-    if stdenv.hostPlatform.isx86_64 then
-      "x86_64"
-    else if stdenv.hostPlatform.isi686 then
-      "i686"
-    else if stdenv.hostPlatform.isAarch64 then
-      "aarch64"
-    else
-      throw "unsupported architecture";
+  version = "3.15.1";
 
-  version = "3.07.1";
-
-  srcs = rec {
-    aarch64 = {
-      url = "https://www.sdrplay.com/software/SDRplay_RSP_API-ARM64-${version}.run";
-      hash = "sha256-GJPFW6W8Ke4mnczcSLFYfioOMGCfFn2/EIA07VnmVGY=";
-    };
-
-    x86_64 = {
+  sources = rec {
+    x86_64-linux = {
       url = "https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${version}.run";
-      sha256 = "1a25c7rsdkcjxr7ffvx2lwj7fxdbslg9qhr8ghaq1r53rcrqgzmf";
+      hash = "sha256-CTcyv10Xz9G2LqHh4qOW9tKBEcB+rztE2R7xJIU4QBQ=";
     };
 
-    i686 = x86_64;
+    x86_64-darwin = {
+      url = "https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.1.pkg";
+      hash = "sha256-XRSM7aH653XS0t9bP89G3uJ7YiLiU1xMBjwvLqL3rMM=";
+    };
+
+    aarch64-linux = x86_64-linux;
+    aarch64-darwin = x86_64-darwin;
   };
+
+  platforms = lib.attrNames sources;
+
+  package = if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix;
+
 in
-stdenv.mkDerivation rec {
+
+callPackage package {
   pname = "sdrplay";
   inherit version;
 
-  src = fetchurl srcs."${arch}";
+  src =
+    let
+      inherit (stdenv.hostPlatform) system;
+      source =
+        if lib.hasAttr system sources then
+          sources."${system}"
+        else
+          throw "SDRplay is not supported on ${system}";
 
-  nativeBuildInputs = [ autoPatchelfHook ];
-
-  buildInputs = [
-    libusb1
-    udev
-    (lib.getLib stdenv.cc.cc)
-  ];
-
-  unpackPhase = ''
-    sh "$src" --noexec --target source
-  '';
-
-  sourceRoot = "source";
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/{bin,lib,include,lib/udev/rules.d}
-    majorVersion="${lib.concatStringsSep "." (lib.take 1 (builtins.splitVersion version))}"
-    majorMinorVersion="${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}"
-    libName="libsdrplay_api"
-    cp "${arch}/$libName.so.$majorMinorVersion" $out/lib/
-    ln -s "$out/lib/$libName.so.$majorMinorVersion" "$out/lib/$libName.so.$majorVersion"
-    ln -s "$out/lib/$libName.so.$majorVersion" "$out/lib/$libName.so"
-    cp "${arch}/sdrplay_apiService" $out/bin/
-    cp -r inc/* $out/include/
-    cp 66-mirics.rules $out/lib/udev/rules.d/
-  '';
+    in
+    fetchurl source;
 
   meta = with lib; {
+    inherit platforms;
+
     description = "SDRplay API";
     longDescription = ''
       Proprietary library and api service for working with SDRplay devices. For documentation and licensing details see
       https://www.sdrplay.com/docs/SDRplay_API_Specification_v${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}.pdf
     '';
+
     homepage = "https://www.sdrplay.com/downloads/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
@@ -81,7 +61,7 @@ stdenv.mkDerivation rec {
       pmenke
       zaninime
     ];
-    platforms = platforms.linux;
+
     mainProgram = "sdrplay_apiService";
   };
 }

From 44fe5c8ee0555a7adc2bfefd780989338fe69a0d Mon Sep 17 00:00:00 2001
From: Calum MacRae <hi@cmacr.ae>
Date: Thu, 4 Sep 2025 10:33:20 +0100
Subject: [PATCH 045/109] nixos/victoriatraces: init service module

Add service module for VictoriaTraces, following the same patterns
as the existing victorialogs and victoriametrics modules.
---
 nixos/modules/module-list.nix                 |   1 +
 .../services/databases/victoriatraces.nix     | 173 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/victoriatraces/default.nix        |   5 +
 nixos/tests/victoriatraces/otlp-ingestion.nix |  96 ++++++++++
 .../victoriatraces/service-endpoints.nix      |  36 ++++
 6 files changed, 312 insertions(+)
 create mode 100644 nixos/modules/services/databases/victoriatraces.nix
 create mode 100644 nixos/tests/victoriatraces/default.nix
 create mode 100644 nixos/tests/victoriatraces/otlp-ingestion.nix
 create mode 100644 nixos/tests/victoriatraces/service-endpoints.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 30f542ac1cc9..b781c18eeb8c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -540,6 +540,7 @@
   ./services/databases/tigerbeetle.nix
   ./services/databases/victorialogs.nix
   ./services/databases/victoriametrics.nix
+  ./services/databases/victoriatraces.nix
   ./services/desktops/accountsservice.nix
   ./services/desktops/ayatana-indicators.nix
   ./services/desktops/bamf.nix
diff --git a/nixos/modules/services/databases/victoriatraces.nix b/nixos/modules/services/databases/victoriatraces.nix
new file mode 100644
index 000000000000..a15662f9d060
--- /dev/null
+++ b/nixos/modules/services/databases/victoriatraces.nix
@@ -0,0 +1,173 @@
+{
+  config,
+  pkgs,
+  lib,
+  utils,
+  ...
+}:
+let
+  inherit (lib)
+    escapeShellArgs
+    getBin
+    hasPrefix
+    literalExpression
+    mkBefore
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    optionalString
+    types
+    ;
+  cfg = config.services.victoriatraces;
+  startCLIList = [
+    "${cfg.package}/bin/victoria-traces"
+    "-storageDataPath=/var/lib/${cfg.stateDir}"
+    "-httpListenAddr=${cfg.listenAddress}"
+  ]
+  ++ lib.optionals (cfg.basicAuthUsername != null) [
+    "-httpAuth.username=${cfg.basicAuthUsername}"
+  ]
+  ++ lib.optionals (cfg.basicAuthPasswordFile != null) [
+    "-httpAuth.password=file://%d/basic_auth_password"
+  ];
+in
+{
+  options.services.victoriatraces = {
+    enable = mkEnableOption "VictoriaTraces is an open source distributed traces storage and query engine from VictoriaMetrics";
+    package = mkPackageOption pkgs "victoriatraces" { };
+    listenAddress = mkOption {
+      default = ":10428";
+      type = types.str;
+      description = ''
+        TCP address to listen for incoming http requests.
+      '';
+    };
+    stateDir = mkOption {
+      type = types.str;
+      default = "victoriatraces";
+      description = ''
+        Directory below `/var/lib` to store VictoriaTraces data.
+        This directory will be created automatically using systemd's StateDirectory mechanism.
+      '';
+    };
+    retentionPeriod = mkOption {
+      type = types.str;
+      default = "7d";
+      example = "30d";
+      description = ''
+        Retention period for trace data. Data older than retentionPeriod is automatically deleted.
+      '';
+    };
+    basicAuthUsername = lib.mkOption {
+      default = null;
+      type = lib.types.nullOr lib.types.str;
+      description = ''
+        Basic Auth username used to protect VictoriaTraces instance by authorization
+      '';
+    };
+
+    basicAuthPasswordFile = lib.mkOption {
+      default = null;
+      type = lib.types.nullOr lib.types.str;
+      description = ''
+        File that contains the Basic Auth password used to protect VictoriaTraces instance by authorization
+      '';
+    };
+    extraOptions = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      example = literalExpression ''
+        [
+          "-loggerLevel=WARN"
+          "-retention.maxDiskSpaceUsageBytes=1073741824"
+        ]
+      '';
+      description = ''
+        Extra options to pass to VictoriaTraces. See {command}`victoria-traces -help` for
+        possible options.
+      '';
+    };
+  };
+  config = mkIf cfg.enable {
+
+    assertions = [
+      {
+        assertion =
+          (cfg.basicAuthUsername == null && cfg.basicAuthPasswordFile == null)
+          || (cfg.basicAuthUsername != null && cfg.basicAuthPasswordFile != null);
+        message = "Both basicAuthUsername and basicAuthPasswordFile must be set together to enable basicAuth functionality, or neither should be set.";
+      }
+    ];
+
+    systemd.services.victoriatraces = {
+      description = "VictoriaTraces distributed traces database";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      startLimitBurst = 5;
+
+      serviceConfig = {
+        ExecStart = lib.concatStringsSep " " [
+          (escapeShellArgs (startCLIList ++ [ "-retentionPeriod=${cfg.retentionPeriod}" ]))
+          (utils.escapeSystemdExecArgs cfg.extraOptions)
+        ];
+        DynamicUser = true;
+        LoadCredential = lib.optional (
+          cfg.basicAuthPasswordFile != null
+        ) "basic_auth_password:${cfg.basicAuthPasswordFile}";
+        RestartSec = 1;
+        Restart = "on-failure";
+        RuntimeDirectory = "victoriatraces";
+        RuntimeDirectoryMode = "0700";
+        StateDirectory = cfg.stateDir;
+        StateDirectoryMode = "0700";
+
+        # Increase the limit to avoid errors like 'too many open files' when handling many trace spans
+        LimitNOFILE = 1048576;
+
+        # Hardening
+        DeviceAllow = [ "/dev/null rw" ];
+        DevicePolicy = "strict";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "full";
+        RemoveIPC = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+        ];
+      };
+
+      postStart =
+        let
+          bindAddr = (optionalString (hasPrefix ":" cfg.listenAddress) "127.0.0.1") + cfg.listenAddress;
+        in
+        mkBefore ''
+          until ${getBin pkgs.curl}/bin/curl -s -o /dev/null http://${bindAddr}/ping; do
+            sleep 1;
+          done
+        '';
+    };
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 70de75dc6355..4ad41d3b2fa9 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1581,6 +1581,7 @@ in
   vengi-tools = runTest ./vengi-tools.nix;
   victorialogs = import ./victorialogs { inherit runTest; };
   victoriametrics = import ./victoriametrics { inherit runTest; };
+  victoriatraces = import ./victoriatraces { inherit runTest; };
   vikunja = runTest ./vikunja.nix;
   virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { };
   vm-variant = handleTest ./vm-variant.nix { };
diff --git a/nixos/tests/victoriatraces/default.nix b/nixos/tests/victoriatraces/default.nix
new file mode 100644
index 000000000000..4821438717c1
--- /dev/null
+++ b/nixos/tests/victoriatraces/default.nix
@@ -0,0 +1,5 @@
+{ runTest }:
+{
+  service-endpoints = runTest ./service-endpoints.nix;
+  otlp-ingestion = runTest ./otlp-ingestion.nix;
+}
diff --git a/nixos/tests/victoriatraces/otlp-ingestion.nix b/nixos/tests/victoriatraces/otlp-ingestion.nix
new file mode 100644
index 000000000000..fb2818d7010e
--- /dev/null
+++ b/nixos/tests/victoriatraces/otlp-ingestion.nix
@@ -0,0 +1,96 @@
+{ lib, pkgs, ... }:
+let
+  # Simple protobuf trace
+  traceGenerator = pkgs.writeScriptBin "trace-generator" ''
+    #!${
+      pkgs.python3.withPackages (
+        ps: with ps; [
+          requests
+          protobuf
+          opentelemetry-proto
+          opentelemetry-api
+          opentelemetry-sdk
+          opentelemetry-exporter-otlp-proto-http
+        ]
+      )
+    }/bin/python3
+
+    import time
+    from opentelemetry import trace
+    from opentelemetry.sdk.trace import TracerProvider
+    from opentelemetry.sdk.trace.export import BatchSpanProcessor
+    from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+    from opentelemetry.sdk.resources import Resource
+
+    resource = Resource.create({
+        "service.name": "test-service",
+        "service.version": "1.0.0"
+    })
+
+    provider = TracerProvider(resource=resource)
+
+    otlp_exporter = OTLPSpanExporter(
+        endpoint="http://localhost:10428/insert/opentelemetry/v1/traces",
+        headers={},
+    )
+
+    provider.add_span_processor(BatchSpanProcessor(otlp_exporter))
+    trace.set_tracer_provider(provider)
+
+    tracer = trace.get_tracer("test-tracer", "1.0.0")
+
+    # Test span
+    with tracer.start_as_current_span("test-span") as span:
+        span.set_attribute("http.method", "GET")
+        span.set_attribute("http.url", "/test")
+        time.sleep(0.1)
+
+    provider.force_flush()
+
+    print("Test trace sent")
+  '';
+in
+{
+  name = "victoriatraces-otlp-ingestion";
+  meta.maintainers = with lib.maintainers; [ cmacrae ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.victoriatraces = {
+        enable = true;
+        retentionPeriod = "1d";
+      };
+
+      environment.systemPackages = with pkgs; [
+        curl
+        jq
+        traceGenerator
+      ];
+    };
+
+  testScript = ''
+    machine.wait_for_unit("victoriatraces.service")
+    machine.wait_for_open_port(10428)
+    machine.succeed("curl --fail http://localhost:10428/")
+    machine.succeed("trace-generator")
+
+    # Wait for trace to be indexed
+    machine.wait_until_succeeds("""
+      curl -s 'http://localhost:10428/select/jaeger/api/services' | \
+      jq -e '.data[] | select(. == "test-service")'
+    """, timeout=10)
+
+    # Query for traces from our test service
+    machine.succeed("""
+      curl -s 'http://localhost:10428/select/jaeger/api/traces?service=test-service' | \
+      jq -e '.data[0].spans[0].operationName' | grep -q 'test-span'
+    """)
+
+    # Verify the trace has the expected attributes
+    machine.succeed("""
+      curl -s 'http://localhost:10428/select/jaeger/api/traces?service=test-service' | \
+      jq -e '.data[0].spans[0].tags[] | select(.key == "http.method") | .value == "GET"'
+    """)
+  '';
+}
diff --git a/nixos/tests/victoriatraces/service-endpoints.nix b/nixos/tests/victoriatraces/service-endpoints.nix
new file mode 100644
index 000000000000..21b5b2460e3a
--- /dev/null
+++ b/nixos/tests/victoriatraces/service-endpoints.nix
@@ -0,0 +1,36 @@
+{ lib, ... }:
+{
+  name = "victoriatraces-service-endpoints";
+  meta.maintainers = with lib.maintainers; [ cmacrae ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.victoriatraces = {
+        enable = true;
+        extraOptions = [
+          "-loggerLevel=WARN"
+        ];
+      };
+
+      environment.systemPackages = with pkgs; [
+        curl
+        jq
+      ];
+    };
+
+  testScript = ''
+    machine.wait_for_unit("victoriatraces.service")
+    machine.wait_for_open_port(10428)
+
+    with subtest("Service endpoints are accessible"):
+        machine.succeed("curl --fail http://localhost:10428/")
+        machine.succeed("curl --fail http://localhost:10428/select/vmui")
+        machine.succeed("curl --fail http://localhost:10428/metrics | grep -E '^(vm_|process_)'")
+        machine.succeed("curl --fail http://localhost:10428/select/jaeger/api/services")
+
+    with subtest("OTLP trace ingestion endpoint accepts requests"):
+        machine.succeed("curl --fail -X POST http://localhost:10428/insert/opentelemetry/v1/traces -H 'Content-Type: application/x-protobuf'")
+        machine.succeed("test -d /var/lib/victoriatraces")
+  '';
+}

From ec6413aed8a36c49e7bb908087a9534b286c9682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Mon, 22 Sep 2025 14:44:31 +0200
Subject: [PATCH 046/109] neovide: 0.15.1 -> 0.15.2

---
 pkgs/by-name/ne/neovide/package.nix         | 10 +++++-----
 pkgs/by-name/ne/neovide/skia-externals.json | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index a0397272cbaf..e0cff9bcdd65 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -26,16 +26,16 @@
 
 rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
   pname = "neovide";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "neovide";
     repo = "neovide";
     tag = finalAttrs.version;
-    hash = "sha256-2iV3g6tcCkMF7sFG/GZDz3czPZNIDi6YLfrVzYO9jYI=";
+    hash = "sha256-NJ4BuJLABIuB7We11QGoKZ3fgjDBdZDyZuBKq6LIWA8=";
   };
 
-  cargoHash = "sha256-YlHAcUCRk6ROg5yXIumHfsiR/2TrsSzbuXz/IQK7sEo=";
+  cargoHash = "sha256-DD2c63JHMdzwD1OmC7c9dMB59qjvdAYZ9drQf3f8xCs=";
 
   SKIA_SOURCE_DIR =
     let
@@ -43,8 +43,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
         owner = "rust-skia";
         repo = "skia";
         # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
-        tag = "m135-0.83.1";
-        hash = "sha256-TSGPJl9DfWQtrkNIhv40s8VcuudCjbiSh+QjLc0hKN4=";
+        tag = "m140-0.87.4";
+        hash = "sha256-pHxqTrqguZcPmuZgv0ASbJ3dgn8JAyHI7+PdBX5gAZQ=";
       };
       # The externals for skia are taken from skia/DEPS
       externals = linkFarm "skia-externals" (
diff --git a/pkgs/by-name/ne/neovide/skia-externals.json b/pkgs/by-name/ne/neovide/skia-externals.json
index 3fb8c440dd1e..191578bbb554 100644
--- a/pkgs/by-name/ne/neovide/skia-externals.json
+++ b/pkgs/by-name/ne/neovide/skia-externals.json
@@ -1,13 +1,13 @@
 {
   "expat": {
     "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
-    "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
-    "sha256": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg="
+    "rev": "8e49998f003d693213b538ef765814c7d21abada",
+    "sha256": "sha256-zP2kiB4nyLi0/I8OsRhxKG0qRGPe2ALLQ+HHfqlBJ6Y="
   },
   "libjpeg-turbo": {
     "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
-    "rev": "ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf",
-    "sha256": "sha256-UhDKDfAgcCS92R2EvxKpoiJMvakUDQgyHu2k/xeE7do="
+    "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
+    "sha256": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs="
   },
   "icu": {
     "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
@@ -21,8 +21,8 @@
   },
   "harfbuzz": {
     "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-    "rev": "a070f9ebbe88dc71b248af9731dd49ec93f4e6e6",
-    "sha256": "sha256-DSjzCLqMmlYCz2agrrY2iwr+VdpxukE/QbhzXmVOVpw="
+    "rev": "08b52ae2e44931eef163dbad71697f911fadc323",
+    "sha256": "sha256-sP9FQLUEgTZFlvfYqSZnzZqBMxVotzD0FKKsu3/OdUw="
   },
   "wuffs": {
     "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",

From 322c8594745c042253631ef18c3b95580079cca4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Sep 2025 16:35:17 +0000
Subject: [PATCH 047/109] whoogle-search: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/by-name/wh/whoogle-search/package.nix b/pkgs/by-name/wh/whoogle-search/package.nix
index 68706f230c80..ded13ce9e2e8 100644
--- a/pkgs/by-name/wh/whoogle-search/package.nix
+++ b/pkgs/by-name/wh/whoogle-search/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "whoogle-search";
-  version = "0.9.3";
+  version = "0.9.4";
   pyproject = true;
 
   src = fetchPypi {
     pname = "whoogle_search";
     inherit version;
-    hash = "sha256-4NFHz3l8kJ9QBbr5N55dhCgfoU83naC7avQZSzW6L8w=";
+    hash = "sha256-EvmNDU1hRUIy+CTwECLzIdcEjzcJgiiFYd2iMy0wDG0=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From 5e95027c1374a98ec5f18d63c22f5d5ac19f3432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 22 Sep 2025 20:17:58 +0000
Subject: [PATCH 048/109] pnpm_10: 10.17.0 -> 10.17.1

---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index b249f8c25144..ca0db0c3898a 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -16,8 +16,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.17.0";
-      hash = "sha256-vZ7FQXZBOR4KyzkSspEr1bA4VAeoLalHRKdAe1Z/208=";
+      version = "10.17.1";
+      hash = "sha256-oeATP2gBwTA5rkEwnl5afRBYo6Hh7dAgpJRKg8U2jQQ=";
     };
   };
 

From af658cf2cf9ddf364ff7237f0ec3cab0a3647c69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 01:18:31 +0000
Subject: [PATCH 049/109] syslogng: 4.9.0 -> 4.10.0

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

diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix
index ca2de5eceddf..2faac3744fea 100644
--- a/pkgs/by-name/sy/syslogng/package.nix
+++ b/pkgs/by-name/sy/syslogng/package.nix
@@ -65,13 +65,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "syslog-ng";
-  version = "4.9.0";
+  version = "4.10.0";
 
   src = fetchFromGitHub {
     owner = "syslog-ng";
     repo = "syslog-ng";
     tag = "syslog-ng-${finalAttrs.version}";
-    hash = "sha256-/hLrUwJhA0jesOl7gmWHfTVO2M7IG8QNPRzc/TIGTH4=";
+    hash = "sha256-XqYfDRJc+AwkdQGSbkslFadYqNK0UDiZOruUUMYO1po=";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [

From 0a5a96279aeb33ae57efff7ef165462d2c7c3cc6 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 23 Sep 2025 09:18:32 +0800
Subject: [PATCH 050/109] butterfly: 2.3.4 -> 2.4.0

---
 pkgs/by-name/bu/butterfly/gitHashes.json    |  18 +-
 pkgs/by-name/bu/butterfly/package.nix       |   8 +-
 pkgs/by-name/bu/butterfly/pubspec.lock.json | 266 ++++++++++----------
 3 files changed, 139 insertions(+), 153 deletions(-)

diff --git a/pkgs/by-name/bu/butterfly/gitHashes.json b/pkgs/by-name/bu/butterfly/gitHashes.json
index 112579c175ea..cf69dc3861d5 100644
--- a/pkgs/by-name/bu/butterfly/gitHashes.json
+++ b/pkgs/by-name/bu/butterfly/gitHashes.json
@@ -1,13 +1,11 @@
 {
   "dart_leap": "sha256-oO5851cIdrW/asgOePxvwUgjn1XchkH9CKJUruvlLYI=",
-  "lw_file_system": "sha256-S2zNpZWPtUH8Q+gUPEX9zW+agH8rq6Wsz7aj/i1DF9c=",
-  "lw_file_system_api": "sha256-/Ur9zu4Ovb4x8j1n6Q6FWFuJ9yp92YQG3b7H5CMf3II=",
-  "lw_sysapi": "sha256-oGs5q8N46WNcRzbsgsPB/6fVBH3g9utK4tlXBpwU4Qc=",
-  "material_leap": "sha256-AHkXi+ENvLmJBXyF8jdXOCn/CThb6/LDr18gl9sL0XE=",
-  "networker": "sha256-/3jFIZj66hWbTcIQx9OB5QRrukcBT4zpek+56AVaGIA=",
-  "networker_crypto": "sha256-nI0luldloScjjix75kR5yOE1ZX8KFxMIC2N4whKlXUg=",
-  "networker_socket": "sha256-5y1oy0IYDs7nhiIx653vI5Gfh5jrVewkRFxB1mjxlE4=",
-  "perfect_freehand": "sha256-eBiid097rkF82n65Yg6a4VkKPv+70HIOYJT+9sCD//U=",
-  "reorderable_grid": "sha256-g30DSPL/gsk0r8c2ecoKU4f1P3BF15zLnBVO6RXvDGQ=",
-  "swamp_api": "sha256-ONaCXeMwEEHDvVmbo3o66O3CTCx4xGR3T5ZtSEwPvaw="
+  "lw_file_system": "sha256-cnGaTriJI3IEZjUg5sj4VrrG3cxfzBfDzJRkFRIKmu4=",
+  "lw_file_system_api": "sha256-ozp/mJq2o5pzQgFcTWLzG67XgHZRHoIRW+W0QDLCTFM=",
+  "lw_sysapi": "sha256-rs/nC6/uUGXHZ6kzb+RCcvtVP/zSYV9NdrUq+WHLOKQ=",
+  "material_leap": "sha256-cnGaTriJI3IEZjUg5sj4VrrG3cxfzBfDzJRkFRIKmu4=",
+  "networker": "sha256-YqCl/FODv8QZFnz1qVHoJLIioYhcluPiY4pP09MzvNE=",
+  "networker_crypto": "sha256-8I/qBdxxbIse7un4W9MjaifbK7TqsyYrFnIbaTuezo0=",
+  "networker_socket": "sha256-8I/qBdxxbIse7un4W9MjaifbK7TqsyYrFnIbaTuezo0=",
+  "swamp_api": "sha256-74Zr2qUeS8JnWcqqU7zAwaD8ygnni76OuTOwQqobhCk="
 }
diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix
index 4b6664f1520e..9a995e94e39b 100644
--- a/pkgs/by-name/bu/butterfly/package.nix
+++ b/pkgs/by-name/bu/butterfly/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter332,
+  flutter335,
   fetchFromGitHub,
   runCommand,
   yq-go,
@@ -9,16 +9,16 @@
 }:
 
 let
-  version = "2.3.4";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "LinwoodDev";
     repo = "Butterfly";
     tag = "v${version}";
-    hash = "sha256-qmgM6h2HxvRwUv4UwkIBR3uYz2NiaWEgJWWjrpumQug=";
+    hash = "sha256-kxX9gHNKDlRir9TGSob6iz8cRJOqHdoYlvIi4MQAroc=";
   };
 in
-flutter332.buildFlutterApplication {
+flutter335.buildFlutterApplication {
   pname = "butterfly";
   inherit version src;
 
diff --git a/pkgs/by-name/bu/butterfly/pubspec.lock.json b/pkgs/by-name/bu/butterfly/pubspec.lock.json
index f781dc3eb04c..ca98d6980ee1 100644
--- a/pkgs/by-name/bu/butterfly/pubspec.lock.json
+++ b/pkgs/by-name/bu/butterfly/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
+        "sha256": "dd3d2ad434b9510001d089e8de7556d50c834481b9abc2891a0184a8493a19dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "85.0.0"
+      "version": "89.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
+        "sha256": "c22b6e7726d1f9e5db58c7251606076a71ca0dbcf76116675edfadbec0c9e875",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.1"
+      "version": "8.2.0"
     },
     "animations": {
       "dependency": "direct main",
@@ -114,11 +114,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "6439a9c71a4e6eca8d9490c1b380a25b02675aa688137dfbe66d2062884a23ac",
+        "sha256": "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "4.0.0"
     },
     "build_config": {
       "dependency": "transitive",
@@ -140,35 +140,15 @@
       "source": "hosted",
       "version": "4.0.4"
     },
-    "build_resolvers": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_resolvers",
-        "sha256": "2b21a125d66a86b9511cc3fb6c668c42e9a1185083922bf60e46d483a81a9712",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.2"
-    },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "fd3c09f4bbff7fa6e8d8ef688a0b2e8a6384e6483a25af0dac75fef362bcfe6f",
+        "sha256": "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.0"
-    },
-    "build_runner_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_runner_core",
-        "sha256": "ab27e46c8aa233e610cf6084ee6d8a22c6f873a0a9929241d8855b7a72978ae7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.3.0"
+      "version": "2.8.0"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -184,11 +164,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb",
+        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.11.1"
+      "version": "8.12.0"
     },
     "butterfly_api": {
       "dependency": "direct main",
@@ -197,7 +177,7 @@
         "relative": true
       },
       "source": "path",
-      "version": "2.3.4"
+      "version": "2.4.0"
     },
     "camera": {
       "dependency": "direct main",
@@ -213,31 +193,31 @@
       "dependency": "transitive",
       "description": {
         "name": "camera_android_camerax",
-        "sha256": "58b8fe843a3c83fd1273c00cb35f5a8ae507f6cc9b2029bcf7e2abba499e28d8",
+        "sha256": "0db8e7b161ec6cdb2219540eaa4cf599dc963929e5f8ded3b20b3acb52712fa4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.19+1"
+      "version": "0.6.21+1"
     },
     "camera_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "camera_avfoundation",
-        "sha256": "e4aca5bccaf897b70cac87e5fdd789393310985202442837922fd40325e2733b",
+        "sha256": "a5a90297520e3b9841331161a7511626681153849c690c138e04a2b6d0af3026",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.21+1"
+      "version": "0.9.21+3"
     },
     "camera_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "camera_platform_interface",
-        "sha256": "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2",
+        "sha256": "ea1ef6ba79cdbed93df2d3eeef11542a90dec24dbcd9cde574926b86d7a09a10",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.0"
+      "version": "2.11.0"
     },
     "camera_web": {
       "dependency": "transitive",
@@ -303,11 +283,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.0"
     },
     "collection": {
       "dependency": "direct main",
@@ -323,11 +303,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec",
+        "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "7.0.0"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -414,21 +394,21 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_mappable",
-        "sha256": "15f41a35da8ee690bbfa0059fa241edeeaea73f89a2ba685b354ece07cd8ada6",
+        "sha256": "0e219930c9f7b9e0f14ae7c1de931c401875110fd5c67975b6b9492a6d3a531b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.6.0"
+      "version": "4.6.1"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
+        "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
     },
     "dbus": {
       "dependency": "transitive",
@@ -514,21 +494,21 @@
       "dependency": "direct main",
       "description": {
         "name": "file_selector",
-        "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828",
+        "sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.3"
+      "version": "1.0.4"
     },
     "file_selector_android": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "3015702ab73987000e7ff2df5ddc99666d2bcd65cdb243f59da35729d3be6cff",
+        "sha256": "4be8ae7374c81daf88e49084a1d68dfe68466ef38a6a3d711cc0b83d53e22465",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1+15"
+      "version": "0.5.1+16"
     },
     "file_selector_ios": {
       "dependency": "transitive",
@@ -604,11 +584,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flex_color_scheme",
-        "sha256": "3344f8f6536c6ce0473b98e9f084ef80ca89024ad3b454f9c32cf840206f4387",
+        "sha256": "034d5720747e6af39b2ad090d82dd92d33fde68e7964f1814b714c9d49ddbd64",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.2.0"
+      "version": "8.3.0"
     },
     "flex_seed_scheme": {
       "dependency": "transitive",
@@ -668,15 +648,25 @@
       "source": "hosted",
       "version": "2.0.5"
     },
+    "flutter_math_fork": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_math_fork",
+        "sha256": "6d5f2f1aa57ae539ffb0a04bb39d2da67af74601d685a161aff7ce5bda5fa407",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.4"
+    },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "6382ce712ff69b0f719640ce957559dde459e55ecd433c767e06d139ddf16cab",
+        "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.29"
+      "version": "2.0.30"
     },
     "flutter_secure_storage": {
       "dependency": "direct main",
@@ -742,11 +732,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
+        "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "2.2.1"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -764,11 +754,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "da32f8ba8cfcd4ec71d9decc8cbf28bd2c31b5283d9887eb51eb4a0659d8110c",
+        "sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.3"
     },
     "freezed_annotation": {
       "dependency": "transitive",
@@ -820,11 +810,11 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "8b1f37dfaf6e958c6b872322db06f946509433bec3de753c3491a42ae9ec2b48",
+        "sha256": "b1488741c9ce37b72e026377c69a59c47378493156fc38efb5a54f6def3f92a3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "16.1.0"
+      "version": "16.2.2"
     },
     "graphs": {
       "dependency": "transitive",
@@ -956,41 +946,41 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "ce2cf974ccdee13be2a510832d7fba0b94b364e0b0395dee42abaa51b855be27",
+        "sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.10.0"
+      "version": "6.11.1"
     },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.9"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
@@ -1016,8 +1006,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/lw_file_system",
-        "ref": "3eb0c455dd56cfcde08a7c7efaba5adbc38dd976",
-        "resolved-ref": "3eb0c455dd56cfcde08a7c7efaba5adbc38dd976",
+        "ref": "12843672e8f33e9370444b13fca8134f4543f7ee",
+        "resolved-ref": "12843672e8f33e9370444b13fca8134f4543f7ee",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1027,8 +1017,8 @@
       "dependency": "transitive",
       "description": {
         "path": "packages/lw_file_system_api",
-        "ref": "2ecf53489240f055c841d7c8f92fe374cc6a27ae",
-        "resolved-ref": "2ecf53489240f055c841d7c8f92fe374cc6a27ae",
+        "ref": "ddd0761c3ed5a48108bddd0448df76d77eeb9da0",
+        "resolved-ref": "ddd0761c3ed5a48108bddd0448df76d77eeb9da0",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1038,8 +1028,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/lw_sysapi",
-        "ref": "82ef4b4f68a18e55226b3030293e26c28b4964c2",
-        "resolved-ref": "82ef4b4f68a18e55226b3030293e26c28b4964c2",
+        "ref": "7a9ebaba930ca39b6d2a4a76ab5056d7fad18a01",
+        "resolved-ref": "7a9ebaba930ca39b6d2a4a76ab5056d7fad18a01",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1079,8 +1069,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/material_leap",
-        "ref": "792044f51747d7d078203904e460d4ef504a9db9",
-        "resolved-ref": "792044f51747d7d078203904e460d4ef504a9db9",
+        "ref": "12843672e8f33e9370444b13fca8134f4543f7ee",
+        "resolved-ref": "12843672e8f33e9370444b13fca8134f4543f7ee",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1130,11 +1120,11 @@
       "dependency": "direct main",
       "description": {
         "name": "network_info_plus",
-        "sha256": "f926b2ba86aa0086a0dfbb9e5072089bc213d854135c1712f1d29fc89ba3c877",
+        "sha256": "2866dadcbee2709e20d67737a1556f5675b8b0cdcf2c1659ba74bc21bffede4f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.4"
+      "version": "7.0.0"
     },
     "network_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1150,8 +1140,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/networker/networker",
-        "ref": "2e0ab5b548cb8e2d64ca24e0d7b4a6cfcc6d57fe",
-        "resolved-ref": "2e0ab5b548cb8e2d64ca24e0d7b4a6cfcc6d57fe",
+        "ref": "4f221c5943ceb786eb7bd427eb71a8cc1346b9b8",
+        "resolved-ref": "4f221c5943ceb786eb7bd427eb71a8cc1346b9b8",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1161,8 +1151,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/networker/networker_crypto",
-        "ref": "1cc2988f680758fcb45c88b3905b0312d8c5a513",
-        "resolved-ref": "1cc2988f680758fcb45c88b3905b0312d8c5a513",
+        "ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
+        "resolved-ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1172,8 +1162,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/networker/networker_socket",
-        "ref": "72c7cdd7a60d98c3a7f587122da83dc8b99b7ed0",
-        "resolved-ref": "72c7cdd7a60d98c3a7f587122da83dc8b99b7ed0",
+        "ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
+        "resolved-ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1193,11 +1183,11 @@
       "dependency": "direct main",
       "description": {
         "name": "one_dollar_unistroke_recognizer",
-        "sha256": "459ba12aaada0e85e8f211f62fea649f246ccb74f726527593a0716bf1bcf6c4",
+        "sha256": "599a074c6cec9c1517e382368e5ea470abbd04a82fe3700472a7b042de882384",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.3"
+      "version": "1.3.4"
     },
     "package_config": {
       "dependency": "transitive",
@@ -1213,11 +1203,11 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.1"
+      "version": "9.0.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1263,11 +1253,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
+        "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.17"
+      "version": "2.2.18"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1332,23 +1322,22 @@
     "perfect_freehand": {
       "dependency": "direct main",
       "description": {
-        "path": ".",
-        "ref": "85a6db5889db2916733a0f6c6914e66d06931f71",
-        "resolved-ref": "85a6db5889db2916733a0f6c6914e66d06931f71",
-        "url": "https://github.com/CodeDoctorDE/perfect-freehand-dart.git"
+        "name": "perfect_freehand",
+        "sha256": "399c16dc35a6eb1dee4d9a2c638ff0fe71ebb5e8980ab41261bf4306dafaa4af",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "2.3.2"
+      "source": "hosted",
+      "version": "2.5.0"
     },
     "petitparser": {
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.1"
     },
     "phosphor_flutter": {
       "dependency": "direct main",
@@ -1394,11 +1383,11 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
     },
     "popover": {
       "dependency": "direct main",
@@ -1434,21 +1423,21 @@
       "dependency": "transitive",
       "description": {
         "name": "process",
-        "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d",
+        "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.3"
+      "version": "5.0.5"
     },
     "provider": {
       "dependency": "transitive",
       "description": {
         "name": "provider",
-        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
+        "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "6.1.5+1"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1483,13 +1472,12 @@
     "reorderable_grid": {
       "dependency": "direct main",
       "description": {
-        "path": ".",
-        "ref": "d6f6a4fcf23129400529a055292133f1030b7eee",
-        "resolved-ref": "d6f6a4fcf23129400529a055292133f1030b7eee",
-        "url": "https://github.com/CodeDoctorDE/reorderable_grid.git"
+        "name": "reorderable_grid",
+        "sha256": "c7d2e1f2e032a8fffe121f9da828546ee58db35c9c7d19d7a2d189dea2f9939d",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.0.9"
+      "source": "hosted",
+      "version": "1.0.12"
     },
     "replay_bloc": {
       "dependency": "direct main",
@@ -1575,11 +1563,11 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
+        "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.1.0"
+      "version": "12.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1605,11 +1593,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e",
+        "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.11"
+      "version": "2.4.12"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1691,21 +1679,21 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3",
+        "sha256": "ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "4.0.1"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca",
+        "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.7"
+      "version": "1.3.8"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1791,8 +1779,8 @@
       "dependency": "direct main",
       "description": {
         "path": "api",
-        "ref": "e3731236887b11685aa9c7c94d453babf726b46c",
-        "resolved-ref": "e3731236887b11685aa9c7c94d453babf726b46c",
+        "ref": "1c15259fc8c5e043997ffcaafbf45348a77e3003",
+        "resolved-ref": "1c15259fc8c5e043997ffcaafbf45348a77e3003",
         "url": "https://github.com/LinwoodDev/Swamp.git"
       },
       "source": "git",
@@ -1832,21 +1820,21 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.6"
     },
-    "timing": {
+    "tuple": {
       "dependency": "transitive",
       "description": {
-        "name": "timing",
-        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
+        "name": "tuple",
+        "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "2.0.2"
     },
     "type_plus": {
       "dependency": "transitive",
@@ -1882,11 +1870,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "0aedad096a85b49df2e4725fa32118f9fa580f3b14af7a2d2221896a02cd5656",
+        "sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.17"
+      "version": "6.3.22"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -1982,41 +1970,41 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "ca81fdfaf62a5ab45d7296614aea108d2c7d0efca8393e96174bf4d51e6725b0",
+        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.18"
+      "version": "1.1.19"
     },
     "vector_math": {
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "vm_service": {
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.0"
+      "version": "15.0.2"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
+        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.3"
     },
     "web": {
       "dependency": "direct main",
@@ -2102,11 +2090,11 @@
       "dependency": "direct main",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
@@ -2120,7 +2108,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.32.8"
+    "dart": ">=3.9.0 <4.0.0",
+    "flutter": ">=3.35.4"
   }
 }

From ef871b4b84f6481d8c1b79c312fc60262bc5dd47 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 23 Sep 2025 09:33:04 +0800
Subject: [PATCH 051/109] spnavcfg: 1.1 -> 1.3

Diff: https://github.com/FreeSpacenav/spnavcfg/compare/v1.1...v1.3
---
 pkgs/by-name/sp/spnavcfg/package.nix | 30 +++++++++++-----------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/sp/spnavcfg/package.nix b/pkgs/by-name/sp/spnavcfg/package.nix
index 7c431a6a6ea1..a8eb341836c3 100644
--- a/pkgs/by-name/sp/spnavcfg/package.nix
+++ b/pkgs/by-name/sp/spnavcfg/package.nix
@@ -1,43 +1,37 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   libspnav,
-  libX11,
-
-  # Qt6 support is close: https://github.com/FreeSpacenav/spnavcfg/issues/43
-  libsForQt5,
+  qt6,
 }:
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "spnavcfg";
-  version = "1.1";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "FreeSpacenav";
     repo = "spnavcfg";
     tag = "v${finalAttrs.version}";
     fetchLFS = true;
-    hash = "sha256-P3JYhZnaCxzJETwC4g5m4xAGBk28/Va7Z/ybqwacIaA=";
+    hash = "sha256-HYBb1/SgjayJjdA0N8UHPde3y4SugYiWIPP+3Eu3CEI=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/FreeSpacenav/spnavcfg/commit/fd9aa10fb8e19a257398757943b3d8e79906e583.patch";
-      hash = "sha256-XKEyLAFrA4qRU3zkBozblb/fKtLKsaItze0xv1uLnq0=";
-    })
-  ];
-
   nativeBuildInputs = [
     pkg-config
-    libsForQt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libsForQt5.qtbase
+    qt6.qtbase
     libspnav
-    libX11
+  ];
+
+  configureFlags = [
+    "--qt6"
+    "--qt-tooldir=${qt6.qtbase}/libexec"
   ];
 
   meta = with lib; {

From 42d18185aad53b4ddaf603b063f2815dfea532c1 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 23 Sep 2025 09:33:33 +0800
Subject: [PATCH 052/109] spnavcfg: remove with lib

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

diff --git a/pkgs/by-name/sp/spnavcfg/package.nix b/pkgs/by-name/sp/spnavcfg/package.nix
index a8eb341836c3..bf70e26d3a54 100644
--- a/pkgs/by-name/sp/spnavcfg/package.nix
+++ b/pkgs/by-name/sp/spnavcfg/package.nix
@@ -34,12 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--qt-tooldir=${qt6.qtbase}/libexec"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://spacenav.sourceforge.net/";
     description = "Interactive configuration GUI for space navigator input devices";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "spnavcfg";
   };
 })

From 05b04db5e49dfe8bd99531c02f898211d179988a Mon Sep 17 00:00:00 2001
From: Susan <susan@susan.lol>
Date: Tue, 23 Sep 2025 13:33:15 +0300
Subject: [PATCH 053/109] todoist-electron: respect NIXOS_OZONE_WL

---
 pkgs/by-name/to/todoist-electron/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/to/todoist-electron/package.nix b/pkgs/by-name/to/todoist-electron/package.nix
index 69a4cbd07fbf..c0e39da0f103 100644
--- a/pkgs/by-name/to/todoist-electron/package.nix
+++ b/pkgs/by-name/to/todoist-electron/package.nix
@@ -3,6 +3,7 @@
   appimageTools,
   fetchurl,
   asar,
+  makeWrapper,
 }:
 
 let
@@ -38,6 +39,10 @@ appimageTools.wrapAppImage {
     substituteInPlace $out/share/applications/todoist.desktop \
       --replace-fail "Exec=AppRun" "Exec=todoist-electron --" \
       --replace-fail "Exec=todoist" "Exec=todoist-electron --"
+
+    . ${makeWrapper}/nix-support/setup-hook
+    wrapProgram $out/bin/todoist-electron \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
   '';
 
   meta = {

From 2fe4cbec36a5762b8bd1f83273d98b8ca4c65f95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 14:16:27 +0000
Subject: [PATCH 054/109] git-town: 21.5.0 -> 22.0.0

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

diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index 00842e055148..b1e7acd4a5c1 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule rec {
   pname = "git-town";
-  version = "21.5.0";
+  version = "22.0.0";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
     tag = "v${version}";
-    hash = "sha256-H0WfUBrXPkqS2UnZpL6TyguzOa34KMetCwMKIvNKJ28=";
+    hash = "sha256-yLDzMKyg9t5VNFXRS+FDD6W0Z80eNNywfZAMOhxNSZU=";
   };
 
   vendorHash = null;

From df100b8dc221f68b56f104687fc8e5b513a45725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= <git@nicomem.com>
Date: Tue, 23 Sep 2025 19:11:55 +0200
Subject: [PATCH 055/109] nixos/crowdsec: Change service type to `notify` like
 upstream

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

diff --git a/nixos/modules/services/security/crowdsec.nix b/nixos/modules/services/security/crowdsec.nix
index d5cb5a1bb6c7..324dfd140df5 100644
--- a/nixos/modules/services/security/crowdsec.nix
+++ b/nixos/modules/services/security/crowdsec.nix
@@ -770,7 +770,7 @@ in
           serviceConfig = {
             User = cfg.user;
             Group = cfg.group;
-            Type = "simple";
+            Type = "notify";
             RestartSec = 60;
             LimitNOFILE = 65536;
             NoNewPrivileges = true;

From 3194eefe3a5101180e6eed540f4bf015cb117e1e Mon Sep 17 00:00:00 2001
From: myypo <nikirsmcgl@gmail.com>
Date: Tue, 23 Sep 2025 23:01:36 +0300
Subject: [PATCH 056/109] postgres-lsp: 0.13.0 -> 0.15.0

---
 pkgs/by-name/po/postgres-lsp/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix
index 238eb0cf396e..93ea5e8604b5 100644
--- a/pkgs/by-name/po/postgres-lsp/package.nix
+++ b/pkgs/by-name/po/postgres-lsp/package.nix
@@ -1,22 +1,21 @@
 {
   lib,
   rustPlatform,
-  fetchFromGitHub,
+  fetchgit,
   rust-jemalloc-sys,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "postgres-lsp";
-  version = "0.13.0";
+  version = "0.15.0";
 
-  src = fetchFromGitHub {
-    owner = "supabase-community";
-    repo = "postgres-language-server";
+  src = fetchgit {
+    url = "https://github.com/supabase-community/postgres-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-0Q8MxKeh12STWIJ9441uTz+qQXEJjCESj21C4X8CBC4=";
+    hash = "sha256-ZintjrSeNsYR6A8tlEfSetse7d79jgLdCpdu+sMe3Zk=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-oIbS5BUpNOXwiRconqJI/jdXeX05FIZVNl2kYt+79wY=";
+  cargoHash = "sha256-x/Wbx3noH6YOQIis1sN8ylQApjhSy4/mrxX6jvZFs6A=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From 3ade6fd7daf51e942a63ccc266d78c28e60921c3 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 23 Sep 2025 18:11:31 -0400
Subject: [PATCH 057/109] maintainers: drop GuillaumeDesforges

Inactive on nixpkgs since Dec 2024, and was requested on 10+ PRs.

Not an org member.
---
 maintainers/maintainer-list.nix                             | 6 ------
 pkgs/by-name/db/dbx/package.nix                             | 2 +-
 pkgs/by-name/du/dummyhttp/package.nix                       | 2 +-
 pkgs/by-name/ma/marp-cli/package.nix                        | 2 +-
 pkgs/development/python-modules/geopy/default.nix           | 2 +-
 pkgs/development/python-modules/pooch/default.nix           | 2 +-
 pkgs/development/python-modules/scikit-survival/default.nix | 2 +-
 pkgs/development/python-modules/standard-sunau/default.nix  | 2 +-
 8 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 50f6211874b6..0cc84f1466c1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9782,12 +9782,6 @@
     githubId = 95086304;
     name = "Guilherme Lima";
   };
-  GuillaumeDesforges = {
-    email = "aceus02@gmail.com";
-    github = "GuillaumeDesforges";
-    githubId = 1882000;
-    name = "Guillaume Desforges";
-  };
   guillaumekoenig = {
     email = "guillaume.edward.koenig@gmail.com";
     github = "guillaumekoenig";
diff --git a/pkgs/by-name/db/dbx/package.nix b/pkgs/by-name/db/dbx/package.nix
index 53efc27c49db..b60adf4ba21f 100644
--- a/pkgs/by-name/db/dbx/package.nix
+++ b/pkgs/by-name/db/dbx/package.nix
@@ -157,6 +157,6 @@ python.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/databrickslabs/dbx";
     changelog = "https://github.com/databrickslabs/dbx/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.databricks-dbx;
-    maintainers = with lib.maintainers; [ GuillaumeDesforges ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix
index aeac1bf7b19b..929ad01b40ac 100644
--- a/pkgs/by-name/du/dummyhttp/package.nix
+++ b/pkgs/by-name/du/dummyhttp/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Super simple HTTP server that replies a fixed body with a fixed response code";
     homepage = "https://github.com/svenstaro/dummyhttp";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ GuillaumeDesforges ];
+    maintainers = with maintainers; [ ];
     mainProgram = "dummyhttp";
   };
 }
diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix
index 3d504c3432ef..278f0fba01ac 100644
--- a/pkgs/by-name/ma/marp-cli/package.nix
+++ b/pkgs/by-name/ma/marp-cli/package.nix
@@ -26,7 +26,7 @@ buildNpmPackage rec {
     description = "About A CLI interface for Marp and Marpit based converters";
     homepage = "https://github.com/marp-team/marp-cli";
     license = licenses.mit;
-    maintainers = with maintainers; [ GuillaumeDesforges ];
+    maintainers = with maintainers; [ ];
     platforms = nodejs.meta.platforms;
     mainProgram = "marp";
   };
diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 6da0af5310e9..f15a09d60526 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Python Geocoding Toolbox";
     changelog = "https://github.com/geopy/geopy/releases/tag/${version}";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ GuillaumeDesforges ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix
index ed35b18025ce..081ce5c48a37 100644
--- a/pkgs/development/python-modules/pooch/default.nix
+++ b/pkgs/development/python-modules/pooch/default.nix
@@ -75,6 +75,6 @@ buildPythonPackage rec {
     description = "Friend to fetch your data files";
     homepage = "https://github.com/fatiando/pooch";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ GuillaumeDesforges ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix
index 9075dafe84aa..e68a02c63f3a 100644
--- a/pkgs/development/python-modules/scikit-survival/default.nix
+++ b/pkgs/development/python-modules/scikit-survival/default.nix
@@ -93,6 +93,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sebp/scikit-survival";
     changelog = "https://github.com/sebp/scikit-survival/releases/tag/v${version}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ GuillaumeDesforges ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/standard-sunau/default.nix b/pkgs/development/python-modules/standard-sunau/default.nix
index 3185ec199654..e2ee88284e70 100644
--- a/pkgs/development/python-modules/standard-sunau/default.nix
+++ b/pkgs/development/python-modules/standard-sunau/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Standard library sunau redistribution";
     homepage = "https://github.com/youknowone/python-deadlib/tree/main/sunau";
     license = lib.licenses.psfl;
-    maintainers = with lib.maintainers; [ GuillaumeDesforges ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 6010a7a6a92dbd15004b4c39ffad869f4295d2ee Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 23 Sep 2025 20:34:19 -0400
Subject: [PATCH 058/109] python3Packages.yapsy: 1.12.2-unstable-2023-03-29 ->
 1.12.2-unstable-2023-03-28

Actually the same version as before, it just uses the committer's time zone for
consistency with the scripts.

Speaking of scripts, I set passthru.updateScript.
This should stop spurious r-ryantm PRs.

Closes: #436561
---
 pkgs/development/python-modules/yapsy/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix
index 256d421f918f..ba3818351bab 100644
--- a/pkgs/development/python-modules/yapsy/default.nix
+++ b/pkgs/development/python-modules/yapsy/default.nix
@@ -4,11 +4,12 @@
   fetchFromGitHub,
   setuptools,
   pytestCheckHook,
+  unstableGitUpdater,
 }:
 
 buildPythonPackage rec {
   pname = "yapsy";
-  version = "1.12.2-unstable-2023-03-29";
+  version = "1.12.2-unstable-2023-03-28";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -26,6 +27,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "yapsy" ];
 
+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "release_Yapsy-";
+  };
+
   meta = with lib; {
     homepage = "https://yapsy.sourceforge.net/";
     description = "Yet another plugin system";

From 86b004ea68d99a47193ff9847419ba83306963a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 01:20:48 +0000
Subject: [PATCH 059/109] atop: 2.12.0 -> 2.12.1

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

diff --git a/pkgs/by-name/at/atop/package.nix b/pkgs/by-name/at/atop/package.nix
index cea7301713de..f06e8ee3f605 100644
--- a/pkgs/by-name/at/atop/package.nix
+++ b/pkgs/by-name/at/atop/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atop";
-  version = "2.12.0";
+  version = "2.12.1";
 
   src = fetchurl {
     url = "https://www.atoptool.nl/download/atop-${version}.tar.gz";
-    hash = "sha256-DQnsyQwU5u9Bwi48V8FCw+T7nPPJQ3kHejPJYdU0MIY=";
+    hash = "sha256-T9vmfF36+JQFY54YWZ9OrneXgHP/pU88eMNoq1S9EvY=";
   };
 
   nativeBuildInputs = [

From 1525ecad359aff8f5fe88a77a6fff895435c9a91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 08:26:43 +0000
Subject: [PATCH 060/109] waveterm: 0.11.5 -> 0.11.6

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

diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 100335da7d40..17b6d21c2ac7 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -31,7 +31,7 @@
 let
   selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
   pname = "waveterm";
-  version = "0.11.5";
+  version = "0.11.6";
 
   passthru.updateScript = ./update.sh;
 
@@ -62,8 +62,8 @@ let
       fetchurl {
         url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb";
         hash = selectSystem {
-          x86_64-linux = "sha256-3HPDjrY8hMMZFqzncEtdr2ap2HT3UZvEDv6PO1Hn/KE=";
-          aarch64-linux = "sha256-lDlMlGgPthBIMA3HIj8ZudIbQA98/tXD7d/Mc2ZZ3t0=";
+          x86_64-linux = "sha256-OM64Tyqo+phMiH6TWmp47hBhnFo0cTvzFvhX/7/JUec=";
+          aarch64-linux = "sha256-g+e2wn1n0EqFeUah5ZgvL5D/y1khRQ2BUEowQf/ZoaI=";
         };
       };
 
@@ -136,8 +136,8 @@ let
       fetchurl {
         url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
         hash = selectSystem {
-          x86_64-darwin = "sha256-5TViV0XG9TTqnNHY7vYClxrczHE8gpMb+m0Euvfu+iQ=";
-          aarch64-darwin = "sha256-RKptVWAEO5YKbyitYEyGxVf/NoRSeT1BfkXPwHmOvkc=";
+          x86_64-darwin = "sha256-AW4AQ/U/WHIlXmgbQJ8g0yQQgpBolYT2kb/fDNWUS1g=";
+          aarch64-darwin = "sha256-Laxjj/MZzKsKhfRvOROQcPiatwNJKVqUCcGWB0chnok=";
         };
       };
 

From d8fd81df486df6b0e43da4791d2d8c030e5d2c20 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Wed, 24 Sep 2025 10:31:09 +0200
Subject: [PATCH 061/109] gdal: 3.11.3 -> 3.11.4

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

diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index 9ae227592082..6345581434ce 100644
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -83,13 +83,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
-  version = "3.11.3";
+  version = "3.11.4";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "gdal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3C/gJejqfdT5pVNej2KlIdbOKZbYJY7jUFTfLsRoeQk=";
+    hash = "sha256-CFQF3vDhhXsAnIfUcn6oTQ4Xm+GH/36dqSGc0HvyEJ0=";
   };
 
   nativeBuildInputs = [

From 6662c83b12ea6a27ad2e82cea792d271b7c5acd8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 10:00:55 +0000
Subject: [PATCH 062/109] havn: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix
index f26a2d6c59dc..c81a18208a6d 100644
--- a/pkgs/by-name/ha/havn/package.nix
+++ b/pkgs/by-name/ha/havn/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "havn";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "mrjackwills";
     repo = "havn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8eufAIiUT4ahlXwlkIg9C2KN/2hJZYO4kX5ulETZriY=";
+    hash = "sha256-IPCV7rpnoZfmkMepdbsbKm3s8PsA+Nn3h4ZmubwkR5E=";
   };
 
-  cargoHash = "sha256-JnPgExfdlk8SDjcnVSMvG9S2oVbBGhhLlQEmeYcbVxI=";
+  cargoHash = "sha256-0a8p7mC/abltpxEpk1KwGYQ14Kk8HJNL9wY6601+qgE=";
 
   checkFlags = [
     # Skip tests that require network access

From 9f20e3789b504d7999bbb346f5efa164a5c04b61 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 09:13:35 +0200
Subject: [PATCH 063/109] postgresql_18: 18rc1 -> 18.0

---
 pkgs/servers/sql/postgresql/18.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/18.nix b/pkgs/servers/sql/postgresql/18.nix
index 46211a7b5fae..401471cde9a7 100644
--- a/pkgs/servers/sql/postgresql/18.nix
+++ b/pkgs/servers/sql/postgresql/18.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  version = "18rc1";
-  rev = "refs/tags/REL_18_RC1";
-  hash = "sha256-PDycGuKrEa00N1h/BsWUiwG7naE0f2wFFXpQSOhs/hY=";
+  version = "18.0";
+  rev = "refs/tags/REL_18_0";
+  hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec=";
   muslPatches = {
     dont-use-locale-a = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";

From 2cfe2d18ab60e1343dfde4e3fa9631ff17288595 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 12:54:43 +0200
Subject: [PATCH 064/109] pg-dump-anon: modernize

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

diff --git a/pkgs/by-name/pg/pg-dump-anon/package.nix b/pkgs/by-name/pg/pg-dump-anon/package.nix
index 506a2e84ef17..8745812d4592 100644
--- a/pkgs/by-name/pg/pg-dump-anon/package.nix
+++ b/pkgs/by-name/pg/pg-dump-anon/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "dalibo";
     repo = "postgresql_anonymizer";
-    rev = version;
+    tag = version;
     hash = "sha256-MGdGvd4P1fFKdd6wnS2V5Tdly6hJlAmSA4TspnO/6Tk=";
   };
 
@@ -29,11 +29,11 @@ buildGoModule rec {
       --prefix PATH : ${lib.makeBinPath [ postgresql ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Export databases with data being anonymized with the anonymizer extension";
     homepage = "https://postgresql-anonymizer.readthedocs.io/en/stable/";
-    teams = [ teams.flyingcircus ];
-    license = licenses.postgresql;
+    teams = [ lib.teams.flyingcircus ];
+    license = lib.licenses.postgresql;
     mainProgram = "pg_dump_anon";
   };
 }

From 415e523ebe8fb26635aa5b09dddf70f699f022fa Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 13:45:02 +0200
Subject: [PATCH 065/109] cargo-pgrx_0_16_0: init

Needed for postgresql.pkgs.anonymizer.
---
 pkgs/development/tools/rust/cargo-pgrx/pinned.nix | 6 ++++++
 pkgs/top-level/all-packages.nix                   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
index 6a73795ad2f2..4277e2835aa7 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
@@ -17,4 +17,10 @@
     hash = "sha256-oMToAhKkRiCyC8JYS0gmo/XX3QVcVtF5mUV0aQjd+p8=";
     cargoHash = "sha256-RawGAQGtG2QVDCMbwjmUEaH6rDeRiBvvJsGCY8wySw0=";
   };
+
+  cargo-pgrx_0_16_0 = {
+    version = "0.16.0";
+    hash = "sha256-emNR7fXNVD9sY/Mdno7mwpH6l/7AD28cBUsFRn9je50=";
+    cargoHash = "sha256-3eyBDWDoCzSU0tbab8qbjSnBkkN0oOgd7YbuyHLEHYw=";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0aa6e787e188..c7b4d79ba669 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5585,6 +5585,7 @@ with pkgs;
     cargo-pgrx_0_12_0_alpha_1
     cargo-pgrx_0_12_6
     cargo-pgrx_0_14_1
+    cargo-pgrx_0_16_0
     cargo-pgrx
     ;
 

From 5b941c8065f520ec684b894bb8376936e908819f Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Wed, 24 Sep 2025 01:47:50 +0800
Subject: [PATCH 066/109] qwen-code: fix login permission validation

fix: include tiktoken_bg.wasm in build output to resolve runtime error.
---
 pkgs/by-name/qw/qwen-code/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index 0aaf2b6654bc..208cfef8cff4 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   nix-update-script,
   jq,
+  git,
   ripgrep,
 }:
 
@@ -30,7 +31,10 @@ buildNpmPackage (finalAttrs: {
     jq
   ];
 
-  buildInputs = [ ripgrep ];
+  buildInputs = [
+    git
+    ripgrep
+  ];
 
   postPatch = ''
     # Remove @lvce-editor/ripgrep dependency (no network on buildPhase
@@ -76,6 +80,7 @@ buildNpmPackage (finalAttrs: {
 
     mkdir -p $out/bin $out/share/qwen-code
     cp -r bundle/* $out/share/qwen-code/
+    cp node_modules/tiktoken/tiktoken_bg.wasm $out/share/qwen-code/
     patchShebangs $out/share/qwen-code
     ln -s $out/share/qwen-code/gemini.js $out/bin/qwen
 

From 4182de0892617af69ba13c881b3169920c0b3a2f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 13:57:31 +0200
Subject: [PATCH 067/109] {pg-dump-anon,postgresql.pkgs.anonymizer}: 1.3.2 ->
 2.4.1

Release Notes:
https://gitlab.com/dalibo/postgresql_anonymizer/-/blob/latest/CHANGELOG.md?ref_type=heads#20250919--241---minor-bug-fixes
---
 nixos/tests/postgresql/anonymizer.nix         |  2 +-
 pkgs/by-name/pg/pg-dump-anon/package.nix      |  5 +++--
 .../servers/sql/postgresql/ext/anonymizer.nix | 21 +++++++------------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix
index 2da7ed506111..be533d718c4e 100644
--- a/nixos/tests/postgresql/anonymizer.nix
+++ b/nixos/tests/postgresql/anonymizer.nix
@@ -39,7 +39,7 @@ let
                   create table player(id serial, name text, points int);
                   insert into player(id,name,points) values (1,'Foo', 23);
                   insert into player(id,name,points) values (2,'Bar',42);
-                  security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name();';
+                  security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name()';
                   security label for anon on column player.points is 'MASKED WITH VALUE NULL';
                 ''}"
             )
diff --git a/pkgs/by-name/pg/pg-dump-anon/package.nix b/pkgs/by-name/pg/pg-dump-anon/package.nix
index 8745812d4592..09124ee49285 100644
--- a/pkgs/by-name/pg/pg-dump-anon/package.nix
+++ b/pkgs/by-name/pg/pg-dump-anon/package.nix
@@ -9,12 +9,13 @@
 
 buildGoModule rec {
   pname = "pg-dump-anon";
-  version = "1.3.2";
+  version = "2.4.1";
+
   src = fetchFromGitLab {
     owner = "dalibo";
     repo = "postgresql_anonymizer";
     tag = version;
-    hash = "sha256-MGdGvd4P1fFKdd6wnS2V5Tdly6hJlAmSA4TspnO/6Tk=";
+    hash = "sha256-vAsKTkFx8HLKDdXIQt6fEF3l7EzzvcilGfqNtBa0AMM=";
   };
 
   sourceRoot = "${src.name}/pg_dump_anon";
diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
index dca8f51c020f..410bcd6966f8 100644
--- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix
+++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
@@ -1,30 +1,25 @@
 {
+  cargo-pgrx_0_16_0,
   jitSupport,
   lib,
-  llvm,
   nixosTests,
   pg-dump-anon,
   postgresql,
-  postgresqlBuildExtension,
+  buildPgrxExtension,
   runtimeShell,
 }:
 
-postgresqlBuildExtension {
+buildPgrxExtension {
   pname = "postgresql_anonymizer";
 
   inherit (pg-dump-anon) version src;
 
-  nativeBuildInputs = lib.optional jitSupport llvm;
+  inherit postgresql;
+  cargo-pgrx = cargo-pgrx_0_16_0;
+  cargoHash = "sha256-Z1uH6Z2qLV1Axr8dXqPznuEZcacAZnv11tb3lWBh1yw=";
 
-  # Needs to be after postInstall, where removeNestedNixStore runs
-  preFixup = ''
-    cat >$out/bin/pg_dump_anon.sh <<'EOF'
-    #!${runtimeShell}
-    echo "This script is deprecated by upstream. To use the new script,"
-    echo "please install pkgs.pg-dump-anon."
-    exit 1
-    EOF
-  '';
+  # Tries to copy extension into postgresql's store path.
+  doCheck = false;
 
   passthru.tests = nixosTests.postgresql.anonymizer.passthru.override postgresql;
 

From df837de00a6cfcc9ef5124d808f5fbd025f2aadf Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 13:58:12 +0200
Subject: [PATCH 068/109] nixosTests.postgresql.anonymizer: silence warning

---
 nixos/tests/postgresql/anonymizer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix
index be533d718c4e..1e80fd6e629b 100644
--- a/nixos/tests/postgresql/anonymizer.nix
+++ b/nixos/tests/postgresql/anonymizer.nix
@@ -61,7 +61,7 @@ let
                 COPY public.player ...
                 1,Shields,
                 2,Salazar,
-                \.
+                \\.
 
             in the given dump (the commas are tabs in case of pg_dump).
                   Extract the CSV lines and split by `sep`.

From f797efcfe812b6757b18ee45894377354b4b9b60 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 14:32:57 +0200
Subject: [PATCH 069/109] nixosTests.postgresql.anonymizer.postgresql_18: fix
 test

The test for the latest PostgreSQL version will always fail while
`postgresql` doesn't point to that, yet.

That's because `pg_dump` can only connect to older versions, so the
`postgresql` package that `pg-dump-anon` uses always needs to use the
very latest version.
---
 nixos/tests/postgresql/anonymizer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix
index 2da7ed506111..689bfb378b8f 100644
--- a/nixos/tests/postgresql/anonymizer.nix
+++ b/nixos/tests/postgresql/anonymizer.nix
@@ -16,7 +16,7 @@ let
       nodes.machine =
         { pkgs, ... }:
         {
-          environment.systemPackages = [ pkgs.pg-dump-anon ];
+          environment.systemPackages = [ (pkgs.pg-dump-anon.override { postgresql = package; }) ];
           services.postgresql = {
             inherit package;
             enable = true;

From 3298c442715a1cabcb61ac5984e1c129ef156ecd Mon Sep 17 00:00:00 2001
From: Pui Yong Qing <puiyongqing@gmail.com>
Date: Wed, 24 Sep 2025 21:34:45 +0800
Subject: [PATCH 070/109] rustlings: 6.4.0 -> 6.5.0

Signed-off-by: Pui Yong Qing <puiyongqing@gmail.com>
---
 pkgs/by-name/ru/rustlings/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix
index 01ed0f3edc55..c2d818cfe705 100644
--- a/pkgs/by-name/ru/rustlings/package.nix
+++ b/pkgs/by-name/ru/rustlings/package.nix
@@ -11,7 +11,7 @@
 }:
 let
   pname = "rustlings";
-  version = "6.4.0";
+  version = "6.5.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -19,15 +19,16 @@ rustPlatform.buildRustPackage {
     owner = "rust-lang";
     repo = "rustlings";
     rev = "v${version}";
-    hash = "sha256-VdIIcpyoCuid3MECVc9aKeIOUlxGlxcG7znqbqo9pjc=";
+    hash = "sha256-dUQIzNPxmKbhew9VjFIW7bY0D1IkuJ5+hRY2/CwmYhY=";
   };
 
-  cargoHash = "sha256-QWmK+chAUnMGjqLq2xN5y6NJZJBMDTszImB9bXhO4+w=";
+  cargoHash = "sha256-AvwulWEqZMywaG7lEmT8nn9s2hda+bbIV1rnVXnKH8o=";
 
   # Disabled test that does not work well in an isolated environment
   checkFlags = [
     "--skip=run_compilation_success"
     "--skip=run_test_success"
+    "--skip=init"
   ];
 
   nativeBuildInputs = [

From 42675df683ed613e5d54874c9a73fa55d64ea9c1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 23 Sep 2025 23:08:51 +0200
Subject: [PATCH 071/109] copacetic: 0.10.0 -> 0.11.1

Changelog: https://github.com/project-copacetic/copacetic/releases/tag/v0.11.1
---
 pkgs/by-name/co/copacetic/package.nix | 34 ++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/copacetic/package.nix b/pkgs/by-name/co/copacetic/package.nix
index c8b434f33a35..369fd33a6c62 100644
--- a/pkgs/by-name/co/copacetic/package.nix
+++ b/pkgs/by-name/co/copacetic/package.nix
@@ -2,47 +2,62 @@
   lib,
   stdenv,
   buildGoModule,
+  docker,
   fetchFromGitHub,
-  nix-update-script,
   installShellFiles,
+  nix-update-script,
+  oras,
   versionCheckHook,
 }:
+
 buildGoModule rec {
   pname = "copacetic";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "project-copacetic";
     repo = "copacetic";
     tag = "v${version}";
-    hash = "sha256-aLFRhmxJ5Hj2vvdYCwALBeK0avPF/jDWUgQiSw0fFGg=";
+    hash = "sha256-kgFT+IK6zCGoGK8L/lwXyiUXCWYG7ElziPs0Q1cq+fw=";
   };
 
-  vendorHash = "sha256-+iS6nom52eofgcj/fZPVs2Eog9Un5ThSX+EBVmHTSlo=";
+  vendorHash = "sha256-qe2VJHXSYtZJlMd5R2J1NXWcXb8+cbTiDBQeN20fbEE=";
 
   nativeBuildInputs = [ installShellFiles ];
 
+  nativeCheckInputs = [
+    docker
+    oras
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   env.CGO_ENABLED = "0";
+
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/project-copacetic/copacetic/pkg/version.GitVersion=${version}"
-    "-X main.version=${version}"
+    "-X=github.com/project-copacetic/copacetic/pkg/version.GitVersion=${version}"
+    "-X=main.version=${version}"
   ];
 
   checkFlags =
     let
-      # Skip tests that require network access
+      # Skip tests that require network access and container services
       skippedTests = [
         "TestNewClient/custom_buildkit_addr"
         "TestPatch"
         "TestPlugins/docker.io"
+        "TestPatchPartialArchitectures"
+        "TestPushToRegistry"
+        "TestMultiPlatformPluginPatch"
+        "TestPodmanLoader_Load_Success"
       ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
+
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
 
   postInstall = ''
@@ -58,8 +73,9 @@ buildGoModule rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    homepage = "https://project-copacetic.github.io/copacetic/";
     description = "Tool for directly patching vulnerabilities in container images";
+    homepage = "https://project-copacetic.github.io/copacetic/";
+    changelog = "https://github.com/project-copacetic/copacetic/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     mainProgram = "copa";
     maintainers = with lib.maintainers; [ bmanuel ];

From 02c0a715209612a88882f94f9c6722e3f2fd68f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Wed, 24 Sep 2025 15:24:26 +0200
Subject: [PATCH 072/109] bspwm: 0.9.10 -> 0.9.11

https://github.com/baskerville/bspwm/releases/tag/0.9.11
---
 .../services/x11/window-managers/bspwm.nix      | 17 ++++++-----------
 pkgs/by-name/bs/bspwm/package.nix               | 14 +++++++++++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 46201036f05a..364b4335dbfa 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -16,9 +16,7 @@ in
     services.xserver.windowManager.bspwm = {
       enable = mkEnableOption "bspwm";
 
-      package = mkPackageOption pkgs "bspwm" {
-        example = "bspwm-unstable";
-      };
+      package = mkPackageOption pkgs "bspwm" { };
       configFile = mkOption {
         type = with types; nullOr path;
         example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"'';
@@ -30,9 +28,7 @@ in
       };
 
       sxhkd = {
-        package = mkPackageOption pkgs "sxhkd" {
-          example = "sxhkd-unstable";
-        };
+        package = mkPackageOption pkgs "sxhkd" { };
         configFile = mkOption {
           type = with types; nullOr path;
           example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"'';
@@ -52,9 +48,11 @@ in
       start = ''
         export _JAVA_AWT_WM_NONREPARENTING=1
         SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${
-          optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""
+          optionalString (cfg.sxhkd.configFile != null) "-c ${escapeShellArg cfg.sxhkd.configFile}"
+        } &
+        ${cfg.package}/bin/bspwm ${
+          optionalString (cfg.configFile != null) "-c ${escapeShellArg cfg.configFile}"
         } &
-        ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} &
         waitPID=$!
       '';
     };
@@ -62,9 +60,6 @@ in
   };
 
   imports = [
-    (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]
-      "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm."
-    )
     (mkRemovedOptionModule [
       "services"
       "xserver"
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index 83aa6961c2ff..fd571ea760ca 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -7,17 +7,18 @@
   xcbutil,
   xcbutilkeysyms,
   xcbutilwm,
+  nixosTests,
 }:
 
 stdenv.mkDerivation rec {
   pname = "bspwm";
-  version = "0.9.10";
+  version = "0.9.11";
 
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "bspwm";
     rev = version;
-    sha256 = "0qlv7b4c2mmjfd65y100d11x8iqyg5f6lfiws3cgmpjidhdygnxc";
+    sha256 = "sha256-5mAw3uSsDozGUJdYE1gD1u0u6Xnik3/LbE654vCFU9E=";
   };
 
   buildInputs = [
@@ -30,10 +31,17 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  passthru.tests = {
+    inherit (nixosTests) startx;
+  };
+
   meta = with lib; {
     description = "Tiling window manager based on binary space partitioning";
     homepage = "https://github.com/baskerville/bspwm";
-    maintainers = with maintainers; [ meisternu ];
+    maintainers = with maintainers; [
+      meisternu
+      ncfavier
+    ];
     license = licenses.bsd2;
     platforms = platforms.linux;
   };

From d1d8aedb459852446943c6d75a5e7e72cb454b8b Mon Sep 17 00:00:00 2001
From: BlockListed <44610569+BlockListed@users.noreply.github.com>
Date: Thu, 29 May 2025 17:48:21 +0200
Subject: [PATCH 073/109] printrun: add platformdirs dependency

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

diff --git a/pkgs/by-name/pr/printrun/package.nix b/pkgs/by-name/pr/printrun/package.nix
index dffe40707e5b..7962606dd906 100644
--- a/pkgs/by-name/pr/printrun/package.nix
+++ b/pkgs/by-name/pr/printrun/package.nix
@@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
+    platformdirs
     cython
     dbus-python
     numpy

From 0d6e0ecda54e8db545d3e71e098f78205f5dc420 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 17:42:58 +0000
Subject: [PATCH 074/109] gdevelop: 5.5.239 -> 5.5.241

---
 pkgs/by-name/gd/gdevelop/darwin.nix  | 2 +-
 pkgs/by-name/gd/gdevelop/linux.nix   | 2 +-
 pkgs/by-name/gd/gdevelop/package.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix
index 14ce3896cb4b..59b3204c7aae 100644
--- a/pkgs/by-name/gd/gdevelop/darwin.nix
+++ b/pkgs/by-name/gd/gdevelop/darwin.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
-    hash = "sha256-f0kqLk6Poc8jiwJGetNnN2zQ72I104R8uXHpS5MNkFY=";
+    hash = "sha256-zp5BiOhld/M5Boje4RCi27fWkkGFExcUhVLdtRse7WA=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix
index eac2516997a7..e0c37d0c10a1 100644
--- a/pkgs/by-name/gd/gdevelop/linux.nix
+++ b/pkgs/by-name/gd/gdevelop/linux.nix
@@ -13,7 +13,7 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
-        hash = "sha256-AYj1o6yiChVCrZypulN1bTzmLlCMonv4lbkw/uzEv6w=";
+        hash = "sha256-We5VDTgtc0pso8a8+9jXMPUtEwg2437Ps5t84ZdgJjc=";
       }
     else
       throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix
index 44978f4a5c4d..a6f0daceba9f 100644
--- a/pkgs/by-name/gd/gdevelop/package.nix
+++ b/pkgs/by-name/gd/gdevelop/package.nix
@@ -4,7 +4,7 @@
   callPackage,
 }:
 let
-  version = "5.5.239";
+  version = "5.5.241";
   pname = "gdevelop";
   meta = {
     description = "Graphical Game Development Studio";

From 34ece94d2b67d3d1166c186495e49546f6a63587 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 24 Sep 2025 20:04:20 +0200
Subject: [PATCH 075/109] python313Pacakges.azure-mgmt-databricks: init at
 2.0.0

Microsoft Azure Data Bricks Management Client Library

https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/databricks/azure-mgmt-databricks
---
 .../azure-mgmt-databricks/default.nix         | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/azure-mgmt-databricks/default.nix

diff --git a/pkgs/development/python-modules/azure-mgmt-databricks/default.nix b/pkgs/development/python-modules/azure-mgmt-databricks/default.nix
new file mode 100644
index 000000000000..b1d7a2a87d87
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-databricks/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  azure-common,
+  azure-mgmt-core,
+  buildPythonPackage,
+  fetchPypi,
+  isodate,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "azure-mgmt-databricks";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    hash = "sha256-cNETYtwtF/X7HbDP5lwa9VuPE28aDbmltR56z3YM9bk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    isodate
+    azure-common
+    azure-mgmt-core
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Microsoft Azure Data Bricks Management Client Library";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/databricks/azure-mgmt-databricks";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-databricks_${version}/sdk/databricks/azure-mgmt-databricks/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f0135c1ca6d..eac9919589a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1404,6 +1404,8 @@ self: super: with self; {
 
   azure-mgmt-databoxedge = callPackage ../development/python-modules/azure-mgmt-databoxedge { };
 
+  azure-mgmt-databricks = callPackage ../development/python-modules/azure-mgmt-databricks { };
+
   azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { };
 
   azure-mgmt-datalake-analytics =

From 0d807f9663ae4ddbc9b9ddbf605d6d114ab13e6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 18:22:41 +0000
Subject: [PATCH 076/109] cherrytree: 1.6.0 -> 1.6.2

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

diff --git a/pkgs/by-name/ch/cherrytree/package.nix b/pkgs/by-name/ch/cherrytree/package.nix
index ff0ded1923bb..5b2ddf22f79a 100644
--- a/pkgs/by-name/ch/cherrytree/package.nix
+++ b/pkgs/by-name/ch/cherrytree/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherrytree";
-  version = "1.6.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "giuspen";
     repo = "cherrytree";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VzY91ZyHL1gNj5liTzisA6iL74294CPLLa8duJy0m8A=";
+    hash = "sha256-YsxhjATadOielthdPyfNrPCL9nhFny00WugDHmRk03k=";
   };
 
   nativeBuildInputs = [

From 3e5cde76e5e4f9763d400a1d01f09cc070920856 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 24 Sep 2025 20:30:50 +0200
Subject: [PATCH 077/109] python313Packages.iamdata: init at 0.1.202509241

Module for utilizing AWS IAM data for Services, Actions, Resources,
and Condition Keys

https://github.com/cloud-copilot/iam-data-python
---
 .../python-modules/iamdata/default.nix        | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/iamdata/default.nix

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
new file mode 100644
index 000000000000..00ee59189ce9
--- /dev/null
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "iamdata";
+  version = "0.1.202509241";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cloud-copilot";
+    repo = "iam-data-python";
+    tag = "v${version}";
+    hash = "sha256-bZkU+9wrFqokw8/6FzjoCu2vNUWcJRNj8f6b+XCFKlc=";
+  };
+
+  build-system = [ hatchling ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "iamdata" ];
+
+  enabledTestPaths = [ "iamdata/tests/*.py" ];
+
+  meta = {
+    description = "Module for utilizing AWS IAM data for Services, Actions, Resources, and Condition Keys";
+    homepage = "https://github.com/cloud-copilot/iam-data-python";
+    changelog = "https://github.com/cloud-copilot/iam-data-python/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eac9919589a9..dd68f0bbe029 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6894,6 +6894,8 @@ self: super: with self; {
 
   i3ipc = callPackage ../development/python-modules/i3ipc { };
 
+  iamdata = callPackage ../development/python-modules/iamdata { };
+
   iammeter = callPackage ../development/python-modules/iammeter { };
 
   iapws = callPackage ../development/python-modules/iapws { };

From 1f1123878fec782fd2e13b640f08fb95f04639c0 Mon Sep 17 00:00:00 2001
From: BlockListed <44610569+BlockListed@users.noreply.github.com>
Date: Thu, 29 May 2025 17:52:17 +0200
Subject: [PATCH 078/109] printrun: switch to pyproject and clean up build

---
 pkgs/by-name/pr/printrun/package.nix | 57 +++++++++++++---------------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/pr/printrun/package.nix b/pkgs/by-name/pr/printrun/package.nix
index 7962606dd906..b377da2e7478 100644
--- a/pkgs/by-name/pr/printrun/package.nix
+++ b/pkgs/by-name/pr/printrun/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   python3Packages,
   fetchFromGitHub,
   glib,
@@ -9,7 +10,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "printrun";
   version = "2.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kliment";
@@ -18,47 +19,41 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-INJNGAmghoPIiivQp6AV1XmhyIu8SjfKqL8PTpi/tkY=";
   };
 
-  postPatch = ''
-    sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py
-  '';
-
-  pythonRelaxDeps = [
-    "pyglet"
-    "cairosvg"
-  ];
-
   nativeBuildInputs = [
     glib
     wrapGAppsHook3
   ];
 
-  propagatedBuildInputs = with python3Packages; [
-    appdirs
-    platformdirs
+  build-system = with python3Packages; [
+    setuptools
     cython
-    dbus-python
-    numpy
-    six
-    wxpython
-    psutil
-    pyglet
-    pyopengl
-    pyserial
-    cffi
-    cairosvg
-    lxml
-    puremagic
   ];
 
+  dependencies =
+    with python3Packages;
+    [
+      pyserial
+      wxpython
+      numpy
+      pyglet
+      psutil
+      lxml
+      platformdirs
+      puremagic
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux dbus-python
+    ++ lib.optional stdenv.hostPlatform.isDarwin pyobjc-framework-Cocoa;
+
+  pythonRelaxDeps = [ "pyglet" ];
+
   # pyglet.canvas.xlib.NoSuchDisplayException: Cannot connect to "None"
   doCheck = false;
 
-  setupPyBuildFlags = [ "-i" ];
-
   postInstall = ''
-    for f in $out/share/applications/*.desktop; do
-      sed -i -e "s|/usr/|$out/|g" "$f"
-    done
+    substituteInPlace $out/share/applications/*.desktop \
+      --replace-fail /usr/bin/ ""
+    substituteInPlace $out/share/applications/pronterface.desktop \
+      --replace-fail "Path=/usr/share/pronterface/" ""
   '';
 
   dontWrapGApps = true;
@@ -71,6 +66,6 @@ python3Packages.buildPythonApplication rec {
     description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software";
     homepage = "https://github.com/kliment/Printrun";
     license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    changelog = "https://github.com/kliment/Printrun/releases/tag/${src.tag}";
   };
 }

From 73e69a99b9a396f79c9b3e2d3ac27dafabfcb6d7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 24 Sep 2025 20:40:39 +0200
Subject: [PATCH 079/109] python313Packages.py-iam-expand: init at 0.2.0

Module to expand and deobfuscate AWS IAM actions

https://github.com/prowler-cloud/py-iam-expand
---
 .../python-modules/py-iam-expand/default.nix  | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/py-iam-expand/default.nix

diff --git a/pkgs/development/python-modules/py-iam-expand/default.nix b/pkgs/development/python-modules/py-iam-expand/default.nix
new file mode 100644
index 000000000000..4b0ee718f0d3
--- /dev/null
+++ b/pkgs/development/python-modules/py-iam-expand/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  iamdata,
+  poetry-core,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "py-iam-expand";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "prowler-cloud";
+    repo = "py-iam-expand";
+    tag = version;
+    hash = "sha256-P6PWf7qkc/8/BeRycYgvFApIaUrbhKq4h718Nrs817U=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [ iamdata ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "py_iam_expand" ];
+
+  meta = {
+    description = "Module to expand and deobfuscate AWS IAM actions";
+    homepage = "https://github.com/prowler-cloud/py-iam-expand";
+    changelog = "https://github.com/prowler-cloud/py-iam-expand/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd68f0bbe029..e6528c889bf3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12432,6 +12432,8 @@ self: super: with self; {
 
   py-expression-eval = callPackage ../development/python-modules/py-expression-eval { };
 
+  py-iam-expand = callPackage ../development/python-modules/py-iam-expand { };
+
   py-improv-ble-client = callPackage ../development/python-modules/py-improv-ble-client { };
 
   py-libnuma = callPackage ../development/python-modules/py-libnuma { };

From b44541d22c7ee04f99b923e7ad88484fb33c7f8e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 24 Sep 2025 20:42:12 +0200
Subject: [PATCH 080/109] prowler: 5.7.5 -> 5.12.2

Changelog: https://github.com/prowler-cloud/prowler/releases/tag/5.12.2
---
 pkgs/by-name/pr/prowler/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix
index 79536abffb26..fdc7d914712c 100644
--- a/pkgs/by-name/pr/prowler/package.nix
+++ b/pkgs/by-name/pr/prowler/package.nix
@@ -21,14 +21,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "prowler";
-  version = "5.7.5";
+  version = "5.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "prowler-cloud";
     repo = "prowler";
     tag = version;
-    hash = "sha256-KcHHZPklJZ7o5cs30rL+vGaeST8LUdGfdhG7daZZzX0=";
+    hash = "sha256-HSMlWuwYc8m6WUNy0Ja5VuC2lbC3mbK2bPHNQY+nk0U=";
   };
 
   pythonRelaxDeps = true;
@@ -40,23 +40,29 @@ py.pkgs.buildPythonApplication rec {
     awsipranges
     azure-identity
     azure-keyvault-keys
+    azure-mgmt-apimanagement
     azure-mgmt-applicationinsights
     azure-mgmt-authorization
     azure-mgmt-compute
     azure-mgmt-containerregistry
     azure-mgmt-containerservice
     azure-mgmt-cosmosdb
+    azure-mgmt-databricks
     azure-mgmt-keyvault
+    azure-mgmt-loganalytics
     azure-mgmt-monitor
     azure-mgmt-network
     azure-mgmt-rdbms
+    azure-mgmt-recoveryservices
+    azure-mgmt-recoveryservicesbackup
     azure-mgmt-resource
-    azure-mgmt-security
     azure-mgmt-search
+    azure-mgmt-security
     azure-mgmt-sql
     azure-mgmt-storage
     azure-mgmt-subscription
     azure-mgmt-web
+    azure-monitor-query
     azure-storage-blob
     boto3
     botocore
@@ -65,6 +71,7 @@ py.pkgs.buildPythonApplication rec {
     dash
     dash-bootstrap-components
     detect-secrets
+    dulwich
     google-api-python-client
     google-auth-httplib2
     jsonschema
@@ -73,6 +80,7 @@ py.pkgs.buildPythonApplication rec {
     msgraph-sdk
     numpy
     pandas
+    py-iam-expand
     py-ocsf-models
     pydantic_1
     pygithub

From 42e106a5d75f352d0ada28da0b31b1a01d78b00d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 18:56:39 +0000
Subject: [PATCH 081/109] junicode: 2.218 -> 2.220

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

diff --git a/pkgs/by-name/ju/junicode/package.nix b/pkgs/by-name/ju/junicode/package.nix
index 81a9ab335ecf..000c3bbf2658 100644
--- a/pkgs/by-name/ju/junicode/package.nix
+++ b/pkgs/by-name/ju/junicode/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "junicode";
-  version = "2.218";
+  version = "2.220";
 
   src = fetchzip {
     url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip";
-    hash = "sha256-X4BN4USa/Ig2TqauOVMwAAASYISGuVHl/43Kqm0r828=";
+    hash = "sha256-NZdNWnWMWscAI0p878mQ8rOoo5TlEDrKYzfiqGeo4lc=";
   };
 
   outputs = [

From 1ad35b8ee11376a14f8b4a20f8a23480b7b816d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 19:48:07 +0000
Subject: [PATCH 082/109] kirsch: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/by-name/ki/kirsch/package.nix b/pkgs/by-name/ki/kirsch/package.nix
index 294e575ddc40..def9b6a38753 100644
--- a/pkgs/by-name/ki/kirsch/package.nix
+++ b/pkgs/by-name/ki/kirsch/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "kirsch";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchzip {
     url = "https://github.com/molarmanful/kirsch/releases/download/v${finalAttrs.version}/kirsch-release_v${finalAttrs.version}.zip";
-    hash = "sha256-6POi3N1JX6FFWHwqOlB3mrkHMYG+TJXz9URarbSPrZw=";
+    hash = "sha256-VGkZ4pWR83SpDd3osLEmmsSecGpAaHiQ5apRcxa8EhA=";
   };
 
   nativeBuildInputs = [ xorg.mkfontscale ];

From 305617c96ddf206db3e7876ba38e9f69b28c6c9a Mon Sep 17 00:00:00 2001
From: Dominic Wrege <dominic.wrege001@stud.fh-dortmund.de>
Date: Wed, 24 Sep 2025 22:14:59 +0200
Subject: [PATCH 083/109] librewolf-bin-unwrapped: 142.0.1-1 -> 143.0-1

---
 pkgs/by-name/li/librewolf-bin-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
index a429b0fd8adb..10852a04033f 100644
--- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
@@ -37,7 +37,7 @@ let
 
   pname = "librewolf-bin-unwrapped";
 
-  version = "142.0.1-1";
+  version = "143.0-1";
 in
 
 stdenv.mkDerivation {
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
     url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
     hash =
       {
-        i686-linux = "sha256-hDB1bo5TCiahFGAOzWLRMxy6hc7whsGbfiJsNxhnXok=";
-        x86_64-linux = "sha256-ijfsxA9XUZanPUXvOysouJNv7tUoclE1E4PoFOZP/EY=";
-        aarch64-linux = "sha256-pB+AQropvNw7kCUqeDHPMkDVht4Dl/98tcaszlw3Qj8=";
+        i686-linux = "sha256-ZDsPexyrK8FgMKAP3TzHnBTvDXLnW50SW6tOTGqWVaI=";
+        x86_64-linux = "sha256-jP6PBvh+RNDpgv5OGX7HSR1Lo//vDSVjUFUsayMONTM=";
+        aarch64-linux = "sha256-DuCQMjL7ZsHAtu2ppX/46QRL/Dt3acOJaTzGoYGfQuM=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };

From 680de660711374b987a9fcba15d20e59dad6ebba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 20:49:26 +0000
Subject: [PATCH 084/109] bundletool: 1.18.1 -> 1.18.2

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

diff --git a/pkgs/by-name/bu/bundletool/package.nix b/pkgs/by-name/bu/bundletool/package.nix
index a14e062f17e8..e3bb6be9377f 100644
--- a/pkgs/by-name/bu/bundletool/package.nix
+++ b/pkgs/by-name/bu/bundletool/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bundletool";
-  version = "1.18.1";
+  version = "1.18.2";
 
   src = fetchurl {
     url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar";
-    sha256 = "sha256-Z1eGSTmDeH/6EVUL23wHFWeaROFkPz/5gKUp6cgiWVw=";
+    sha256 = "sha256-N4tUNM0TeL72srxSe4x/D/JYSyc4MDNbzlTW0IE8hYQ=";
   };
 
   dontUnpack = true;

From 8043611d55bf69b57ee4f820208cc4248adc8cef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 21:02:35 +0000
Subject: [PATCH 085/109] cosmic-protocols: 0-unstable-2025-09-01 ->
 0-unstable-2025-09-17

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

diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix
index 93226ccba76c..0cb9221a598b 100644
--- a/pkgs/by-name/co/cosmic-protocols/package.nix
+++ b/pkgs/by-name/co/cosmic-protocols/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "cosmic-protocols";
-  version = "0-unstable-2025-09-01";
+  version = "0-unstable-2025-09-17";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-protocols";
-    rev = "6254f50abc6dbfccadc6939f80e20081ab5f9d51";
-    hash = "sha256-gOYgz07RGZoBp2RbHn0jUGLGXH/geoch/Y27Qh+jBao=";
+    rev = "af1997b1827ad64aab46fa31c0b77fb20d7a537a";
+    hash = "sha256-gIfCk8FqZo1iFwTTtcLqnX14Jg3k6UXIBkpKsom43EU=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];

From 886c6df58d7e3606a51f2612251dba7c08edc2ec Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 24 Sep 2025 23:08:48 +0200
Subject: [PATCH 086/109] grafana: 12.1.1 -> 12.2.0

ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.2.0
---
 pkgs/servers/monitoring/grafana/default.nix   |  66 ++++-----
 .../monitoring/grafana/missing-hashes.json    | 130 +++++++++---------
 2 files changed, 89 insertions(+), 107 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 6052bde08752..524ba2fa4c0e 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch,
   removeReferencesTo,
   tzdata,
   wire,
@@ -18,31 +17,9 @@
   nodejs,
 }:
 
-let
-  # Grafana seems to just set it to the latest version available
-  # nowadays.
-  # NOTE: I(Ma27) leave this in, even if it's technically dead code because
-  # it doesn't make sense to pull this out of the history on every other release.
-  #
-  # Please make sure to always set a Go version to `.0`: it may happen that
-  # stable is on an older patch-release of Go and then the build would fail
-  # after a backport.
-  patchGoVersion = ''
-    find . -name go.mod -not -path "./.bingo/*" -and -not -path "./hack/*" -and -not -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do
-      substituteInPlace "$line" \
-        --replace-fail "go 1.24.6" "go 1.24.0"
-    done
-    find . -name go.work -print0 | while IFS= read -r -d ''' line; do
-      substituteInPlace "$line" \
-        --replace-fail "go 1.24.6" "go 1.24.0"
-    done
-    substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.24.6" "GO_VERSION = 1.24.0"
-  '';
-in
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "grafana";
-  version = "12.1.1";
+  version = "12.2.0";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -53,19 +30,10 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana";
-    rev = "v${version}";
-    hash = "sha256-41OqvOTHlP66UtAecrpeArKldj0DNxK1oxTtQEihbo8=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-EFqR+du+ZeWih7+s4iVVAiwOvTwbF1pNg1TntkoGCEQ=";
   };
 
-  # Fix build
-  # FIXME: remove in next update
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/grafana/grafana/commit/21f305c6a0e242463f5219cc6944fb880ea809f0.patch";
-      hash = "sha256-sXooRlnKY5ax0+1CPhy4zxDQtDGspbSdOoHHciqLTD8=";
-    })
-  ];
-
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
   env = {
     CYPRESS_INSTALL_BINARY = 0;
@@ -77,15 +45,27 @@ buildGoModule rec {
 
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
-    inherit src missingHashes;
-    hash = "sha256-51jCwnfWJoBICesM3SKiEvRC/Q1qUD310q59DucPdMs=";
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-BqlkFgWiU5gruDHjkazNy6GKL2KgpcrwaHXDYNBF9EY=";
   };
 
-  disallowedRequisites = [ offlineCache ];
+  disallowedRequisites = [ finalAttrs.offlineCache ];
 
-  postPatch = patchGoVersion;
+  vendorHash = "sha256-yoOs9MngUCfvvK9rPUsXCoSc5LiRs0g66KdINLQzO8Q=";
 
-  vendorHash = "sha256-9z3HqheXLNh3zfmp1A620vzzf5yZBUJsbj/cc6J+xTg=";
+  # Grafana seems to just set it to the latest version available
+  # nowadays.
+  # However, while `substituteInPlace --replace-fail` is desirable to keep
+  # the section up-to-date, this gets increasingly annoying since there's
+  # an inconsistent 1% with a different version. So we now blindly set all
+  # `go` directives to whatever nixpkgs provides and make it the maintainer's
+  # duty to ensure that the mandated
+  # Go version is compatible with what we provide.
+  # This is still better than maintaining some list of go.mod files (or exclusions of that)
+  # where to patch the go version (and where to not do that).
+  postPatch = ''
+    find . -name go.mod -or -name "go.work" -type f -exec sed -i -e 's/^go .*/go ${finalAttrs.passthru.go.version}/g' {} \;
+  '';
 
   proxyVendor = true;
 
@@ -135,7 +115,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   # Tests start http servers which need to bind to local addresses:
@@ -184,4 +164,4 @@ buildGoModule rec {
     ];
     mainProgram = "grafana-server";
   };
-}
+})
diff --git a/pkgs/servers/monitoring/grafana/missing-hashes.json b/pkgs/servers/monitoring/grafana/missing-hashes.json
index 8fb585b13fe0..94fc50d2806b 100644
--- a/pkgs/servers/monitoring/grafana/missing-hashes.json
+++ b/pkgs/servers/monitoring/grafana/missing-hashes.json
@@ -1,40 +1,50 @@
 {
-  "@esbuild/aix-ppc64@npm:0.25.6": "57ecd2ad4128117f7983047573052e937fa66ec503322f8b865a870319bb0f9ab678a3177bd1c601de8321f13d02f51224b881c947720724777d119af71e717b",
-  "@esbuild/android-arm64@npm:0.25.6": "99060a51fd5ed6454d59afe7542ac8ef3cb8b9dea8d57e535df61a5d8b314e5c32367326079ccc30789ecb7d875c8ff44ac299df2f26a3f60a73200f17170383",
-  "@esbuild/android-arm@npm:0.25.6": "b68ff7acb5ce0af02f8fa48ff715bdfa842a7b3dbead62ef7537a633fd8eb91eaed91b535f63e682e4a7a32cf6faa6ecb3301d9b1e71e1e07a696ed350dfd85d",
-  "@esbuild/android-x64@npm:0.25.6": "8c991eab1a81864577438cc199a7925210e78cc04142906e63222617ec9fb0a7a20b30b0d53bd258de8a922bf175edbf713b8e4185720bb66625a842c7258cca",
-  "@esbuild/darwin-arm64@npm:0.25.6": "bb22081bf2255546bad72a9b28bbcea8a208844b2ba3470da3527ff1b5a9c3cde7a027604ce9128b52843a4d4edfede4b6e03a5dcbdc86ebcc2c4cfd62734708",
-  "@esbuild/darwin-x64@npm:0.25.6": "2d9fefd41d3f375052500ca7f6ba9d31d1da413eb72d84cb021588c6be75f237684fcb1fbb20c445e3e96a7daf89055d63c1f13cec52057342364236439932ec",
-  "@esbuild/freebsd-arm64@npm:0.25.6": "854227c6f0d14096e6c54f9604e15713a6de8734e2bc9aaae195fbd3c50a82e40e728363cdf9bf1607978aacad94ed1ec20007d9df4265d6e285edde88ae6ff4",
-  "@esbuild/freebsd-x64@npm:0.25.6": "d023337780e5f0078b2166b0d6788c3443b98c9f298565f525fca0bd06a28e752393bcfa9b4472bbe33a0d83156770270a809d1590e21d5fd259c4ed556f231f",
-  "@esbuild/linux-arm64@npm:0.25.6": "038569ce10254ab7f8ddca547a4e1b98fa1acfd9343a47f8e62f2183a78e06dff03324b0f47d3f3cc10b87b8493c58a4882fbe5420e3348531eae4810ec3609e",
-  "@esbuild/linux-arm@npm:0.25.6": "05f48c125d52b3ee845ca0569b5a1b48081c505b4568d7e33f59c6ce3e557b3e2322cd7c734519b1251c6809e72fd260095302185d5d874c639188d8abebeb6e",
-  "@esbuild/linux-ia32@npm:0.25.6": "5c28b2d7ba7fbf4f8583a51eb480164db4274415a2e8de4a4f32a46e422b7bd45d42711ed7c7198fb8ea3311fcfc4721d75094d3b5500c3a83632cced0a98b40",
-  "@esbuild/linux-loong64@npm:0.25.6": "165fd44c49df4fd74c2837e74da4afee09964200c07eef295b2a77302825b5ae13b05c47de6356b90ef63256a1bfffd0d645290c8005cd28a29dd6e726c43528",
-  "@esbuild/linux-mips64el@npm:0.25.6": "6acfc822783d5fd211a271456e152d68a8f2f760f1691c18b19144ab2b9fefbb9a82f4afa966dad2773e5d79ea15e3a060736f069bd5b19bec4950eeaf3b0f52",
-  "@esbuild/linux-ppc64@npm:0.25.6": "a787a00358a4539163ebd374a580fa6b5b3c04a067f53c9471bba61a0af552923804f60143909348c6845a399cb79df6950cea7f368f9f9e8d85f57f04c3c779",
-  "@esbuild/linux-riscv64@npm:0.25.6": "2d108701eb3e61aeffa77c75c86e4255ecc6ca6d9024ce8fdcf727bf7d70f90b1c0d94a13e9694f0fd61265c69e6bd2ef03fa3dae766e186e4cad4813140b43b",
-  "@esbuild/linux-s390x@npm:0.25.6": "74f713e0b818198a4139498ac016260be7fd938bf720cdb56d6835e34f2f564383ed87ef848851186e8a02b564356728659457c45f83b7f28a27a5010e866df0",
-  "@esbuild/linux-x64@npm:0.25.6": "5f073daa3abfcddc143942e888ea0c4faaaf4fdf9f2dd7af5823771c93da3797b43d7305b7031f3de30c9e395ff94a6186d34843fd8070fff9ae53846c86d8fc",
-  "@esbuild/netbsd-arm64@npm:0.25.6": "8074332fb3cb2ec1164df3f2ceffce051a776f1013cecfbcbadaaac709f1c9b8237b493add7c9a7c41a85ebe3e9af284a2e2a133cea81b84da8ad806dac56218",
-  "@esbuild/netbsd-x64@npm:0.25.6": "cc6ee54137f70e41d0dfff45b163242e2b53f91076c0fdb34716282d52334ed77228f146855f71135e6e1be437d1e9eefb1175a34520b7697adb6ed1aa4788b9",
-  "@esbuild/openbsd-arm64@npm:0.25.6": "90b137de2876135feeda2d20804d7760a155449c7d7a002f02a100d7998ac6aa60cce6ca944abb7265bc23df27d85f3760d9d879a74b4b3693e7299b9af484a5",
-  "@esbuild/openbsd-x64@npm:0.25.6": "8ef6d5d8818421bc1657b46e6daa1ffd28acf8c049a39089d0a8a6adc5ecc649fd905b7042e26cfa46e701981afc0b35e3a94e25691f3272bda8b98df9bb1da7",
-  "@esbuild/openharmony-arm64@npm:0.25.6": "9a68ff38623cded0c4042b1fdbf1e6ca56c8725760c0a39f1c508a31e12582c91544cc4ea6da0935ae524948c5e7834daee8cad778d87db0b26b71b44aed079b",
-  "@esbuild/sunos-x64@npm:0.25.6": "5fb554255d90c417d28f3d735658478f8e0a3e9ab9960ef585a36f1ff9ac1d101d848f6131c335a62cadc17d5bc46787b8b35c3c0cbd94d0b2482a723f1cac9a",
-  "@esbuild/win32-arm64@npm:0.25.6": "84371851571fbd20fa32e1559581c0cd0f083a91cf4462f414862db4d506d73364eaab2a5fadb9d5b7016d3f5bbd1246f611c453ea52dca8f01c1b9b7c903b56",
-  "@esbuild/win32-ia32@npm:0.25.6": "0549959d25fc9b2d03e1d7ba5767171956d91977ff06c4656ba6f9b56319f7e31ca26d2cb393c56f9cee41446d78e1f4b77e94e490006236559e6daaff6abb80",
-  "@esbuild/win32-x64@npm:0.25.6": "0c7e62abb6e2a3ab8960ee598a108d68b6a23a68c629b0a14b450e87fa123b6beb8ce1b228cdbb7a15f8b13155016d3ece5e78232287a47270f7e72ac014a0e4",
+  "@esbuild/aix-ppc64@npm:0.25.8": "451dc5fd41cf67ccc24b8d1da6f95b1082552b6908f0cb0c78fba3da39a4b6c3669ce37dc3c2c383cc18266ea35c0fcec6696fb24f8a0aaf097b94def035c129",
+  "@esbuild/android-arm64@npm:0.25.8": "ef542eda68837bd16cdae4ed99c312405673da95ec3fba1d2f0f102cbd983fdd7357acd1504b5a5ef517b952c9978a0c4baa65211626db6cf862e2bf9ebebe49",
+  "@esbuild/android-arm@npm:0.25.8": "a0a5995ed8ff2c9775e8395d3da0b7d7b9246040db680aedeb8df9ca980891fe322a6b833cf0bc554852de351aa1351b37aff0213113d4d4afd28c638edc74f1",
+  "@esbuild/android-x64@npm:0.25.8": "afb24505bf544e53c71707456a85dc21bcc26106c1863aad85733eb5d5bd2e334cb58a2fe31973b4311cc08802493c8d920f41c91f88884baf4c6700a04182ec",
+  "@esbuild/darwin-arm64@npm:0.25.8": "c5bcf68dce1ba9fa111c2da068c50ade5fd74f724bab93058542619a67554b598ef0c47593f4d5cc382f0ac53507e2bc0ac3111824df9d5776c7cd8fe2c28001",
+  "@esbuild/darwin-x64@npm:0.25.8": "db948746f087aace173b52d08b7085514755cbc5bab7f1e64ff7e075489fb8596c7490038bea9e54337586ba02ca3c9f56365029660e711a380bb30f1dccb41a",
+  "@esbuild/freebsd-arm64@npm:0.25.8": "faa5a23e4f2e8d1fae84ea0ae424b3b89e8c425e15427e749d0ca9f5a8ca77c6b237886914ce61495ce1f01cb5430b0e55ea61d21a2dc4930be09dffec56059f",
+  "@esbuild/freebsd-x64@npm:0.25.8": "e5a93cef5e2c6b191f178aa73137d2c44cee60a7a6be8806d630ec82ff1dfc72ccd30297c6b607d2ad715ef20b88068e93abb0fa8e187c8fe2547920eef9b4e7",
+  "@esbuild/linux-arm64@npm:0.25.8": "deb61aafe7a2cb32d9f43b5030fb070856f45210d2ac8ac9ce527fec4016bb4a58ffea93536834cd386786cd6ec40327e057853b0348b45d7a06e6eeec71a63c",
+  "@esbuild/linux-arm@npm:0.25.8": "3382c6f8e7b3bb479c5b4a01b0baa78054efdf002241eea1d606c8727b9d2168f0ee1798b5627de6b92285b85904e358c9531a1c0f07ef585845fd7d88696db4",
+  "@esbuild/linux-ia32@npm:0.25.8": "e32f2fa63c74d6723c876cec9b42c04e6aa5e6d0cd9a7447d0b4b00d7615a484da55ef95b4fcf871492019a007c40defb497ef6075ad94da46b6121828fcf83a",
+  "@esbuild/linux-loong64@npm:0.25.8": "a55894549cd7e64c2062863eaf697175a1d6f86def565555614ad335b462afbfebf403ec0f1d83bf8dff145d57c4046815b26c70e98f068a9f99317fc37d71e8",
+  "@esbuild/linux-mips64el@npm:0.25.8": "5c1ef406e07fbb766417be11b859baa3e905587c8bf3465f0f6ffd6cfd54b658ceffc616bfbea0340473deaebd430db6aea33468876796bcad83f05bf1910d9d",
+  "@esbuild/linux-ppc64@npm:0.25.8": "a5f386bd5b18eb3eb7f240b112595182f450382ca93a7d6cad4c57b82e13830aff22250ff02728dd5b8d65f3b9908ef291f223a6e83d78d64f497d3117a567a1",
+  "@esbuild/linux-riscv64@npm:0.25.8": "6b624062871ac3bb93af3b560a97fb489eef06cb12f4716c0c7d54fb31d4047fec570bbc9cc2bc9f98e8a4fbd07db6fa542115c02ec3bb66922e8b1988304cc1",
+  "@esbuild/linux-s390x@npm:0.25.8": "c13f82778a07b14fa50d52322f4b347bea6540a207e0468b060588922fae2278ae1b18a88bbd1cf3656b5d7eb8a84dcf8a237c91e7e0629fa6e56be41db46055",
+  "@esbuild/linux-x64@npm:0.25.8": "e6483e5c367e7c35899c98bc378e8a37f5617a741297d9b91c59c1d29b9b00f26f9c315a736b41af33f21d9d74a8c648715ce13ac520b3fa7604978a05dedd99",
+  "@esbuild/netbsd-arm64@npm:0.25.8": "02afba2e5fbf8e8cc4c375edfce673b38015213744f1df05a74ab9de99f5860e50dc26af97b4f0b4f804c461ab45cfa773603ce0e1b0528bd93e7a979eca7682",
+  "@esbuild/netbsd-x64@npm:0.25.8": "76c43cc94f9b287a6a0d277d51f17e650d168e26008741e86035f2e054b8216d61855feddc2c0b48f989b46c58913168148a30b30fff5b87a1bc08fd78cbd0e7",
+  "@esbuild/openbsd-arm64@npm:0.25.8": "9c0fbf35b6cefcc46c1c545520c50c65e89d620c65c97a55d47f1440e908cbbe6535073cb78ae69c1e2ba76621f09f3ab0f4bf9d5567660b8726c198a0ebdb0f",
+  "@esbuild/openbsd-x64@npm:0.25.8": "cd45098a84bcc86d4b1a809cf6e5f9548aa69cdff3a0f63a9bb039d05fdfd0daa2e166e1e30b8fbb71ede895dfc9c371e8368e3d51e7bf0484083f9bb112945a",
+  "@esbuild/openharmony-arm64@npm:0.25.8": "769c3e589d62648c67cd36306aaee683429e42e7d02608a52929f245c3a42d8036156fe90d59aff7695c2e75712be89ae4d4f06f4249f15a06bdc091ff42908d",
+  "@esbuild/sunos-x64@npm:0.25.8": "8b3c79794775dce54d8d2c2c87cf876e8708ba2d7ca0ccda41d96c9bf3193237909f148195a20b7fa876c8e07def6db22510948a795156beeace160e9830ab62",
+  "@esbuild/win32-arm64@npm:0.25.8": "80f13cf66b45a32892f9b433689897362b69042173bc1e47ff333d8dd9df746be27bee031197653ee4e034a1563f61ae34efc44c61160a104dfda6500f6b4936",
+  "@esbuild/win32-ia32@npm:0.25.8": "e4f0595306b2acbf19b62305c7acf97aa18954acf04f194c3cfd7a5782fab145ec6a551eaf657c3f0d2774cf19bc1fcb7ba76fb10cac32a4c2f48825c955690e",
+  "@esbuild/win32-x64@npm:0.25.8": "4bf57733c5c4c1409cfceaf19bf5b8ce3c9b9a29705bc8a24fc72652846afd0bd478b14a17db326ae27896574ee346ffb96b2fa043f0716d1a7f30b89f8b3855",
   "@nx/nx-darwin-arm64@npm:20.7.1": "fc5f1e310a8b31c030404791fbddcbfdf072e1342dee50c6795d21e807752560b936ccec02609f25d806aeb44f0935d5dae45a224ac44b9e9e679db57a786616",
+  "@nx/nx-darwin-arm64@npm:21.3.11": "b02f760415cfe1b4803d6aac8fb25dbe7e94c120b2d2d1313561fca92cee8519f826e4cec481268c7c574de892daa38353f1c7812e254239b5385f5d9d2315ff",
   "@nx/nx-darwin-x64@npm:20.7.1": "b0f4595a3b4dd62cd5b95b461e74bbec82e02a74bdaade5c7418eb52bbc2204dd613d92f0c860cf5dd473d38c90b8b31d42aab3a1afdd78b1ba89b20155080c1",
+  "@nx/nx-darwin-x64@npm:21.3.11": "f6f39817f7e409ff4234002a8bac75b8be58d366554c641a12da3d6311fb0270c9915dd29a35edb29e10834693fb2744242f524c87067f1d28ec757259803643",
   "@nx/nx-freebsd-x64@npm:20.7.1": "e8b193a009241264426172d82918f7aaf6b47de17e5eb43185a77d4e795b755c70c1d9e60c44f2ab43394105db710386aa2f3b8f3f524e8cd490ab9df5442a61",
+  "@nx/nx-freebsd-x64@npm:21.3.11": "07a997916a58ea581593cec985144beb801e508a15b924ca92d44d73508a7dc7104065a78cd058a606817856f66b47a53e08add8e68733ce9b86c07ab3484083",
   "@nx/nx-linux-arm-gnueabihf@npm:20.7.1": "2b202c359a0812ceb1d7b126016f77909910ba7c4dade3fe2a0f0b772619a93550748a04c7410c26389c82999709cdd1daf774061978ceb918da8a057dd87e38",
+  "@nx/nx-linux-arm-gnueabihf@npm:21.3.11": "f0549860c4399bf589bd8e769889622f6ee2e3372c26173f45ff44ea46a832abd46ca8c53fa7d1b6287cc3d8e7d6ea78cf6bb5172d4ea92724f4b770d5aa3c6e",
   "@nx/nx-linux-arm64-gnu@npm:20.7.1": "17ad19647fd162cf0b18ab370e1937f13277565cc54271caa5d266951482fd79e89ecbd900b46071bc2a7bb83826194c9eab2de2b4df27994f3e5c75edb8392d",
+  "@nx/nx-linux-arm64-gnu@npm:21.3.11": "784cdb07b35a52110b7cfc8462292b497b87b3eaf7fecedb7f66d9da05ff9feb31d384c06950bc3c5c602fd35d637671404dcd2b1ca9ed2e76e6f52c0ff1b644",
   "@nx/nx-linux-arm64-musl@npm:20.7.1": "f234de81327a6ecfd5fce16a616241496e32980e189ed02d012153a440345bcfb946a3ec16ce074af31b985120b1baa7cc0081eead0c20a4de25a7632e297e2d",
+  "@nx/nx-linux-arm64-musl@npm:21.3.11": "2e0af30c3a4cc91f79a1febd7cb2d1b3f082d4870207ad3790b35b2c0959ebdfac51c4104cbceba7b24d31589b57689b39fb73b9b8c114bbbb07145591cb27e6",
   "@nx/nx-linux-x64-gnu@npm:20.7.1": "04170e48dd902df661244153de8a63a1d60b7277a279de3760a439ac2c6bb48ea791ace863d726d2d4e7e9848ca257f9ce162ee08a3d349e3caaa4461ef87b6a",
+  "@nx/nx-linux-x64-gnu@npm:21.3.11": "ff67dffc04fa63f3df7913b2acb44536798652f999b9959e2bd553ec38dec0060d4f7e29f6a162cd21498e912a968d62ffab35ddea796c96e13a363174ce8ec4",
   "@nx/nx-linux-x64-musl@npm:20.7.1": "210314fdbf1c00e3775ea42fa7ef171b81670f9875f2e990e5cfeceee3779114757c40d3663a74cad1e023ddccf526da447027b325dbde740819b0b9e8d91be3",
+  "@nx/nx-linux-x64-musl@npm:21.3.11": "d1dc84080c92793ee1acfdbaeb63e5531ad5a79f5a0e5c3519530bebdadbe447c469e53463bf774199f6d1fe2c7bc4a674f6b952be81b09051d0ebda4b6f51ed",
   "@nx/nx-win32-arm64-msvc@npm:20.7.1": "6a9a9aa25121132350a97f220877d4c6d2acdd419c045d7ed293e0e0744e581bbc6f7dd38e5048ff0688459caf0348377dedb8cd2e105add1f51da737db193cd",
+  "@nx/nx-win32-arm64-msvc@npm:21.3.11": "62a7c4c02812f821a615f20164190f50330b18415fd68d80b1b5b15458ef16a9a0a0d14ce1a96326f1e4e9dbd317f1da8bee995e85c8aea43ab1b83c98f9699c",
   "@nx/nx-win32-x64-msvc@npm:20.7.1": "0ff238e94d4db2fc8bf54b4b393689617738f0a9ed96b6a5c90ea0848d2aa5d6a367d7c92f29f293ff0fe3c37bb27a7c7a0d67b0bcdb478728eac4e49e38dc2c",
+  "@nx/nx-win32-x64-msvc@npm:21.3.11": "c653c2b4fb8679986afac7443fc557264c9dd4cc22ee5db8f5c0e8d6516d5f4b3cc872a9a7276c1681248877dc46637970aa40e4d2e1fef0451d4c88c9c7b27e",
   "@parcel/watcher-android-arm64@npm:2.4.1": "279ac643abaccb2f9c986f35e39478e242b33bdda3128ca9e728ca1429b923d5f1bdc22268946138b0ced130ac3b2294cf2a44ff080b27c06a79062a5bbba13c",
   "@parcel/watcher-darwin-arm64@npm:2.4.1": "312fd03aaf7e75824fb84b6b99649caa4db01d55320320d88fb75ad5151bd24876555ae19fe8fdf81f92952bcf01e0a82db7c3bf540e54cee5beb20b85a6a80c",
   "@parcel/watcher-darwin-x64@npm:2.4.1": "47d8fd40e17e419459294b75c455ac7ce2a53dfcc578f2c2ab0fb0f59ad1ee6a6e87b6ecb92708139f48ed8568ffdd675fe5e57ed1468abac6a2a650fe490926",
@@ -47,42 +57,34 @@
   "@parcel/watcher-win32-arm64@npm:2.4.1": "a1395a97d1373dd7075da7234af8996302e45cb9d2507633a0f8188c239e8121e63842dded6fc13613986e0833c88435a8750b3c6b35d86b9e1af2b97430b940",
   "@parcel/watcher-win32-ia32@npm:2.4.1": "05a294e24923a02febe852154d8f8dd75fdeb53db8522c3bc87860523f1dc70d41a7507318b3ac93a24feda44526720dba2f1a7e0e20de7ca815c7dd175e3c11",
   "@parcel/watcher-win32-x64@npm:2.4.1": "28dc8dc547c4ef8b24193356bab99c4e5aafb2c8097e2d06b875c2ce4d767a9034ff82fbfac34a86fd331f8daea91a3aeee5c179ed69120c02e035f72dd44877",
-  "@rollup/rollup-android-arm-eabi@npm:4.26.0": "d0c2ef6dd5eae7cfe446998b2fb3285c27426347529ad9403b5b1ed56c585c83f859996a5b4a6e1446143dce1e8fbe7ba2bf37888dbb65ae4409088dec43d6db",
-  "@rollup/rollup-android-arm64@npm:4.26.0": "089a925fdc0cb1b7f5d428e58bea3f0ece1fb2d17fa918aba5d3e58cdaf69913fbf477145f5874f0c04779fe35a35c076d0ef93c7fabbf83c54a9c3bc57907cc",
-  "@rollup/rollup-darwin-arm64@npm:4.26.0": "2f86fd7f56d0f52b93647beb78f37e194c0561e6f653f86d40ed51c4c7647c780dd5b3e117073da163159d349c4722703026f5d644ad5f4402c5178757251b4a",
-  "@rollup/rollup-darwin-x64@npm:4.26.0": "e78b2396b94b8504af25bd4d36cddd2f3d76a3db8ed7f7ce4d0a9cc60f955c54e4ec483361b56810479a47740facaa78402c43618d3c36d10ada63a22af986a9",
-  "@rollup/rollup-freebsd-arm64@npm:4.26.0": "c4e3951402b0ffbaf2b36b1c66ea0fd31da75e6538702c9a12df4245f2c7cd370c718bdd99a48d9fbaacad133510e7bbd46699ec314c510a89228f3a4603bac4",
-  "@rollup/rollup-freebsd-x64@npm:4.26.0": "6a54a2613c9ebbfebf09fede106656aeb1a6bcb0040d04472f7afb57c35dd3cd9502b5a00792b749ce88765072e58a46727741596913a96ee4cc57ffb52186e9",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.26.0": "b25ccb3d3265f55dc7a5b9a9c49c8c416e0087ce6c508470a136bdae6f66fac4832611c9a349c480c919fcfa38613b0dab47634897150026cc5c101c89c683d1",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.26.0": "6939fa7668e50e3901fcc7bf20d89f0b07f8e46df9b8c96ca4bb0b766dd536bc613a48031aab8af63bb6bcc4a303ef306bd9be9cda4c7972b0db993962a22643",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.26.0": "b7f2a5ae857d229a54bcb9a7b4ca0ffb8daa5dffb3e3acf74f47c751dec3ff9d99275432bca40231255920f2ef63e5f2b757c2c2a7a4466db389a40919db4e1b",
-  "@rollup/rollup-linux-arm64-musl@npm:4.26.0": "e6109f231f3301ce0d32fc58938f805db5dcd77ad540dd34abb29f12d62fee8cb764bada8143942b43ab7b81b45aa29e2bb60c6210cc1ec29b93ad69651175e9",
-  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.26.0": "f1a3cb873ce9f102d85dbedad578b8ac25e6218b5415bf458f63d1923775bd48b878cbf3e627d43c1e2ba2be7691b0f703b4d38460012d3ec1b9dcc6297f0fe1",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.26.0": "295848704eb7e93dd1a5525d8b4948669e9a01c583f95431ee97e4d2b8791b0e83bb9a4d356312a1b8c2b58c2061e3567f6c50dfd7f86b390e49220dbd25f298",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.26.0": "7d30e6a9e14220fcc83f980784406c1cb03953c49f4dd70bf1e78b462e4e9491876d086cfa91cc6262832d3671b1f3af6014ec0ef05fbd1928ed1c61a728d03a",
-  "@rollup/rollup-linux-x64-gnu@npm:4.26.0": "903d77b3314ff31ec97c183b4b66abae1a467ee167c7de74a7b9e36d7455f06d63f4fcc781f76e256992d9fa4c13a552c114114605a27cc0ef44df85e75368b4",
-  "@rollup/rollup-linux-x64-musl@npm:4.26.0": "e7913fdc007a841784c1181aff95f0392ef6abdbe5a8098abe96d96a888fe0c28799ab4279f719fd01143ed198e82d5a4e635a65d7e617d3a4f2b4e4354de9ae",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.26.0": "4c96c96d93a9f9794a1571bfee0051225f75910679f9cf0718c1e2d21b4dfe5c3fd1864f8cd86a5b018b56b75f7c0ea6b37954b10f225e60a0e38daf9dcbfda3",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.26.0": "58177998faf3272c87da8c3b28d99f49756ca58efa23ce9aad783de15a203ce1311c12d4a619fa885551a2e98167903bdd29500132b9a6e6732935569063025e",
-  "@rollup/rollup-win32-x64-msvc@npm:4.26.0": "903caa60c6c4f22003aebc81695960438b33cccab3af01925758a8d347553697315b58eea8b363b4e8b4220b289168c6e68251f5cbdbb55d5046d9870cb7152e",
-  "@swc/core-darwin-arm64@npm:1.10.12": "f9e130a3f754b327499c9a2cce7ed7f7ade71430321a59d856102908c8d4c0ef873c1c84e35b303cfc632788579cd3f8474dc8d45d4f81ac2657e525b766aee9",
-  "@swc/core-darwin-arm64@npm:1.11.4": "f66ade345eda79cb2d61f9f1ef3492bd1caca389c19090b839c9f1e5d5080dde0162269130a0b4b1aec757f5f2d82393bad8b04075968c277a8b2f495ff47c14",
-  "@swc/core-darwin-x64@npm:1.10.12": "7176b9926e4bded9475fd964337fb2cf5a42dcd4d38ae660064c1ff554ce837c2b4c51b5ea8fe0b82f1cb7ee42f40ac913aa90cdb21b561b6cb0cf976ccebd91",
-  "@swc/core-darwin-x64@npm:1.11.4": "b223e1375196c5b3395bb321e5acc5503c5ce1e9ea7292171d49421e8cb9dc678ba61a3a1013d0d28edadcafb687fea95d0c2883cdfbff7d35c3425732ee5b9f",
-  "@swc/core-linux-arm-gnueabihf@npm:1.10.12": "3346e03f89e490978e6e87145790a47ffb563133ff37cefe21cd6ef0ea5b47b717ed82611305e4f70bf9f8023dc4f56e6d207c5e85fc2dd8d9a467c2bea339d9",
-  "@swc/core-linux-arm-gnueabihf@npm:1.11.4": "76f0a34f144c08259d45fb864023cce52970f3b2cd401d371b6f27d57d6d418b0aed8e30b90ad736b3cd71b542c3cff0908fa58da5558b2ff22b1cf070a961ca",
-  "@swc/core-linux-arm64-gnu@npm:1.10.12": "a3e19bc00cb0394b0f62e42220cff64f6e84aba72fd9a078cdba6523157d4ff240843a7dead6b5cdf8f143f5007445637e741ead794666d130644da70bb09737",
-  "@swc/core-linux-arm64-gnu@npm:1.11.4": "b4c6dfa4a80064f861afa82d31b630f104733516dd48d5614b345f76fad2648d0e76fe4ac36e5c5f02621ddf8d5be7f8e61c00c2ddab33e6f11b633cbabb0174",
-  "@swc/core-linux-arm64-musl@npm:1.10.12": "bca439723e73bef871ca0a22b00bd0f83bd972f172cc8b9594d85043c9ed2d0ca290ca58bba7afce064792685168f4e7c4561b7c25e085f95227252cee32e195",
-  "@swc/core-linux-arm64-musl@npm:1.11.4": "b23e6800a7bc75e46af230ec26fe699078ed422adc0393300479dab1735771178ad96c64c3548e5d79d447e8dcd7807757af71e3741d70e9e29ddac43d09242a",
-  "@swc/core-linux-x64-gnu@npm:1.10.12": "f0e40dc6c9c1b486ff8165b96e63cff66ccc1a35af922ee1ae99c9773eaaec8d6d080f18aacce5ef89987037aa8994422a73efb24eafdf151dcc0d6524a222ae",
-  "@swc/core-linux-x64-gnu@npm:1.11.4": "9979a8e0cd4a333f279340bef4c92bbffe211b81a0a8303dd98e4164f95d7f186587ef5f6d34a7d0a1f75ae23dd0c7350bd9214fa090d220d37288eb5580ebda",
-  "@swc/core-linux-x64-musl@npm:1.10.12": "a3d17b84d05233293280a9eb9a2a773a36b2a566147d8c1bc2551ee0166260f6e576589736f77a2f5270dd7b6988d4397119617232ecf351145dc4449e193212",
-  "@swc/core-linux-x64-musl@npm:1.11.4": "5d919b8ccc791f169f7f2d44edab577eeb809b82bbede081d307328209c7be82a29ab65f54fa69b28022366ccb4bdbcaceb623d55753e2f6067d77c90a06dd15",
-  "@swc/core-win32-arm64-msvc@npm:1.10.12": "9bc68365749129569258f6542a897eca224b67009aa43aabb08b074c3c7e63147acf2fb330c7fa0217e9816901eaeca7eb4e5abdf80c720a9296b865af8ff117",
-  "@swc/core-win32-arm64-msvc@npm:1.11.4": "c78cace9e6942216587ff4c82ebb45f9ca050b84eddc9a2e8f3a511eeff570a683a5016cf3badfae176b76c22f68395fdebf719a725ea54fd1a97e70ed4c8faf",
-  "@swc/core-win32-ia32-msvc@npm:1.10.12": "a6ff15734b55af34eebe86d6ee2d6b9447d4dd2bfcd50883a01d5310f5fa8274a1e2840b647a2b97e128cddc8463272f0258af35d1065e9c68784a425920e246",
-  "@swc/core-win32-ia32-msvc@npm:1.11.4": "e122f27adf40e581a7790beae25ee3c2c29b38520de8a1ecbbfea006bec52b3d6060db1cc9d6d6db1cb2950c28391f46dcc989536138084f30d5c95accb6049c",
-  "@swc/core-win32-x64-msvc@npm:1.10.12": "7efa206f3f2778cfeda3f9a580ebcbac34e91c3c720c16c1bc00bb7963f9c63a9dc226f89b6609f19d568a917fc9db3fc3ee5dcea931f70bbafb30602bc3b4d1",
-  "@swc/core-win32-x64-msvc@npm:1.11.4": "45e698626c0336a70501c8fb1c23feb28cfb03d61108104a6de6be0090ca4a47e455baac2396167d05e9c710d087d8e48c36cfeb52470c93be1e7599666680e0"
+  "@rollup/rollup-android-arm-eabi@npm:4.46.1": "3db36af320f1b9e55faed805583f05ac7bff150c1b350a5bca92fe1930acd692da09aa88e118da623ffe507c6392bff3fc093ce0410017d06584904a60cfd015",
+  "@rollup/rollup-android-arm64@npm:4.46.1": "416acc45eeb6d531aa71a9d88faae1c10d885e91e8927a11db2a42627443740e770588041e14bb775cbf9ea2e66193b6a5c73919743799d0a73b19cfa080b809",
+  "@rollup/rollup-darwin-arm64@npm:4.46.1": "4ae2fdd07446b185ecaf00c867155e48b61a3efef8bfabc3a9e89ce78cf6fc1552f5c276679dd95f03b4349805f10c092fc1e8c158bb2a935e4788eb5797dae9",
+  "@rollup/rollup-darwin-x64@npm:4.46.1": "92362936476c92519f39a194fe0767b8c000f6c6ff2eb910cb6cfd4ad6980a18624f368a1a286238c3fb53cb4842ab11d47bbaabfa9420d5f34ea7895b6fc5a0",
+  "@rollup/rollup-freebsd-arm64@npm:4.46.1": "ae52a9906031e98b23c4c1ea4838f3811a6a1458665f98243269e2231c087ff8a20987726209ec9b54f90bace9771a4f7209c4d7493015dc8104f2e7d62aeb84",
+  "@rollup/rollup-freebsd-x64@npm:4.46.1": "8aeaa25e652a3409cbed62a5be329824886512e4997b779e6da5413240024ee4f77f0cd75d9c8e35e2706e79544b505421324b467d91ee3fff2f1321ce0c4240",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.1": "27baf0800307cc82f5ba3388f730553d4c30e4cf77dc59c5b90f86b68c9c9193467a37bec64822582a16f3ab59b6fc9c3fe8f6d6d399912a53a3973618583b76",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.46.1": "8d74daffca58b5e9599ee3643fbe0cde61f01fb54c890ef25a641e11d23403adaa6374bb4e7f520daeb181b3134bed0c159d25f0aa933ec4d66c43b703b75c3c",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.46.1": "dc6e777c7fde0a4ec99343e34bb533358af730df0060ba40446dd71fcf83322040aebf6661bb4dfb86f31873d670c42f80fb492ae58e0a251ef510b86566c8cd",
+  "@rollup/rollup-linux-arm64-musl@npm:4.46.1": "2e1d5d58788f6d9499ef0db653eba8d4de2f29acc1fc6767436122d2d8d67e1516cb5b958b3136f347bb8f416e147bdb92b7dd02a712b1ccb7802a292544c972",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.1": "f434514fa5153838cb5d019b1463ac82f2f843e7390220e6567cba9516d791997fecbe6b9242756328f20898d4be6726f7f2a9fbba673b9421300026d9a1e857",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.46.1": "6a64579bd64e247e1f92cfe8144669dae803b057913bee580735237e596d54bf70d5abaab3f47916df8db30a0c412b8e7c36b1f679332215239ba63f96f2c7a3",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.46.1": "aa52a1bf36877db538a57a94943ce66cc897df5a3ef130a2659b20aa3172c0f41d58e9a7a93a35fdd8ae958fcc261abe3e2d2819353ff5e84cd013466a09950e",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.46.1": "68f4e4548384fb2c0c9d5f5c33bea8bc900cf3507b6b550d8fecdcb6faaedb8dbf1ae6c4fe55600944d6ef799e8a5aa3dfc7df9055ecd2046455c3e2a9e359d9",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.46.1": "830338101f2161d450ff6faf3dfcd9f009a36c884d4e2e71a20975a5d6fc459d1c560ca68cb5291f983f497b4cbfe8d0bc5afbd5572c6c6966f7076cc3ceac76",
+  "@rollup/rollup-linux-x64-gnu@npm:4.46.1": "58fbd1ebf407f9473878a485b1c1e6d3b379346c3b90f53537a2809584cc4907774c8736ce25c9b41960a278ccc813bb052e6246445d1c8c2e6c809de2fc924a",
+  "@rollup/rollup-linux-x64-musl@npm:4.46.1": "7d7a795ec3f96030c62ae9f4bc59c4e5367de13588fa27e2813787b69b9366706c1b200ef5cdf80c2a3b5b684e5a2567e0b9c293d2a5841fa11b63f57190a3ea",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.46.1": "eb0203af6adb0b38bb6ffa9cbe64dc95acf92908498df0254df15d8d1f16857da44a584729a8f7a9f2e608d6ec8e2716132186bc27349752b1c049fcfb95ee63",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.46.1": "37956d2acf2044b1ce45826407571155bdd3cd1f81f8dccf0e476021e4ec05aa0f940b2e81267a76d0d538a766d022958f67eaa12ec807b26bed0591130778f2",
+  "@rollup/rollup-win32-x64-msvc@npm:4.46.1": "2560ef23f34fd4cb86fbe61366e339509b3c94b1e823484cb601e5913d81667de3cd10b6dafa84bc56b1376861f84b5b518a9158beaff13df72bf67291519f88",
+  "@swc/core-darwin-arm64@npm:1.13.3": "02e4c06e113dbf57a560c04bdfb0d9abc9eefbf6277a19f8f78fb42be710defd41bfd784f427a94dd23b371ce5c604a8cfae92509fef213c9de427ab3e64b25d",
+  "@swc/core-darwin-x64@npm:1.13.3": "39ed8633b500b8a32fd507c0a57ecbaed1d4840d75a1dcee9d8cafe36b378029299d9f5552404230800c186b7b972dd476401d7c216cb16f2d87c5f95ff8c58e",
+  "@swc/core-linux-arm-gnueabihf@npm:1.13.3": "d3889724b5b787db220a65424b5e5e4b2a587f658582905d5a296e8931f30bd42202c356d05d650cfb649984884b05e1513412edaf4ce97c7a055547e3d26fd0",
+  "@swc/core-linux-arm64-gnu@npm:1.13.3": "9ab7ed4e31d4dba8df4b25109248c0225c33573a0046ef7380449fe348a9404dcf4115320e649ba5b5476a38a12dbc52dfe534f7dd7ad92dc5995e9aa9513dba",
+  "@swc/core-linux-arm64-musl@npm:1.13.3": "39ce1201862d2368ed7a89a9f1960bcbf56da875c353da720894bccc75110d71ab2cb7f99a252518f96e678c5dd42ed2e1a588bf343e175f41a532785c03ffaf",
+  "@swc/core-linux-x64-gnu@npm:1.13.3": "9e7edee322efd9b35a62d8507300adacbbcd53630a26e935cee8ede5ecf8710fac1ae60ce490cd2d6297d27196d8202a9281b6193da223689804ef9afab451c0",
+  "@swc/core-linux-x64-musl@npm:1.13.3": "89f256a8a7da0317cf0b504846cf6d077695b7f86f3cb85e727deedcc82f00fbd42c36e5ec6ff9ead3a2ab1fda748b4d3fd59d93420b6abd3629e902f5a34828",
+  "@swc/core-win32-arm64-msvc@npm:1.13.3": "18929504fef4c53a191512a9bdb5384fe2ef701f4cf43927aaaadd8fab199cf5c970f8ca48b9533e8190c4a88fc514147beb17768cf5232055b6ba075457ae09",
+  "@swc/core-win32-ia32-msvc@npm:1.13.3": "0b7d5fc610de99bd24e0bd5430569e5b71dc0e2660a6e17aaffc7671ed0474a5a18096ea23acb83aadaa287fef5ff4c245a544c5ba38cb498ac4d843f7ca2256",
+  "@swc/core-win32-x64-msvc@npm:1.13.3": "632eac6a4997f4299e710f8be1a1d6df862a852beaa3b30dc1dce9ba5acd128d6e93af6ce64f8b39e4c37318b254f4f10d27ad5df1cf5bb493de39d7f205d1b7"
 }

From 292b63e44fb85ad4fed35f7803db2bf9dd41a6e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 21:22:51 +0000
Subject: [PATCH 087/109] nb: 7.21.1 -> 7.21.3

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

diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix
index 579fadc8912a..e61fbc94b9e5 100644
--- a/pkgs/by-name/nb/nb/package.nix
+++ b/pkgs/by-name/nb/nb/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nb";
-  version = "7.21.1";
+  version = "7.21.3";
 
   src = fetchFromGitHub {
     owner = "xwmx";
     repo = "nb";
     rev = version;
-    hash = "sha256-d9QhJBRdfTMIDHFOX4/fMmZnqCMeGqQhJTr60Ea7ucw=";
+    hash = "sha256-jvjAxXynLo19D5GdnEXtmcrxjXQRYQYOiZ6I1Wl47xA=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 3a7aab99d5530301ea5dc1f619c05194d9635152 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 01:09:11 +0000
Subject: [PATCH 088/109] eiquadprog: 1.2.9 -> 1.3.0

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

diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix
index 70242a2aa9a0..068c0cf73c70 100644
--- a/pkgs/by-name/ei/eiquadprog/package.nix
+++ b/pkgs/by-name/ei/eiquadprog/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eiquadprog";
-  version = "1.2.9";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "eiquadprog";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VqRx06sCCZrnB+NWm6Z9OMKzjKQIydGgKQU6fMY7phk=";
+    hash = "sha256-8CwyTREHzTtgXTnzAIcRAlKm3fBEUEeMxNwzzEMADqk=";
   };
 
   outputs = [

From 58a604800e419fe73db162a305e31f47668f4885 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 24 Sep 2025 17:58:53 -0700
Subject: [PATCH 089/109] python3Packages.typedunits: 0.0.1.dev20250509200845
 -> 0.0.1

https://github.com/quantumlib/TypedUnits/releases/tag/v0.0.1
---
 .../development/python-modules/typedunits/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/typedunits/default.nix b/pkgs/development/python-modules/typedunits/default.nix
index 941db335c3e0..a0f8d285e5ef 100644
--- a/pkgs/development/python-modules/typedunits/default.nix
+++ b/pkgs/development/python-modules/typedunits/default.nix
@@ -12,17 +12,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "typedunits";
-  version = "0.0.1.dev20250509200845";
+  version = "0.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "quantumlib";
     repo = "TypedUnits";
-    # PyPi ships platform- and python- specific wheels, so pin the matching source
-    rev = "95e698b10454dc8dffdb708d56199a748e6dab75";
-    hash = "sha256-mNo2s1sIMOa7zYfp6XyF8CBQ840+XvN0Ek59W6bRqeM=";
+    tag = "v${version}";
+    hash = "sha256-g/kUPEtdyNvcWJOqcTCF27pW22WTg0EiHoEXgSs2xMs=";
   };
 
   build-system = [
@@ -63,6 +62,6 @@ buildPythonPackage {
     description = "Units and dimensions library with support for static dimensionality checking and protobuffer serialization";
     homepage = "https://github.com/quantumlib/TypedUnits";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.sarahec ];
+    maintainers = with lib.maintainers; [ sarahec ];
   };
 }

From e8512a075f1e5dafcc4bb41a0f3a811e15676aac Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Thu, 25 Sep 2025 01:41:06 +0000
Subject: [PATCH 090/109] shader-slang: 2025.17 -> 2025.17.1

Changelog: https://github.com/shader-slang/slang/releases/tag/v2025.17.1
---
 pkgs/by-name/sh/shader-slang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 1c7494078a59..a4d565eb1935 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shader-slang";
-  version = "2025.17";
+  version = "2025.17.1";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JmDInquZlyGG7LivZ4792Ef7IazntgwOwAheNILT+HI=";
+    hash = "sha256-0rpjwUCOJedafF6ZKyV+a3fHhnEcflFC6nflTApN4Z0=";
     fetchSubmodules = true;
   };
 

From b263bec31096e9e1c53409286050bb5ae53d4393 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 02:19:24 +0000
Subject: [PATCH 091/109] python3Packages.pytubefix: 9.5.0 -> 9.5.1

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

diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix
index fac6e408664d..f93143056c71 100644
--- a/pkgs/development/python-modules/pytubefix/default.nix
+++ b/pkgs/development/python-modules/pytubefix/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pytubefix";
-  version = "9.5.0";
+  version = "9.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JuanBindez";
     repo = "pytubefix";
     tag = "v${version}";
-    hash = "sha256-3X0oSW1LdVzd9m6awUjqW+uI+0VijCjYYim0sH3wcSU=";
+    hash = "sha256-r8bzgDQK3csx3Myh90lVnv4Zs3cJq6B+PmpVAUCMRLs=";
   };
 
   build-system = [ setuptools ];

From bf1711c0403c51af6604d294575b20a6934c5dab Mon Sep 17 00:00:00 2001
From: Henry M <poacherGoneWild@proton.me>
Date: Wed, 24 Sep 2025 22:25:17 -0400
Subject: [PATCH 092/109] nixos/gnome: Adds `pkgs` attribute to shell
 extensions

This configuration was invalid as none of the packages were prefaced with the `pkgs` attribute.
---
 nixos/modules/services/desktop-managers/gnome.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/gnome.md b/nixos/modules/services/desktop-managers/gnome.md
index 1fa248761ada..114bd9e63124 100644
--- a/nixos/modules/services/desktop-managers/gnome.md
+++ b/nixos/modules/services/desktop-managers/gnome.md
@@ -113,9 +113,9 @@ You can install them like any other package:
 ```nix
 {
   environment.systemPackages = [
-    gnomeExtensions.dash-to-dock
-    gnomeExtensions.gsconnect
-    gnomeExtensions.mpris-indicator-button
+    pkgs.gnomeExtensions.dash-to-dock
+    pkgs.gnomeExtensions.gsconnect
+    pkgs.gnomeExtensions.mpris-indicator-button
   ];
 }
 ```

From 749f9aff76002b53904fcd23a13facb61520bf44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 03:46:59 +0000
Subject: [PATCH 093/109] nakama: 3.31.0 -> 3.32.0

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

diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix
index 2caa13cd8534..ff1a744d60b9 100644
--- a/pkgs/by-name/na/nakama/package.nix
+++ b/pkgs/by-name/na/nakama/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "nakama";
-  version = "3.31.0";
+  version = "3.32.0";
 
   src = fetchFromGitHub {
     owner = "heroiclabs";
     repo = "nakama";
     tag = "v${version}";
-    hash = "sha256-e31Mn4Ma+7vjOtwV13w79AshN9LCg2V0V3h9sSaad1U=";
+    hash = "sha256-Ly8NYqaJIC/ySPrCiEwwWR3+Zyk6dEW0r7SeyOS1CwE=";
   };
 
   vendorHash = null;

From 1595f616d661eaa127b9f395433df98a31575632 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 03:54:45 +0000
Subject: [PATCH 094/109] netbird-ui: 0.57.1 -> 0.58.1

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

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 89fb9313685c..e09d811f3309 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -68,13 +68,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.57.1";
+  version = "0.58.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DwNJSQAbFVIkxOZCdZkMWtPe1YQglpF6kIsy653jFMo=";
+    hash = "sha256-I6nWYc/eITqXMBZVEcNj/b4rgJLQovA19PJW7ceHyD8=";
   };
 
   vendorHash = "sha256-ZjeTKj99BTSNFOvtywfmuXfYVxU3s9O2EwD/4IZodvs=";

From 724045a08f221dc22a6dda2c664cb5d2b4786f5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 04:51:18 +0000
Subject: [PATCH 095/109] python3Packages.bump-my-version: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/development/python-modules/bump-my-version/default.nix b/pkgs/development/python-modules/bump-my-version/default.nix
index 60eeb3023541..f6af076bb320 100644
--- a/pkgs/development/python-modules/bump-my-version/default.nix
+++ b/pkgs/development/python-modules/bump-my-version/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "bump-my-version";
-  version = "1.2.2";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "callowayproject";
     repo = "bump-my-version";
     tag = version;
-    hash = "sha256-r83RMI9oj8cauvMUJys4wA97HKflVWja2TKXjOSiVGQ=";
+    hash = "sha256-0gaRW8gUCC4gVsikGD4is8xGZm+JTWfFQ2QUyau8vZ0=";
   };
 
   build-system = [

From 2ca18a8b175c961eef8aa3637c490de833fcccef Mon Sep 17 00:00:00 2001
From: Spencer Heywood <github@heywoodlh.io>
Date: Wed, 24 Sep 2025 22:52:49 -0600
Subject: [PATCH 096/109] maintainers/team-list: add heywoodlh to k3s team

---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 4046a3f3e3cd..bb981244c578 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -674,6 +674,7 @@ with lib.maintainers;
     members = [
       euank
       frederictobiasc
+      heywoodlh
       marcusramberg
       mic92
       rorosen

From 5e389a3fb27841768f627513739dbc1063dc0aac Mon Sep 17 00:00:00 2001
From: Spencer Heywood <github@heywoodlh.io>
Date: Wed, 24 Sep 2025 22:53:58 -0600
Subject: [PATCH 097/109] k3s: update nvidia docs

---
 .../cluster/k3s/docs/examples/NVIDIA.md       | 244 ++++++++++++++++--
 1 file changed, 221 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md b/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md
index 4e31e798beb8..fa8270e86ca8 100644
--- a/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md
+++ b/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md
@@ -1,16 +1,62 @@
 # Nvidia GPU Support
 
-To use Nvidia GPU in the cluster the nvidia-container-runtime and runc are needed. To get the two components it suffices to add the following to the configuration
+> Note: this article assumes `services.k3s.enable = true;` is already set
+
+## Enable the Nvidia driver
 
 ```
-virtualisation.docker = {
-  enable = true;
-  enableNvidia = true;
+hardware.nvidia = {
+  open = true;
+  package = config.boot.kernelPackages.nvidiaPackages.stable; # change to match your kernel
+  nvidiaSettings = true;
 };
-environment.systemPackages = with pkgs; [ docker runc ];
+
+# Hack for getting the nvidia driver recognized
+services.xserver = {
+  enable = false;
+  videoDrivers = [ "nvidia" ];
+};
+
+nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+  "nvidia-x11"
+  "nvidia-settings"
+];
 ```
 
-Note, using docker here is a workaround, it will install nvidia-container-runtime and that will cause it to be accessible via /run/current-system/sw/bin/nvidia-container-runtime, currently its not directly accessible in nixpkgs.
+Also, enable the Nvidia container toolkit:
+
+```
+hardware.nvidia-container-toolkit.enable = true;
+hardware.nvidia-container-toolkit.mount-nvidia-executables = true;
+
+environment.systemPackages = with pkgs; [
+  nvidia-container-toolkit
+];
+```
+
+Rebuild your NixOS configuration.
+
+### Verify that the GPU is accessible
+
+Use the following command to ensure the GPU is accessible:
+
+```
+nvidia-smi
+```
+
+If there is an error in the output, a reboot may be required for the driver to be assigned to the GPU.
+
+Additionally, `lspci -k` can be used to ensure the driver has been assigned to the GPU:
+
+```
+# lspci -k | grep -i nvidia
+
+01:00.0 VGA compatible controller: NVIDIA Corporation TU106 [GeForce RTX 2060 Rev. A] (rev a1)
+  Kernel driver in use: nvidia
+  Kernel modules: nvidiafb, nouveau, nvidia_drm, nvidia
+```
+
+## Configure k3s
 
 You now need to create a new file in `/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl` with the following
 
@@ -22,15 +68,8 @@ You now need to create a new file in `/var/lib/rancher/k3s/agent/etc/containerd/
   runtime_engine = ""
   runtime_root = ""
   runtime_type = "io.containerd.runc.v2"
-
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia.options]
-  BinaryName = "/run/current-system/sw/bin/nvidia-container-runtime"
 ```
 
-Update: As of 12/03/2024 It appears that the last two lines above are added by default, and if the two lines are present (as shown above) it will refuse to start the server. You will need to remove the two lines from that point onward.
-
-Note here we are pointing the nvidia runtime to "/run/current-system/sw/bin/nvidia-container-runtime".
-
 Now apply the following runtime class to k3s cluster:
 
 ```yaml
@@ -43,16 +82,175 @@ metadata:
   name: nvidia
 ```
 
-Following [k8s-device-plugin](https://github.com/NVIDIA/k8s-device-plugin#deployment-via-helm) install the helm chart with `runtimeClassName: nvidia` set. In order to passthrough the nvidia card into the container, your deployments spec must contain
+Restart k3s:
 
-```yaml
-runtimeClassName: nvidia
-# for each container
-  env:
-   - name: NVIDIA_VISIBLE_DEVICES
-     value: all
-   - name: NVIDIA_DRIVER_CAPABILITIES
-     value: all
+```
+systemctl restart k3s.service
 ```
 
-to test its working exec onto a pod and run nvidia-smi. For more configurability of nvidia related matters in k3s look in [k3s-docs](https://docs.k3s.io/advanced#nvidia-container-runtime-support).
+Ensure that the Nvidia runtime is detected by k3s:
+
+```
+grep nvidia /var/lib/rancher/k3s/agent/etc/containerd/config.toml
+```
+
+Apply the DaemonSet in the [generic-cdi-plugin README](https://github.com/OlfillasOdikno/generic-cdi-plugin):
+
+```
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: generic-cdi-plugin
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: generic-cdi-plugin-daemonset
+  namespace: generic-cdi-plugin
+spec:
+  selector:
+    matchLabels:
+      name: generic-cdi-plugin
+  template:
+    metadata:
+      labels:
+        name: generic-cdi-plugin
+        app.kubernetes.io/component: generic-cdi-plugin
+        app.kubernetes.io/name: generic-cdi-plugin
+    spec:
+      containers:
+      - image: ghcr.io/olfillasodikno/generic-cdi-plugin:main
+        name: generic-cdi-plugin
+        command:
+          - /generic-cdi-plugin
+          - /var/run/cdi/nvidia-container-toolkit.json
+        imagePullPolicy: Always
+        securityContext:
+          privileged: true
+        tty: true
+        volumeMounts:
+        - name: kubelet
+          mountPath: /var/lib/kubelet
+        - name: nvidia-container-toolkit
+          mountPath: /var/run/cdi/nvidia-container-toolkit.json
+      volumes:
+      - name: kubelet
+        hostPath:
+          path: /var/lib/kubelet
+      - name: nvidia-container-toolkit
+        hostPath:
+          path: /var/run/cdi/nvidia-container-toolkit.json
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: "nixos-nvidia-cdi"
+                operator: In
+                values:
+                - "enabled"
+```
+
+Apply the following node label (replace `#CHANGEME` with your node name):
+
+```
+kind: Node
+apiVersion: v1
+metadata:
+  name: #CHANGEME
+  labels:
+    nixos-nvidia-cdi: enabled
+```
+
+Now, GPU-enabled pods can be run with this configuration:
+
+```
+spec:
+  runtimeClassName: nvidia
+  containers:
+    resources:
+      requests:
+        nvidia.com/gpu-all: "1"
+      limits:
+        nvidia.com/gpu-all: "1"
+```
+
+### Test pod
+
+This is a complete pod configuration for reference/testing:
+
+```
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: gpu-test
+  namespace: default
+spec:
+  runtimeClassName: nvidia # <- THIS FOR GPU
+  containers:
+  - name: gpu-test
+    image: nvidia/cuda:12.6.3-base-ubuntu22.04
+    command: [ "/bin/bash", "-c", "--" ]
+    args: [ "while true; do sleep 30; done;" ]
+    env:
+      - name: NVIDIA_VISIBLE_DEVICES
+        value: all
+      - name: NVIDIA_DRIVER_CAPABILITIES
+        value: all
+    resources: # <- THIS FOR GPU
+      requests:
+        nvidia.com/gpu-all: "1"
+      limits:
+        nvidia.com/gpu-all: "1"
+```
+
+Once the pod is running, use the following command to test that the GPU was detected:
+
+```
+kubectl exec -n default -it pod/gpu-test -- nvidia-smi
+```
+
+If successful, the output will look like the following:
+
+```
+Thu Sep 25 04:17:42 2025
+
++-----------------------------------------------------------------------------------------+
+
+| NVIDIA-SMI 580.82.09              Driver Version: 580.82.09      CUDA Version: 13.0     |
+
++-----------------------------------------+------------------------+----------------------+
+
+| GPU  Name                 Persistence-M | Bus-Id          Disp.A | Volatile Uncorr. ECC |
+
+| Fan  Temp   Perf          Pwr:Usage/Cap |           Memory-Usage | GPU-Util  Compute M. |
+
+|                                         |                        |               MIG M. |
+
+|=========================================+========================+======================|
+
+|   0  NVIDIA GeForce RTX 2060        Off |   00000000:01:00.0  On |                  N/A |
+
+|  0%   36C    P8             10W /  190W |     104MiB /   6144MiB |      0%      Default |
+
+|                                         |                        |                  N/A |
+
++-----------------------------------------+------------------------+----------------------+
+
+
+
++-----------------------------------------------------------------------------------------+
+
+| Processes:                                                                              |
+
+|  GPU   GI   CI              PID   Type   Process name                        GPU Memory |
+
+|        ID   ID                                                               Usage      |
+
+|=========================================================================================|
+
+|  No running processes found                                                             |
+
++-----------------------------------------------------------------------------------------+
+```

From cfd5ccac7a41cc1cd3c20cdb716a57805f76a5b2 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sun, 21 Sep 2025 02:42:44 +0300
Subject: [PATCH 098/109] mrxvt: drop

Unmaintained upstream since 2012 and marked insecure in nixpkgs since 2021.
---
 nixos/tests/terminal-emulators.nix |  2 -
 pkgs/by-name/mr/mrxvt/package.nix  | 69 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 pkgs/by-name/mr/mrxvt/package.nix

diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index fa8ab05fd5ea..145708c1f2f7 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -70,8 +70,6 @@ let
 
     mlterm.pkg = p: p.mlterm;
 
-    mrxvt.pkg = p: p.mrxvt;
-
     qterminal.pkg = p: p.lxqt.qterminal;
     qterminal.kill = true;
 
diff --git a/pkgs/by-name/mr/mrxvt/package.nix b/pkgs/by-name/mr/mrxvt/package.nix
deleted file mode 100644
index 39ee43c80f9c..000000000000
--- a/pkgs/by-name/mr/mrxvt/package.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  libX11,
-  libXft,
-  libXi,
-  xorgproto,
-  libSM,
-  libICE,
-  freetype,
-  pkg-config,
-  which,
-  nixosTests,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "mrxvt";
-  version = "0.5.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz";
-    sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    libX11
-    libXft
-    libXi
-    xorgproto
-    libSM
-    libICE
-    freetype
-    which
-  ];
-
-  configureFlags = [
-    "--with-x"
-    "--enable-frills"
-    "--enable-xft"
-    "--enable-xim"
-    # "--with-term=xterm"
-    "--with-max-profiles=100"
-    "--with-max-term=100"
-    "--with-save-lines=10000"
-  ];
-
-  preConfigure = ''
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2";
-  '';
-
-  passthru.tests.test = nixosTests.terminal-emulators.mrxvt;
-
-  meta = with lib; {
-    description = "Lightweight multitabbed feature-rich X11 terminal emulator";
-    longDescription = "
-      Multitabbed lightweight terminal emulator based on rxvt.
-      Supports transparency, backgroundimages, freetype fonts, ...
-    ";
-    homepage = "https://sourceforge.net/projects/materm";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ ];
-    knownVulnerabilities = [
-      "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)"
-    ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9d490d8f84d4..18d20d5986ac 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1718,6 +1718,7 @@ mapAliases {
   mpris-discord-rpc = throw "'mpris-discord-rpc' has been renamed to 'music-discord-rpc'."; # Added 2025-09-14
   mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21
+  mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25
   msp430NewlibCross = msp430Newlib; # Added 2024-09-06
   mumps_par = lib.warnOnInstantiate "mumps_par has been renamed to mumps-mpi" mumps-mpi; # Added 2025-05-07
   mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22

From 0845d8c503cc68d742b0b460e63ca5de80065ce3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 05:57:28 +0000
Subject: [PATCH 099/109] python3Packages.meshtastic: 2.7.2 -> 2.7.3

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index b8bfce96c5c9..2c321fa6e721 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -34,7 +34,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.7.2";
+  version = "2.7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "python";
     tag = version;
-    hash = "sha256-8dNapcj4SW4fgbW48IxxrawyCuOayI/dxmVHQPshDp0=";
+    hash = "sha256-9p9tDc74WpH0+8orI69bW2Yj7Cow4v7M3cotIbk/mcw=";
   };
 
   pythonRelaxDeps = [

From 3d413a6a710844c5b6a8e0c49b9ee97d3c7df6ff Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 25 Sep 2025 00:14:25 -0600
Subject: [PATCH 100/109] tandoor-recipes: 2.2.3 -> 2.2.5

https://github.com/TandoorRecipes/recipes/releases/tag/2.2.5
Diff: https://github.com/TandoorRecipes/recipes/compare/2.2.3...2.2.5
---
 pkgs/by-name/ta/tandoor-recipes/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix
index 3ae948f604f0..475f23738cca 100644
--- a/pkgs/by-name/ta/tandoor-recipes/common.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "2.2.3";
+  version = "2.2.5";
 
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
     tag = version;
-    hash = "sha256-ezjeUOlbVoPWfUBs865ixBKet3U6O7UwfvqJY4v1hwQ=";
+    hash = "sha256-N6d5T11fOAtPKAV/tqTWGdwMkWNY8rPpWT2TBSc0ybc=";
   };
 
   yarnHash = "sha256-1p79Bdsn6KDApYKz9BAwrA97svbB8ub+Wl49MTIumW8=";

From fb4cf13a67d8f6fb08ab4f5369880c04fff675a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 06:40:01 +0000
Subject: [PATCH 101/109] python3Packages.uxsim: 1.9.1 -> 1.10.0

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

diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix
index 974e8bea7d85..536203271c5a 100644
--- a/pkgs/development/python-modules/uxsim/default.nix
+++ b/pkgs/development/python-modules/uxsim/default.nix
@@ -18,14 +18,14 @@
 }:
 buildPythonPackage rec {
   pname = "uxsim";
-  version = "1.9.1";
+  version = "1.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "toruseo";
     repo = "UXsim";
     tag = "v${version}";
-    hash = "sha256-txKeUf19l/BJZoQCLpMP31u0DBPlPHxrSqzASC3DPIw=";
+    hash = "sha256-4ZN52atcAbT6z9GzV4tOA3IiDYu+v4i3NHfauMPwMJ0=";
   };
 
   patches = [ ./add-qt-plugin-path-to-env.patch ];

From 8b6c6d5d1c4388ee3123481269de0948125fd13b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 06:47:52 +0000
Subject: [PATCH 102/109] oci-cli: 3.66.0 -> 3.66.2

---
 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 a2ab398a4b50..c0bc621ae638 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.66.0";
+  version = "3.66.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${version}";
-    hash = "sha256-Hxmon49aaa0uUWiyL4QX9qUKQK+rkSbfcB26qdBweU4=";
+    hash = "sha256-aU7rVbmKWkB119oy2sbEMe3nNXrWcpTa4hPHGil8HFg=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 4163a8e661cf48528bec5351a2fa8796eb22199f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 07:37:53 +0000
Subject: [PATCH 103/109] keycloak: 26.3.4 -> 26.3.5

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

diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index 6bca672d32fd..cefbad44861b 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "keycloak";
-  version = "26.3.4";
+  version = "26.3.5";
 
   src = fetchzip {
     url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
-    hash = "sha256-K+7ZUBN3iYGMteP/ycu4M5rJPdIavN144BgOwktdu3g=";
+    hash = "sha256-y95R+mUkqvfCwnnjyFQOcs03ekezR/yR+61zBx/w/Ow=";
   };
 
   nativeBuildInputs = [

From d50cea2f7ac6f12d67aaabe29768382513b31182 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Sun, 21 Sep 2025 20:14:04 +0200
Subject: [PATCH 104/109] bant: 0.2.2 -> 0.2.3

---
 pkgs/by-name/ba/bant/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix
index bee8f31291fe..de0d6b53e2b7 100644
--- a/pkgs/by-name/ba/bant/package.nix
+++ b/pkgs/by-name/ba/bant/package.nix
@@ -14,19 +14,19 @@ let
   registry = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "bazel-central-registry";
-    rev = "b03f4f95d8ba67873843eae80a73fef8ebf1522e";
-    hash = "sha256-gJr5bJ6Kj7jiUhnCC+YOUh3ChFR/55eUbwpP2srsVvM=";
+    rev = "1f55d91e1be0e4863a698b9d7582cf097ad456ee";
+    hash = "sha256-ESHF5FhLvn4u4j//6AFiSJRJYSKrI4EKr4oDwvsrcPM=";
   };
 in
 buildBazelPackage rec {
   pname = "bant";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "bant";
     rev = "v${version}";
-    hash = "sha256-wrzOszkqWDEylMDZYgtAqB837uWevWCwkhBhv9LGj4Y=";
+    hash = "sha256-0RWR793+qXc5QYIc7wIL323iDkNts9w4e90FCdHT6t4=";
   };
 
   bazelFlags = [
@@ -44,9 +44,8 @@ buildBazelPackage rec {
   fetchAttrs = {
     hash =
       {
-        aarch64-linux = "sha256-1iy2S0mmXksfwucks+HOZ2/HUGaVBqk7VlR+kO6iYZE=";
-        x86_64-linux = "sha256-YOIwwlCYlNINlYbm/vq3Jjhe+/zgrtECdMRl+vE8FgI=";
-        aarch64-darwin = "sha256-7g1deAihrjpwAxNbG7rv9dDs3FjOCuRIFieLbENKmbw=";
+        aarch64-linux = "sha256-aGfFbeosrWhNqiHV9ng59DeMZSGjaylPRfolxatauJE";
+        x86_64-linux = "sha256-nbHHkgN4O8bWZzrpQUMZbm4+iRffqdfu7C1kkLJ3GDQ=";
       }
       .${system} or (throw "No hash for system: ${system}");
   };

From ae2851c62fd549df616406fc48752305abc0b4d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 08:37:17 +0000
Subject: [PATCH 105/109] tun2proxy: 0.7.15 -> 0.7.16

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

diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix
index df97b6767837..65a6c7c45920 100644
--- a/pkgs/by-name/tu/tun2proxy/package.nix
+++ b/pkgs/by-name/tu/tun2proxy/package.nix
@@ -6,15 +6,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tun2proxy";
-  version = "0.7.15";
+  version = "0.7.16";
 
   src = fetchCrate {
     pname = "tun2proxy";
     inherit (finalAttrs) version;
-    hash = "sha256-Yyct1yGSXbZf49t4+8hP+V4ydyIi7zyff5IIqrTfJS0=";
+    hash = "sha256-VO0dxX2FVKFSW157HYJxvlc2Xe6W+npw+4ls/1ePu80=";
   };
 
-  cargoHash = "sha256-DhfUhjA8/+gmIe+91vVnK7Zca0x0r6lisTxPmg5yM8k=";
+  cargoHash = "sha256-CWaHHKuDr731cf3tms4Sg9NvCjW0TgmxG3vO37z/UrE=";
 
   env.GIT_HASH = "000000000000000000000000000000000000000000000000000";
 

From a2be56a90ff61e350c021f7fe185acb9cb348310 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Mon, 22 Sep 2025 18:55:30 +0200
Subject: [PATCH 106/109] proj: 9.6.1 -> 9.7.0

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

diff --git a/pkgs/by-name/pr/proj/package.nix b/pkgs/by-name/pr/proj/package.nix
index be79b8659203..2857daa8551e 100644
--- a/pkgs/by-name/pr/proj/package.nix
+++ b/pkgs/by-name/pr/proj/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proj";
-  version = "9.6.1";
+  version = "9.7.0";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     rev = finalAttrs.version;
-    hash = "sha256-81wrwBB11SKhq2dTBrvbuUd97iYkTYYrYyKpk2IlHAA=";
+    hash = "sha256-Vdznj9WGuws1p+owDNHlVERjOM3fS1+RBtqe01q500E=";
   };
 
   patches = [

From 6aae2245d2d657f8cf024c461c0ba56acfd0efcd Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sat, 20 Sep 2025 20:06:37 +0300
Subject: [PATCH 107/109] mesa: fix build with gcc15

- remove `rustPlatform.bindgenHook` from `buildInputs`,
`rustPlatform.bindgenHook` adds gcc headers to `BINDGEN_EXTRA_CLANG_ARGS`
which somehow conflict more with gcc15 than gcc14.
Removing hook should let meson use bindgen from cli with clang libraries.

Fixes bindgen error building `mesa` with gcc15:
```
FAILED: [code=1] src/nouveau/compiler/nak_bindings.rs
/nix/store/rm899xgm82kanr814dk8siwyghyxwphg-rust-bindgen-0.72.0/bin/bindgen
../src/nouveau/compiler/nak_bindings.h ...
/build/source/src/nouveau/winsys/./nouveau_bo.h:41:4: error: unknown
type name 'atomic_uint_fast32_t'
Unable to generate bindings: clang diagnosed error:
/build/source/src/nouveau/winsys/./nouveau_bo.h:41:4: error: unknown
type name 'atomic_uint_fast32_t'
```
---
 pkgs/development/libraries/mesa/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 31e15d8242a3..7c0fc1abfb5d 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -29,7 +29,6 @@
   runCommand,
   rust-bindgen,
   rust-cbindgen,
-  rustPlatform,
   rustc,
   spirv-llvm-translator,
   stdenv,
@@ -314,7 +313,6 @@ stdenv.mkDerivation {
     rustc
     rust-bindgen
     rust-cbindgen
-    rustPlatform.bindgenHook
     wayland-scanner
   ]
   ++ lib.optionals needNativeCLC [

From 6d6d870e0674120b757cab179fe40ca93fe36dc7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 10:49:14 +0000
Subject: [PATCH 108/109] lunatask: 2.1.7 -> 2.1.10

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

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index e538e2077e4e..c01739f59cca 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "2.1.7";
+  version = "2.1.10";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-Nj3CTy0qVSYMFyuUKmSkfwwqZVLh//Zqnh+tJVaVAIM=";
+    hash = "sha256-8lnMg3mkdfXqimOdyujk/DE8CU6lzj9RDM8Nb2cEUms=";
   };
 
   appimageContents = appimageTools.extract {

From 85d7db4a20833e00d072e8cdb5964375bed4a9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 25 Sep 2025 04:11:38 -0700
Subject: [PATCH 109/109] python3Packages.uxsim: add meta.changelog

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

diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix
index 536203271c5a..e728ce1b5120 100644
--- a/pkgs/development/python-modules/uxsim/default.nix
+++ b/pkgs/development/python-modules/uxsim/default.nix
@@ -55,6 +55,7 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
+    changelog = "https://github.com/toruseo/UXsim/releases/tag/${src.tag}";
     description = "Vehicular traffic flow simulator in road network, written in pure Python";
     homepage = "https://github.com/toruseo/UXsim";
     license = licenses.mit;