From dcfb3202bd9cc8b83d17cbe9b1a539120c3ddd11 Mon Sep 17 00:00:00 2001
From: David Flanagan <david@rawkode.dev>
Date: Thu, 7 Aug 2025 19:20:03 +0100
Subject: [PATCH 01/88] cue.validator: fix deprecated --strict flag

The --strict flag was deprecated in CUE 0.14.0 and causes NixOS builds
to fail with: '--strict is deprecated; use "jsonschema+strict:" as
shown in "cue help filetypes"'

Since strict validation is now the default behavior in CUE, we can
safely remove this flag without changing functionality.
---
 pkgs/by-name/cu/cue/validator.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/cu/cue/validator.nix b/pkgs/by-name/cu/cue/validator.nix
index 48c69f6c9bf1..c74c57cf93fe 100644
--- a/pkgs/by-name/cu/cue/validator.nix
+++ b/pkgs/by-name/cu/cue/validator.nix
@@ -15,7 +15,6 @@ cueSchemaFile:
 writeShellScript "validate-using-cue" ''
   ${cue}/bin/cue \
     --all-errors \
-    --strict \
     vet \
     --concrete \
     "$1" \

From 5575efd3842e431205cf816175aa45597996408e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 06:36:35 +0000
Subject: [PATCH 02/88] python3Packages.ultralytics-thop: 2.0.15 -> 2.0.16

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

diff --git a/pkgs/development/python-modules/ultralytics-thop/default.nix b/pkgs/development/python-modules/ultralytics-thop/default.nix
index 7e141c307530..5e7c7cf0702c 100644
--- a/pkgs/development/python-modules/ultralytics-thop/default.nix
+++ b/pkgs/development/python-modules/ultralytics-thop/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "ultralytics-thop";
-  version = "2.0.15";
+  version = "2.0.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "thop";
     tag = "v${version}";
-    hash = "sha256-1osW/yTyNZWYVqyRBBoT5FOO9nAvZL2Bmo0vJhJcwu8=";
+    hash = "sha256-WKIO5XAf8gVtDTbwN42614E6JtqolUNqVAsCL6iPKrs=";
   };
 
   build-system = [ setuptools ];

From f67c1f3acfba3f93daa5b8cef895a7b13abc6425 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 08:59:47 +0000
Subject: [PATCH 03/88] spire: 1.12.4 -> 1.12.5

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

diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index dd3e118f8901..ede9d21f82ea 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "spire";
-  version = "1.12.4";
+  version = "1.12.5";
 
   outputs = [
     "out"
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
     owner = "spiffe";
     repo = "spire";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-gyACFRoA0WwIea4GRmKvZlC83YGtjyZROH6QB0GyHOg=";
+    sha256 = "sha256-Ggsl40CusrHhwO/Cc9MkxHjraQsNmBLwnJJCQ1QFiAw=";
   };
 
   vendorHash = "sha256-yWONqvSNOgeXkYU5TX1Sec8xNCnaqdVLXk3ylhGBvyE=";

From 65d3cb7ca0522125b62594b362ebf99dab44986b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 13:06:41 +0000
Subject: [PATCH 04/88] prometheus-zfs-exporter: 2.3.8 -> 2.3.10

---
 pkgs/servers/monitoring/prometheus/zfs-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix
index ce2db8415c34..f961412989f8 100644
--- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "zfs_exporter";
-  version = "2.3.8";
+  version = "2.3.10";
 
   src = fetchFromGitHub {
     owner = "pdf";
     repo = pname;
     rev = "v" + version;
-    hash = "sha256-bFS4JdmtHdRPNSZP2YZQEl8y9AC6aKpxgN1D0W4dIwc=";
+    hash = "sha256-8of1FdfofkmlTMSJKbpBxI5KNEu2y1Epkl2L6nNAJ/k=";
   };
 
-  vendorHash = "sha256-P0KqKHQsocM/mrOUDJb4iNaFxJILF4toHPf7DIwMzBw=";
+  vendorHash = "sha256-wXPFR1B86oq/RieyYP1KTrpaUu3xOQnX2ismYt9N2Aw=";
 
   ldflags = [
     "-s"

From a58eabe0fd293ae3d80afa48551637bf3aa899cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 19:44:09 +0000
Subject: [PATCH 05/88] kubedock: 0.18.1 -> 0.18.2

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

diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix
index 68a4dcce1135..086c991d9c42 100644
--- a/pkgs/by-name/ku/kubedock/package.nix
+++ b/pkgs/by-name/ku/kubedock/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubedock";
-  version = "0.18.1";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "joyrex2001";
     repo = "kubedock";
     rev = version;
-    hash = "sha256-O8heDxfYmBV4sSdBZOQri+FMHJMrRW9+kai1S62ffQY=";
+    hash = "sha256-95C14Vo3QbHR/PEIPoLECCq9hhLg0Q7iThvdfaV6/lY=";
   };
 
-  vendorHash = "sha256-9mPcHMNAkjO8Ae9HcgvdR2+UUPMYmE2oTfYksZ/KL+Y=";
+  vendorHash = "sha256-iTXpODO45oUgpSvKmjLBQWAVDHLrOYN6iBL/58dd1Mg=";
 
   # config.Build not defined as it would break r-ryantm
   ldflags = [

From 559d58efbe3f9d96b328a79425ffac98d9093682 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 20:20:11 +0000
Subject: [PATCH 06/88] osv-scanner: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix
index d7a0efe9c18b..ca0fc8341a53 100644
--- a/pkgs/by-name/os/osv-scanner/package.nix
+++ b/pkgs/by-name/os/osv-scanner/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "osv-scanner";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "osv-scanner";
     tag = "v${version}";
-    hash = "sha256-ePhwY1F1MfjFnWuIZwDBBo4rmngcW9BJfPijBs0HmQQ=";
+    hash = "sha256-6s399GG2k0bkaLTwtMpt87BszzpS+GD4glt2/52Cb3A=";
   };
 
   vendorHash = "sha256-Ph7ukPx2BD2GKnxooWqH2jYoHoeTow+ta9ZaY+3dIX4=";

From e906bd7b613d60778c1f6f140bb31c264f7137f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 08:11:35 +0000
Subject: [PATCH 07/88] sbt: 1.11.4 -> 1.11.5

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index c2432fc22781..a9d21294aafa 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sbt";
-  version = "1.11.4";
+  version = "1.11.5";
 
   src = fetchurl {
     url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
-    hash = "sha256-1LVmQmTh11KRX3jMOaSeaB329h0av2HOppZssiEEarY=";
+    hash = "sha256-lJM3qaCC0BSPirUFiTJGf2nK48TBYZ9KGVZuwPG7ZJI=";
   };
 
   postPatch = ''

From 6496761ae2304bcf6aeff7d576a41aafbba3f8ce Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 27 Aug 2025 13:08:55 +0800
Subject: [PATCH 08/88] python313Packages.orm: drop

no maintainer, upstream archived.
---
 .../python-modules/orm/default.nix            | 51 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/development/python-modules/orm/default.nix

diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix
deleted file mode 100644
index 20825a18b550..000000000000
--- a/pkgs/development/python-modules/orm/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  aiomysql,
-  aiosqlite,
-  asyncpg,
-  buildPythonPackage,
-  databases,
-  fetchFromGitHub,
-  pythonOlder,
-  typesystem,
-}:
-
-buildPythonPackage rec {
-  pname = "orm";
-  version = "0.3.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "encode";
-    repo = "orm";
-    rev = version;
-    hash = "sha256-nlKEWdqttFnjBnXutlxTy9oILqFzKHKKPJpTtCUbJ5k=";
-  };
-
-  propagatedBuildInputs = [
-    aiomysql
-    aiosqlite
-    asyncpg
-    databases
-    typesystem
-  ];
-
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "typesystem==0.3.1" "typesystem"
-  '';
-
-  # Tests require databases
-  doCheck = false;
-
-  pythonImportsCheck = [ "orm" ];
-
-  meta = with lib; {
-    description = "Async ORM";
-    homepage = "https://github.com/encode/orm";
-    license = licenses.bsd3;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index fdb38432f1dd..c27a73739bbc 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -493,6 +493,7 @@ mapAliases ({
   opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16
   opentracing = throw "The opentracing Python module was removed due to being unmaintained upstream. Use OpenTelemetry instead."; # Added 2024-12-09
   ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28
+  orm = throw "orm has been removed as it is unmaintained"; # added 2025-08-27
   pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
   paho-mqtt_1 = throw "paho-mqtt_1 was removed because no package depends on it anymore"; # added 2025-03-05
   paho-mqtt_2 = paho-mqtt; # added 2025-03-05
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63a2b6385f5d..b81ef755ba4f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11068,8 +11068,6 @@ self: super: with self; {
 
   orjson = callPackage ../development/python-modules/orjson { };
 
-  orm = callPackage ../development/python-modules/orm { };
-
   ormar = callPackage ../development/python-modules/ormar { };
 
   ormsgpack = callPackage ../development/python-modules/ormsgpack { };

From 3bfd5caf7214483876ae2ae4b7e0683af626a607 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 26 Aug 2025 02:00:47 +0200
Subject: [PATCH 09/88] docker-sync: drop

---
 pkgs/tools/misc/docker-sync/Gemfile      |  3 -
 pkgs/tools/misc/docker-sync/Gemfile.lock | 29 --------
 pkgs/tools/misc/docker-sync/default.nix  | 29 --------
 pkgs/tools/misc/docker-sync/gemset.nix   | 84 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 -
 6 files changed, 1 insertion(+), 147 deletions(-)
 delete mode 100644 pkgs/tools/misc/docker-sync/Gemfile
 delete mode 100644 pkgs/tools/misc/docker-sync/Gemfile.lock
 delete mode 100644 pkgs/tools/misc/docker-sync/default.nix
 delete mode 100644 pkgs/tools/misc/docker-sync/gemset.nix

diff --git a/pkgs/tools/misc/docker-sync/Gemfile b/pkgs/tools/misc/docker-sync/Gemfile
deleted file mode 100644
index 2c8125a46165..000000000000
--- a/pkgs/tools/misc/docker-sync/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'https://rubygems.org' do
-  gem 'docker-sync'
-end
diff --git a/pkgs/tools/misc/docker-sync/Gemfile.lock b/pkgs/tools/misc/docker-sync/Gemfile.lock
deleted file mode 100644
index 4f14b77d0ef0..000000000000
--- a/pkgs/tools/misc/docker-sync/Gemfile.lock
+++ /dev/null
@@ -1,29 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    backticks (1.0.2)
-    daemons (1.3.1)
-    docker-compose (1.1.10)
-      backticks (~> 1.0)
-    docker-sync (0.5.9)
-      daemons (~> 1.2, >= 1.2.3)
-      docker-compose (~> 1.1, >= 1.1.7)
-      dotenv (~> 2.1, >= 2.1.1)
-      gem_update_checker (~> 0.2.0, >= 0.2.0)
-      os
-      terminal-notifier (= 2.0.0)
-      thor (~> 0.20, >= 0.20.0)
-    dotenv (2.6.0)
-    gem_update_checker (0.2.0)
-    os (1.0.0)
-    terminal-notifier (2.0.0)
-    thor (0.20.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  docker-sync!
-
-BUNDLED WITH
-   2.1.4
diff --git a/pkgs/tools/misc/docker-sync/default.nix b/pkgs/tools/misc/docker-sync/default.nix
deleted file mode 100644
index 0336a7b07e08..000000000000
--- a/pkgs/tools/misc/docker-sync/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  ruby,
-  bundlerApp,
-  bundlerUpdateScript,
-}:
-
-bundlerApp {
-  pname = "docker-sync";
-  gemdir = ./.;
-
-  inherit ruby;
-
-  exes = [ "docker-sync" ];
-
-  passthru.updateScript = bundlerUpdateScript "docker-sync";
-
-  meta = with lib; {
-    description = "Run your application at full speed while syncing your code for development";
-    homepage = "http://docker-sync.io";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [
-      manveru
-      nicknovitski
-    ];
-    platforms = platforms.unix;
-    mainProgram = "docker-sync";
-  };
-}
diff --git a/pkgs/tools/misc/docker-sync/gemset.nix b/pkgs/tools/misc/docker-sync/gemset.nix
deleted file mode 100644
index db73c92ed3b5..000000000000
--- a/pkgs/tools/misc/docker-sync/gemset.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  backticks = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1vr28l9vckavnrb9pnqrhcmnk3wsvvpas8jjh165w2rzv3sdkws5";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  daemons = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
-  docker-compose = {
-    dependencies = [ "backticks" ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "00v3y182rmpq34dl91iprvhc50vw8hysy2h7iy3ihmmm9pgg71gc";
-      type = "gem";
-    };
-    version = "1.1.10";
-  };
-  docker-sync = {
-    dependencies = [
-      "daemons"
-      "docker-compose"
-      "dotenv"
-      "gem_update_checker"
-      "os"
-      "terminal-notifier"
-      "thor"
-    ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1vrlcggj7k8w30b76f23p64yx4wg7p7mq9lp6lsnh2ysq9n3cjqg";
-      type = "gem";
-    };
-    version = "0.5.9";
-  };
-  dotenv = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0rgl2kqhnxqbjvi9brbvb52iaq1z8yi0pl0bawk4fm6kl9igxr8f";
-      type = "gem";
-    };
-    version = "2.6.0";
-  };
-  gem_update_checker = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ckbz4q3q59kkv138n0cmsyida0wg45pwscxzf5vshxcrxhmq3x7";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  os = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  terminal-notifier = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  thor = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
-      type = "gem";
-    };
-    version = "0.20.3";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ada5eb0b9855..e267d8f9cccf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -757,6 +757,7 @@ mapAliases {
   docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
   docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29
   docker-distribution = distribution; # Added 2023-12-26
+  docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26
   dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
   dolphinEmu = throw "'dolphinEmu' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2024-10-17
   dolphinEmuMaster = throw "'dolphinEmuMaster' has been renamed to/replaced by 'dolphin-emu-beta'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d0914e36e76..e6e5391c69c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -434,8 +434,6 @@ with pkgs;
 
   nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { };
 
-  docker-sync = callPackage ../tools/misc/docker-sync { };
-
   # Dotnet
 
   dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet { });

From 558ded8aeac032ea490340c4980d47af97329e2c Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 28 Aug 2025 13:13:21 +0800
Subject: [PATCH 10/88] xtensor: 0.26.0 -> 0.27.0

Diff: https://github.com/xtensor-stack/xtensor/compare/0.26.0...0.27.0
---
 pkgs/by-name/xt/xtensor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xt/xtensor/package.nix b/pkgs/by-name/xt/xtensor/package.nix
index 3a47f4ce30f2..4a3ef07fbf81 100644
--- a/pkgs/by-name/xt/xtensor/package.nix
+++ b/pkgs/by-name/xt/xtensor/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xtensor";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xtensor";
     tag = finalAttrs.version;
-    hash = "sha256-gAGLb5NPT4jiIpXONqY+kalxKCFKFXlNqbM79x1lTKE=";
+    hash = "sha256-RvxjQXMKhgAsvCSprMKyAMETbOsg9Ek7yREXtaNa5Eo=";
   };
 
   nativeBuildInputs = [

From d8f89b48aca9e1d23639bae5946a2a5e69016979 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 28 Aug 2025 14:10:27 +0800
Subject: [PATCH 11/88] xtensor-blas: 0.22.0 -> 0.23.0

Diff: https://github.com/xtensor-stack/xtensor-blas/compare/0.22.0...0.23.0
---
 pkgs/by-name/xt/xtensor-blas/package.nix | 32 +++++++++++-------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/xt/xtensor-blas/package.nix b/pkgs/by-name/xt/xtensor-blas/package.nix
index ef46533f776c..68f8dcf0cd0a 100644
--- a/pkgs/by-name/xt/xtensor-blas/package.nix
+++ b/pkgs/by-name/xt/xtensor-blas/package.nix
@@ -3,51 +3,49 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  gtest,
   openblas,
   xtensor,
   xtl,
+  doctest,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xtensor-blas";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xtensor-blas";
     tag = finalAttrs.version;
-    hash = "sha256-Lg6MjJbZUCMqv4eSiZQrLfJy/86RWQ9P85UfeIQJ6bk=";
+    hash = "sha256-3g84TMOBWq9q8O6GipwdsugjGhPwkZE1cXbRsnVp3Ls=";
   };
 
+  # test case THREW exception: Could not find workspace size for gelsd
+  postPatch = ''
+    substituteInPlace test/CMakeLists.txt \
+      --replace-fail "test_lapack.cpp" "" \
+      --replace-fail "test_linalg.cpp" "" \
+      --replace-fail "test_qr.cpp" "" \
+      --replace-fail "test_lstsq.cpp" ""
+  '';
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
+    openblas
     xtensor
     xtl
   ];
-  nativeCheckInputs = [
-    gtest
-    openblas
-  ];
+  nativeCheckInputs = [ doctest ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
   ];
 
-  # Disable some failing tests
-  env.GTEST_FILTER =
-    "-"
-    + lib.concatStringsSep ":" [
-      "xlapack.*"
-      "xlinalg.*"
-      "xtest_extended.*"
-    ];
-
   doCheck = true;
 
   meta = {
     description = "Extension to the xtensor library offering bindings to BLAS and LAPACK";
-    homepage = "https://github.com/QuantStack/xtensor-blas";
+    homepage = "https://github.com/xtensor-stack/xtensor-blas";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ jherland ];
   };

From b553a5b8b39a75ec2e568ecf0e7d3c4bbb3f3414 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sat, 30 Aug 2025 01:46:57 +0900
Subject: [PATCH 12/88] appflowy: 0.9.7 -> 0.9.8

https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.9.8

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/ap/appflowy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix
index 3cabfdf16a5a..2689a3aee405 100644
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@@ -17,11 +17,11 @@ let
     rec {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-GzG1IpI3azJP9uWHUm90+MJjeU+3QZuDtekkpB9/R7c=";
+        hash = "sha256-ROtQQqTr6v7JnzNOBYVoE4feUZQuqooaA6TKu9iJe8E=";
       };
       x86_64-darwin = {
         urlSuffix = "macos-universal.zip";
-        hash = "sha256-E1V/F+ZM6r/R8r/AhifS2rQwZHrL2J67FbCvVMhm89Q=";
+        hash = "sha256-y7YxsLr01qqrtftdLnx0bIXd8eL+Y3UryjgdBmaZ4gQ=";
       };
       aarch64-darwin = x86_64-darwin;
     }
@@ -30,7 +30,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "appflowy";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";

From 01620f6dbe08c649018da1f003580aa3e47672a9 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Fri, 29 Aug 2025 23:14:04 +0200
Subject: [PATCH 13/88] pkl: 0.29.0 -> 0.29.1

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

diff --git a/pkgs/by-name/pk/pkl/package.nix b/pkgs/by-name/pk/pkl/package.nix
index ba29ab89307d..9846881b4a85 100644
--- a/pkgs/by-name/pk/pkl/package.nix
+++ b/pkgs/by-name/pk/pkl/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pkl";
-  version = "0.29.0";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "apple";
     repo = "pkl";
     tag = finalAttrs.version;
-    hash = "sha256-lhLzkx0FdpluUi/GSI8HDksCZ7m3zAFmhWEnsXSO9hc=";
+    hash = "sha256-vel4Il/muHd4wqV5tfMPwBHoxgei8vPcnk2kS2/XG3I=";
     leaveDotGit = true;
     postFetch = ''
       pushd $out

From 9ee239da66e85f43510703de2839c5f98400e56b Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Sat, 30 Aug 2025 08:25:12 +0800
Subject: [PATCH 14/88] vscode-extensions.ms-vscode.theme-tomorrowkit: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It hasn’t been updated for many years, and it still has an incorrect VS Code version constraint of 0.10.x.
---
 .../editors/vscode/extensions/default.nix       | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 205276584175..f99f42b4fcf9 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3481,22 +3481,6 @@ let
         };
       };
 
-      ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension {
-        mktplcRef = {
-          name = "Theme-TomorrowKit";
-          publisher = "ms-vscode";
-          version = "0.1.4";
-          hash = "sha256-qakwJWak+IrIeeVcMDWV/fLPx5M8LQGCyhVt4TS/Lmc=";
-        };
-        meta = {
-          description = "Additional Tomorrow and Tomorrow Night themes for VS Code. Based on the TextMate themes";
-          downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.Theme-TomorrowKit";
-          homepage = "https://github.com/microsoft/vscode-themes";
-          license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.ratsclub ];
-        };
-      };
-
       ms-vscode-remote.remote-containers = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "remote-containers";
@@ -5621,6 +5605,7 @@ let
     mgt19937.typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07
     ms-vscode.go = throw "ms-vscode.go is deprecated in favor of golang.go"; # Added 2024-05-29
     ms-vscode.PowerShell = throw "ms-vscode.PowerShell is deprecated in favor of super.ms-vscode.powershell"; # Added 2024-05-29
+    ms-vscode.theme-tomorrowkit = throw "ms-vscode.theme-tomorrowkit is deprecated"; # Added 2025-08-30
     rioj7.commandOnAllFiles = throw "rioj7.commandOnAllFiles is deprecated in favor of rioj7.commandonallfiles"; # Added 2024-05-29
     WakaTime.vscode-wakatime = throw "WakaTime.vscode-wakatime is deprecated in favor of wakatime.vscode-wakatime"; # Added 2024-05-29
   };

From 6a5cb7d8d6ab50bb2732ccc8312ca95177b8d26c Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 29 Aug 2025 20:31:46 -0400
Subject: [PATCH 15/88] kustomize: return same version as official releases

Some scripts may decide to compare version with an expected one, and
they may assume the version string has the same format as returned by
upstream releases. (I actually hit this scenario in the field.)

Upstream releases use git tag names (with v prefix) [1], so mimicking it
in nixpkgs.

[1]: https://github.com/kubernetes-sigs/kustomize/blob/cd30471046d33b64b3d761d22c63365387dccd02/releasing/create-release.sh#L91
---
 pkgs/development/tools/kustomize/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 4e1da6ecc27d..1580712f559d 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
     in
     [
       "-s"
-      "-X ${t}.version=${version}"
+      "-X ${t}.version=v${version}" # add 'v' prefix to match official releases
       "-X ${t}.gitCommit=${src.rev}"
     ];
 

From da4b0677231eefb7d02cdb82263dbbed64bf10a9 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 29 Aug 2025 20:38:47 -0400
Subject: [PATCH 16/88] kustomize: modernize

---
 pkgs/development/tools/kustomize/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 1580712f559d..8f4e4656bde7 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -5,7 +5,7 @@
   installShellFiles,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "kustomize";
   version = "5.7.1";
 
@@ -15,14 +15,14 @@ buildGoModule rec {
     in
     [
       "-s"
-      "-X ${t}.version=v${version}" # add 'v' prefix to match official releases
-      "-X ${t}.gitCommit=${src.rev}"
+      "-X ${t}.version=v${finalAttrs.version}" # add 'v' prefix to match official releases
+      "-X ${t}.gitCommit=${finalAttrs.src.rev}"
     ];
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
-    repo = pname;
-    rev = "kustomize/v${version}";
+    repo = "kustomize";
+    rev = "kustomize/v${finalAttrs.version}";
     hash = "sha256-eLj9OQlHZph/rI3om6S5/0sYxjgYloUWag2mS0hEpCE=";
   };
 
@@ -40,7 +40,7 @@ buildGoModule rec {
       --zsh <($out/bin/kustomize completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Customization of kubernetes YAML configurations";
     mainProgram = "kustomize";
     longDescription = ''
@@ -49,8 +49,8 @@ buildGoModule rec {
       as is.
     '';
     homepage = "https://github.com/kubernetes-sigs/kustomize";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       carlosdagos
       vdemeester
       periklis
@@ -59,4 +59,4 @@ buildGoModule rec {
       saschagrunert
     ];
   };
-}
+})

From a4303e0d637367dad9d1e054c9e87bb1de4c3c81 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 29 Aug 2025 20:49:43 -0400
Subject: [PATCH 17/88] kustomize: add test case to check returned version

---
 pkgs/development/tools/kustomize/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 8f4e4656bde7..5b71777928ef 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -3,6 +3,8 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
+  kustomize,
+  testers,
 }:
 
 buildGoModule (finalAttrs: {
@@ -40,6 +42,14 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/kustomize completion zsh)
   '';
 
+  passthru.tests = {
+    versionCheck = testers.testVersion {
+      command = "${finalAttrs.meta.mainProgram} version";
+      version = "v${finalAttrs.version}";
+      package = kustomize;
+    };
+  };
+
   meta = {
     description = "Customization of kubernetes YAML configurations";
     mainProgram = "kustomize";

From f2ede3274fb4447bc7c055516d22f253fe6fc53e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 09:39:29 +0000
Subject: [PATCH 18/88] xk6: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix
index 5bfba7bd4aa4..82ffbfb45c63 100644
--- a/pkgs/by-name/xk/xk6/package.nix
+++ b/pkgs/by-name/xk/xk6/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "xk6";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "xk6";
     tag = "v${version}";
-    hash = "sha256-o+sN/xAGewqHo6/aoN23+FG1YrtNykc4voSg5wO74uA=";
+    hash = "sha256-+sKZjC6H8ddRvCGFmUKp3H1BrLfoawWy3YCDY7bbnc0=";
   };
 
   vendorHash = null;

From 774a012f8d51f125cf22feadd61d0b437021fd4a Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 30 Aug 2025 21:43:16 +0800
Subject: [PATCH 19/88] vidmerger: 0.3.0 -> 0.4.0

---
 pkgs/by-name/vi/vidmerger/Cargo.lock  | 2121 +++++++++++++++++++++----
 pkgs/by-name/vi/vidmerger/package.nix |   19 +-
 2 files changed, 1865 insertions(+), 275 deletions(-)

diff --git a/pkgs/by-name/vi/vidmerger/Cargo.lock b/pkgs/by-name/vi/vidmerger/Cargo.lock
index 1d9d03a4cd90..6f5284062e04 100644
--- a/pkgs/by-name/vi/vidmerger/Cargo.lock
+++ b/pkgs/by-name/vi/vidmerger/Cargo.lock
@@ -1,37 +1,88 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "anstyle"
-version = "1.0.6"
+name = "anstream"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+dependencies = [
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.60.2",
+]
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.14"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8"
+checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66"
 dependencies = [
  "anstyle",
  "bstr",
  "doc-comment",
+ "libc",
  "predicates",
  "predicates-core",
  "predicates-tree",
@@ -39,21 +90,191 @@ dependencies = [
 ]
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "async-broadcast"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
 dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi 0.3.9",
+ "event-listener 2.5.3",
+ "futures-core",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.1.0"
+name = "async-channel"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand 2.3.0",
+ "futures-lite 2.6.1",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
+dependencies = [
+ "async-lock 2.8.0",
+ "autocfg",
+ "blocking",
+ "futures-lite 1.13.0",
+]
+
+[[package]]
+name = "async-io"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+dependencies = [
+ "async-lock 2.8.0",
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-lite 1.13.0",
+ "log",
+ "parking",
+ "polling 2.8.0",
+ "rustix 0.37.28",
+ "slab",
+ "socket2",
+ "waker-fn",
+]
+
+[[package]]
+name = "async-io"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
+dependencies = [
+ "async-lock 3.4.1",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite 2.6.1",
+ "parking",
+ "polling 3.10.0",
+ "rustix 1.0.8",
+ "slab",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
+dependencies = [
+ "event-listener 2.5.3",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+dependencies = [
+ "event-listener 5.4.1",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
+dependencies = [
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
+ "async-signal",
+ "blocking",
+ "cfg-if",
+ "event-listener 3.1.0",
+ "futures-lite 1.13.0",
+ "rustix 0.38.44",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1"
+dependencies = [
+ "async-io 2.5.0",
+ "async-lock 3.4.1",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix 1.0.8",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
@@ -63,15 +284,37 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite 2.6.1",
+ "piper",
+]
 
 [[package]]
 name = "bstr"
-version = "1.9.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -79,69 +322,213 @@ dependencies = [
 ]
 
 [[package]]
-name = "cfg-if"
-version = "1.0.0"
+name = "byteorder"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "clap"
-version = "3.2.25"
+version = "4.5.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57"
 dependencies = [
- "atty",
- "bitflags 1.3.2",
+ "clap_builder",
  "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41"
+dependencies = [
+ "anstream",
+ "anstyle",
  "clap_lex",
- "indexmap",
- "once_cell",
  "strsim",
- "termcolor",
- "textwrap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.2.25"
+version = "4.5.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
+checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
 dependencies = [
  "heck",
- "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+[[package]]
+name = "colored"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
+dependencies = [
+ "lazy_static",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crossterm"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
+dependencies = [
+ "bitflags 2.9.3",
+ "crossterm_winapi",
+ "derive_more",
+ "document-features",
+ "mio",
+ "parking_lot",
+ "rustix 1.0.8",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "ctor"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec09e802f5081de6157da9a75701d6c713d8dc3ba52571fd4bd25f412644e8a6"
+dependencies = [
+ "ctor-proc-macro",
+ "dtor",
+]
+
+[[package]]
+name = "ctor-proc-macro"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2"
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
 [[package]]
-name = "clap_lex"
-version = "0.2.4"
+name = "derive_more"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
 dependencies = [
- "os_str_bytes",
+ "derive_more-impl",
 ]
 
 [[package]]
-name = "colored"
-version = "1.9.4"
+name = "derive_more-impl"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355"
-dependencies = [
- "is-terminal",
- "lazy_static",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
+ "convert_case",
+ "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -156,6 +543,37 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
@@ -163,52 +581,259 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
-name = "either"
-version = "1.10.0"
+name = "document-features"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
+dependencies = [
+ "litrs",
+]
+
+[[package]]
+name = "dtor"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8"
+dependencies = [
+ "dtor-proc-macro",
+]
+
+[[package]]
+name = "dtor-proc-macro"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "enumflags2"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "env_home"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe"
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "flate2"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+dependencies = [
+ "fastrand 1.9.0",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand 2.3.0",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.3+wasi-0.2.4",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.12.3"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
@@ -217,40 +842,81 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
-name = "home"
-version = "0.5.9"
+name = "hermit-abi"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
- "windows-sys",
+ "bytes",
+ "fnv",
+ "itoa",
 ]
 
 [[package]]
-name = "indexmap"
-version = "1.9.3"
+name = "httparse"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "indexmap"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
 dependencies = [
- "autocfg",
+ "equivalent",
  "hashbrown",
 ]
 
 [[package]]
-name = "is-terminal"
-version = "0.4.12"
+name = "instant"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "windows-sys",
+ "cfg-if",
 ]
 
 [[package]]
-name = "k9"
-version = "0.11.6"
+name = "io-lifetimes"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ddb58b0079a063218472916af599f2753ccb40942cdaba9d1f3fefccef17a9"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "k9"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "088bcebb5b68b1b14b64d7f05b0f802719250b97fdc0338ec42529ea777ed614"
 dependencies = [
  "anyhow",
  "colored",
@@ -259,43 +925,116 @@ dependencies = [
  "libc",
  "proc-macro2",
  "regex",
- "syn 1.0.109",
- "term_size",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
+ "syn 2.0.106",
+ "terminal_size",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+
+[[package]]
+name = "libredox"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
+dependencies = [
+ "bitflags 2.9.3",
+ "libc",
+]
 
 [[package]]
 name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "litrs"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed"
+
+[[package]]
+name = "lock_api"
 version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
+]
 
 [[package]]
 name = "nanoid"
@@ -307,34 +1046,147 @@ dependencies = [
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.19.0"
+name = "nix"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset 0.7.1",
+]
 
 [[package]]
-name = "os_str_bytes"
-version = "6.6.1"
+name = "once_cell"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.6",
+]
 
 [[package]]
 name = "path-slash"
-version = "0.1.5"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696"
+checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand 2.3.0",
+ "futures-io",
+]
+
+[[package]]
+name = "polling"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "concurrent-queue",
+ "libc",
+ "log",
+ "pin-project-lite",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "polling"
+version = "3.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi 0.5.2",
+ "pin-project-lite",
+ "rustix 1.0.8",
+ "windows-sys 0.60.2",
+]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "predicates"
-version = "3.1.0"
+version = "3.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
+checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
 dependencies = [
  "anstyle",
  "difflib",
@@ -343,62 +1195,54 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
 dependencies = [
  "predicates-core",
  "termtree",
 ]
 
 [[package]]
-name = "proc-macro-error"
-version = "1.0.4"
+name = "proc-macro-crate"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
+ "once_cell",
+ "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -426,14 +1270,34 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+dependencies = [
+ "bitflags 2.9.3",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom 0.2.16",
+ "libredox",
+ "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -443,9 +1307,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -454,54 +1318,243 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
-name = "rustix"
-version = "0.38.31"
+name = "ring"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
- "bitflags 2.4.2",
- "errno",
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
  "libc",
- "linux-raw-sys",
- "windows-sys",
+ "untrusted",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "serde"
-version = "1.0.197"
+name = "rustix"
+version = "0.37.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags 2.9.3",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+dependencies = [
+ "bitflags 2.9.3",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.4",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+dependencies = [
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.106",
 ]
 
 [[package]]
-name = "stdext"
-version = "0.2.1"
+name = "serde_repr"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a61b4ae487cb43d0479907e74d36f8813e9940bd3b1adcbecc69fe8a0cee3ec"
+checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
+dependencies = [
+ "libc",
+ "mio",
+ "signal-hook",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "stdext"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4af28eeb7c18ac2dbdb255d40bee63f203120e1db6b0024b177746ebec7049c1"
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
@@ -516,9 +1569,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.53"
+version = "2.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -527,124 +1580,284 @@ dependencies = [
 
 [[package]]
 name = "system_shutdown"
-version = "3.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "035e081d603551d8d78db27d2232913269c749ea67648c369100049820406a14"
+checksum = "7567f71160af5e9abfb4f5a21532cf2174cefe91ac5c336419295685a695cc66"
 dependencies = [
- "winapi 0.3.9",
+ "windows",
+ "zbus",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
+dependencies = [
+ "fastrand 2.3.0",
+ "getrandom 0.3.3",
+ "once_cell",
+ "rustix 1.0.8",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "term"
-version = "0.4.6"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
 dependencies = [
- "kernel32-sys",
- "winapi 0.2.8",
+ "dirs-next",
+ "rustversion",
+ "winapi",
 ]
 
 [[package]]
 name = "term-painter"
-version = "0.2.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcaa948f0e3e38470cd8dc8dcfe561a75c9e43f28075bb183845be2b9b3c08cf"
+checksum = "5c63b9849d4c0a39cc60371c15c4bfc81001a73c27503a03932b9e8fb2fc5274"
 dependencies = [
  "term",
 ]
 
 [[package]]
-name = "term_size"
-version = "0.3.2"
+name = "terminal_size"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
+checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
 dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
+ "rustix 0.37.28",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "termtree"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
 
 [[package]]
-name = "textwrap"
-version = "0.16.1"
+name = "thiserror"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "typenum"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+
+[[package]]
+name = "uds_windows"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+dependencies = [
+ "memoffset 0.9.1",
+ "tempfile",
+ "winapi",
+]
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00432f493971db5d8e47a65aeb3b02f8226b9b11f1450ff86bb772776ebadd70"
+dependencies = [
+ "base64",
+ "flate2",
+ "log",
+ "percent-encoding",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "ureq-proto",
+ "utf-8",
+ "webpki-roots",
+]
+
+[[package]]
+name = "ureq-proto"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe120bb823a0061680e66e9075942fcdba06d46551548c2c259766b9558bc9a"
+dependencies = [
+ "base64",
+ "http",
+ "httparse",
+ "log",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vidmerger"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "assert_cmd",
  "clap",
+ "crossterm",
  "ctor",
  "k9",
+ "lazy_static",
  "nanoid",
  "path-slash",
  "regex",
  "stdext",
  "system_shutdown",
  "term-painter",
+ "ureq",
  "which",
 ]
 
 [[package]]
 name = "wait-timeout"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
 dependencies = [
  "libc",
 ]
 
 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "waker-fn"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
-name = "which"
-version = "4.4.2"
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasi"
+version = "0.14.3+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
 dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
+ "wit-bindgen",
 ]
 
 [[package]]
-name = "winapi"
-version = "0.2.8"
+name = "webpki-roots"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "which"
+version = "7.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762"
+dependencies = [
+ "either",
+ "env_home",
+ "rustix 1.0.8",
+ "winsafe",
+]
 
 [[package]]
 name = "winapi"
@@ -656,95 +1869,469 @@ dependencies = [
  "winapi-x86_64-pc-windows-gnu",
 ]
 
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
-[[package]]
-name = "winapi-util"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winsafe"
+version = "0.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
+
+[[package]]
+name = "wit-bindgen"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
+
+[[package]]
+name = "xdg-home"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "zbus"
+version = "3.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "byteorder",
+ "derivative",
+ "enumflags2",
+ "event-listener 2.5.3",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix",
+ "once_cell",
+ "ordered-stream",
+ "rand",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "winapi",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "3.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 1.0.109",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zvariant"
+version = "3.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db"
+dependencies = [
+ "byteorder",
+ "enumflags2",
+ "libc",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "3.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
diff --git a/pkgs/by-name/vi/vidmerger/package.nix b/pkgs/by-name/vi/vidmerger/package.nix
index 28f5fdff031a..e35f35496dd4 100644
--- a/pkgs/by-name/vi/vidmerger/package.nix
+++ b/pkgs/by-name/vi/vidmerger/package.nix
@@ -3,22 +3,21 @@
   ffmpeg,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vidmerger";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "TGotwig";
     repo = "vidmerger";
-    rev = version;
-    hash = "sha256-E3Y1UaYXl6NdCMM7IepqFzWNuHaMGLCN5BvQ/lxjFoc=";
+    tag = finalAttrs.version;
+    hash = "sha256-N/iX0EN5R4oG4XHhpd/VaihrEHv5uT+grAJ6/KfSORE=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
+  cargoLock.lockFile = ./Cargo.lock;
 
   postPatch = ''
     cp ${./Cargo.lock} Cargo.lock
@@ -31,6 +30,10 @@ rustPlatform.buildRustPackage rec {
     ffmpeg
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--generate-lockfile" ];
+  };
+
   meta = with lib; {
     description = "Merge video & audio files via CLI";
     homepage = "https://github.com/TGotwig/vidmerger";
@@ -41,4 +44,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [ ByteSudoer ];
     mainProgram = "vidmerger";
   };
-}
+})

From 423d5437d65e77194b38175863ac4a9505b068fa Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 30 Aug 2025 21:43:50 +0800
Subject: [PATCH 20/88] vidmerger: remove with lib

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

diff --git a/pkgs/by-name/vi/vidmerger/package.nix b/pkgs/by-name/vi/vidmerger/package.nix
index e35f35496dd4..f4a7a2eef032 100644
--- a/pkgs/by-name/vi/vidmerger/package.nix
+++ b/pkgs/by-name/vi/vidmerger/package.nix
@@ -34,14 +34,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     extraArgs = [ "--generate-lockfile" ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Merge video & audio files via CLI";
     homepage = "https://github.com/TGotwig/vidmerger";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       commons-clause
     ];
-    maintainers = with maintainers; [ ByteSudoer ];
+    maintainers = with lib.maintainers; [ ByteSudoer ];
     mainProgram = "vidmerger";
   };
 })

From 12be28bc4ce6deea7314649b5c3f9145cf8dba63 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 31 Aug 2025 00:06:24 +0800
Subject: [PATCH 21/88] usbsdmux: 24.1.1 -> 25.8

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

diff --git a/pkgs/by-name/us/usbsdmux/package.nix b/pkgs/by-name/us/usbsdmux/package.nix
index 26945b0c8e98..cbc72f5b100c 100644
--- a/pkgs/by-name/us/usbsdmux/package.nix
+++ b/pkgs/by-name/us/usbsdmux/package.nix
@@ -7,12 +7,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "usbsdmux";
-  version = "24.1.1";
+  version = "25.8";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OtGgToDGUr6pBu9+LS/DxaYw/9+Pd6jPhxVDAM22HB4=";
+    hash = "sha256-/hDDEUvpdpUpg3ZVw8NWcDOLOtLu087Ki7FmGrDh9Gg=";
   };
 
   # Remove the wrong GROUP=plugdev.
@@ -22,7 +22,10 @@ python3Packages.buildPythonApplication rec {
       --replace-fail 'TAG+="uaccess", GROUP="plugdev"' 'TAG+="uaccess"'
   '';
 
-  build-system = with python3Packages; [ setuptools ];
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
 
   nativeBuildInputs = [
     udevCheckHook

From ac3e9c990e7df67cbe271a7fe4b0468f64c86c91 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 31 Aug 2025 00:06:49 +0800
Subject: [PATCH 22/88] usbsdmux: remove with lib

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

diff --git a/pkgs/by-name/us/usbsdmux/package.nix b/pkgs/by-name/us/usbsdmux/package.nix
index cbc72f5b100c..111ca3bf23a3 100644
--- a/pkgs/by-name/us/usbsdmux/package.nix
+++ b/pkgs/by-name/us/usbsdmux/package.nix
@@ -39,11 +39,11 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "usbsdmux" ];
 
-  meta = with lib; {
+  meta = {
     description = "Control software for the LXA USB-SD-Mux";
     homepage = "https://github.com/linux-automation/usbsdmux";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ emantor ];
-    platforms = with platforms; linux;
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ emantor ];
+    platforms = with lib.platforms; linux;
   };
 }

From a7eea2d9d7c2020957019bf2d09fd92b82132996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dav=C3=AD=C3=B0=20Steinn=20Geirsson?= <david@dsg.is>
Date: Sat, 30 Aug 2025 01:19:17 +0000
Subject: [PATCH 23/88] ceph: Use full path to mount(8) when remounting FUSE fs

Before, using ceph-fuse in a systemd unit, it failed to remount and exited.
```
ceph-fuse[74399]:   -257> 2025-08-30T01:19:31.420+0000 7f0fce7f46c0 -1 client.740614836 failed to remount (to trim kernel dentries): return code = 127
ceph-fuse[74399]:   -256> 2025-08-30T01:19:31.420+0000 7f0fce7f46c0 -1 client.740614836 failed to remount for kernel dentry trimming; quitting!
```
---
 pkgs/tools/filesystems/ceph/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 944a97bff76e..11e7fff175a6 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -498,6 +498,11 @@ rec {
         --replace "/sbin/modprobe" "${kmod}/bin/modprobe" \
         --replace "/bin/grep" "${gnugrep}/bin/grep"
 
+      # Patch remount to use full path to mount(8), otherwise ceph-fuse fails when run
+      # from a systemd unit for example.
+      substituteInPlace src/client/fuse_ll.cc \
+        --replace-fail "mount -i -o remount" "${util-linux}/bin/mount -i -o remount"
+
       # The install target needs to be in PYTHONPATH for "*.pth support" check to succeed
       export PYTHONPATH=$PYTHONPATH:$lib/${sitePackages}:$out/${sitePackages}
       patchShebangs src/

From 0aef16b9d1bb4b63c36363914dbdc798cce840de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 02:46:41 +0000
Subject: [PATCH 24/88] mcdreforged: 2.14.7 -> 2.15.1

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

diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix
index eb98ab120e13..5b737f4d2dec 100644
--- a/pkgs/development/python-modules/mcdreforged/default.nix
+++ b/pkgs/development/python-modules/mcdreforged/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "mcdreforged";
-  version = "2.14.7";
+  version = "2.15.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MCDReforged";
     repo = "MCDReforged";
     tag = "v${version}";
-    hash = "sha256-KwXvjLS9tg3EZT9vYFfiOIjPGswcOwdl66ErKPKS2rA=";
+    hash = "sha256-ksNSmy1VEZvP0MmJYB50aKexm35OmeLQchGdoMvxZZ0=";
   };
 
   build-system = [ setuptools ];

From e37fb4306b0665f29ef860b1c4bbbbf4db34cfb3 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 31 Aug 2025 14:10:33 +0800
Subject: [PATCH 25/88] upcloud-cli: 3.21.0 -> 3.22.0

Changelog: https://github.com/UpCloudLtd/upcloud-cli/blob/refs/tags/v3.22.0/CHANGELOG.md
---
 pkgs/by-name/up/upcloud-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix
index c0e8a0c90e1d..a5e4b7173a08 100644
--- a/pkgs/by-name/up/upcloud-cli/package.nix
+++ b/pkgs/by-name/up/upcloud-cli/package.nix
@@ -1,24 +1,24 @@
 {
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
   nix-update-script,
   versionCheckHook,
   dbus,
 }:
 
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "upcloud-cli";
-  version = "3.21.0";
+  version = "3.22.0";
 
   src = fetchFromGitHub {
     owner = "UpCloudLtd";
     repo = "upcloud-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GN/GIqppSXDexe2KRH1RoVpm8HUkvsnul3H+q4OcjOA=";
+    hash = "sha256-37e5eJdKqUMlipcViFC4bTtZSlL3PgjjPiTO3PJWpTw=";
   };
 
-  vendorHash = "sha256-Z2Eumhsn/YmHopgpKBFGs4HmDdUl/cr+R6bRaeCFQtE=";
+  vendorHash = "sha256-F1QUH0+FMmpt05G50PfDryfzbBHvDLCMQMb8qAo6BR4=";
 
   ldflags = [
     "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${finalAttrs.version}"

From e9951f3277592ea70ea21352b5a6dd65a43335e1 Mon Sep 17 00:00:00 2001
From: Joel Pepper <pepper@bronze-deer.de>
Date: Sun, 31 Aug 2025 11:28:05 +0200
Subject: [PATCH 26/88] cobra-cli: install shell completions for bash, zsh, and
 fish

---
 pkgs/by-name/co/cobra-cli/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cobra-cli/package.nix b/pkgs/by-name/co/cobra-cli/package.nix
index 11b8b80e98c1..4d9c064288a9 100644
--- a/pkgs/by-name/co/cobra-cli/package.nix
+++ b/pkgs/by-name/co/cobra-cli/package.nix
@@ -3,6 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   makeWrapper,
+  installShellFiles,
   go,
 }:
 
@@ -19,7 +20,10 @@ buildGoModule rec {
 
   vendorHash = "sha256-vrtGPQzY+NImOGaSxV+Dvch+GNPfL9XfY4lfCHTGXwY=";
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    installShellFiles
+  ];
 
   allowGoReference = true;
 
@@ -35,6 +39,13 @@ buildGoModule rec {
       --prefix PATH : ${go}/bin
   '';
 
+  postInstall = ''
+    installShellCompletion --cmd cobra-cli \
+      --bash <($out/bin/cobra-cli completion bash) \
+      --fish <($out/bin/cobra-cli completion fish) \
+      --zsh <($out/bin/cobra-cli completion zsh) \
+  '';
+
   meta = {
     description = "Cobra CLI tool to generate applications and commands";
     mainProgram = "cobra-cli";

From 0960d502488e1f988a5641e455ce5390fae4cba7 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 31 Aug 2025 21:30:19 +0200
Subject: [PATCH 27/88] exiv2: 0.28.5 -> 0.28.7

---
 pkgs/by-name/ex/exiv2/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ex/exiv2/package.nix b/pkgs/by-name/ex/exiv2/package.nix
index 25275b39fc6d..28dbc735de95 100644
--- a/pkgs/by-name/ex/exiv2/package.nix
+++ b/pkgs/by-name/ex/exiv2/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation rec {
   pname = "exiv2";
-  version = "0.28.5";
+  version = "0.28.7";
 
   outputs = [
     "out"
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exiv2";
     repo = "exiv2";
-    rev = "v${version}";
-    hash = "sha256-+Fe0+wkWWtM3MNgY6qp34/kC8jkOjOLusnd9WquYpA8=";
+    tag = "v${version}";
+    hash = "sha256-a7nPjDjTcwsQeypARvy2rRsv9jpasSSxSyCTLWNDDtA=";
   };
 
   nativeBuildInputs = [
@@ -79,6 +79,10 @@ stdenv.mkDerivation rec {
   preCheck = ''
     patchShebangs ../test/
     mkdir ../test/tmp
+
+    # template.exv_test (test_regression_allfiles.TestAllFiles.template.exv_test) ... ERROR
+    substituteInPlace ../tests/regression_tests/test_regression_allfiles.py \
+      --replace-fail '"issue_2403_poc.exv",' '"issue_2403_poc.exv", "template.exv",'
   ''
   + lib.optionalString stdenv.hostPlatform.isAarch32 ''
     # Fix tests on arm
@@ -90,8 +94,8 @@ stdenv.mkDerivation rec {
     export LC_ALL=C
 
     # disable tests that requires loopback networking
-    substituteInPlace  ../tests/bash_tests/testcases.py \
-      --replace "def io_test(self):" "def io_disabled(self):"
+    substituteInPlace ../tests/bash_tests/testcases.py \
+      --replace-fail "def io_test(self):" "def io_disabled(self):"
   '';
 
   preFixup = ''

From 6c1a925cc23abb136f7855d23e8611e7dfd1835f Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 30 Aug 2025 10:57:45 -0700
Subject: [PATCH 28/88] rocmPackages.rocm-core: fix find_package(rocm-core)

---
 .../rocm-modules/6/rocm-core/default.nix      | 51 +++++++++++++++++--
 .../6/rocm-core/env-rocm-path.patch           | 22 ++++++++
 2 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/rocm-modules/6/rocm-core/env-rocm-path.patch

diff --git a/pkgs/development/rocm-modules/6/rocm-core/default.nix b/pkgs/development/rocm-modules/6/rocm-core/default.nix
index 55316f4c65d5..08bf9e53fe34 100644
--- a/pkgs/development/rocm-modules/6/rocm-core/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-core/default.nix
@@ -7,6 +7,14 @@
   writeText,
 }:
 
+# rocm-core is used by most distros for a few purposes:
+# - meta package that all rocm packages depend so `apt-get remove rocm-core` removes all rocm packages
+# - provide overall ROCM_PATH
+# - provide rocm version info and path to rocm version headers
+# only the last usage makes sense in nixpkgs
+let
+  padIfSingle = s: if lib.stringLength s == 1 then "0${s}" else s;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-core";
   version = "6.3.3";
@@ -18,23 +26,56 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-UDnPGvgwzwv49CzF+Kt0v95CsxS33BZeqNcKw1K6jRI=";
   };
 
+  patches = [
+    ./env-rocm-path.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
-  # FIXME: What's the correct way to set this?
-  env.ROCM_LIBPATCH_VERSION = "${lib.versions.major finalAttrs.version}0${lib.versions.minor finalAttrs.version}0${lib.versions.patch finalAttrs.version}";
-  env.BUILD_ID = "nixos-${finalAttrs.env.ROCM_LIBPATCH_VERSION}";
-  env.ROCM_BUILD_ID = "release-${finalAttrs.env.BUILD_ID}";
+  env = {
+    ROCM_LIBPATCH_VERSION = "${lib.versions.major finalAttrs.version}${padIfSingle (lib.versions.minor finalAttrs.version)}${padIfSingle (lib.versions.patch finalAttrs.version)}";
+    BUILD_ID = "nixpkgs-${finalAttrs.env.ROCM_LIBPATCH_VERSION}";
+    ROCM_BUILD_ID = "${finalAttrs.env.BUILD_ID}";
+  };
   cmakeFlags = [
     "-DROCM_LIBPATCH_VERSION=${finalAttrs.env.ROCM_LIBPATCH_VERSION}"
     "-DROCM_VERSION=${finalAttrs.version}"
     "-DBUILD_ID=${finalAttrs.env.BUILD_ID}"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_BINDIR=bin"
   ];
 
   setupHook = writeText "setupHook.sh" ''
+    export ROCM_VERSION="${finalAttrs.version}"
     export ROCM_LIBPATCH_VERSION="${finalAttrs.env.ROCM_LIBPATCH_VERSION}"
-    export BUILD_ID="${finalAttrs.env.BUILD_ID}"
     export ROCM_BUILD_ID="${finalAttrs.env.ROCM_BUILD_ID}"
   '';
 
+  doInstallCheck = true;
+  preInstallCheck =
+    # Test that the CMake config file can be included and sets expected vars
+    ''
+      mkdir test_project
+      cd test_project
+
+      echo '
+        cmake_minimum_required(VERSION 3.16)
+        project(test_rocm_core)
+        find_package(rocm-core REQUIRED)
+        if(NOT DEFINED ROCM_CORE_INCLUDE_DIR)
+          message(FATAL_ERROR "ROCM_CORE_INCLUDE_DIR not set")
+        endif()
+        message(STATUS "Found ROCM_CORE_INCLUDE_DIR: ''${ROCM_CORE_INCLUDE_DIR}")
+        message(STATUS "Found ROCM_PATH: ''${ROCM_PATH}")
+      ' > CMakeLists.txt
+
+      CMAKE_PREFIX_PATH="$out" cmake .
+      cd ..
+
+      . $out/nix-support/setup-hook
+      env | grep '^ROCM'
+    '';
+
   passthru.ROCM_LIBPATCH_VERSION = finalAttrs.env.ROCM_LIBPATCH_VERSION;
   passthru.updateScript = rocmUpdateScript {
     name = finalAttrs.pname;
diff --git a/pkgs/development/rocm-modules/6/rocm-core/env-rocm-path.patch b/pkgs/development/rocm-modules/6/rocm-core/env-rocm-path.patch
new file mode 100644
index 000000000000..a40fa33b90ce
--- /dev/null
+++ b/pkgs/development/rocm-modules/6/rocm-core/env-rocm-path.patch
@@ -0,0 +1,22 @@
+In FHS distros rocm-core expects to be installed colocated with a full set of ROCM packages.
+In nixpkgs contexts, we don't want rocm-core to be a ROCM_PATH root.
+diff --git a/cmake_modules/rocm-core-config.cmake.in b/cmake_modules/rocm-core-config.cmake.in
+index f5fe07c..9d72c9c 100644
+--- a/cmake_modules/rocm-core-config.cmake.in
++++ b/cmake_modules/rocm-core-config.cmake.in
+@@ -11,7 +11,14 @@ set_and_check(rocm_core_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+ set_and_check(ROCM_CORE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+ set_and_check(rocm_core_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+ set_and_check(ROCM_CORE_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+-set_and_check(ROCM_PATH "${PACKAGE_PREFIX_DIR}")
++# Set ROCM_PATH with priority: existing value > environment variable > package prefix
++if(NOT DEFINED ROCM_PATH)
++    if(DEFINED ENV{ROCM_PATH})
++        set(ROCM_PATH "$ENV{ROCM_PATH}")
++    else()
++        set_and_check(ROCM_PATH "${PACKAGE_PREFIX_DIR}")
++    endif()
++endif()
+ 
+ get_filename_component(ROCM_CORE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+ include("${ROCM_CORE_CMAKE_DIR}/rocmCoreTargets.cmake")

From 0b5fbe5382757758f75241371316ebdfb02b0d62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 02:46:58 +0000
Subject: [PATCH 29/88] zsh-forgit: 25.08.0 -> 25.09.0

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

diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix
index bef7658244c7..a08191d79ab4 100644
--- a/pkgs/by-name/zs/zsh-forgit/package.nix
+++ b/pkgs/by-name/zs/zsh-forgit/package.nix
@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zsh-forgit";
-  version = "25.08.0";
+  version = "25.09.0";
 
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
     tag = finalAttrs.version;
-    hash = "sha256-45NeIRSTNiCqctdwBaS/qOeOI/8f4L+KVI/I6grYm+0=";
+    hash = "sha256-hbPiuuiyPOCtnByInhoA0atVDwNaMRfzp1n9dusg59I=";
   };
 
   strictDeps = true;

From d9e9a62fcbf94a5984e3a5df66705dc47397cd6d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 1 Sep 2025 17:45:48 +0200
Subject: [PATCH 30/88] fmsynth: drop

- no non-treewide changes to the nix package expression since 2019
- source pinned to an unstable version from 2015
- broken for a while on hydra
- no dependent packages
---
 pkgs/by-name/fm/fmsynth/package.nix | 61 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 pkgs/by-name/fm/fmsynth/package.nix

diff --git a/pkgs/by-name/fm/fmsynth/package.nix b/pkgs/by-name/fm/fmsynth/package.nix
deleted file mode 100644
index 982504c84410..000000000000
--- a/pkgs/by-name/fm/fmsynth/package.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  gtkmm2,
-  lv2,
-  lvtk,
-  pkg-config,
-}:
-stdenv.mkDerivation {
-  pname = "fmsynth-unstable";
-  version = "2015-02-07";
-  src = fetchFromGitHub {
-    owner = "Themaister";
-    repo = "libfmsynth";
-    rev = "9ffa1d2fea287f1209b210d2dbde2f0f60f37176";
-    sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    gtkmm2
-    lv2
-    lvtk
-  ];
-
-  buildPhase = ''
-    cd lv2
-    substituteInPlace GNUmakefile --replace "/usr/lib/lv2" "$out/lib/lv2"
-    make  SIMD=0
-  '';
-
-  preInstall = "mkdir -p $out/lib/lv2";
-
-  meta = {
-    description = "Flexible 8 operator FM synthesizer for LV2";
-    longDescription = ''
-      The synth core supports:
-
-      - Arbitrary amounts of polyphony
-      - 8 operators
-      - No fixed "algorithms"
-      - Arbitrary modulation, every operator can modulate any other operator, even itself
-      - Arbitrary carrier selection, every operator can be a carrier
-      - Sine LFO, separate LFO per voice, modulates amplitude and frequency of operators
-      - Envelope per operator
-      - Carrier stereo panning
-      - Velocity sensitivity per operator
-      - Mod wheel sensitivity per operator
-      - Pitch bend
-      - Keyboard scaling
-      - Sustain, sustained keys can overlap each other for a very rich sound
-      - Full floating point implementation optimized for SIMD
-      - Hard real-time constraints
-    '';
-    homepage = "https://github.com/Themaister/libfmsynth";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.magnetophon ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7155fddfd0d3..537566641900 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -913,6 +913,7 @@ mapAliases {
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
   fluxctl = throw "fluxctl is unmaintained and has been removed. Migration to flux2 is recommended"; # Added 2025-05-11
   fluxus = throw "fluxus has been removed because it hasn't been updated in 9 years and depended on insecure Racket 7.9"; # Added 2024-12-06
+  fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
   fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12
   fntsample = throw "fntsample has been removed as it is unmaintained upstream"; # Added 2025-04-21
   foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17

From 61e2c0c58048eed235af00a2d91976ecc5ea8a52 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 31 Aug 2025 19:09:44 -0700
Subject: [PATCH 31/88] python312Packages.torchWithRocm: remove
 find_package(rocm-core) workaround

---
 pkgs/development/python-modules/torch/source/default.nix | 7 -------
 pkgs/development/rocm-modules/6/rocm-core/default.nix    | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 6dc35b8e6165..b3dd739cf36c 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -369,13 +369,6 @@ buildPythonPackage rec {
     substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \
       --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}"
 
-    # Workaround cmake error //include does not exist! in rocm-core-config.cmake
-    # Removing the call falls back to hip_version. Can likely be removed after ROCm 6.4 bump
-    substituteInPlace cmake/public/LoadHIP.cmake \
-      --replace-fail \
-        "find_package(rocm-core CONFIG)" \
-        ""
-
     # Use composable kernel as dependency, rather than built-in third-party
     substituteInPlace aten/src/ATen/CMakeLists.txt \
       --replace-fail "list(APPEND ATen_HIP_INCLUDE \''${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/include)" "" \
diff --git a/pkgs/development/rocm-modules/6/rocm-core/default.nix b/pkgs/development/rocm-modules/6/rocm-core/default.nix
index 08bf9e53fe34..8f5100ec0000 100644
--- a/pkgs/development/rocm-modules/6/rocm-core/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-core/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Test that the CMake config file can be included and sets expected vars
     ''
       mkdir test_project
-      cd test_project
+      pushd test_project
 
       echo '
         cmake_minimum_required(VERSION 3.16)
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
       ' > CMakeLists.txt
 
       CMAKE_PREFIX_PATH="$out" cmake .
-      cd ..
+      popd
 
       . $out/nix-support/setup-hook
       env | grep '^ROCM'

From 5f7573d2f71c067bea8333550b8a7fd986be09f8 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 1 Sep 2025 17:35:24 -0400
Subject: [PATCH 32/88] python3Packages.bjoern: drop

This package depends on a 14-year-old version of http-parser, which has
numerous security issues. The upstream also hasn't been updated in
several years, so this is a security issue to keep around.
---
 doc/release-notes/rl-2511.section.md          |  2 +
 .../python-modules/bjoern/default.nix         | 39 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/development/python-modules/bjoern/default.nix

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index a62e6bc0c001..1da869e852c2 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -26,6 +26,8 @@
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 
+- `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities.
+
 - `buildGoModule` now warns if `<pkg>.passthru.overrideModAttrs` is lost during the overriding of its result packages.
 
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
deleted file mode 100644
index f6fb503578e9..000000000000
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  libev,
-  python,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "bjoern";
-  version = "3.2.2";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "jonashaag";
-    repo = "bjoern";
-    tag = version;
-    hash = "sha256-drFLM6GsgrM8atQDxmb3/1bpj+C1WetQLjNbZqCTzog=";
-    fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules
-  };
-
-  build-system = [ setuptools ];
-
-  buildInputs = [ libev ];
-
-  checkPhase = ''
-    ${python.interpreter} tests/keep-alive-behaviour.py 2>/dev/null
-    ${python.interpreter} tests/test_wsgi_compliance.py
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/jonashaag/bjoern";
-    description = "Screamingly fast Python 2/3 WSGI server written in C";
-    changelog = "https://github.com/jonashaag/bjoern/blob/${src.tag}/CHANGELOG";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ cmcdragonkai ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 074304ed4eaf..19389172d76b 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -109,6 +109,7 @@ mapAliases ({
   bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
   bip_utils = bip-utils; # 2023-10-08
   bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
+  bjoern = throw "'bjoern' has been removed, as the upstream repository was unmaintained and it was using libraries with severe security issues."; # Added 2025-09-01
   bkcharts = throw "'bkcharts' has been removed as the upstream repository was archived in 2018"; # added 2025-08-26
   blessings = throw "blessings has been removed in favor of blessed, as it was unmaintained"; # added 2024-08-20
   BlinkStick = blinkstick; # added 2023-02-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ed489ffb2e3..1b8777d8f81d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1933,8 +1933,6 @@ self: super: with self; {
 
   bizkaibus = callPackage ../development/python-modules/bizkaibus { };
 
-  bjoern = callPackage ../development/python-modules/bjoern { };
-
   bk7231tools = callPackage ../development/python-modules/bk7231tools { };
 
   black = callPackage ../development/python-modules/black { };

From a9d8bca30c5ea5529ac8b5216fb5d02abb38203f Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 2 Sep 2025 06:54:00 +0800
Subject: [PATCH 33/88] python3Packages.firedrake-fiat: fix pname

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

diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix
index 10f348818690..9c3d2aa279bd 100644
--- a/pkgs/development/python-modules/firedrake-fiat/default.nix
+++ b/pkgs/development/python-modules/firedrake-fiat/default.nix
@@ -14,7 +14,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "firdrake-fiat";
+  pname = "firedrake-fiat";
   version = "2025.4.0";
   pyproject = true;
 

From 86d3c2f68f6c387799f6013135b6dfd16be965bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 00:38:40 +0000
Subject: [PATCH 34/88] constructium: 2025-03-20 -> 2025-09-01

---
 pkgs/data/fonts/open-relay/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/open-relay/default.nix b/pkgs/data/fonts/open-relay/default.nix
index 56107c8d21c6..a339f05e5796 100644
--- a/pkgs/data/fonts/open-relay/default.nix
+++ b/pkgs/data/fonts/open-relay/default.nix
@@ -10,13 +10,13 @@ let
     { directory, meta }:
     stdenvNoCC.mkDerivation (finalAttrs: {
       pname = "open-relay-${name}";
-      version = "2025-03-20";
+      version = "2025-09-01";
 
       src = fetchFromGitHub {
         owner = "kreativekorp";
         repo = "open-relay";
         tag = finalAttrs.version;
-        hash = "sha256-OQpZHPbNL3rxXH89lwtHvm7eENl8fS0M0i8IBn4m2hI=";
+        hash = "sha256-+vG9gzbb3x7Fh3xIpUJZRpclz1qT+gyTSqmOtKJXZtw=";
       };
 
       installPhase = ''

From 51a8eef0ecd0749c165232c9eacf11b5ad158be8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 00:52:10 +0000
Subject: [PATCH 35/88] python3Packages.latex2mathml: 3.78.0 -> 3.78.1

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

diff --git a/pkgs/development/python-modules/latex2mathml/default.nix b/pkgs/development/python-modules/latex2mathml/default.nix
index 790696697541..86a2a6451b66 100644
--- a/pkgs/development/python-modules/latex2mathml/default.nix
+++ b/pkgs/development/python-modules/latex2mathml/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "latex2mathml";
-  version = "3.78.0";
+  version = "3.78.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "roniemartinez";
     repo = "latex2mathml";
     tag = version;
-    hash = "sha256-FB1VM2z9y17q+6/wv4oTrhe/rD2QzdAc0VMbFmcrIAw=";
+    hash = "sha256-VhBq6KSiomFPue9yzYhU68gH+MkHovVi8VEEFi3yUZ8=";
   };
 
   build-system = [ poetry-core ];

From 3d9c7e28e1a6cafa8c11d2bea3628da721ec166d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 06:29:49 +0000
Subject: [PATCH 36/88] alioth: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix
index e7b0ef19b27b..b5bf54c9396d 100644
--- a/pkgs/by-name/al/alioth/package.nix
+++ b/pkgs/by-name/al/alioth/package.nix
@@ -6,19 +6,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "alioth";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "alioth";
     tag = "v${version}";
-    hash = "sha256-7mQmyWOMEHg374mmYGJL8xhVWlYk1zKplpjc74wLoKw=";
+    hash = "sha256-6+Co+Du08Hr2U8vifsD5kYfgSERVkFZ2BpqE1wXEDkM=";
   };
 
   # Checks use `debug_assert_eq!`
   checkType = "debug";
 
-  cargoHash = "sha256-rAq3Ghg7zpiycQ8hNzn4Jz7cUCfwQ4aqtWxoVCg8MrE=";
+  cargoHash = "sha256-W01mqG0QlKDP/b4NbVm/ohySF3v5j38BLZEuMwkFffs=";
 
   separateDebugInfo = true;
 

From 24392f1107df9f737e76b1d661474d1f98cc893b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 11:47:16 +0000
Subject: [PATCH 37/88] tideways-cli: 1.2.10 -> 1.2.12

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

diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix
index e937f5a2fe02..438805baf9d7 100644
--- a/pkgs/by-name/ti/tideways-cli/package.nix
+++ b/pkgs/by-name/ti/tideways-cli/package.nix
@@ -11,7 +11,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-cli";
-  version = "1.2.10";
+  version = "1.2.12";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -38,19 +38,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-dUWwX+0rDQce/AklrBU4ALRSmHbBnbQQGlUtfK+Foeg=";
+        hash = "sha256-SsXVDNXaxppF9E9CGJBwdWoseV7YXbuWfsVrkB+R5To=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-a/0H64NSJZG2ixJCeCAp1SD/2l6HGCT1oECTSsgfu2E=";
+        hash = "sha256-MUUsDNN03i3+ZrKLKptex+P7SWjZ+YIUkXHkZf21Q+0=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-B5K7CvBVdSpgRfPXxYraPIZwkwW/kxlkPmaDEy1cOuE=";
+        hash = "sha256-ue0RV57rpL5KIhCEVy6/J3cwZKOEg5Kq+490ABJrxXE=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-xstTc8y03uWmN33Oi8h7zmoMm4XtY8kl3taLlaJCYmk=";
+        hash = "sha256-OEtEjo8/qFt/iQlUBho7G5uBdCqFrHWpoTXrCzyO/oo=";
       };
     };
 

From 8dd6a0eb4b2abb5db653c0bc032682202ae2c2c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 13:27:53 +0000
Subject: [PATCH 38/88] python3Packages.pytubefix: 9.4.1 -> 9.5.0

---
 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 0051f7669298..fac6e408664d 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.4.1";
+  version = "9.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JuanBindez";
     repo = "pytubefix";
     tag = "v${version}";
-    hash = "sha256-aw17XiWdr8cDIL8o4Dc91YLi3t4B8r5VAhBgZtCm3x8=";
+    hash = "sha256-3X0oSW1LdVzd9m6awUjqW+uI+0VijCjYYim0sH3wcSU=";
   };
 
   build-system = [ setuptools ];

From 1ba97a235a21de54b4d50004ae4de2e1368bff4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 13:50:28 +0000
Subject: [PATCH 39/88] python3Packages.langchain-ollama: 0.3.6 -> 0.3.7

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

diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix
index 63f58a0be5ad..b2e8e13620e2 100644
--- a/pkgs/development/python-modules/langchain-ollama/default.nix
+++ b/pkgs/development/python-modules/langchain-ollama/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-ollama";
-  version = "0.3.6";
+  version = "0.3.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-ollama==${version}";
-    hash = "sha256-GQkyJaYvwRbjDR0Rfen7/X5hFhY2+WU74B6/9Ufhpo4=";
+    hash = "sha256-BOXYyisEU/Hwf1/IymIrlK6ALL8DD3vBAXuDdb9eM9c=";
   };
 
   sourceRoot = "${src.name}/libs/partners/ollama";

From 3c38f0c547d3944b0ea7f01504e63303adf1e150 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 18:00:11 +0000
Subject: [PATCH 40/88] python3Packages.splunk-sdk: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/splunk-sdk/default.nix b/pkgs/development/python-modules/splunk-sdk/default.nix
index a85e7cb5a142..a34fdcb4299f 100644
--- a/pkgs/development/python-modules/splunk-sdk/default.nix
+++ b/pkgs/development/python-modules/splunk-sdk/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "splunk-sdk";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "splunk";
     repo = "splunk-sdk-python";
     tag = version;
-    hash = "sha256-N+QQ4DSkx7yakROhcJ2ISXPWFa7BXDeSUULNquhDPrg=";
+    hash = "sha256-+ae4/Q7Rx6K35RZuTOc/MDIgnX9hqswgZelnRvFiaRM=";
   };
 
   build-system = [ setuptools ];

From 5eae7151d8dd192540616640880f46f7373cdf05 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Tue, 2 Sep 2025 15:02:11 -0400
Subject: [PATCH 41/88] wrkflw: 0.7.1 -> 0.7.3

changelog: https://github.com/bahdotsh/wrkflw/releases/tag/v0.7.2

changelog: https://github.com/bahdotsh/wrkflw/releases/tag/v0.7.3
---
 pkgs/by-name/wr/wrkflw/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wr/wrkflw/package.nix b/pkgs/by-name/wr/wrkflw/package.nix
index 40742d26f28f..52049c242a0f 100644
--- a/pkgs/by-name/wr/wrkflw/package.nix
+++ b/pkgs/by-name/wr/wrkflw/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wrkflw";
-  version = "0.7.1";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "bahdotsh";
     repo = "wrkflw";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-r7FEyMVvsHqFylOXx9NKeI3WHGmlv5655BOhi0tlbVU=";
+    hash = "sha256-VwB8qpCNyuB28XqIUJa+ghtZ4Dx1QYDluw6+zxtePIQ=";
   };
 
-  cargoHash = "sha256-hCkUN8BcdJIIWXJhPbSrdX06nHjsx5arrgPuC+Jo8rM=";
+  cargoHash = "sha256-lZ2dcR33fzIUX8XvJMcysQWSViWD1hpm471wkpD22QA=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From f52a81e42e1cfea3d845bfea4ebcfd927f4935f9 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Tue, 2 Sep 2025 15:02:56 -0400
Subject: [PATCH 42/88] wrkflw: add tebriel as maintainer

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

diff --git a/pkgs/by-name/wr/wrkflw/package.nix b/pkgs/by-name/wr/wrkflw/package.nix
index 52049c242a0f..3ea67f6f612a 100644
--- a/pkgs/by-name/wr/wrkflw/package.nix
+++ b/pkgs/by-name/wr/wrkflw/package.nix
@@ -40,6 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       awwpotato
       FKouhai
+      tebriel
     ];
     mainProgram = "wrkflw";
   };

From 6d00ff3a5878f990bac9a58219f07fe77f3a58da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 19:39:46 +0000
Subject: [PATCH 43/88] cnspec: 11.69.1 -> 12.0.0-pre2

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

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 0d293831d966..6983b74682b5 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.69.1";
+  version = "12.0.0-pre2";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-MphCAmM49ThVYRWsw46LLqDP9OJ9tgHzDFmlBjzIjA8=";
+    hash = "sha256-BeriITIsi2/PE/UdyB3YT8vVN9vzzV7tIa+WXAe6XZY=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-pSgUt+Gv425YQrMpKZb7lncK/9hY7pxtCt/Drouea/M=";
+  vendorHash = "sha256-wzeVCOWox6hFQwbv/qpEZJZBDlulS4SPXtQEsKRumuU=";
 
   subPackages = [ "apps/cnspec" ];
 

From 20f113f1b194aa4f245bf7d595266c46d7c7b06d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 2 Sep 2025 09:18:16 +0200
Subject: [PATCH 44/88] python3Packages.crewai: init at 0.175.0

---
 pkgs/by-name/cr/crewai/package.nix            |   5 +
 .../python-modules/crewai/default.nix         | 384 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 3 files changed, 391 insertions(+)
 create mode 100644 pkgs/by-name/cr/crewai/package.nix
 create mode 100644 pkgs/development/python-modules/crewai/default.nix

diff --git a/pkgs/by-name/cr/crewai/package.nix b/pkgs/by-name/cr/crewai/package.nix
new file mode 100644
index 000000000000..bfb1422d1782
--- /dev/null
+++ b/pkgs/by-name/cr/crewai/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.crewai
diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix
new file mode 100644
index 000000000000..2ea81b677222
--- /dev/null
+++ b/pkgs/development/python-modules/crewai/default.nix
@@ -0,0 +1,384 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  appdirs,
+  blinker,
+  chromadb,
+  click,
+  instructor,
+  json-repair,
+  json5,
+  jsonref,
+  litellm,
+  onnxruntime,
+  openai,
+  opentelemetry-api,
+  opentelemetry-exporter-otlp-proto-http,
+  opentelemetry-sdk,
+  openpyxl,
+  pdfplumber,
+  portalocker,
+  pydantic,
+  pyjwt,
+  python-dotenv,
+  pyvis,
+  qdrant-client,
+  regex,
+  tokenizers,
+  tomli,
+  tomli-w,
+  uv,
+
+  # tests
+  pytestCheckHook,
+  pytest-xdist,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "crewai";
+  version = "0.175.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "crewAIInc";
+    repo = "crewAI";
+    tag = version;
+    hash = "sha256-F1hw8MTQDA6eW9Rw+MdV3hJHiTuj1SHwu2c39KirPnI=";
+  };
+
+  build-system = [ hatchling ];
+
+  pythonRelaxDeps = [
+    "chromadb"
+    "json-repair"
+    "litellm"
+    "portalocker"
+    "pyvis"
+  ];
+
+  dependencies = [
+    appdirs
+    blinker
+    chromadb
+    click
+    instructor
+    json-repair
+    json5
+    jsonref
+    litellm
+    onnxruntime
+    openai
+    opentelemetry-api
+    opentelemetry-exporter-otlp-proto-http
+    opentelemetry-sdk
+    openpyxl
+    pdfplumber
+    portalocker
+    pydantic
+    pyjwt
+    python-dotenv
+    pyvis
+    regex
+    tokenizers
+    tomli
+    tomli-w
+    uv
+  ];
+
+  pythonImportsCheck = [ "crewai" ];
+
+  disabledTestPaths = [
+    # Ignore tests that require {mem0, chromadb, telemetry, security, test_agent}
+    "tests/memory/test_external_memory.py" # require mem0ai
+    "tests/storage/test_mem0_storage.py" # require mem0ai
+    "tests/cli/test_git.py" # require git
+    "tests/memory/test_short_term_memory.py" # require require API keys
+    "tests/test_crew.py" # require require API keys
+    "tests/rag/chromadb/test_client.py" # issue with chromadb
+    "tests/telemetry/test_telemetry.py" # telemetry need network access
+  ];
+
+  disabledTests = [
+    # Tests parser
+    "test_valid_action_parsing_with_special_characters"
+
+    # Tests agent - require API keys (OpenAI, Anthropic, etc)
+    "test_agent_execution_with_tools"
+    "test_llm_call"
+    "test_agent_repeated_tool_usage"
+    "test_agent_execute_task_basic"
+    "test_agent_execution"
+    "test_ensure_first_task_allow_crewai_trigger_context_is_false_does_not_inject"
+    "test_agent_use_specific_tasks_output_as_context"
+    "test_task_allow_crewai_trigger_context"
+    "test_agent_with_only_crewai_knowledge"
+    "test_logging_tool_usage"
+    "test_agent_execute_task_with_context"
+    "test_agent_repeated_tool_usage_check_even_with_disabled_cache"
+    "test_agent_step_callback"
+    "test_handle_context_length_exceeds_limit_cli_no"
+    "test_task_without_allow_crewai_trigger_context"
+    "test_cache_hitting"
+    "test_agent_knowledege_with_crewai_knowledge"
+    "test_agent_execute_task_with_tool"
+    "test_agent_moved_on_after_max_iterations"
+    "test_agent_function_calling_llm"
+    "test_task_allow_crewai_trigger_context_no_payload"
+    "test_disabling_cache_for_agent"
+    "test_do_not_allow_crewai_trigger_context_for_first_task_hierarchical"
+    "test_tool_result_as_answer_is_the_final_answer_for_the_agent"
+    "test_agent_execute_task_with_ollama"
+    "test_agent_with_knowledge_sources"
+    "test_agent_respect_the_max_rpm_set"
+    "test_agent_execution_with_specific_tools"
+    "test_llm_call_with_ollama_llama3"
+    "test_first_task_auto_inject_trigger"
+    "test_agent_respect_the_max_rpm_set_over_crew_rpm"
+    "test_agent_powered_by_new_o_model_family_that_allows_skipping_tool"
+    "test_agent_with_knowledge_with_no_crewai_knowledge"
+    "test_tool_usage_information_is_appended_to_agent"
+    "test_agent_without_max_rpm_respects_crew_rpm"
+    "test_agent_powered_by_new_o_model_family_that_uses_tool"
+    "test_agent_error_on_parsing_tool"
+    "test_agent_custom_max_iterations"
+    "test_agent_remembers_output_format_after_using_tools_too_many_times"
+    "test_llm_call_with_all_attributes"
+    "test_agent_execute_task_with_custom_llm"
+    "test_agent_with_ollama_llama3"
+    "test_custom_llm_with_langchain"
+    "test_custom_llm_temperature_preservation"
+    "test_agent_from_repository_override_attributes"
+    "test_agent_from_repository_with_invalid_tools"
+    "test_get_knowledge_search_query"
+    "test_agent_from_repository"
+
+    # Tests lite agent - require API keys
+    "test_guardrail_is_called_using_callable"
+    "test_lite_agent_created_with_correct_parameters"
+    "test_guardrail_reached_attempt_limit"
+    "test_agent_output_when_guardrail_returns_base_model"
+    "test_lite_agent_with_tools"
+    "test_lite_agent_structured_output"
+    "test_lite_agent_returns_usage_metrics"
+    "test_guardrail_is_called_using_string"
+
+    # Tests evaluation - require API keys
+    "test_evaluate_current_iteration"
+    "test_eval_lite_agent"
+    "test_eval_specific_agents_from_crew"
+    "test_failed_evaluation"
+
+    # Tests knowledge - missing optional dependencies (docling, embedchain, pandas)
+    "test_docling_source"
+    "test_multiple_docling_sources"
+    "test_excel_knowledge_source"
+
+    # Test telemetry
+    "test_telemetry_fails_due_connect_timeout"
+
+    # Tests crew
+    "test_task_tools_override_agent_tools"
+    "test_crew_output_file_end_to_end"
+    "test_conditional_task_last_task_when_conditional_is_true"
+    "test_crew_with_failing_task_guardrails"
+    "test_kickoff_for_each_single_input"
+    "test_hierarchical_verbose_manager_agent"
+    "test_crew_function_calling_llm"
+    "test_replay_interpolates_inputs_properly"
+    "test_manager_agent_delegating_to_all_agents"
+    "test_crew_does_not_interpolate_without_inputs"
+    "test_crew_creation"
+    "test_delegation_is_not_enabled_if_there_are_only_one_agent"
+    "test_tools_with_custom_caching"
+    "test_api_calls_throttling"
+    "test_multimodal_agent_describing_image_successfully"
+    "test_warning_long_term_memory_without_entity_memory"
+    "test_replay_with_context"
+    "test_crew_verbose_output"
+    "test_before_kickoff_callback"
+    "test_hierarchical_verbose_false_manager_agent"
+    "test_task_with_no_arguments"
+    "test_replay_setup_context"
+    "test_kickoff_for_each_multiple_inputs"
+    "test_conditional_task_last_task_when_conditional_is_false"
+    "test_crew_with_delegating_agents"
+    "test_agents_do_not_get_delegation_tools_with_there_is_only_one_agent"
+    "test_multimodal_agent_live_image_analysis"
+    "test_hierarchical_process"
+    "test_crew_kickoff_usage_metrics"
+    "test_disabled_memory_using_contextual_memory"
+    "test_ensure_exchanged_messages_are_propagated_to_external_memory"
+    "test_agent_usage_metrics_are_captured_for_hierarchical_process"
+    "test_crew_log_file_output"
+    "test_before_kickoff_without_inputs"
+    "test_cache_hitting_between_agents"
+    "test_crew_kickoff_streaming_usage_metrics"
+    "test_async_crews_thread_safety"
+    "test_valid_action_parsing_with_unbalanced_quotes"
+    "test_valid_action_parsing_with_angle_brackets"
+    "test_valid_action_parsing_with_mixed_quotes"
+    "test_valid_action_parsing_with_parentheses"
+    "test_parsing_with_whitespace"
+    "test_valid_action_parsing_special_characters"
+    "test_parsing_with_special_characters"
+    "test_valid_action_parsing_with_newlines"
+    "test_valid_action_parsing_with_nested_quotes"
+    "test_valid_action_parsing_with_quotes"
+    "test_valid_action_parsing_with_escaped_characters"
+    "test_create_crew"
+
+    # Tests LLM - require API keys
+    "test_llm_callback_replacement"
+    "test_gemini_models"
+    "test_llm_call_with_message_list"
+    "test_gpt_4_1"
+    "test_o3_mini_reasoning_effort_low"
+    "test_handle_streaming_tool_calls"
+    "test_llm_call_with_string_input"
+    "test_llm_call_with_tool_and_string_input"
+    "test_llm_call_with_string_input_and_callbacks"
+    "test_llm_call_when_stop_is_unsupported"
+    "test_handle_streaming_tool_calls_with_error"
+    "test_o3_mini_reasoning_effort_medium"
+    "test_llm_call_with_tool_and_message_list"
+    "test_gemma3"
+    "test_llm_call_when_stop_is_unsupported_when_additional_drop_params_is_provided"
+    "test_o3_mini_reasoning_effort_high"
+    "test_handle_streaming_tool_calls_no_available_functions"
+    "test_handle_streaming_tool_calls_no_tools"
+
+    # Test main - require git
+    "test_publish_when_not_in_sync"
+
+    # Tests project - require embedchain and API keys
+    "test_before_kickoff_modification"
+    "test_before_kickoff_with_none_input"
+    "test_multiple_before_after_kickoff"
+    "test_after_kickoff_modification"
+    "test_internal_crew_with_mcp"
+
+    # Tests task - require API keys
+    "test_output_json_hierarchical"
+    "test_output_pydantic_sequential"
+    "test_no_inject_date"
+    "test_increment_tool_errors"
+    "test_task_execution_times"
+    "test_custom_converter_cls"
+    "test_save_task_output"
+    "test_inject_date"
+    "test_output_pydantic_hierarchical"
+    "test_json_property_without_output_json"
+    "test_task_interpolation_with_hyphens"
+    "test_increment_delegations_for_hierarchical_process"
+    "test_save_task_json_output"
+    "test_output_pydantic_to_another_task"
+    "test_output_json_dict_sequential"
+    "test_inject_date_custom_format"
+    "test_output_json_sequential"
+    "test_output_json_to_another_task"
+    "test_increment_delegations_for_sequential_process"
+    "test_save_task_pydantic_output"
+    "test_output_json_dict_hierarchical"
+    "test_task_with_max_execution_time"
+    "test_task_with_max_execution_time_exceeded"
+
+    # Tests task guardrails
+    "test_task_guardrail_process_output"
+    "test_guardrail_when_an_error_occurs"
+    "test_guardrail_emits_events"
+
+    # Tests tools
+    "test_delegate_work"
+    "test_delegate_work_with_wrong_co_worker_variable"
+    "test_ask_question_with_wrong_co_worker_variable"
+    "test_ask_question"
+    "test_delegate_work_withwith_coworker_as_array"
+    "test_ask_question_with_coworker_as_array"
+    "test_max_usage_count_is_respected"
+    "test_async_tool_using_within_isolated_crew"
+    "test_async_tool_using_decorator_within_flow"
+    "test_async_tool_using_decorator_within_isolated_crew"
+    "test_async_tool_within_flow"
+    "test_ainvoke"
+
+    # Tests tracing
+    "test_trace_listener_disabled_when_env_false"
+    "test_trace_listener_with_authenticated_user"
+    "test_trace_listener_collects_crew_events"
+    "test_trace_listener_ephemeral_batch"
+    "test_events_collection_batch_manager"
+
+    # Tests utilities
+    "test_converter_with_llama3_2_model"
+    "test_converter_with_llama3_1_model"
+    "test_converter_with_nested_model"
+    "test_convert_with_instructions"
+    "test_crew_emits_start_kickoff_event"
+    "test_crew_emits_test_kickoff_type_event"
+    "test_crew_emits_start_task_event"
+    "test_llm_emits_call_started_event"
+    "test_register_handler_adds_new_handler"
+    "test_multiple_handlers_for_same_event"
+    "test_llm_emits_event_with_lite_agent"
+    "test_tools_emits_finished_events"
+    "test_agent_emits_execution_started_and_completed_events"
+    "test_crew_emits_end_kickoff_event"
+    "test_llm_emits_stream_chunk_events"
+    "test_tools_emits_error_events"
+    "test_crew_emits_end_task_event"
+    "test_stream_llm_emits_event_with_task_and_agent_info"
+    "test_llm_no_stream_chunks_when_streaming_disabled"
+    "test_llm_emits_event_with_task_and_agent_info"
+
+    # Tests qdrant
+    "test_acreate_collection"
+    "test_aget_or_create_collection_wrong_client_type"
+    "test_aadd_documents_empty_list"
+    "test_acreate_collection_already_exists"
+    "test_aget_or_create_collection_existing"
+    "test_aadd_documents_collection_not_exists"
+    "test_acreate_collection_wrong_client_type"
+    "test_aadd_documents"
+    "test_aadd_documents_wrong_client_type"
+    "test_asearch"
+    "test_adelete_collection_not_exists"
+    "test_asearch_with_filters"
+    "test_adelete_collection_wrong_client_type"
+    "test_asearch_collection_not_exists"
+    "test_areset"
+    "test_areset_no_collections"
+    "test_aget_or_create_collection_new"
+    "test_aadd_documents_with_doc_id"
+    "test_asearch_wrong_client_type"
+    "test_areset_wrong_client_type"
+    "test_adelete_collection"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-xdist
+    qdrant-client
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    description = "Framework for orchestrating role-playing, autonomous AI agents";
+    homepage = "https://github.com/crewAIInc/crewAI";
+    changelog = "https://github.com/crewAIInc/crewAI/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ liberodark ];
+    platforms = lib.platforms.linux;
+    mainProgram = "crewai";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ed489ffb2e3..7a33e02db287 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3069,6 +3069,8 @@ self: super: with self; {
 
   credstash = callPackage ../development/python-modules/credstash { };
 
+  crewai = callPackage ../development/python-modules/crewai { };
+
   crispy-bootstrap3 = callPackage ../development/python-modules/crispy-bootstrap3 { };
 
   crispy-bootstrap4 = callPackage ../development/python-modules/crispy-bootstrap4 { };

From 7412361d875aeb96dbf0abd8a6b213bb9af66837 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Sep 2025 10:47:51 +0000
Subject: [PATCH 45/88] xremap: 0.10.15 -> 0.10.16

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

diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index 7eb03d6a1710..b0e83c49a198 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -6,16 +6,16 @@
 }:
 let
   pname = "xremap";
-  version = "0.10.15";
+  version = "0.10.16";
 
   src = fetchFromGitHub {
     owner = "xremap";
     repo = "xremap";
     tag = "v${version}";
-    hash = "sha256-ghGlyjBqW9UyXno1l4+a6AzgIJx7RNuJEVCQkae2pww=";
+    hash = "sha256-rBzjHrwAwFzHaF6JJzZDlfEFp+rSAkKaprOQk3kyDk8=";
   };
 
-  cargoHash = "sha256-xP1UC8ViAS3/EXmvZjerDexH96Esj5vfRPx1GRzcICI=";
+  cargoHash = "sha256-vGCoQG162riXe9zCh9IRWLmq5zgcNnYBnh44+2BNvwk=";
 
   buildXremap =
     {

From 006a9fffa699d31b61c11e33f535cdb9ec481493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 3 Sep 2025 14:01:03 +0200
Subject: [PATCH 46/88] python313Packages.pgcli: drop inactive maintainer

---
 pkgs/development/python-modules/pgcli/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix
index f5eb409af6e8..51ab5f2f0189 100644
--- a/pkgs/development/python-modules/pgcli/default.nix
+++ b/pkgs/development/python-modules/pgcli/default.nix
@@ -73,7 +73,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/dbcli/pgcli/raw/v${version}/changelog.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [
-      dywedir
       SuperSandro2000
     ];
   };

From 6f4512249801e2dcd5ae4e3e15348d53c557d28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 3 Sep 2025 14:01:11 +0200
Subject: [PATCH 47/88] python313Packages.pgspecial: skip tests on darwin as
 postgresqlTestHook is not available there

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

diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 10fe8a87c17c..7def8a06f95d 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -11,6 +11,7 @@
   setuptools,
   setuptools-scm,
   sqlparse,
+  stdenv,
 }:
 
 buildPythonPackage rec {
@@ -34,6 +35,9 @@ buildPythonPackage rec {
     psycopg
   ];
 
+  # postgresqlTestHook is not available on Darwin
+  doCheck = stdenv.hostPlatform.isLinux;
+
   nativeCheckInputs = [
     configobj
     pytestCheckHook

From b5950c56c39d975777f3795f6656270b07472af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 3 Sep 2025 14:01:27 +0200
Subject: [PATCH 48/88] python313Packages.pgspecial: adopt as a direct
 dependency on pgcli

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

diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 7def8a06f95d..e00421c7be03 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -63,6 +63,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dbcli/pgspecial";
     changelog = "https://github.com/dbcli/pgspecial/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.SuperSandro2000 ];
   };
 }

From 7ebae6b27d4e8e9dbbdd31187a6f2acb27d903a7 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sun, 31 Aug 2025 22:03:38 +0530
Subject: [PATCH 49/88] linuxPackages.nvidia_x11.persistenced: fix build

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../linux/nvidia-x11/persistenced.nix         | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index d125cf520447..87634c72383d 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -5,7 +5,9 @@ nvidia_x11: sha256:
   lib,
   fetchFromGitHub,
   m4,
+  glibc,
   libtirpc,
+  pkg-config,
 }:
 
 stdenv.mkDerivation {
@@ -19,8 +21,21 @@ stdenv.mkDerivation {
     inherit sha256;
   };
 
-  nativeBuildInputs = [ m4 ];
-  buildInputs = [ libtirpc ];
+  env = {
+    LIBRARY_PATH = "${glibc}/lib";
+    NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
+  };
+  NIX_LDFLAGS = [ "-ltirpc" ];
+
+  nativeBuildInputs = [
+    m4
+    pkg-config
+  ];
+
+  buildInputs = [
+    libtirpc
+    stdenv.cc.cc.lib
+  ];
 
   makeFlags = nvidia_x11.makeFlags ++ [ "DATE=true" ];
 
@@ -36,9 +51,6 @@ stdenv.mkDerivation {
       $out/bin/nvidia-persistenced
   '';
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
-  NIX_LDFLAGS = [ "-ltirpc" ];
-
   meta = with lib; {
     homepage = "https://www.nvidia.com/object/unix.html";
     description = "Settings application for NVIDIA graphics cards";

From 575a7b2687f2e460b795971a0a55de678f18321c Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Wed, 3 Sep 2025 20:50:53 +0530
Subject: [PATCH 50/88] linuxPackages.nvidia_x11.persistenced: update metadata

license is mit as per source repo
update homepage url to github source
remove with lib usage in meta

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 87634c72383d..cf9a8f0f404b 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -51,10 +51,10 @@ stdenv.mkDerivation {
       $out/bin/nvidia-persistenced
   '';
 
-  meta = with lib; {
-    homepage = "https://www.nvidia.com/object/unix.html";
-    description = "Settings application for NVIDIA graphics cards";
-    license = licenses.unfreeRedistributable;
+  meta = {
+    homepage = "https://github.com/NVIDIA/nvidia-persistenced";
+    description = "NVIDIA driver persistence daemon";
+    license = lib.licenses.mit;
     platforms = nvidia_x11.meta.platforms;
     maintainers = [ ];
     mainProgram = "nvidia-persistenced";

From f13f6fb7226521132448fd1b68daadb46cee4292 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 3 Sep 2025 22:05:44 +0200
Subject: [PATCH 51/88] dnf5: use util-linux instead of libsmartcols

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

diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix
index a46b70cc0794..4666e1106a13 100644
--- a/pkgs/by-name/dn/dnf5/package.nix
+++ b/pkgs/by-name/dn/dnf5/package.nix
@@ -15,7 +15,7 @@
   json_c,
   libmodulemd,
   librepo,
-  libsmartcols,
+  util-linux,
   libsolv,
   libxml2,
   libyaml,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     json_c
     libmodulemd
     librepo
-    libsmartcols
+    util-linux
     libsolv
     libxml2
     libyaml

From dbb2c294eecf29f842b6d5d64fb063d6588e72d4 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 3 Sep 2025 22:18:14 +0200
Subject: [PATCH 52/88] libdnf: use util-linux instead of libsmartcols

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

diff --git a/pkgs/by-name/li/libdnf/package.nix b/pkgs/by-name/li/libdnf/package.nix
index 37a904e477af..300593dbc6f6 100644
--- a/pkgs/by-name/li/libdnf/package.nix
+++ b/pkgs/by-name/li/libdnf/package.nix
@@ -10,7 +10,7 @@
   check,
   json_c,
   libmodulemd,
-  libsmartcols,
+  util-linux,
   sqlite,
   librepo,
   libyaml,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     cppunit
     openssl
     json_c
-    libsmartcols
+    util-linux
     libyaml
     libmodulemd
     zchunk

From f79c7f1f5783474df1248d296ba79b7087089852 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 3 Sep 2025 22:19:45 +0200
Subject: [PATCH 53/88] microdnf: use util-linux instead of libsmartcols

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

diff --git a/pkgs/by-name/mi/microdnf/package.nix b/pkgs/by-name/mi/microdnf/package.nix
index db9d8910f39f..989eeeed5cbf 100644
--- a/pkgs/by-name/mi/microdnf/package.nix
+++ b/pkgs/by-name/mi/microdnf/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   glib,
   libpeas,
-  libsmartcols,
+  util-linux,
   help2man,
   zchunk,
   pcre2,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libdnf
     glib
     libpeas
-    libsmartcols
+    util-linux
     zchunk
     pcre2.dev
   ];

From 2e5056421265a5ff704fabb7fe7747bfd50b23d4 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 3 Sep 2025 22:24:24 +0200
Subject: [PATCH 54/88] libsmartcols: drop in favor of util-linux

The libsmartcols package can be replaced by the util-linux
package which is properly kept updated.
---
 pkgs/by-name/li/libsmartcols/package.nix | 50 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/li/libsmartcols/package.nix

diff --git a/pkgs/by-name/li/libsmartcols/package.nix b/pkgs/by-name/li/libsmartcols/package.nix
deleted file mode 100644
index 942b92df5b8b..000000000000
--- a/pkgs/by-name/li/libsmartcols/package.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  pkg-config,
-  python3,
-  gtk-doc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libsmartcols";
-  version = "2.39.3";
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    python3
-    gtk-doc
-  ];
-
-  src = fetchFromGitHub {
-    owner = "karelzak";
-    repo = "util-linux";
-    rev = "v${version}";
-    sha256 = "sha256-X39os2iHqSrrYP6HVHPOkuTfc6vNB3pmsOP3VjW50fI=";
-  };
-
-  configureFlags = [
-    "--disable-all-programs"
-    "--enable-libsmartcols"
-  ];
-
-  buildPhase = ''
-    make libsmartcols.la
-  '';
-
-  installTargets = [
-    "install-am"
-    "install-pkgconfigDATA"
-  ];
-
-  meta = {
-    description = "Smart column output alignment library";
-    homepage = "https://github.com/karelzak/util-linux/tree/master/libsmartcols";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ rb2k ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 70f61efe6c37..7e5791f3ab1a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1339,6 +1339,7 @@ mapAliases {
   librewolf-wayland = librewolf; # Added 2022-11-15
   libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17
   libsForQt515 = libsForQt5; # Added 2022-11-24
+  libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
   libsoup = lib.warnOnInstantiate "‘libsoup’ has been renamed to ‘libsoup_2_4’" libsoup_2_4; # Added 2024-12-02
   libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24
   libtensorflow-bin = libtensorflow; # Added 2022-09-25

From ea6a8d375d96f600ca40323ba9089ae8c81c1934 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Sep 2025 21:04:34 +0000
Subject: [PATCH 55/88] abracadabra: 3.3.0 -> 3.3.1

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

diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix
index 942323cf92d1..e69274fb39b5 100644
--- a/pkgs/by-name/ab/abracadabra/package.nix
+++ b/pkgs/by-name/ab/abracadabra/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abracadabra";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "KejPi";
     repo = "AbracaDABra";
     tag = "v${version}";
-    hash = "sha256-udMPbnR/AXF+zCuU6AMcDerqinJ/B1J2OzuFrkQmEh0=";
+    hash = "sha256-cx5Kq5V0XTUJdqEDI0iDICIygbYkGu8JwdCACNLMgtY=";
   };
 
   nativeBuildInputs = [

From b37c9c5bee1998b45dc1bee40b901aa0ff25f578 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 3 Sep 2025 17:49:33 -0400
Subject: [PATCH 56/88] podman: fix darwin build

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

diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index ad3069791ddf..34170da7994f 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -34,6 +34,7 @@
   passt,
   vfkit,
   versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 let
   # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
@@ -162,7 +163,11 @@ buildGoModule rec {
   '';
 
   doInstallCheck = true;
-  nativeInstallCheckInputs = [ versionCheckHook ];
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
   versionCheckProgramArg = "--version";
 
   passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {

From bfb2d2f3d92f47c60126087dfd23a8698e1e2b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 4 Sep 2025 00:05:32 +0200
Subject: [PATCH 57/88] python313Packages.colormath2: use pytest7 to fix test
 execution

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

diff --git a/pkgs/development/python-modules/colormath2/default.nix b/pkgs/development/python-modules/colormath2/default.nix
index 30f081f8cb62..e4175a62e6b4 100644
--- a/pkgs/development/python-modules/colormath2/default.nix
+++ b/pkgs/development/python-modules/colormath2/default.nix
@@ -5,7 +5,7 @@
   setuptools,
   networkx,
   numpy,
-  pytestCheckHook,
+  pytest7CheckHook,
 }:
 
 buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     numpy
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytest7CheckHook ];
 
   pythonImportsCheck = [ "colormath2" ];
 

From 6784df307d00beed5b9c3822772d944a41d486a4 Mon Sep 17 00:00:00 2001
From: tropf <tropf@users.noreply.github.com>
Date: Mon, 11 Aug 2025 22:19:22 +0200
Subject: [PATCH 58/88] inkstitch: 3.1.0 -> 3.2.2

Inkstitch requires a unreleased version of inkex, which is overwritten
in-place. Injecting it requires messing with the pythonpath within the
plugin (as Inkscape meddles with it itself), which is done through a
wrapper.
---
 .../inkstitch/0001-force-frozen-true.patch    |   8 +-
 ...tion-use-python-script-as-entrypoint.patch |   8 +-
 ...oad-module-to-access-global_settings.patch | 490 ++++++++++++++++++
 ...nable-force-insertion-of-python-path.patch |  31 ++
 .../inkscape/extensions/inkstitch/default.nix |  42 +-
 5 files changed, 566 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/applications/graphics/inkscape/extensions/inkstitch/0003-lazy-load-module-to-access-global_settings.patch
 create mode 100644 pkgs/applications/graphics/inkscape/extensions/inkstitch/0004-enable-force-insertion-of-python-path.patch

diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/0001-force-frozen-true.patch b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0001-force-frozen-true.patch
index ef345bb0aeb0..38c6006af04e 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/0001-force-frozen-true.patch
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0001-force-frozen-true.patch
@@ -1,7 +1,7 @@
-From af541a4f8ddda287f74687327e4ed89b79557777 Mon Sep 17 00:00:00 2001
+From 64f735a58d3e5cc2344f823e73602eab638d7076 Mon Sep 17 00:00:00 2001
 From: tropf <tropf@noreply.codeberg.org>
 Date: Mon, 5 Aug 2024 21:25:33 +0200
-Subject: [PATCH 1/3] force frozen=true
+Subject: [PATCH 1/4] force frozen=true
 
 Enforce installation in frozen mode, i.e. as a packaged version where
 source can not be modified.
@@ -10,7 +10,7 @@ source can not be modified.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/inkstitch.py b/inkstitch.py
-index 50f33d19..398465ca 100644
+index efe6f6dec..be8ddf665 100644
 --- a/inkstitch.py
 +++ b/inkstitch.py
 @@ -40,7 +40,7 @@ else:
@@ -23,5 +23,5 @@ index 50f33d19..398465ca 100644
  if not running_as_frozen:  # override running_as_frozen from DEBUG.toml - for testing
      if safe_get(ini, "DEBUG", "force_frozen", default=False):
 -- 
-2.36.0
+2.49.0
 
diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/0002-plugin-invocation-use-python-script-as-entrypoint.patch b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0002-plugin-invocation-use-python-script-as-entrypoint.patch
index 3db643c9f07b..c416e3e79de5 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/0002-plugin-invocation-use-python-script-as-entrypoint.patch
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0002-plugin-invocation-use-python-script-as-entrypoint.patch
@@ -1,7 +1,7 @@
-From a86412c57833c24743214c9d3abb76093365769f Mon Sep 17 00:00:00 2001
+From c15715af2cfca6603241f4d414b68d43bd4acb98 Mon Sep 17 00:00:00 2001
 From: tropf <tropf@noreply.codeberg.org>
 Date: Mon, 5 Aug 2024 21:26:13 +0200
-Subject: [PATCH 2/3] plugin invocation: use python script as entrypoint
+Subject: [PATCH 2/4] plugin invocation: use python script as entrypoint
 
 Ink/Stitch is invoked by calling a script with command line parameters.
 Depending on the distribution format, this is bundled into a standalone
@@ -17,7 +17,7 @@ intent of only using the else path.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/inx/utils.py b/lib/inx/utils.py
-index 9168f2a2..00313639 100755
+index c4cbf6f0d..6d4774ec0 100755
 --- a/lib/inx/utils.py
 +++ b/lib/inx/utils.py
 @@ -21,7 +21,7 @@ def build_environment():
@@ -30,5 +30,5 @@ index 9168f2a2..00313639 100755
          # Command tag and icons path
          if sys.platform == "win32":
 -- 
-2.36.0
+2.49.0
 
diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/0003-lazy-load-module-to-access-global_settings.patch b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0003-lazy-load-module-to-access-global_settings.patch
new file mode 100644
index 000000000000..e68ed4c4becf
--- /dev/null
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0003-lazy-load-module-to-access-global_settings.patch
@@ -0,0 +1,490 @@
+From 87d64cbc61175a2adebd4563ac833562a4729295 Mon Sep 17 00:00:00 2001
+From: tropf <tropf@noreply.codeberg.org>
+Date: Fri, 16 May 2025 23:28:21 +0200
+Subject: [PATCH 3/4] lazy-load module to access global_settings
+
+The access to global_settings triggers a read to the home directory on
+module inclusion. During the nix build process, this home does not
+exist, and hence fails, crashing the entire build.
+
+The inclusion is moved into the function calls, such that it is only
+loaded at runtime (where a home should be available), but not at build
+time.
+
+The performance impact is considered negligible, as the loads are called
+every invocation, but will mostly hit the cache.
+
+Note to self: If this patch is missing, the cache module import will be
+the first to trigger the read. This import can be left untouched, as the
+underlying cause is defused by this patch.
+---
+ lib/gui/apply_palette.py                           | 3 ++-
+ lib/gui/edit_json/main_panel.py                    | 3 ++-
+ lib/gui/lettering/main_panel.py                    | 6 +++++-
+ lib/gui/lettering_font_sample.py                   | 4 +++-
+ lib/gui/preferences.py                             | 3 ++-
+ lib/gui/simulator/control_panel.py                 | 4 +++-
+ lib/gui/simulator/drawing_panel.py                 | 6 +++++-
+ lib/gui/simulator/simulator_preferences.py         | 5 ++++-
+ lib/gui/simulator/split_simulator_window.py        | 4 +++-
+ lib/gui/simulator/view_panel.py                    | 6 +++++-
+ lib/metadata.py                                    | 3 +--
+ lib/sew_stack/stitch_layers/stitch_layer_editor.py | 3 ++-
+ lib/utils/cache.py                                 | 6 +++---
+ 13 files changed, 40 insertions(+), 16 deletions(-)
+
+diff --git a/lib/gui/apply_palette.py b/lib/gui/apply_palette.py
+index 6bc771914..df647d082 100644
+--- a/lib/gui/apply_palette.py
++++ b/lib/gui/apply_palette.py
+@@ -8,12 +8,12 @@ import wx.adv
+ 
+ from ..i18n import _
+ from ..threads import ThreadCatalog
+-from ..utils.settings import global_settings
+ 
+ 
+ class ApplyPaletteFrame(wx.Frame):
+ 
+     def __init__(self, title, **kwargs):
++        from ..utils.settings import global_settings
+         super().__init__(None, title=title)
+ 
+         self.SetWindowStyle(wx.FRAME_FLOAT_ON_PARENT | wx.DEFAULT_FRAME_STYLE)
+@@ -99,6 +99,7 @@ class ApplyPaletteApp(wx.App):
+         app.MainLoop()
+ 
+     def set_palette(self):
++        from ..utils.settings import global_settings
+         if self.frame.palette_list.GetSelection() == -1:
+             return
+         self.palette = self.frame.palette_list.GetString(self.frame.palette_list.GetSelection())
+diff --git a/lib/gui/edit_json/main_panel.py b/lib/gui/edit_json/main_panel.py
+index bd43f523b..5eb9d4cc9 100644
+--- a/lib/gui/edit_json/main_panel.py
++++ b/lib/gui/edit_json/main_panel.py
+@@ -22,7 +22,6 @@ from ...lettering.categories import FONT_CATEGORIES
+ from ...lettering.font_variant import FontVariant
+ from ...stitch_plan import stitch_groups_to_stitch_plan
+ from ...svg.tags import SVG_PATH_TAG
+-from ...utils.settings import global_settings
+ from ...utils.threading import ExitThread, check_stop_flag
+ from .. import PreviewRenderer, WarningPanel
+ from . import HelpPanel, SettingsPanel
+@@ -33,6 +32,7 @@ LETTER_CASE = {0: '', 1: 'upper', 2: 'lower'}
+ class LetteringEditJsonPanel(wx.Panel):
+ 
+     def __init__(self, parent, simulator, layer, metadata=None, background_color='white'):
++        from ...utils.settings import global_settings
+         self.parent = parent
+         self.simulator = simulator
+         self.layer = layer
+@@ -251,6 +251,7 @@ class LetteringEditJsonPanel(wx.Panel):
+         return glyph
+ 
+     def on_font_changed(self, event=None):
++        from ...utils.settings import global_settings
+         selected_font = self.settings_panel.font_chooser.GetValue()
+         if selected_font:
+             self.font = self.fonts[selected_font]
+diff --git a/lib/gui/lettering/main_panel.py b/lib/gui/lettering/main_panel.py
+index 64312b5a1..5ed11b247 100644
+--- a/lib/gui/lettering/main_panel.py
++++ b/lib/gui/lettering/main_panel.py
+@@ -17,7 +17,6 @@ from ...lettering.categories import FONT_CATEGORIES
+ from ...stitch_plan import stitch_groups_to_stitch_plan
+ from ...svg.tags import INKSTITCH_LETTERING
+ from ...utils import DotDict, cache
+-from ...utils.settings import global_settings
+ from ...utils.threading import ExitThread, check_stop_flag
+ from .. import PresetsPanel, PreviewRenderer, info_dialog
+ from . import LetteringHelpPanel, LetteringOptionsPanel
+@@ -73,6 +72,7 @@ class LetteringPanel(wx.Panel):
+ 
+     def load_settings(self):
+         """Load the settings saved into the SVG group element"""
++        from ...utils.settings import global_settings
+ 
+         self.settings = DotDict({
+             "text": "",
+@@ -184,12 +184,14 @@ class LetteringPanel(wx.Panel):
+ 
+     @property
+     def default_font(self):
++        from ...utils.settings import global_settings
+         try:
+             return self.fonts[global_settings['last_font']]
+         except KeyError:
+             return list(self.fonts.values())[0]
+ 
+     def on_change(self, attribute, event):
++        from ...utils.settings import global_settings
+         value = event.GetEventObject().GetValue()
+         self.settings[attribute] = value
+         if attribute == "text" and self.options_panel.font_glyph_filter.GetValue() is True:
+@@ -206,6 +208,7 @@ class LetteringPanel(wx.Panel):
+         self.update_preview()
+ 
+     def on_choice_change(self, attribute, event=None):
++        from ...utils.settings import global_settings
+         value = event.GetEventObject().GetCurrentSelection()
+         self.settings[attribute] = value
+         if attribute == 'trim_option':
+@@ -215,6 +218,7 @@ class LetteringPanel(wx.Panel):
+         self.update_preview()
+ 
+     def on_font_changed(self, event=None):
++        from ...utils.settings import global_settings
+         font = self.fonts.get(self.options_panel.font_chooser.GetValue(), self.default_font)
+         self.settings.font = font.marked_custom_font_id
+         global_settings['last_font'] = font.marked_custom_font_name
+diff --git a/lib/gui/lettering_font_sample.py b/lib/gui/lettering_font_sample.py
+index e19544dce..c2f7fcaaa 100644
+--- a/lib/gui/lettering_font_sample.py
++++ b/lib/gui/lettering_font_sample.py
+@@ -13,12 +13,12 @@ from ..commands import ensure_command_symbols
+ from ..i18n import _
+ from ..lettering import get_font_list
+ from ..marker import ensure_marker_symbols
+-from ..utils.settings import global_settings
+ 
+ 
+ class FontSampleFrame(wx.Frame):
+ 
+     def __init__(self, *args, **kwargs):
++        from ..utils.settings import global_settings
+         self.layer = kwargs.pop("layer")
+         wx.Frame.__init__(self, None, wx.ID_ANY, _("Font Sampling"), *args, **kwargs)
+ 
+@@ -135,6 +135,7 @@ class FontSampleFrame(wx.Frame):
+                 self.font_chooser.Append(font.marked_custom_font_name)
+ 
+     def on_font_changed(self, event=None):
++        from ..utils.settings import global_settings
+         selected_font = self.font_chooser.GetValue()
+         if selected_font:
+             self.font = self.fonts[selected_font]
+@@ -157,6 +158,7 @@ class FontSampleFrame(wx.Frame):
+             self.color_sort_checkbox.Disable()
+ 
+     def apply(self, event):
++        from ..utils.settings import global_settings
+         # apply scale to layer and extract for later use
+         self.layer.transform.add_scale(self.scale_spinner.GetValue() / 100)
+         scale = self.layer.transform.a
+diff --git a/lib/gui/preferences.py b/lib/gui/preferences.py
+index 23dbbf0c6..13684acb9 100644
+--- a/lib/gui/preferences.py
++++ b/lib/gui/preferences.py
+@@ -7,11 +7,11 @@ import wx
+ 
+ from ..i18n import _
+ from ..utils.cache import get_stitch_plan_cache
+-from ..utils.settings import global_settings
+ 
+ 
+ class PreferencesFrame(wx.Frame):
+     def __init__(self, *args, **kwargs):
++        from ..utils.settings import global_settings
+         self.extension = kwargs.pop("extension")
+         wx.Frame.__init__(self, None, wx.ID_ANY, _("Preferences"), *args, **kwargs)
+         self.SetTitle(_("Preferences"))
+@@ -180,6 +180,7 @@ class PreferencesFrame(wx.Frame):
+         stitch_plan_cache.clear(retry=True)
+ 
+     def apply(self):
++        from ..utils.settings import global_settings
+         metadata = self.extension.get_inkstitch_metadata()
+         metadata['min_stitch_len_mm'] = self.minimum_stitch_length.GetValue()
+         metadata['collapse_len_mm'] = self.minimum_jump_stitch_length.GetValue()
+diff --git a/lib/gui/simulator/control_panel.py b/lib/gui/simulator/control_panel.py
+index 99d1f92ba..1bd9e1872 100644
+--- a/lib/gui/simulator/control_panel.py
++++ b/lib/gui/simulator/control_panel.py
+@@ -11,7 +11,6 @@ from wx.lib.intctrl import IntCtrl
+ from ...debug.debug import debug
+ from ...i18n import _
+ from ...utils import get_resource_dir
+-from ...utils.settings import global_settings
+ from . import SimulatorSlider
+ 
+ 
+@@ -21,6 +20,7 @@ class ControlPanel(wx.Panel):
+     @debug.time
+     def __init__(self, parent, *args, **kwargs):
+         """"""
++        from ...utils.settings import global_settings
+         self.parent = parent
+         self.stitch_plan = kwargs.pop('stitch_plan', None)
+         self.detach_callback = kwargs.pop('detach_callback', None)
+@@ -204,6 +204,7 @@ class ControlPanel(wx.Panel):
+         return icon.ConvertToBitmap()
+ 
+     def choose_speed(self):
++        from ...utils.settings import global_settings
+         if not global_settings['simulator_adaptive_speed']:
+             self.set_speed(global_settings['simulator_speed'])
+             return
+@@ -233,6 +234,7 @@ class ControlPanel(wx.Panel):
+             self.animation_reverse()
+ 
+     def set_speed(self, speed):
++        from ...utils.settings import global_settings
+         global_settings['simulator_speed'] = speed
+         self.speed = int(max(speed, 1))
+         self.update_speed_text()
+diff --git a/lib/gui/simulator/drawing_panel.py b/lib/gui/simulator/drawing_panel.py
+index abe6fa0fb..036a7b2a6 100644
+--- a/lib/gui/simulator/drawing_panel.py
++++ b/lib/gui/simulator/drawing_panel.py
+@@ -11,7 +11,6 @@ from numpy import split
+ from ...debug.debug import debug
+ from ...i18n import _
+ from ...svg import PIXELS_PER_MM
+-from ...utils.settings import global_settings
+ 
+ # L10N command label at bottom of simulator window
+ COMMAND_NAMES = [_("STITCH"), _("JUMP"), _("TRIM"), _("STOP"), _("COLOR CHANGE")]
+@@ -37,6 +36,7 @@ class DrawingPanel(wx.Panel):
+ 
+     def __init__(self, parent, *args, **kwargs):
+         """"""
++        from ...utils.settings import global_settings
+         self.parent = parent
+         self.stitch_plan = kwargs.pop('stitch_plan', None)
+         kwargs['style'] = wx.BORDER_SUNKEN
+@@ -269,6 +269,7 @@ class DrawingPanel(wx.Panel):
+                     canvas.StrokeLines(block)
+ 
+     def draw_needle_penetration_points(self, canvas, pen, stitches):
++        from ...utils.settings import global_settings
+         if self.view_panel.btnNpp.GetValue():
+             npp_size = global_settings['simulator_npp_size'] * PIXELS_PER_MM * self.PIXEL_DENSITY
+             npp_pen = wx.Pen(pen.GetColour(), width=int(npp_size))
+@@ -364,11 +365,13 @@ class DrawingPanel(wx.Panel):
+                 pass
+ 
+     def color_to_pen(self, color):
++        from ...utils.settings import global_settings
+         line_width = global_settings['simulator_line_width'] * PIXELS_PER_MM * self.PIXEL_DENSITY
+         background_color = self.GetBackgroundColour().GetAsString()
+         return wx.Pen(list(map(int, color.visible_on_background(background_color).rgb)), int(line_width))
+ 
+     def update_pen_size(self):
++        from ...utils.settings import global_settings
+         line_width = global_settings['simulator_line_width'] * PIXELS_PER_MM * self.PIXEL_DENSITY
+         for pen in self.pens:
+             pen.SetWidth(int(line_width))
+@@ -421,6 +424,7 @@ class DrawingPanel(wx.Panel):
+                 self.jumps.append(jumps)
+ 
+     def set_speed(self, speed):
++        from ...utils.settings import global_settings
+         self.speed = speed
+         global_settings['simulator_speed'] = speed
+ 
+diff --git a/lib/gui/simulator/simulator_preferences.py b/lib/gui/simulator/simulator_preferences.py
+index 7b72b87de..bfebc7cbe 100644
+--- a/lib/gui/simulator/simulator_preferences.py
++++ b/lib/gui/simulator/simulator_preferences.py
+@@ -6,7 +6,6 @@
+ import wx
+ 
+ from ...i18n import _
+-from ...utils.settings import global_settings
+ 
+ 
+ class SimulatorPreferenceDialog(wx.Dialog):
+@@ -14,6 +13,7 @@ class SimulatorPreferenceDialog(wx.Dialog):
+     """
+ 
+     def __init__(self, *args, **kwargs):
++        from ...utils.settings import global_settings
+         super(SimulatorPreferenceDialog, self).__init__(*args, **kwargs)
+         self.SetWindowStyle(wx.FRAME_FLOAT_ON_PARENT | wx.DEFAULT_FRAME_STYLE)
+ 
+@@ -62,18 +62,21 @@ class SimulatorPreferenceDialog(wx.Dialog):
+         self.SetSizerAndFit(sizer)
+ 
+     def on_change(self, attribute, event):
++        from ...utils.settings import global_settings
+         global_settings[attribute] = event.EventObject.GetValue()
+         if self.drawing_panel.loaded and attribute == 'simulator_line_width':
+             self.drawing_panel.update_pen_size()
+         self.drawing_panel.Refresh()
+ 
+     def on_adaptive_speed_changed(self, event=None):
++        from ...utils.settings import global_settings
+         adaptive_speed = self.adaptive_speed.GetValue()
+         global_settings['simulator_adaptive_speed'] = adaptive_speed
+         self.control_panel.choose_speed()
+         self.control_panel.Refresh()
+ 
+     def save_settings(self):
++        from ...utils.settings import global_settings
+         global_settings['simulator_line_width'] = self.line_width.GetValue()
+         global_settings['simulator_npp_size'] = self.npp_size.GetValue()
+ 
+diff --git a/lib/gui/simulator/split_simulator_window.py b/lib/gui/simulator/split_simulator_window.py
+index e4b2803e2..6513b6d3d 100644
+--- a/lib/gui/simulator/split_simulator_window.py
++++ b/lib/gui/simulator/split_simulator_window.py
+@@ -8,12 +8,12 @@ import wx
+ 
+ from ...debug.debug import debug
+ from ...utils import get_resource_dir
+-from ...utils.settings import global_settings
+ from . import SimulatorPanel, SimulatorWindow
+ 
+ 
+ class SplitSimulatorWindow(wx.Frame):
+     def __init__(self, panel_class, title, target_duration=None, **kwargs):
++        from ...utils.settings import global_settings
+         super().__init__(None, title=title)
+ 
+         self.SetWindowStyle(wx.FRAME_FLOAT_ON_PARENT | wx.DEFAULT_FRAME_STYLE)
+@@ -89,6 +89,7 @@ class SplitSimulatorWindow(wx.Frame):
+             self.detach_simulator()
+ 
+     def attach_simulator(self):
++        from ...utils.settings import global_settings
+         self.detached_simulator_frame.detach_simulator_panel()
+         self.simulator_panel.Reparent(self.splitter)
+         self.splitter.SplitVertically(self.settings_panel, self.simulator_panel)
+@@ -105,6 +106,7 @@ class SplitSimulatorWindow(wx.Frame):
+         global_settings['pop_out_simulator'] = False
+ 
+     def detach_simulator(self):
++        from ...utils.settings import global_settings
+         self.splitter.Unsplit()
+         self.detached_simulator_frame = SimulatorWindow(panel=self.simulator_panel, parent=self)
+         self.splitter.SetMinimumPaneSize(100)
+diff --git a/lib/gui/simulator/view_panel.py b/lib/gui/simulator/view_panel.py
+index e2f2618d8..abbbc49d4 100644
+--- a/lib/gui/simulator/view_panel.py
++++ b/lib/gui/simulator/view_panel.py
+@@ -9,7 +9,6 @@ from ...debug.debug import debug
+ from ...i18n import _
+ from . import SimulatorPreferenceDialog
+ from . import DesignInfoDialog
+-from ...utils.settings import global_settings
+ 
+ 
+ class ViewPanel(ScrolledPanel):
+@@ -18,6 +17,7 @@ class ViewPanel(ScrolledPanel):
+     @debug.time
+     def __init__(self, parent, detach_callback):
+         """"""
++        from ...utils.settings import global_settings
+         self.parent = parent
+         self.detach_callback = detach_callback
+         ScrolledPanel.__init__(self, parent)
+@@ -159,14 +159,17 @@ class ViewPanel(ScrolledPanel):
+         self.toggle_npp(event)
+ 
+     def toggle_npp(self, event):
++        from ...utils.settings import global_settings
+         self.drawing_panel.Refresh()
+         global_settings['npp_button_status'] = self.btnNpp.GetValue()
+ 
+     def on_cursor_button(self, event):
++        from ...utils.settings import global_settings
+         self.drawing_panel.Refresh()
+         global_settings['display_crosshair'] = self.btnCursor.GetValue()
+ 
+     def toggle_page(self, event):
++        from ...utils.settings import global_settings
+         debug.log("toggle page")
+         value = self.btnPage.GetValue()
+         self.drawing_panel.set_show_page(value)
+@@ -174,6 +177,7 @@ class ViewPanel(ScrolledPanel):
+         global_settings['toggle_page_button_status'] = value
+ 
+     def on_marker_button(self, marker_type, event):
++        from ...utils.settings import global_settings
+         value = event.GetEventObject().GetValue()
+         self.control_panel.slider.enable_marker_list(marker_type, value)
+         if marker_type == 'jump':
+diff --git a/lib/metadata.py b/lib/metadata.py
+index 837fbf008..0beaeeb7a 100644
+--- a/lib/metadata.py
++++ b/lib/metadata.py
+@@ -5,8 +5,6 @@ from collections.abc import MutableMapping
+ import inkex
+ from lxml import etree
+ 
+-from .utils.settings import DEFAULT_METADATA, global_settings
+-
+ 
+ def strip_namespace(tag):
+     """Remove xml namespace from a tag name.
+@@ -33,6 +31,7 @@ class InkStitchMetadata(MutableMapping):
+     """
+ 
+     def __init__(self, document):
++        from .utils.settings import DEFAULT_METADATA, global_settings
+         super().__init__()
+         self.document = document
+         self.metadata = document.metadata
+diff --git a/lib/sew_stack/stitch_layers/stitch_layer_editor.py b/lib/sew_stack/stitch_layers/stitch_layer_editor.py
+index eddf78675..4a5dfcf40 100644
+--- a/lib/sew_stack/stitch_layers/stitch_layer_editor.py
++++ b/lib/sew_stack/stitch_layers/stitch_layer_editor.py
+@@ -7,7 +7,6 @@ import wx.propgrid
+ from ...debug.debug import debug
+ from ...gui.windows import SimpleBox
+ from ...i18n import _
+-from ...utils.settings import global_settings
+ 
+ 
+ class CheckBoxProperty(wx.propgrid.BoolProperty):
+@@ -311,6 +310,7 @@ class StitchLayerEditor:
+             return any(property.HasFlag(wx.propgrid.PG_PROP_MODIFIED) for property in self.property_grid.Items)
+ 
+     def get_panel(self, parent):
++        from ...utils.settings import global_settings
+         if self.property_grid_panel is None:
+             self.layer_editor_panel = wx.Panel(parent, wx.ID_ANY)
+ 
+@@ -426,6 +426,7 @@ class StitchLayerEditor:
+                 self.property_grid.RefreshEditor()
+ 
+     def on_sash_position_changed(self, event):
++        from ...utils.settings import global_settings
+         global_settings['stitch_layer_editor_sash_position'] = event.GetSashPosition()
+ 
+     def show_help(self, property):
+diff --git a/lib/utils/cache.py b/lib/utils/cache.py
+index cca6296a9..6ecdf6403 100644
+--- a/lib/utils/cache.py
++++ b/lib/utils/cache.py
+@@ -10,9 +10,6 @@ import sqlite3
+ 
+ import diskcache  # type: ignore[import-untyped]
+ 
+-from lib.utils.settings import global_settings
+-
+-from .paths import get_user_dir
+ from functools import lru_cache
+ 
+ 
+@@ -25,6 +22,8 @@ __stitch_plan_cache = None
+ 
+ 
+ def get_stitch_plan_cache():
++    from .paths import get_user_dir
++    from lib.utils.settings import global_settings
+     global __stitch_plan_cache
+ 
+     if __stitch_plan_cache is None:
+@@ -51,6 +50,7 @@ def get_stitch_plan_cache():
+ 
+ 
+ def is_cache_disabled():
++    from lib.utils.settings import global_settings
+     return not global_settings['cache_size']
+ 
+ 
+-- 
+2.49.0
+
diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/0004-enable-force-insertion-of-python-path.patch b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0004-enable-force-insertion-of-python-path.patch
new file mode 100644
index 000000000000..2b1899248153
--- /dev/null
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0004-enable-force-insertion-of-python-path.patch
@@ -0,0 +1,31 @@
+From 99c895045df01e291c6c9dc89b7a1c758e010bda Mon Sep 17 00:00:00 2001
+From: tropf <tropf@noreply.codeberg.org>
+Date: Sat, 26 Oct 2024 14:07:17 +0200
+Subject: [PATCH 4/4] enable force-insertion of python path
+
+As of now, the inkex library loaded by inkstitch must be fixed. The
+version supplied by inkscape is not sufficient. This should be fixed
+with inkscape 1.4, where this patch can be removed.
+
+The fixed path is injected through an environment variable at runtime.
+---
+ inkstitch.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/inkstitch.py b/inkstitch.py
+index be8ddf665..d7a8fca2f 100644
+--- a/inkstitch.py
++++ b/inkstitch.py
+@@ -105,6 +105,9 @@ if not running_as_frozen:  # debugging/profiling only in development mode
+     if prefer_pip_inkex and 'PYTHONPATH' in os.environ:
+         debug_utils.reorder_sys_path()
+ 
++if "PYTHON_INKEX_PATH" in os.environ:
++    sys.path = [os.environ["PYTHON_INKEX_PATH"]] + sys.path
++
+ # enabling of debug depends on value of debug_type in DEBUG.toml file
+ if debug_type != 'none':
+     from lib.debug.debugger import init_debugger
+-- 
+2.49.0
+
diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
index ae6862d9bfd3..be267ad83b7c 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
@@ -2,25 +2,47 @@
   lib,
   python3,
   fetchFromGitHub,
+  fetchFromGitLab,
   gettext,
 }:
 let
-  version = "3.1.0";
+  # on update check compatibility to nixpkgs inkex
+  version = "3.2.2";
+
+  # remove and use nixpkgs version is recent enough
+  inkex' = python3.pkgs.inkex.overrideAttrs (old: rec {
+    # this is no special commit, just the most recent as of writing
+    version = "3150a5b3b06f7e4c2104d9e8eb6dc448982bb2b0";
+    src = fetchFromGitLab {
+      owner = "inkscape";
+      repo = "extensions";
+      rev = "${version}";
+      hash = "sha256-FYBZ66ERC3nVYCaAmFPqKnBxDOKAoQwT14C0fKLn10c=";
+    };
+
+    postPatch = ''
+      substituteInPlace pyproject.toml \
+        --replace-fail 'scour = "^0.37"' 'scour = ">=0.37"'
+    '';
+  });
+
   dependencies =
     with python3.pkgs;
     [
       pyembroidery
-      inkex
+      # inkex upstream release & nixpkgs is too old
+      # use nixpkgs inkex once up to date
+      inkex'
       wxpython
       networkx
+      platformdirs
       shapely
       lxml
       appdirs
       numpy
       jinja2
       requests
-      # Upstream wants colormath2 yet still refers to it as colormath. Curious.
-      colormath
+      colormath2
       flask
       fonttools
       trimesh
@@ -41,7 +63,7 @@ python3.pkgs.buildPythonApplication {
     owner = "inkstitch";
     repo = "inkstitch";
     tag = "v${version}";
-    hash = "sha256-CGhJsDRhElgemNv2BXqZr6Vi5EyBArFak7Duz545ivY=";
+    hash = "sha256-6EVfjmTXEYgZta01amK8E6t5h2JBPfGGNnqfBG8LQfo=";
   };
 
   nativeBuildInputs = [
@@ -70,8 +92,12 @@ python3.pkgs.buildPythonApplication {
   patches = [
     ./0001-force-frozen-true.patch
     ./0002-plugin-invocation-use-python-script-as-entrypoint.patch
+    ./0003-lazy-load-module-to-access-global_settings.patch
+    ./0004-enable-force-insertion-of-python-path.patch
   ];
 
+  doCheck = false;
+
   postPatch = ''
     # Add shebang with python dependencies
     substituteInPlace lib/inx/utils.py --replace-fail ' interpreter="python"' ""
@@ -79,6 +105,12 @@ python3.pkgs.buildPythonApplication {
     chmod a+x inkstitch.py
   '';
 
+  postInstall = ''
+    export SITE_PACKAGES=$(find "${pyEnv}" -type d -name 'site-packages')
+    wrapProgram $out/share/inkscape/extensions/inkstitch/inkstitch.py \
+      --set PYTHON_INKEX_PATH "$SITE_PACKAGES"
+  '';
+
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
   ];

From d5a615f278484b40439e0c59fe3e95e62daa3103 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 4 Sep 2025 01:51:05 +0200
Subject: [PATCH 59/88] sby: cleanup

---
 pkgs/by-name/sb/sby/package.nix | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index 8ac2b53c0824..c26a3906c79f 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -17,28 +17,17 @@ let
   pythonEnv = python3.withPackages (ps: with ps; [ click ]);
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sby";
   version = "0.56";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-uKndGUoLbG7SBhsOSYyM/v9g33pq7zFFajzvTUYa7NY=";
   };
 
-  nativeCheckInputs = [
-    python3
-    python3.pkgs.xmlschema
-    yosys
-    boolector
-    yices
-    z3
-    aiger
-    btor2tools
-  ];
-
   postPatch = ''
     patchShebangs --build \
       docs/source/conf.py \
@@ -54,9 +43,9 @@ stdenv.mkDerivation rec {
 
     # Fix various executable references
     substituteInPlace sbysrc/sby_core.py \
-      --replace-fail '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \
-      --replace-fail ', "btormc"'             ', "${boolector}/bin/btormc"' \
-      --replace-fail ', "aigbmc"'             ', "${aiger}/bin/aigbmc"'
+      --replace-fail '"/usr/bin/env", "bash"' '"${lib.getExe bash}"' \
+      --replace-fail ', "btormc"'             ', "${lib.getExe' boolector "btormc"}"' \
+      --replace-fail ', "aigbmc"'             ', "${lib.getExe' aiger "aigbmc"}"'
 
     substituteInPlace sbysrc/sby_core.py \
       --replace-fail '##yosys-program-prefix##' '"${yosys}/bin/"'
@@ -64,7 +53,7 @@ stdenv.mkDerivation rec {
     substituteInPlace sbysrc/sby.py \
       --replace-fail '/usr/bin/env python3' '${pythonEnv}/bin/python'
     substituteInPlace sbysrc/sby_autotune.py \
-      --replace-fail '["btorsim", "--vcd"]' '["${btor2tools}/bin/btorsim", "--vcd"]'
+      --replace-fail '["btorsim", "--vcd"]' '["${lib.getExe' btor2tools "btorsim"}", "--vcd"]'
   '';
 
   dontBuild = true;
@@ -80,6 +69,17 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  nativeCheckInputs = [
+    python3
+    python3.pkgs.xmlschema
+    yosys
+    boolector
+    yices
+    z3
+    aiger
+    btor2tools
+  ];
+
   doCheck = true;
 
   checkPhase = ''
@@ -100,4 +100,4 @@ stdenv.mkDerivation rec {
     mainProgram = "sby";
     platforms = lib.platforms.all;
   };
-}
+})

From 56c44ec736495c1a62be87006497e34b31b468d0 Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Thu, 4 Sep 2025 01:25:23 +0000
Subject: [PATCH 60/88] zed-editor: 0.202.5 -> 0.202.6

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.202.6
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 9fbe74288ee4..ad73f5deafa2 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.202.5";
+  version = "0.202.6";
 
   outputs = [
     "out"
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q7Ord+GJJcOCH/S3qNwAbzILqQiIC94qb8V+JkzQqaQ=";
+    hash = "sha256-S220e+mK0IHKVrSRAcbYtlIpK0T25+2gpIzMmyjaM2Y=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
     '';
 
-  cargoHash = "sha256-13ChlJU2IGwftYXkWEmUhp4w+VeNPZA2fp1qTY1fOW0=";
+  cargoHash = "sha256-P3eOp81LHXZr4O29kuuChd22ucFfkbneQvzKxpDhrV0=";
 
   nativeBuildInputs = [
     cmake

From 555884bb0bcab0f4ae217a1bac05fbd99ad86a37 Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Wed, 3 Sep 2025 20:40:12 -0700
Subject: [PATCH 61/88] graalvm-oracle_25-ea: 25-ea-35 -> 25-ea-36

Update graalvm-oracle_25-ea-35 to 25-ea-36,
currently the latest version available at:
https://github.com/graalvm/oracle-graalvm-ea-builds/releases

This is likely the final release candidate for 25.
---
 pkgs/development/compilers/graalvm/default.nix |  2 +-
 .../graalvm/graalvm-oracle/hashes.nix          | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 038ead38b9b2..964ea5edfd38 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -24,7 +24,7 @@ lib.makeScope pkgs.newScope (
     truffleruby = self.callPackage ./community-edition/truffleruby { };
 
     graalvm-oracle_25-ea =
-      (self.callPackage ./graalvm-oracle { version = "25-ea-35"; }).overrideAttrs
+      (self.callPackage ./graalvm-oracle { version = "25-ea-36"; }).overrideAttrs
         (prev: {
           autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1" ];
         });
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
index 3800f8a281b7..c9f201605f93 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
@@ -4,22 +4,22 @@
 # $ rg -No "(https://.+)\"" -r '$1' pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix | \
 #   parallel -k 'echo {}; nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(curl -s {}.sha256)'
 {
-  "25-ea-35" = {
+  "25-ea-36" = {
     "aarch64-linux" = {
-      hash = "sha256-DbESXsX/saJSizZ/s6ENsL3W9VASRRGYArKzjvqlRk8=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.35/graalvm-jdk-25.0.0-ea.35_linux-aarch64_bin.tar.gz";
+      hash = "sha256-NbN5UYIRgyqMXuGZcf0OQhghBa1v4/jpMJvOih8+7Nk=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.36/graalvm-jdk-25.0.0-ea.36_linux-aarch64_bin.tar.gz";
     };
     "x86_64-linux" = {
-      hash = "sha256-fR9cA8vwV7/w4eRAkrzft0cNW29tM2rCCjSoUEDcX1A=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.35/graalvm-jdk-25.0.0-ea.35_linux-x64_bin.tar.gz";
+      hash = "sha256-LQCwzhYDsbhR+ij8zYh37H7xhxbfxzZxAVFNLBzmFVs=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.36/graalvm-jdk-25.0.0-ea.36_linux-x64_bin.tar.gz";
     };
     "x86_64-darwin" = {
-      hash = "sha256-OZHBmZqwC5DpGmXSDah4f002XGBhreoumBXv0IEalRs=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.35/graalvm-jdk-25.0.0-ea.35_macos-x64_bin.tar.gz";
+      hash = "sha256-GU57RhQJK4SHOigRMsCPwXkLo9SKJ/73GVZw2QzcIVM=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.36/graalvm-jdk-25.0.0-ea.36_macos-x64_bin.tar.gz";
     };
     "aarch64-darwin" = {
-      hash = "sha256-Q2HU2wHIPdanGTKFLNdllEEPXmERgqTyeVNMWKj/CvE=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.35/graalvm-jdk-25.0.0-ea.35_macos-aarch64_bin.tar.gz";
+      hash = "sha256-nOJ6Ngsy/EMZ93R1WIQ6AMD//QSaKBvNqAd3CxLdJ74=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.36/graalvm-jdk-25.0.0-ea.36_macos-aarch64_bin.tar.gz";
     };
   };
   "24" = {

From 0c75dca7615470acab4cb0135a0ad957334c7fd8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Sep 2025 05:32:53 +0000
Subject: [PATCH 62/88] varia: 2025.7.19 -> 2025.7.19-1

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

diff --git a/pkgs/by-name/va/varia/package.nix b/pkgs/by-name/va/varia/package.nix
index 37df6ecb6237..50112dff212e 100644
--- a/pkgs/by-name/va/varia/package.nix
+++ b/pkgs/by-name/va/varia/package.nix
@@ -15,14 +15,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "varia";
-  version = "2025.7.19";
+  version = "2025.7.19-1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "giantpinkrobots";
     repo = "varia";
     tag = "v${version}";
-    hash = "sha256-/u6Eb9Se/Lt8Hisv24zfOgNE9ZxC3AJXbZHmukVLSRA=";
+    hash = "sha256-gdHg1q33HMTpH3DFdMx6RAVvcOuu6Rcigt9HoUgPqDM=";
   };
 
   nativeBuildInputs = [

From b7d73b07fbb554a0f4bbcc1edfca871588c7c407 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 31 Aug 2025 19:16:22 +0200
Subject: [PATCH 63/88] php8*Extensions.apcu: 5.1.26 -> 5.1.27

ChangeLog: https://github.com/krakjoe/apcu/releases/tag/v5.1.27
---
 pkgs/development/php-packages/apcu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix
index 33b1b6c0b7f6..3006ed973fb1 100644
--- a/pkgs/development/php-packages/apcu/default.nix
+++ b/pkgs/development/php-packages/apcu/default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "5.1.26";
+  version = "5.1.27";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "krakjoe";
     repo = "apcu";
     rev = "v${version}";
-    sha256 = "sha256-zJTrFckl7caKAF5/IL9RpVhbwsFZiol6w2GVpNdDdPg=";
+    sha256 = "sha256-kf1d+WLpwhzQVn9pnkXtPPTXI5XaAuIAReI6rDGypB8=";
   };
 
   buildInputs = [ pcre2 ];

From e2c77b8391605c3d6008a1acab8e66381dd7c078 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 31 Aug 2025 19:16:54 +0200
Subject: [PATCH 64/88] php8*Extensions.event: 3.0.8 -> 3.1.4

ChangeLog: https://pecl.php.net/package-changelog.php?package=event&release=3.1.4
---
 pkgs/development/php-packages/event/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix
index 1427622234fe..f65b8500862e 100644
--- a/pkgs/development/php-packages/event/default.nix
+++ b/pkgs/development/php-packages/event/default.nix
@@ -9,8 +9,8 @@
 buildPecl {
   pname = "event";
 
-  version = "3.0.8";
-  sha256 = "sha256-4+ke3T3BXglpuSVMw2Jq4Hgl45vybWG0mTX2b2A9e2s=";
+  version = "3.1.4";
+  sha256 = "sha256-XEyqc7wtzu4xCS/5GSE53yjpqA8RR63g3+hp2y5N39M=";
 
   configureFlags = [
     "--with-event-libevent-dir=${libevent.dev}"

From 9ee2ccadd79242e959d2994bebad2bf1d14f1135 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 31 Aug 2025 19:18:42 +0200
Subject: [PATCH 65/88] php8*Extensions.imagick: 3.7.0 -> 3.8.0

ChangeLog: https://pecl.php.net/package-changelog.php?package=imagick&release=3.8.0
---
 pkgs/development/php-packages/imagick/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix
index 698620e1b93c..9cee585f0b73 100644
--- a/pkgs/development/php-packages/imagick/default.nix
+++ b/pkgs/development/php-packages/imagick/default.nix
@@ -11,23 +11,13 @@
 buildPecl {
   pname = "imagick";
 
-  version = "3.7.0";
-  sha256 = "sha256-WjZDVBCQKdIkvLsuguFbJIvptkEif0XmNCXAZTF5LT4=";
+  version = "3.8.0";
+  sha256 = "sha256-vaZ0YchU8g1hBXgrdpxST8NziLddRIHZUWRNIWf/7sY=";
 
   configureFlags = [ "--with-imagick=${imagemagick.dev}" ];
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ pcre2 ];
 
-  patches = lib.optionals (lib.versionAtLeast php.version "8.4") [
-    # PHP 8.4 compatibility patch based on https://github.com/Imagick/imagick/pull/690
-    # These is also an alternative https://github.com/Imagick/imagick/pull/704
-    # Which includes more changes but doesn't apply cleanly.
-    (fetchpatch {
-      url = "https://github.com/Imagick/imagick/commit/65e27f2bc02e7e8f1bf64e26e359e42a1331fca1.patch";
-      hash = "sha256-I0FwdqtQ/Y/QVkCl+nWPBIxsdQY6qcjdwiA/BaLNl7g=";
-    })
-  ];
-
   meta = with lib; {
     description = "Imagick is a native php extension to create and modify images using the ImageMagick API";
     license = licenses.php301;

From 2a7dd2ac5020c76ad07a529320a9a0b50fdd38ca Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 4 Sep 2025 07:31:49 +0200
Subject: [PATCH 66/88] php8*Extensions.msgpack: 2.2.0 -> 3.0.0

ChangeLog: https://pecl.php.net/package-changelog.php?package=msgpack&release=3.0.0
---
 pkgs/development/php-packages/msgpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/msgpack/default.nix b/pkgs/development/php-packages/msgpack/default.nix
index b4d8e1bdea79..df746a99829b 100644
--- a/pkgs/development/php-packages/msgpack/default.nix
+++ b/pkgs/development/php-packages/msgpack/default.nix
@@ -1,10 +1,10 @@
 { buildPecl, lib }:
 
 buildPecl rec {
-  version = "2.2.0";
+  version = "3.0.0";
   pname = "msgpack";
 
-  sha256 = "sha256-gqoeQExf9U7EHSogEwXNZZTtFKdSnpEZ+nykV+S70So=";
+  sha256 = "sha256-VTBqhHl9OZxrJpGB7EhGNPGL6hMwu9nXQFBDxZfeac0=";
 
   meta = {
     changelog = "https://pecl.php.net/package-info.php?package=msgpack&version=${version}";

From dacd21ca9d14bee6e4a7e5b602e1cfd42855087e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 4 Sep 2025 07:32:37 +0200
Subject: [PATCH 67/88] php8*Extensions.rdkafka: 6.0.4 -> 6.0.5

ChangeLog: https://pecl.php.net/package-changelog.php?package=rdkafka&release=6.0.5
---
 pkgs/development/php-packages/rdkafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix
index d7cd9e89b813..0d9a400d0428 100644
--- a/pkgs/development/php-packages/rdkafka/default.nix
+++ b/pkgs/development/php-packages/rdkafka/default.nix
@@ -7,8 +7,8 @@
 
 buildPecl {
   pname = "rdkafka";
-  version = "6.0.4";
-  hash = "sha256-DZc5YxOjFnruSZqVFtqFzKJa+Y5fS1XaxVVBAJvzWlk=";
+  version = "6.0.5";
+  hash = "sha256-Cva2ZcljyMfREJzsc4A0N42ciGPL9hLAvTI15RmnCPE=";
 
   buildInputs = [
     rdkafka

From 9849dfd5ee0529a2c768683ee539d96e0b390d95 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 4 Sep 2025 07:33:12 +0200
Subject: [PATCH 68/88] php8*Extensions.smbclient: 1.0.6 -> 1.1.2

ChangeLog: https://pecl.php.net/package-changelog.php?package=smbclient&release=1.1.2
---
 pkgs/development/php-packages/smbclient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix
index a7f8977687d3..e4b045c7c099 100644
--- a/pkgs/development/php-packages/smbclient/default.nix
+++ b/pkgs/development/php-packages/smbclient/default.nix
@@ -6,8 +6,8 @@
 }:
 buildPecl {
   pname = "smbclient";
-  version = "1.0.6";
-  sha256 = "sha256-ZsQzdDt6NLRWBsA75om9zkxSvB6zBsvvPhXJZrX/KNc=";
+  version = "1.1.2";
+  sha256 = "sha256-Hmp0RWOqxwCBXlca2YsRNahOhA1E5qxnmXSUx4Cpzec=";
 
   # TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66
   LIBSMBCLIENT_INCDIR = "${samba.dev}/include/samba-4.0";

From e040850a7d346e2604a9cbd68208d6818c033334 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 4 Sep 2025 01:58:23 +0530
Subject: [PATCH 69/88] google-chrome: 139.0.7258.154 -> 140.0.7339.80

Darwin google-chrome: 139.0.7258.155 -> 140.0.7339.81

https://developer.chrome.com/blog/new-in-chrome-140

https://developer.chrome.com/release-notes/140

https://chromereleases.googleblog.com/2025/09/stable-channel-update-for-desktop.html
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 04f80e7a68b1..8fe9addc7736 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.154";
+    version = "140.0.7339.80";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-6uEk4a5bVlsVNwW+ZHHBgTGmw/ArgrRQwKfLcSITt8o=";
+      hash = "sha256-9hNwMWUbtWsDvKc9hvfbI7PNVYm1L1mBLuXPlDzIG40=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -275,11 +275,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.155";
+    version = "140.0.7339.81";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/gzhmrqghx4b6bwhn7ck3vb2h5y_139.0.7258.155/GoogleChrome-139.0.7258.155.dmg";
-      hash = "sha256-k8kbSLD7K4AuuZlPYavjEyL+4Cbx3geYCghLfaf5o2E=";
+      url = "http://dl.google.com/release2/chrome/ockuail56dwhuxixexwh6zhrhm_140.0.7339.81/GoogleChrome-140.0.7339.81.dmg";
+      hash = "sha256-81TTdxKGHzLgSXSY2TVxY8JEjFZ6FZOhq3UuGvC0XAE=";
     };
 
     dontPatch = true;

From 0b06031ede562c2d92a17b11729c199620187140 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 4 Sep 2025 14:42:36 +0800
Subject: [PATCH 70/88] python3Packages.firedrake-fiat: skip bulk update and
 add updateScript

---
 .../python-modules/firedrake-fiat/default.nix       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix
index 9c3d2aa279bd..25a5b3466f24 100644
--- a/pkgs/development/python-modules/firedrake-fiat/default.nix
+++ b/pkgs/development/python-modules/firedrake-fiat/default.nix
@@ -11,6 +11,7 @@
   symengine,
   fenics-ufl,
   pytestCheckHook,
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -62,6 +63,18 @@ buildPythonPackage rec {
     "--skip-download"
   ];
 
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "([0-9.]+)"
+      ];
+    };
+  };
+
   meta = {
     description = "FInite element Automatic Tabulator";
     homepage = "http://fenics-fiat.readthedocs.org/";

From 1c28b775960eb1ee094640d968a3c83325b7f61f Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 2 Sep 2025 06:53:22 +0800
Subject: [PATCH 71/88] python3Packages.firedrake-fiat: 2025.4.0 -> 2025.4.1

Diff: firedrakeproject/fiat@2025.4.0...2025.4.1
Changelog: https://github.com/firedrakeproject/fiat/releases/tag/2025.4.1
---
 pkgs/development/python-modules/firedrake-fiat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix
index 25a5b3466f24..412077919710 100644
--- a/pkgs/development/python-modules/firedrake-fiat/default.nix
+++ b/pkgs/development/python-modules/firedrake-fiat/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "firedrake-fiat";
-  version = "2025.4.0";
+  version = "2025.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firedrakeproject";
     repo = "fiat";
     tag = version;
-    hash = "sha256-i+hDpeg4SYRF7OK6uh1p1gVscyuJ4FjmyUUiLR7P7/A=";
+    hash = "sha256-rN2JPXsauyBF6X2378kOmqHNB+1EqxiGnDaVoEXy4vw=";
   };
 
   postPatch =

From 9d949bfed91b77768cf223062d4bf5798ce2bf79 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 4 Sep 2025 14:23:30 +0800
Subject: [PATCH 72/88] python3Packages.firedrake: add updateScript

---
 pkgs/development/python-modules/firedrake/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix
index d46edecae34f..645bf8ae82ff 100644
--- a/pkgs/development/python-modules/firedrake/default.nix
+++ b/pkgs/development/python-modules/firedrake/default.nix
@@ -43,9 +43,10 @@
   mpiCheckPhaseHook,
   writableTmpDirAsHomeHook,
 
-  # passthru.tests
+  # passthru
   firedrake,
   mpich,
+  nix-update-script,
 }:
 let
   firedrakePackages = lib.makeScope newScope (self: {
@@ -173,6 +174,13 @@ buildPythonPackage rec {
     # python updater script sets the wrong tag
     skipBulkUpdate = true;
 
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "([0-9.]+)"
+      ];
+    };
+
     tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
       mpich = firedrake.override {
         petsc4py = petsc4py.override { mpi = mpich; };

From da5e78b83534cdcaafe97e83dff5cd4a6a3d741b Mon Sep 17 00:00:00 2001
From: xbreak <xbreak@users.noreply.github.com>
Date: Thu, 4 Sep 2025 09:28:59 +0200
Subject: [PATCH 73/88] nixos/asusd: Fix broken links to asusctl manual

---
 nixos/modules/services/hardware/asusd.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/hardware/asusd.nix b/nixos/modules/services/hardware/asusd.nix
index fccb0c04a5d7..d1f4f3f22a7e 100644
--- a/nixos/modules/services/hardware/asusd.nix
+++ b/nixos/modules/services/hardware/asusd.nix
@@ -64,7 +64,7 @@ in
           default = null;
           description = ''
             The content of /etc/asusd/anime.ron.
-            See <https://asus-linux.org/asusctl/#anime-control>.
+            See <https://asus-linux.org/manual/asusctl-manual/#anime-control>.
           '';
         };
 
@@ -73,7 +73,7 @@ in
           default = null;
           description = ''
             The content of /etc/asusd/asusd.ron.
-            See <https://asus-linux.org/asusctl/>.
+            See <https://asus-linux.org/manual/asusctl-manual/>.
           '';
         };
 
@@ -82,7 +82,7 @@ in
           default = { };
           description = ''
             The content of /etc/asusd/aura_<name>.ron.
-            See <https://asus-linux.org/asusctl/#led-keyboard-control>.
+            See <https://asus-linux.org/manual/asusctl-manual/#led-keyboard-control>.
           '';
         };
 
@@ -91,7 +91,7 @@ in
           default = null;
           description = ''
             The content of /etc/asusd/profile.ron.
-            See <https://asus-linux.org/asusctl/#profiles>.
+            See <https://asus-linux.org/manual/asusctl-manual/#profiles>.
           '';
         };
 
@@ -100,7 +100,7 @@ in
           default = null;
           description = ''
             The content of /etc/asusd/fan_curves.ron.
-            See <https://asus-linux.org/asusctl/#fan-curves>.
+            See <https://asus-linux.org/manual/asusctl-manual/#fan-curves>.
           '';
         };
 
@@ -109,7 +109,7 @@ in
           default = null;
           description = ''
             The content of /etc/asusd/asusd-user-ledmodes.ron.
-            See <https://asus-linux.org/asusctl/#led-keyboard-control>.
+            See <https://asus-linux.org/manual/asusctl-manual/#led-keyboard-control>.
           '';
         };
       };

From e0d61a7984c42806a5ee48ab914f6daf05cc0331 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 4 Sep 2025 07:33:57 +0200
Subject: [PATCH 74/88] php8*Extensions.sqlsrv: 5.10.1 -> 5.12.0

ChangeLog: https://pecl.php.net/package-changelog.php?package=sqlsrv&release=5.12.0
---
 pkgs/development/php-packages/sqlsrv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix
index e3bc0ce1b2d3..956464042e16 100644
--- a/pkgs/development/php-packages/sqlsrv/default.nix
+++ b/pkgs/development/php-packages/sqlsrv/default.nix
@@ -9,8 +9,8 @@
 buildPecl {
   pname = "sqlsrv";
 
-  version = "5.10.1";
-  sha256 = "sha256-XNrttNiihjQ+azuZmS2fy0So+2ndAqpde8IOsupeWdI=";
+  version = "5.12.0";
+  sha256 = "sha256-qeu4gLKlWNPWaE9uaALFPFv/pJ4e5g0Uc6cST8nLcq0=";
 
   buildInputs = [ unixODBC ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 

From 0e57fc7ec9352a1bf44f3b3714075b8f27ac8866 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 4 Sep 2025 07:34:48 +0200
Subject: [PATCH 75/88] php8*Extensions.ssh2: 1.3.1 -> 1.4.1

ChangeLog: https://pecl.php.net/package-info.php?package=ssh2&version=1.4.1
---
 pkgs/development/php-packages/ssh2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/ssh2/default.nix b/pkgs/development/php-packages/ssh2/default.nix
index 18438dbcd6ac..c8a56980e676 100644
--- a/pkgs/development/php-packages/ssh2/default.nix
+++ b/pkgs/development/php-packages/ssh2/default.nix
@@ -5,10 +5,10 @@
 }:
 
 buildPecl rec {
-  version = "1.3.1";
+  version = "1.4.1";
   pname = "ssh2";
 
-  sha256 = "sha256-kJOh+NJNxlg2AnsOI5xQ3o1err+DlrwzMf3TjF1pr9k=";
+  sha256 = "sha256-e8pbI/cx252O0K6l25uxXaj/EzsPu6lhArguldpNh2Q=";
 
   buildInputs = [ libssh2 ];
   configureFlags = [ "--with-ssh2=${libssh2.dev}" ];

From 93d4f4db7cdba88f2842d5e4c1c105fba906a300 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 4 Sep 2025 07:36:08 +0200
Subject: [PATCH 76/88] php8*Extensions.yaml: 2.2.4 -> 2.2.5

ChangeLog: https://pecl.php.net/package-info.php?package=yaml&version=2.2.5
---
 pkgs/development/php-packages/yaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix
index 2b5601ff3318..1982ffd8d8c2 100644
--- a/pkgs/development/php-packages/yaml/default.nix
+++ b/pkgs/development/php-packages/yaml/default.nix
@@ -7,8 +7,8 @@
 buildPecl {
   pname = "yaml";
 
-  version = "2.2.4";
-  sha256 = "sha256-jrNTuvh/FbG2Ksbrcci1iWhZWKH+iw49IqxZVg0OiRM=";
+  version = "2.2.5";
+  sha256 = "sha256-DHUbSJdJ+/AgcdWwxr/rJsS4Y8Zo74lxHs+VBzkb33E=";
 
   configureFlags = [ "--with-yaml=${libyaml.dev}" ];
 

From 2fa114f97288c42331ae651279974190e18cdd9b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 4 Sep 2025 10:09:15 +0200
Subject: [PATCH 77/88] postgresqlPackages.pg_cron: 1.6.5 -> 1.6.6

Release Notes:
https://github.com/citusdata/pg_cron/releases/tag/v1.6.6

Now supports PostgreSQL 18.
---
 pkgs/servers/sql/postgresql/ext/pg_cron.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index ef019030ddb1..bb5dca058bfe 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -7,22 +7,16 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_cron";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = "pg_cron";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Llksil7Fk7jvJJmCpfCN0Qm2b2I4J1VOA7/ibytO+KM=";
+    hash = "sha256-N6lLmfegUeHCpwXztMifTRvajlVLyxL0j+8edouKIOQ=";
   };
 
   meta = {
-    # PostgreSQL 18 support issue upstream: https://github.com/citusdata/pg_cron/issues/396
-    # Note: already fixed on `main` branch.
-    # Check after next package update.
-    broken = lib.warnIf (
-      finalAttrs.version != "1.6.5"
-    ) "Is postgresql18Packages.pg_cron still broken?" (lib.versionAtLeast postgresql.version "18");
     description = "Run Cron jobs through PostgreSQL";
     homepage = "https://github.com/citusdata/pg_cron";
     changelog = "https://github.com/citusdata/pg_cron/releases/tag/v${finalAttrs.version}";

From ae563740682ca07e3e22cc115ad16f12dcdece3c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 4 Sep 2025 10:15:15 +0200
Subject: [PATCH 78/88] postgresql_18: 18beta3 -> 18rc1

Release Notes for v18:
https://www.postgresql.org/docs/18/release-18.html
---
 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 9b8dbda07e9c..46211a7b5fae 100644
--- a/pkgs/servers/sql/postgresql/18.nix
+++ b/pkgs/servers/sql/postgresql/18.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  version = "18beta2";
-  rev = "refs/tags/REL_18_BETA3";
-  hash = "sha256-QpJONriQnRN75cCcsdu9TGt8Km7NQLs5diZx1pVruc4=";
+  version = "18rc1";
+  rev = "refs/tags/REL_18_RC1";
+  hash = "sha256-PDycGuKrEa00N1h/BsWUiwG7naE0f2wFFXpQSOhs/hY=";
   muslPatches = {
     dont-use-locale-a = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";

From 296f222cf8924d8c2ca52d19e962b673b39cac84 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 4 Sep 2025 10:48:14 +0200
Subject: [PATCH 79/88] postgresql18Packages.pg_hll: fix on darwin

Disabling the `missing-variable-declarations` warning only was part of
the solution, it didn't fix darwin builds. Applying upstream's patch
fixes it on all platforms. It will also warn us via build failure when
this isn't needed anymore. Win-win!
---
 pkgs/servers/sql/postgresql/ext/pg_hll.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index bd3bd7bcdb09..0354b6c337af 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -1,5 +1,6 @@
 {
   fetchFromGitHub,
+  fetchpatch,
   lib,
   postgresql,
   postgresqlBuildExtension,
@@ -16,8 +17,13 @@ postgresqlBuildExtension (finalAttrs: {
     hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c=";
   };
 
-  # https://github.com/citusdata/postgresql-hll/issues/166#issuecomment-3165489050
-  NIX_CFLAGS_COMPILE = "-Wno-error=missing-variable-declarations";
+  patches = [
+    (fetchpatch {
+      name = "fix-postgresql-18.patch";
+      url = "https://github.com/citusdata/postgresql-hll/commit/f998e234653ea397ddddc1278d1c02d8d011bd16.patch";
+      hash = "sha256-gF4f+B4Gu/QEyCGMfKLmRK6lNwgfd8lML55wMkhsSY4=";
+    })
+  ];
 
   meta = {
     description = "HyperLogLog for PostgreSQL";

From 01c7f65ed1da29b80bde251e1faeadd9b3ed61b0 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Thu, 4 Sep 2025 16:52:11 +0800
Subject: [PATCH 80/88] woof: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The upstream code hasn’t been updated for nearly four years, and it’s already broken. https://github.com/simon-budig/woof/issues/19
---
 pkgs/by-name/wo/woof/package.nix | 35 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/by-name/wo/woof/package.nix

diff --git a/pkgs/by-name/wo/woof/package.nix b/pkgs/by-name/wo/woof/package.nix
deleted file mode 100644
index 054ff86e5623..000000000000
--- a/pkgs/by-name/wo/woof/package.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  python3,
-}:
-
-stdenv.mkDerivation {
-  pname = "woof";
-  version = "2022-01-13";
-
-  src = fetchFromGitHub {
-    owner = "simon-budig";
-    repo = "woof";
-    rev = "f51e9db264118d4cbcd839348c4a6223fda49813";
-    sha256 = "sha256-tk55q2Ew2mZkQtkxjWCuNgt9t+UbjH4llIJ42IruqGY=";
-  };
-
-  propagatedBuildInputs = [ python3 ];
-
-  installPhase = ''
-    runHook preInstall
-    install -Dm555 -t $out/bin woof
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "http://www.home.unix-ag.org/simon/woof.html";
-    description = "Web Offer One File - Command-line utility to easily exchange files over a local network";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
-    maintainers = with maintainers; [ matthiasbeyer ];
-    mainProgram = "woof";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 04522b9243e3..2ce5c92790a8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2497,6 +2497,7 @@ mapAliases {
   wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17
   wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14
   wlroots = wlroots_0_19; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
+  woof = throw "'woof' has been removed as it is broken and unmaintained upstream"; # Added 2025-09-04
   wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04
   wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03
   wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03

From 01dde1fe6be0ba297dfacdf1fd625f074deee976 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 4 Sep 2025 10:57:45 +0200
Subject: [PATCH 81/88] postgresqlPackages: remove outdated broken conditions

"older than v13" is not important anymore, we don't package v12.
---
 pkgs/servers/sql/postgresql/ext/pg_ivm.nix    | 15 ++++++---------
 pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
index 1c57b2502482..4fcb9c38dc4b 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
@@ -23,14 +23,11 @@ postgresqlBuildExtension (finalAttrs: {
     maintainers = with lib.maintainers; [ ivan ];
     platforms = postgresql.meta.platforms;
     license = lib.licenses.postgresql;
-    broken =
-      lib.versionOlder postgresql.version "13"
-      ||
-        # PostgreSQL 18 support issue upstream: https://github.com/sraoss/pg_ivm/issues/133
-        # Note: already fixed on `main` branch.
-        # Check after next package update.
-        lib.warnIf (finalAttrs.version != "1.11") "Is postgresql18Packages.pg_ivm still broken?" (
-          lib.versionAtLeast postgresql.version "18"
-        );
+    # PostgreSQL 18 support issue upstream: https://github.com/sraoss/pg_ivm/issues/133
+    # Note: already fixed on `main` branch.
+    # Check after next package update.
+    broken = lib.warnIf (finalAttrs.version != "1.11") "Is postgresql18Packages.pg_ivm still broken?" (
+      lib.versionAtLeast postgresql.version "18"
+    );
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
index e648a5a65750..3eef7dbefa06 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
@@ -23,6 +23,5 @@ postgresqlBuildExtension (finalAttrs: {
     maintainers = with lib.maintainers; [ gaelreyrol ];
     platforms = postgresql.meta.platforms;
     license = lib.licenses.mpl20;
-    broken = lib.versionOlder postgresql.version "13";
   };
 })

From 19393acb7c4ecd492169c7ccc16281f71e5029ba Mon Sep 17 00:00:00 2001
From: qwqawawow <eihqnh@outlook.com>
Date: Thu, 4 Sep 2025 09:24:16 +0800
Subject: [PATCH 82/88] sftool: init at 0.1.13; sftool-gui: init at 1.0.2

---
 pkgs/by-name/sf/sftool-gui/package.nix | 75 ++++++++++++++++++++++++++
 pkgs/by-name/sf/sftool/package.nix     | 40 ++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 pkgs/by-name/sf/sftool-gui/package.nix
 create mode 100644 pkgs/by-name/sf/sftool/package.nix

diff --git a/pkgs/by-name/sf/sftool-gui/package.nix b/pkgs/by-name/sf/sftool-gui/package.nix
new file mode 100644
index 000000000000..24c5f55d0336
--- /dev/null
+++ b/pkgs/by-name/sf/sftool-gui/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  cargo-tauri,
+  glib-networking,
+  nodejs,
+  libgudev,
+  systemdLibs,
+  pnpm,
+  openssl,
+  nix-update-script,
+  pkg-config,
+  webkitgtk_4_1,
+  wrapGAppsHook4,
+  autoPatchelfHook,
+  fetchFromGitHub,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "sftool-gui";
+  version = "1.0.2";
+  src = fetchFromGitHub {
+    owner = "OpenSiFli";
+    repo = "sftool-gui";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FD3eQN4Uto4q7gdyfK5KUyZJ5ZiIJeUKkqaCZRWdQNo=";
+  };
+
+  cargoHash = "sha256-XAU3ru+TxUo99OQwcXNLJ8gzBOZUkC8UCAApz7M/QTM=";
+  cargoRoot = "src-tauri";
+
+  pnpmDeps = pnpm.fetchDeps {
+    fetcherVersion = 2;
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-gamgu9koBf+JLDswi3eGXRZybF8UiYE8CoifpQCgLaI=";
+  };
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    pnpm.configHook
+    nodejs
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook4
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking # Most Tauri apps need networking
+    webkitgtk_4_1
+    libgudev
+    systemdLibs
+  ];
+
+  # Set our Tauri source directory
+  # And make sure we build there too
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  passthru = {
+    inherit (finalAttrs) pnpmDeps;
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Download tool for the SiFli family of chips";
+    homepage = "https://github.com/OpenSiFli/sftool-gui";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ eihqnh ];
+    mainProgram = "sftool";
+  };
+})
diff --git a/pkgs/by-name/sf/sftool/package.nix b/pkgs/by-name/sf/sftool/package.nix
new file mode 100644
index 000000000000..b120150aa26c
--- /dev/null
+++ b/pkgs/by-name/sf/sftool/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  pkg-config,
+  rustPlatform,
+  stdenv,
+  systemdLibs,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "sftool";
+  version = "0.1.13";
+  src = fetchFromGitHub {
+    owner = "OpenSiFli";
+    repo = "sftool";
+    tag = finalAttrs.version;
+    hash = "sha256-/5RVBWHrZpPK2R4khnvZAnFyMfSZStCnQO5g7Ao9Ck4=";
+  };
+
+  cargoHash = "sha256-fteBYld3JzsTn/KMy5w/6Ts7x1PsYmi8zhBvgYVw5os=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    systemdLibs # libudev-sys
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Download tool for the SiFli family of chips";
+    homepage = "https://github.com/OpenSiFli/sftool";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ eihqnh ];
+    mainProgram = "sftool";
+  };
+})

From 68054da0c50bb17b0f56a1780680e0ad985ddafd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Sep 2025 09:19:02 +0000
Subject: [PATCH 83/88] python3Packages.defusedcsv: 2.0.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/defusedcsv/default.nix b/pkgs/development/python-modules/defusedcsv/default.nix
index ceebfba65114..5fe4db7e1abe 100644
--- a/pkgs/development/python-modules/defusedcsv/default.nix
+++ b/pkgs/development/python-modules/defusedcsv/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "defusedcsv";
-  version = "2.0.0";
+  version = "3.0.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "defusedcsv";
     tag = "v${version}";
-    hash = "sha256-y8qLVfdkxRrDjtrTOLK5Zvi/1Vyv8eOnCueUkaRp4sQ=";
+    hash = "sha256-OEDZbltnh2tAM58Kk852W0so7oOSv7S+S046MjIOMfY=";
   };
 
   pythonImportsCheck = [ "defusedcsv.csv" ];

From 8d09bd12adb75d09146321445416d9d8e7be53cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Sep 2025 09:33:45 +0000
Subject: [PATCH 84/88] chameleon-cli: 2.0.0-unstable-2025-08-19 ->
 2.1.0-unstable-2025-09-02

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

diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix
index 5fa514d7db20..bba8aabbef03 100644
--- a/pkgs/by-name/ch/chameleon-cli/package.nix
+++ b/pkgs/by-name/ch/chameleon-cli/package.nix
@@ -21,14 +21,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chameleon-cli";
-  version = "2.0.0-unstable-2025-08-19";
+  version = "2.1.0-unstable-2025-09-02";
 
   src = fetchFromGitHub {
     owner = "RfidResearchGroup";
     repo = "ChameleonUltra";
-    rev = "09870c3fc5094fee779b821feaae31397d4f040c";
+    rev = "964904fbfad182d6d97b72eef1ad6ec7d2fdfb79";
     sparseCheckout = [ "software" ];
-    hash = "sha256-ePY602AT9+LBRcVLWR7I46rV+6JK0HYcb9iy/UQwmwU=";
+    hash = "sha256-SYtDmfheXZvjI0bttfXZPtjRV9jIL+9OSitA11rR2Ng=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/software";

From 0a0c3e01189659965508dbeb0b9e0156f5c005df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Sep 2025 10:14:32 +0000
Subject: [PATCH 85/88] hellwal: 1.0.5 -> 1.0.7

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

diff --git a/pkgs/by-name/he/hellwal/package.nix b/pkgs/by-name/he/hellwal/package.nix
index e66194776e66..2f8000cacf39 100644
--- a/pkgs/by-name/he/hellwal/package.nix
+++ b/pkgs/by-name/he/hellwal/package.nix
@@ -6,12 +6,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "hellwal";
-  version = "1.0.5";
+  version = "1.0.7";
   src = fetchFromGitHub {
     owner = "danihek";
     repo = "hellwal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RIg2l2lFPkmbk9Dh4uKoo7kcl+/InZZ1oYXt2ih8zKs=";
+    hash = "sha256-1oF+v3sEHf8DT7yLiWRYDppNx1LpiCNrm0IQ2IWIBLU=";
   };
   nativeBuildInputs = [ makeWrapper ];
   installPhase = ''

From 5d12b6de8648b8075b9c73d7a6816a4a5fb9996c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 4 Sep 2025 13:15:20 +0300
Subject: [PATCH 86/88] perl540Packages.PPI: don't patchShebangs

---
 pkgs/top-level/perl-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 31922c7deb18..f2c0c80b136e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -28499,6 +28499,10 @@ with self;
       url = "mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.277.tar.gz";
       hash = "sha256-h8efg7aHbiBgUZZdUBnSUHxVH4GahnUAgOx+xDsuCvg=";
     };
+
+    # override default postPatch to avoid patchShebangs breaking tests
+    postPatch = "";
+
     buildInputs = [
       ClassInspector
       TestDeep

From 27664b5d7a134540bf1b5844acdfe7ad0faa4b28 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 4 Sep 2025 21:15:58 +1000
Subject: [PATCH 87/88] 
 home-assistant-custom-lovelace-modules.advanced-camera-card: 7.15.0 -> 7.17.0
 (#440099)

https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.16.0
https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.16.1
https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.16.2
https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.17.0
---
 .../custom-lovelace-modules/advanced-camera-card/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
index 4e1381b3183a..e08c29ca4862 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "advanced-camera-card";
-  version = "7.15.0";
+  version = "7.17.0";
 
   src = fetchzip {
     url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
-    hash = "sha256-7Xtr+MloMWB9lGOZvPNGjRWdznkal8HMhiU0fvZ6bK0=";
+    hash = "sha256-GwZU/vcucgg2zPsSXkgQlGzcOp/3gUCkGgGtspH0MgE=";
   };
 
   # TODO: build from source once yarn berry support lands in nixpkgs

From 8b56fe735e2c6137ab342af79a266fe2a151ebc7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 4 Sep 2025 13:33:46 +0200
Subject: [PATCH 88/88] pretalx: relax defusedcsv constraint

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

diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index 0f799ed29581..027b0bd60961 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -105,6 +105,7 @@ python.pkgs.buildPythonApplication rec {
     "celery"
     "css_inline"
     "cssutils"
+    "defusedcsv"
     "defusedxml"
     "django-compressor"
     "django-csp"