From cf523f3f84d603c2f9581d2995f2f89d39339138 Mon Sep 17 00:00:00 2001
From: Gergely Nagy <me@gergo.csillger.hu>
Date: Sun, 23 Mar 2025 14:42:01 +0100
Subject: [PATCH 001/230] nixos/caddy: Make virtualHosts' logFormat optional

Allow `services.caddy.virtualHosts.<name>.logFormat` to be null, and in
that case, do not add a `log {}` block to the Caddy configuration. This
makes it possible to have multiple loggers declared in the global
configuration, and instruct Caddy to use a logger by name.

Signed-off-by: Gergely Nagy <me@gergo.csillger.hu>
---
 nixos/modules/services/web-servers/caddy/default.nix      | 8 +++++---
 .../modules/services/web-servers/caddy/vhost-options.nix  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix
index d87a04e0f5f1..b31a341b2dbe 100644
--- a/nixos/modules/services/web-servers/caddy/default.nix
+++ b/nixos/modules/services/web-servers/caddy/default.nix
@@ -30,9 +30,11 @@ let
         ${optionalString (
           hostOpts.useACMEHost != null
         ) "tls ${sslCertDir}/cert.pem ${sslCertDir}/key.pem"}
-        log {
-          ${hostOpts.logFormat}
-        }
+        ${optionalString (hostOpts.logFormat != null) ''
+          log {
+            ${hostOpts.logFormat}
+          }
+        ''}
 
         ${hostOpts.extraConfig}
       }
diff --git a/nixos/modules/services/web-servers/caddy/vhost-options.nix b/nixos/modules/services/web-servers/caddy/vhost-options.nix
index 73ef4b87ee52..9afa699ad037 100644
--- a/nixos/modules/services/web-servers/caddy/vhost-options.nix
+++ b/nixos/modules/services/web-servers/caddy/vhost-options.nix
@@ -56,7 +56,7 @@ in
     };
 
     logFormat = mkOption {
-      type = types.lines;
+      type = types.nullOr types.lines;
       default = ''
         output file ${cfg.logDir}/access-${lib.replaceStrings [ "/" " " ] [ "_" "_" ] config.hostName}.log
       '';

From 7db47b0fffc12d14369d026be49d2a555be90ebd Mon Sep 17 00:00:00 2001
From: Johan Herland <johan@herland.net>
Date: Wed, 25 Jun 2025 10:03:07 +0000
Subject: [PATCH 002/230] hdrhistogram_c: init at 0.11.8

---
 pkgs/by-name/hd/hdrhistogram_c/package.nix | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/hd/hdrhistogram_c/package.nix

diff --git a/pkgs/by-name/hd/hdrhistogram_c/package.nix b/pkgs/by-name/hd/hdrhistogram_c/package.nix
new file mode 100644
index 000000000000..f1d128e6a1f6
--- /dev/null
+++ b/pkgs/by-name/hd/hdrhistogram_c/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  zlib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hdrhistogram_c";
+  version = "0.11.8";
+
+  src = fetchFromGitHub {
+    owner = "HdrHistogram";
+    repo = "HdrHistogram_c";
+    tag = finalAttrs.version;
+    hash = "sha256-TFlrC4bgK8o5KRZcLMlYU5EO9Oqaqe08PjJgmsUl51M=";
+  };
+
+  buildInputs = [ zlib ];
+  nativeBuildInputs = [ cmake ];
+
+  doCheck = true;
+
+  meta = {
+    description = "C port or High Dynamic Range (HDR) Histogram";
+    homepage = "https://github.com/HdrHistogram/HdrHistogram_c";
+    changelog = "https://github.com/HdrHistogram/HdrHistogram_c/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.publicDomain;
+    maintainers = with lib.maintainers; [ jherland ];
+  };
+})

From b264a6a3f7f373da4244c17c84811bc93119ce8d Mon Sep 17 00:00:00 2001
From: toyboot4e <toyboot4e@gmail.com>
Date: Thu, 3 Jul 2025 00:24:16 +0900
Subject: [PATCH 003/230] python3Packages.pyobjc-core: 11.0 -> 11.1

---
 .../python-modules/pyobjc-core/default.nix       | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix
index 4f5c0f3a1e13..968a60515fc4 100644
--- a/pkgs/development/python-modules/pyobjc-core/default.nix
+++ b/pkgs/development/python-modules/pyobjc-core/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyobjc-core";
-  version = "11.0";
+  version = "11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ronaldoussoren";
     repo = "pyobjc";
     tag = "v${version}";
-    hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg=";
+    hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us=";
   };
 
   sourceRoot = "${src.name}/pyobjc-core";
@@ -31,18 +31,6 @@ buildPythonPackage rec {
     darwin.DarwinTools # sw_vers
   ];
 
-  # See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we
-  # cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727.
-  postPatch = ''
-    for file in Modules/objc/test/*.m; do
-      substituteInPlace "$file" --replace "[[clang::suppress]]" ""
-    done
-
-    substituteInPlace setup.py \
-      --replace-fail "-buildversion" "-buildVersion" \
-      --replace-fail "-productversion" "-productVersion"
-  '';
-
   env.NIX_CFLAGS_COMPILE = toString [
     "-I${darwin.libffi.dev}/include"
     "-Wno-error=cast-function-type-mismatch"

From 9c143fceacbae535791654b52049484a5a69b8f9 Mon Sep 17 00:00:00 2001
From: toyboot4e <toyboot4e@gmail.com>
Date: Thu, 3 Jul 2025 00:24:34 +0900
Subject: [PATCH 004/230] python3Packages.pyobjc-framework-Cocoa: 11.0 -> 11.1

---
 .../pyobjc-framework-Cocoa/default.nix          | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix
index e6904460f4d1..a395f1069420 100644
--- a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix
+++ b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyobjc-framework-Cocoa";
-  version = "11.0";
+  version = "11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ronaldoussoren";
     repo = "pyobjc";
     tag = "v${version}";
-    hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg=";
+    hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us=";
   };
 
   sourceRoot = "${src.name}/pyobjc-framework-Cocoa";
@@ -25,7 +25,6 @@ buildPythonPackage rec {
 
   buildInputs = [
     darwin.libffi
-    darwin.DarwinTools
   ];
 
   nativeBuildInputs = [
@@ -37,7 +36,9 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyobjc_setup.py \
       --replace-fail "-buildversion" "-buildVersion" \
-      --replace-fail "-productversion" "-productVersion"
+      --replace-fail "-productversion" "-productVersion" \
+      --replace-fail "/usr/bin/sw_vers" "sw_vers" \
+      --replace-fail "/usr/bin/xcrun" "xcrun"
   '';
 
   dependencies = [ pyobjc-core ];
@@ -47,7 +48,13 @@ buildPythonPackage rec {
     "-Wno-error=unused-command-line-argument"
   ];
 
-  pythonImportsCheck = [ "Cocoa" ];
+  pythonImportsCheck = [
+    "Cocoa"
+    "CoreFoundation"
+    "Foundation"
+    "AppKit"
+    "PyObjCTools"
+  ];
 
   meta = with lib; {
     description = "PyObjC wrappers for the Cocoa frameworks on macOS";

From ae1dc0c57675530a82f6a0658c9156692a690bae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 08:32:15 +0200
Subject: [PATCH 005/230] cf-hero: init at 1.0.4

Tool that uses multiple data sources to discover the origin IP
addresses of Cloudflare-protected web applications

https://github.com/musana/CF-Hero
---
 pkgs/by-name/cf/cf-hero/package.nix | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/cf/cf-hero/package.nix

diff --git a/pkgs/by-name/cf/cf-hero/package.nix b/pkgs/by-name/cf/cf-hero/package.nix
new file mode 100644
index 000000000000..e4e16e814785
--- /dev/null
+++ b/pkgs/by-name/cf/cf-hero/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "cf-hero";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "musana";
+    repo = "CF-Hero";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-n0kcapHBz6Dap6KKJByCwBZmXmcO/aK88X78Yit6rx4=";
+  };
+
+  vendorHash = "sha256-Yf+iZ3UIpP9EtOWW1jh3h3zTFK1D7mcOh113Q4fbAhA=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Tool that uses multiple data sources to discover the origin IP addresses of Cloudflare-protected web applications";
+    homepage = "https://github.com/musana/CF-Hero";
+    changelog = "https://github.com/musana/CF-Hero/releases/tag/${finalAttrs.src.tag}";
+    # No licensing details present, https://github.com/musana/CF-Hero/issues/16
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "cf-hero";
+  };
+})

From 74c453cbd5cebfae0249c6c1c5ba288a2d3a06db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 20:47:48 +0200
Subject: [PATCH 006/230] python313Packages.types-html5lib: 1.1.11.20250516 ->
 1.1.11.20250708

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

diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix
index 869dd0f9ff63..992b8e7496ac 100644
--- a/pkgs/development/python-modules/types-html5lib/default.nix
+++ b/pkgs/development/python-modules/types-html5lib/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-html5lib";
-  version = "1.1.11.20250516";
+  version = "1.1.11.20250708";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_html5lib";
     inherit version;
-    hash = "sha256-ZQQ6ZxjJf31SVnzAzfQe+/wzsfksbAxeGfYKfsaa5yA=";
+    hash = "sha256-JDIXIP26xxzuUNWkvsm3RISVtyF5dM/+P88e3k7vev4=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 9d50f2dd2fd1b2cb793caf4467f64883abfe9043 Mon Sep 17 00:00:00 2001
From: Glen Huang <me@glenhuang.com>
Date: Thu, 17 Jul 2025 13:28:04 +0800
Subject: [PATCH 007/230] nixos/dnsmasq: make dnsmasq --test test the config
 file

Currently it's testing an empty configuration
---
 nixos/modules/services/networking/dnsmasq.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index b345b51d4bda..605c4666ab60 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -173,7 +173,7 @@ in
         touch ${stateDir}/dnsmasq.leases
         chown -R dnsmasq ${stateDir}
         ${lib.optionalString cfg.resolveLocalQueries "touch /etc/dnsmasq-{conf,resolv}.conf"}
-        dnsmasq --test
+        dnsmasq --test -C ${cfg.configFile}
       '';
       serviceConfig = {
         Type = "dbus";

From 7454288c9186ba712980c4c25cd43779e23b84c3 Mon Sep 17 00:00:00 2001
From: Glen Huang <me@glenhuang.com>
Date: Sat, 19 Jul 2025 11:00:05 +0800
Subject: [PATCH 008/230] nixos/resolveconf: not resetting package

package already has a default value, there is no need to reset it
---
 nixos/modules/config/resolvconf.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix
index f9c9d04b3fbe..c8e7abf2f860 100644
--- a/nixos/modules/config/resolvconf.nix
+++ b/nixos/modules/config/resolvconf.nix
@@ -175,8 +175,6 @@ in
 
       networking.resolvconf.subscriberFiles = [ "/etc/resolv.conf" ];
 
-      networking.resolvconf.package = pkgs.openresolv;
-
       environment.systemPackages = [ cfg.package ];
 
       systemd.services.resolvconf = {

From bb51f7022cef0427493e1262396a23fec89189e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 24 Jul 2025 21:14:25 +0200
Subject: [PATCH 009/230] python312Packages.banks: 2.1.3 -> 2.2.0

Diff: https://github.com/masci/banks/compare/refs/tags/v2.1.3...refs/tags/v2.2.0

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

diff --git a/pkgs/development/python-modules/banks/default.nix b/pkgs/development/python-modules/banks/default.nix
index 59417bda2e50..d002be189ec9 100644
--- a/pkgs/development/python-modules/banks/default.nix
+++ b/pkgs/development/python-modules/banks/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "banks";
-  version = "2.1.3";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "masci";
     repo = "banks";
     tag = "v${version}";
-    hash = "sha256-aDcmrvrTNE+YfwFmcOvNBuCfzamvtkGE3EwybAucKuQ=";
+    hash = "sha256-lzU1SwgZ7EKCmpDtCp4jKDBIdZVB+S1s/Oh3GfZCmtg=";
   };
 
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

From 3352c7c46a3d4bd9726d4948f0c19be91a8ae2ce Mon Sep 17 00:00:00 2001
From: DoctorDalek1963 <dyson.dyson@icloud.com>
Date: Sat, 26 Jul 2025 12:22:15 +0100
Subject: [PATCH 010/230] maintainers: add DoctorDalek1963

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index be3ed66528da..cdc3b12a11b0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6613,6 +6613,12 @@
     githubId = 129093;
     name = "Desmond O. Chang";
   };
+  DoctorDalek1963 = {
+    email = "dyson.dyson@icloud.com";
+    github = "DoctorDalek1963";
+    githubId = 69600500;
+    name = "Dyson Dyson";
+  };
   dod-101 = {
     email = "david.thievon@proton.me";
     github = "DOD-101";

From 9e2d007b94325158199e8da26c778e2851c4e9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 2 Jul 2025 16:49:49 +0200
Subject: [PATCH 011/230] nixos/nextcloud: configure redis by default

---
 nixos/doc/manual/release-notes/rl-2511.section.md  | 2 ++
 nixos/modules/services/web-apps/nextcloud.nix      | 7 +++++--
 nixos/tests/nextcloud/with-mysql-and-memcached.nix | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index d3cff7b638e7..0e80b43edd28 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -135,6 +135,8 @@
 
 - `services.dnscrypt-proxy2` gains a `package` option to specify dnscrypt-proxy package to use.
 
+- `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details.
+
 - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.
 
 - `libvirt` now supports using `nftables` backend.
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index dcee09968bc1..86ee09b87df3 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -772,11 +772,14 @@ in
 
     configureRedis = lib.mkOption {
       type = lib.types.bool;
-      default = config.services.nextcloud.notify_push.enable;
-      defaultText = lib.literalExpression "config.services.nextcloud.notify_push.enable";
+      default = true;
       description = ''
         Whether to configure Nextcloud to use the recommended Redis settings for small instances.
 
+        ::: {.note}
+        The Nextcloud system check recommends to configure either Redis or Memcache for file lock caching.
+        :::
+
         ::: {.note}
         The `notify_push` app requires Redis to be configured. If this option is turned off, this must be configured manually.
         :::
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
index 5b2cd4976064..f05dcd0a9835 100644
--- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@@ -23,10 +23,10 @@ runTest (
           services.nextcloud = {
             caching = {
               apcu = true;
-              redis = false;
               memcached = true;
             };
             config.dbtype = "mysql";
+            configureRedis = false;
           };
 
           services.memcached.enable = true;

From 1eb0e955b5fac9ceb2f3c2d0a34a16c0fe757dd8 Mon Sep 17 00:00:00 2001
From: DoctorDalek1963 <dyson.dyson@icloud.com>
Date: Sat, 26 Jul 2025 12:22:26 +0100
Subject: [PATCH 012/230] sunsetr: init at 0.6.1

---
 pkgs/by-name/su/sunsetr/Cargo.lock  | 1818 +++++++++++++++++++++++++++
 pkgs/by-name/su/sunsetr/package.nix |   34 +
 2 files changed, 1852 insertions(+)
 create mode 100644 pkgs/by-name/su/sunsetr/Cargo.lock
 create mode 100644 pkgs/by-name/su/sunsetr/package.nix

diff --git a/pkgs/by-name/su/sunsetr/Cargo.lock b/pkgs/by-name/su/sunsetr/Cargo.lock
new file mode 100644
index 000000000000..8266aa015faa
--- /dev/null
+++ b/pkgs/by-name/su/sunsetr/Cargo.lock
@@ -0,0 +1,1818 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
+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.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[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.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "chrono"
+version = "0.4.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link",
+]
+
+[[package]]
+name = "chrono-tz"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3"
+dependencies = [
+ "chrono",
+ "phf",
+]
+
+[[package]]
+name = "cities"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee8bec2115436fa4c2d3fb2e7286482c16e812fd781f2e40ffb8d1f66186e4c2"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+[[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 = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "crossterm"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
+dependencies = [
+ "bitflags",
+ "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 = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "document-features"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
+dependencies = [
+ "litrs",
+]
+
+[[package]]
+name = "downcast"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
+[[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.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
+[[package]]
+name = "float_next_after"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "fragile"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
+
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[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-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "geometry-rs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fe577bea4aec9757361ef0ea2e38ff05aa65b887858229e998b2cdfe16ee65"
+dependencies = [
+ "float_next_after",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "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.2+wasi-0.2.4",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "jiff"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.174"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+
+[[package]]
+name = "libredox"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0"
+dependencies = [
+ "bitflags",
+ "libc",
+]
+
+[[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 = "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.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+
+[[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 = "mockall"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2"
+dependencies = [
+ "cfg-if",
+ "downcast",
+ "fragile",
+ "mockall_derive",
+ "predicates",
+ "predicates-tree",
+]
+
+[[package]]
+name = "mockall_derive"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898"
+dependencies = [
+ "cfg-if",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multimap"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
+
+[[package]]
+name = "nix"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[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 = "petgraph"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
+dependencies = [
+ "fixedbitset",
+ "indexmap",
+]
+
+[[package]]
+name = "phf"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
+dependencies = [
+ "siphasher",
+]
+
+[[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 = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "predicates"
+version = "3.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
+dependencies = [
+ "anstyle",
+ "predicates-core",
+]
+
+[[package]]
+name = "predicates-core"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
+
+[[package]]
+name = "predicates-tree"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
+dependencies = [
+ "predicates-core",
+ "termtree",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proptest"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
+dependencies = [
+ "bit-set",
+ "bit-vec",
+ "bitflags",
+ "lazy_static",
+ "num-traits",
+ "rand",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
+[[package]]
+name = "prost"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
+dependencies = [
+ "heck",
+ "itertools",
+ "log",
+ "multimap",
+ "once_cell",
+ "petgraph",
+ "prettyplease",
+ "prost",
+ "prost-types",
+ "regex",
+ "syn",
+ "tempfile",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quick-xml"
+version = "0.37.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.3",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
+dependencies = [
+ "getrandom 0.2.16",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags",
+ "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",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.4",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
+
+[[package]]
+name = "scc"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22b2d775fb28f245817589471dd49c5edf64237f4a19d10ce9a92ff4651a27f4"
+dependencies = [
+ "sdd",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sdd"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
+
+[[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.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serial_test"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
+dependencies = [
+ "futures",
+ "log",
+ "once_cell",
+ "parking_lot",
+ "scc",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[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.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
+[[package]]
+name = "slab"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "sunrise"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0733c9f1eaa06ed6d103d88e21f784449d08a6733c2ca2b39381cbcbcfe89272"
+dependencies = [
+ "chrono",
+]
+
+[[package]]
+name = "sunsetr"
+version = "0.6.1"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "chrono-tz",
+ "cities",
+ "crossterm",
+ "dirs",
+ "env_logger",
+ "fs2",
+ "mockall",
+ "nix",
+ "proptest",
+ "regex",
+ "serde",
+ "serial_test",
+ "signal-hook",
+ "sunrise",
+ "sunsetr",
+ "tempfile",
+ "termios",
+ "toml",
+ "tzf-rs",
+ "wayland-client",
+ "wayland-protocols-wlr",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.3",
+ "once_cell",
+ "rustix 1.0.8",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termios"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "termtree"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
+
+[[package]]
+name = "thiserror"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_write",
+ "winnow",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
+[[package]]
+name = "tzf-rel"
+version = "0.0.2025-b"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb5c10d0e0d00ad6552ae5feab676ba03858ba9ccf4494743b7f242984419d4"
+
+[[package]]
+name = "tzf-rs"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bb74389502c5223e56831ef510cd85b961659d1518deca5be257ce6f5301c4f"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "geometry-rs",
+ "prost",
+ "prost-build",
+ "tzf-rel",
+]
+
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "wait-timeout"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wayland-backend"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix 0.38.44",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
+dependencies = [
+ "bitflags",
+ "log",
+ "rustix 0.38.44",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
+dependencies = [
+ "bitflags",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
+dependencies = [
+ "bitflags",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615"
+dependencies = [
+ "pkg-config",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[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-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link",
+]
+
+[[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.2",
+]
+
+[[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.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+dependencies = [
+ "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.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.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.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.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.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.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.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.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags",
+]
+
+[[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",
+]
diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix
new file mode 100644
index 000000000000..22480bf81898
--- /dev/null
+++ b/pkgs/by-name/su/sunsetr/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "sunsetr";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "psi4j";
+    repo = "sunsetr";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kFIfNVA1UJrle/5udi8+9uDgq9fArUdudM/v8QpGuaM=";
+  };
+
+  cargoLock.lockFile = ./Cargo.lock;
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  checkFlags = [
+    "--skip=config::tests::test_geo_toml_exists_before_config_creation"
+  ];
+
+  meta = {
+    mainProgram = "sunsetr";
+    description = "Automatic blue light filter for Hyprland, Niri, and everything Wayland";
+    homepage = "https://github.com/psi4j/sunsetr";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.DoctorDalek1963 ];
+  };
+})

From 0eb8d674fb9c9515b56d01852bc0736489a4fa20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 09:24:43 +0000
Subject: [PATCH 013/230] python3Packages.lib50: 3.0.12 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/lib50/default.nix b/pkgs/development/python-modules/lib50/default.nix
index 4dedfc40b05b..37a8b51eb111 100644
--- a/pkgs/development/python-modules/lib50/default.nix
+++ b/pkgs/development/python-modules/lib50/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "lib50";
-  version = "3.0.12";
+  version = "3.1.1";
   pyproject = true;
 
   # latest GitHub release is several years old. Pypi is up to date.
   src = fetchPypi {
     pname = "lib50";
     inherit version;
-    hash = "sha256-Fc4Hb1AbSeetK3gH1/dRCUfHGDlMzfzgF1cnK3Se01U=";
+    hash = "sha256-DSAYgtce9lU9dlfLejdIH9K8jVeNaPl0wSqStMgwUD4=";
   };
 
   build-system = [ setuptools ];

From 1a5dfb192952ef1b860c55c35b939a7524af35d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Sun, 27 Jul 2025 21:09:18 -0500
Subject: [PATCH 014/230] secretspec: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix
index e659f665026f..a1d7d2c748d0 100644
--- a/pkgs/by-name/se/secretspec/package.nix
+++ b/pkgs/by-name/se/secretspec/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "secretspec";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-6a3BerjcLn86XCakyYlMm4FUUQTc7iq/hCvZEbHnp4g=";
+    hash = "sha256-CYIAbp6O2e8WQcaffJ6fNY0hyKduu9mfH4xkC6ZEEWU=";
   };
 
-  cargoHash = "sha256-4sKja7dED1RuiRYA2BNqvvYlJhPFiM8IzAgQVeSa9Oc=";
+  cargoHash = "sha256-cKV4rrIBKPPNfBeHdZ6K8+2yU5gznPGSlFcHfKVCnNM=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus ];

From 3e15b6c8d762ee6ae2980040a48c0d8401b18181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ha=CC=88cker?= <mhaecker@mac.com>
Date: Sun, 2 Mar 2025 19:29:19 +0100
Subject: [PATCH 015/230] mumble: Switch to upstream build system: ninja
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ninja is a bit faster at building the software than make. My
measurements put it at about 20% faster.

# make
❯ nx hyperfine 'nix build .#mumble --rebuild' --warmup 1
--ignore-failure
Benchmark 1: nix build .#mumble --rebuild
  Time (mean ± σ):     73.287 s ±  2.462 s    [User: 0.679 s, System:
3.338 s]
  Range (min … max):   69.478 s … 77.686 s    10 runs

# ninja
❯ nx hyperfine 'nix build .#mumble --rebuild' --warmup 1
--ignore-failure
Benchmark 1: nix build .#mumble --rebuild
  Time (mean ± σ):     60.481 s ±  2.828 s    [User: 0.089 s, System:
1.173 s]
  Range (min … max):   57.687 s … 66.910 s    10 runs
---
 pkgs/applications/networking/mumble/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index fda05185adff..0bd762a05632 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -6,6 +6,7 @@
   pkg-config,
   qt5,
   cmake,
+  ninja,
   avahi,
   boost,
   libopus,
@@ -51,6 +52,7 @@ let
 
         nativeBuildInputs = [
           cmake
+          ninja
           pkg-config
           python3
           qt5.wrapQtAppsHook

From 6c1809192c42bf64a46abd6187eadbf6618fcba9 Mon Sep 17 00:00:00 2001
From: ZHANG Yuntian <yt@radxa.com>
Date: Wed, 30 Jul 2025 15:41:52 +0800
Subject: [PATCH 016/230] ch9344: support Linux 6.16

---
 pkgs/os-specific/linux/ch9344/default.nix        |  1 +
 .../linux/ch9344/fix-linux-6-16-build.patch      | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/os-specific/linux/ch9344/fix-linux-6-16-build.patch

diff --git a/pkgs/os-specific/linux/ch9344/default.nix b/pkgs/os-specific/linux/ch9344/default.nix
index 2f290467ace7..3a6d448b784f 100644
--- a/pkgs/os-specific/linux/ch9344/default.nix
+++ b/pkgs/os-specific/linux/ch9344/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./fix-linux-6-12-build.patch
     ./fix-linux-6-15-build.patch
+    ./fix-linux-6-16-build.patch
   ];
 
   sourceRoot = "${src.name}/driver";
diff --git a/pkgs/os-specific/linux/ch9344/fix-linux-6-16-build.patch b/pkgs/os-specific/linux/ch9344/fix-linux-6-16-build.patch
new file mode 100644
index 000000000000..a66e4c4251e2
--- /dev/null
+++ b/pkgs/os-specific/linux/ch9344/fix-linux-6-16-build.patch
@@ -0,0 +1,16 @@
+diff --git a/ch9344.c b/ch9344.c
+index 36402c0..9f0df54 100644
+--- a/ch9344.c
++++ b/ch9344.c
+@@ -929,7 +929,11 @@ static void timer_function(unsigned long arg)
+ static void timer_function(struct timer_list *t)
+ {
+ 	unsigned char *buffer;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0))
++	struct ch9344_ttyport *ttyport = timer_container_of(ttyport, t, timer);
++#else
+ 	struct ch9344_ttyport *ttyport = from_timer(ttyport, t, timer);
++#endif
+ 	int fifolen = kfifo_len(&ttyport->rfifo);
+ 	int len;
+ 

From f5461d0f09e1a890ce5b3785a3ff702d5a91e464 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 03:39:08 +0000
Subject: [PATCH 017/230] opa-envoy-plugin: 1.6.0-envoy-2 -> 1.7.1-envoy

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

diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix
index 8698fefe0d47..efa934195f52 100644
--- a/pkgs/by-name/op/opa-envoy-plugin/package.nix
+++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix
@@ -14,13 +14,13 @@ assert
 
 buildGoModule rec {
   pname = "opa-envoy-plugin";
-  version = "1.6.0-envoy-2";
+  version = "1.7.1-envoy";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa-envoy-plugin";
     tag = "v${version}";
-    hash = "sha256-pYyGbZKrdQj1Bw6q4c8wcfqOzgX/WE0hn/qODxFItB0=";
+    hash = "sha256-q4Cs5/QtGTWj8Ljr1R7BD6GWge6+/hUDAF/M2N/tgWE=";
   };
 
   vendorHash = null;

From 5ff1b30307577df5393ee8a3af3bfe35f18687c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 06:40:51 +0000
Subject: [PATCH 018/230] azurite: 3.34.0 -> 3.35.0

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

diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix
index ec273e15187c..5ad12be555d8 100644
--- a/pkgs/by-name/az/azurite/package.nix
+++ b/pkgs/by-name/az/azurite/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "azurite";
-  version = "3.34.0";
+  version = "3.35.0";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "Azurite";
     rev = "v${version}";
-    hash = "sha256-6NECduq2ewed8bR4rlF5MW8mGcsgu8bqgA/DBt8ywtM=";
+    hash = "sha256-sVYiHQJ3nR5vM+oPAHzr/MjuNBMY14afqCHpw32WCiQ=";
   };
 
-  npmDepsHash = "sha256-WRaD99CsIuH3BrO01eVuoEZo40VjuScnVzmlFcKpj8g=";
+  npmDepsHash = "sha256-UBHjb65Ud7IANsR30DokbI/16+dVjDEtfhqRPAQhGUw=";
 
   nativeBuildInputs = [
     pkg-config

From 3ad01858c5e0316de7a7e40568ed217a126e5fb7 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Mon, 17 Mar 2025 12:22:37 +0000
Subject: [PATCH 019/230] nixos/snips-sh: init module

Co-authored-by: NotAShelf <raf@notashelf.dev>
---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/web-apps/snips-sh.nix | 159 +++++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/snips-sh.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 92899fd6115f..5e4deba44d45 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1681,6 +1681,7 @@
   ./services/web-apps/simplesamlphp.nix
   ./services/web-apps/slskd.nix
   ./services/web-apps/snipe-it.nix
+  ./services/web-apps/snips-sh.nix
   ./services/web-apps/sogo.nix
   ./services/web-apps/stash.nix
   ./services/web-apps/stirling-pdf.nix
diff --git a/nixos/modules/services/web-apps/snips-sh.nix b/nixos/modules/services/web-apps/snips-sh.nix
new file mode 100644
index 000000000000..c11cfa6588f5
--- /dev/null
+++ b/nixos/modules/services/web-apps/snips-sh.nix
@@ -0,0 +1,159 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib)
+    mkOption
+    mkEnableOption
+    mkPackageOption
+    mapAttrs
+    optional
+    boolToString
+    isBool
+    mkIf
+    getExe
+    types
+    ;
+
+  cfg = config.services.snips-sh;
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    isabelroses
+    NotAShelf
+  ];
+
+  options.services.snips-sh = {
+    enable = mkEnableOption "snips.sh";
+
+    package = mkPackageOption pkgs "snips-sh" {
+      example = "pkgs.snips-sh.override {withTensorflow = true;}";
+    };
+
+    stateDir = mkOption {
+      type = types.path;
+      default = "/var/lib/snips-sh";
+      description = "The state directory of the service.";
+    };
+
+    settings = mkOption {
+      type = types.submodule {
+        freeformType = types.attrsOf (
+          types.nullOr (
+            types.oneOf [
+              types.str
+              types.int
+              types.bool
+            ]
+          )
+        );
+
+        options = {
+          SNIPS_HTTP_INTERNAL = mkOption {
+            type = types.str;
+            description = "The internal HTTP address of the service";
+          };
+
+          SNIPS_SSH_INTERNAL = mkOption {
+            type = types.str;
+            description = "The internal SSH address of the service";
+          };
+        };
+      };
+
+      default = { };
+      example = {
+        SNIPS_HTTP_INTERNAL = "http://0.0.0.0:8080";
+        SNIPS_SSH_INTERNAL = "ssh://0.0.0.0:2222";
+      };
+
+      description = ''
+        The configuration of snips-sh is done through environment variables,
+        therefore you must use upper snake case (e.g. {env}`SNIPS_HTTP_INTERNAL`).
+
+        Based on the attributes passed to this config option an environment file will be generated
+        that is passed to snips-sh's systemd service.
+
+        The available configuration options can be found in
+        [self-hosting guide](https://github.com/robherley/snips.sh/blob/main/docs/self-hosting.md#configuration) to
+        find about the environment variables you can use.
+      '';
+    };
+
+    environmentFile = mkOption {
+      type = with types; nullOr path;
+      default = null;
+      example = "/etc/snips-sh.env";
+      description = ''
+        Additional environment file as defined in {manpage}`systemd.exec(5)`.
+
+        Sensitive secrets such as {env}`SNIPS_SSH_HOSTKEYPATH` and {env}`SNIPS_METRICS_STATSD`
+        may be passed to the service while avoiding potentially making them world-readable in the nix store or
+        to convert an existing non-nix installation with minimum hassle.
+
+        Note that this file needs to be available on the host on which
+        `snips-sh` is running.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd = {
+      tmpfiles.settings."10-snips-sh" = {
+        "${cfg.stateDir}/data".D = {
+          mode = "0755";
+        };
+      };
+
+      services.snips-sh = {
+        wants = [ "network-online.target" ];
+        after = [ "network-online.target" ];
+        wantedBy = [ "multi-user.target" ];
+
+        environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings;
+
+        serviceConfig = {
+          EnvironmentFile = optional (cfg.environmentFile != null) cfg.environmentFile;
+          ExecStart = getExe cfg.package;
+          LimitNOFILE = "1048576";
+          AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+          WorkingDirectory = cfg.stateDir;
+          RuntimeDirectory = "snips-sh";
+          StateDirectory = "snips-sh";
+          StateDirectoryMode = "0700";
+          Restart = "always";
+
+          # hardening
+          DynamicUser = true;
+          NoNewPrivileges = true;
+          ProtectSystem = "strict";
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectClock = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectControlGroups = true;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          PrivateUsers = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+          ];
+          RestrictNamespaces = true;
+          RestrictSUIDSGID = true;
+          SystemCallFilter = "@system-service";
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
+          RemoveIPC = true;
+        };
+      };
+    };
+  };
+}

From 98460649ab80823a0bbe289b40e06403041817f4 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Mon, 17 Mar 2025 12:22:57 +0000
Subject: [PATCH 020/230] nixosTests.snips-sh: init

Co-authored-by: NotAShelf <raf@notashelf.dev>
---
 nixos/tests/all-tests.nix |  1 +
 nixos/tests/snips-sh.nix  | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 nixos/tests/snips-sh.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 34af2e0f2202..3a0f0db4c506 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1335,6 +1335,7 @@ in
   snapcast = runTest ./snapcast.nix;
   snapper = runTest ./snapper.nix;
   snipe-it = runTest ./web-apps/snipe-it.nix;
+  snips-sh = runTest ./snips-sh.nix;
   soapui = runTest ./soapui.nix;
   soft-serve = runTest ./soft-serve.nix;
   sogo = runTest ./sogo.nix;
diff --git a/nixos/tests/snips-sh.nix b/nixos/tests/snips-sh.nix
new file mode 100644
index 000000000000..04e40472e412
--- /dev/null
+++ b/nixos/tests/snips-sh.nix
@@ -0,0 +1,27 @@
+{ lib, ... }:
+{
+  name = "snips-sh";
+
+  nodes.machine = {
+    services.snips-sh = {
+      enable = true;
+      settings = {
+        SNIPS_HTTP_INTERNAL = "http://0.0.0.0:8080";
+        SNIPS_SSH_INTERNAL = "ssh://0.0.0.0:2222";
+      };
+    };
+  };
+
+  testScript = ''
+    start_all()
+
+    machine.wait_for_unit("snips-sh.service")
+    machine.wait_for_open_port(8080)
+    machine.succeed("curl --fail http://localhost:8080")
+  '';
+
+  meta.maintainers = with lib.maintainers; [
+    isabelroses
+    NotAShelf
+  ];
+}

From e01a50d5bfd68874d9b3e2f23f7e2c8bf9097a40 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Mon, 17 Mar 2025 12:23:17 +0000
Subject: [PATCH 021/230] snips-sh: add NixOS test

Co-authored-by: NotAShelf <raf@notashelf.dev>
---
 pkgs/by-name/sn/snips-sh/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sn/snips-sh/package.nix b/pkgs/by-name/sn/snips-sh/package.nix
index 4058628c9a54..cfbe3ffc2068 100644
--- a/pkgs/by-name/sn/snips-sh/package.nix
+++ b/pkgs/by-name/sn/snips-sh/package.nix
@@ -5,6 +5,7 @@
   sqlite,
   libtensorflow,
   withTensorflow ? false,
+  nixosTests,
 }:
 buildGoModule rec {
   pname = "snips-sh";
@@ -22,6 +23,8 @@ buildGoModule rec {
 
   buildInputs = [ sqlite ] ++ (lib.optional withTensorflow libtensorflow);
 
+  passthru.tests = nixosTests.snips-sh;
+
   meta = {
     description = "Passwordless, anonymous SSH-powered pastebin with a human-friendly TUI and web UI";
     license = lib.licenses.mit;

From a326bc6ce690700598226553e52ec7a09a41a797 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 10:47:43 +0000
Subject: [PATCH 022/230] python3Packages.smp: 3.3.1 -> 3.3.2

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

diff --git a/pkgs/development/python-modules/smp/default.nix b/pkgs/development/python-modules/smp/default.nix
index 8f4ec2f8fe41..37eb2452d93f 100644
--- a/pkgs/development/python-modules/smp/default.nix
+++ b/pkgs/development/python-modules/smp/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "smp";
-  version = "3.3.1";
+  version = "3.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JPHutchins";
     repo = "smp";
     tag = version;
-    hash = "sha256-TjucQm07nbfuFrVOHGOVA/f1rQRQfU8ws8VVC+U/kp8=";
+    hash = "sha256-klMFJOKGSy6s16M+9wQhSvLSWdNPO/IMNdY5RW+wyFc=";
   };
 
   build-system = [
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple Management Protocol (SMP) for remotely managing MCU firmware";
     homepage = "https://github.com/JPHutchins/smp";
-    changelog = "https://github.com/JPHutchins/smp/releases/tag/${version}";
+    changelog = "https://github.com/JPHutchins/smp/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ otavio ];
   };

From 30a9a6f032562fcc3816b4b67420e22db8da9dc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 13:03:40 +0000
Subject: [PATCH 023/230] protoc-gen-entgrpc: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
index f7eed9ab1c33..14d9cce6540a 100644
--- a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "protoc-gen-entgrpc";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "ent";
     repo = "contrib";
     rev = "v${version}";
-    sha256 = "sha256-8BQXjoVTasCReAc3XWBgeoYmL9zLj+uvf9TRKBYaAr4=";
+    sha256 = "sha256-kI+/qbWvOxcHKee7jEFBs5Bb+5MPGunAsB6d1j9fhp8=";
   };
 
-  vendorHash = "sha256-jdjcnDfEAP33oQSn5nqgFqE+uwKBXp3gJWTNiiH/6iw=";
+  vendorHash = "sha256-tOt6Uxo4Z2zJrTjyTPoqHGfUgxFmtB+xP+kB+S6ez84=";
 
   subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];
 

From 2dfb965aff71fe9d20a85af5b632a0aa2f607217 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 13:08:58 +0000
Subject: [PATCH 024/230] mitra: 4.6.0 -> 4.7.0

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

diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix
index 68b987678fb3..7c9f91a7456f 100644
--- a/pkgs/by-name/mi/mitra/package.nix
+++ b/pkgs/by-name/mi/mitra/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mitra";
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "silverpill";
     repo = "mitra";
     rev = "v${version}";
-    hash = "sha256-FSgB2h52dpfO3GdBoCKlb8jl8eR2pQ1vWuQZdXoS0jo=";
+    hash = "sha256-xSgwCKjYuF6nUo4P7NrGocyhqBbBV/sx2BGKjWCEtB0=";
   };
 
-  cargoHash = "sha256-GFrhTbW+o18VmB+wyokpPXIV9XlcjSdHwckZEHNX+KY=";
+  cargoHash = "sha256-dwaW69Mxn4GVFqOI+UUGkJG9yc3SWob0FcC1oMGsHg8=";
 
   # require running database
   doCheck = false;

From 60578704388a4d144dbfd4e1fb4addc2c07b88e5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:34:10 +0200
Subject: [PATCH 025/230] python313Packages.scrypt: 0.8.27 -> 0.8.29

Diff: https://github.com/holgern/py-scrypt/compare/refs/tags/v0.8.27...refs/tags/v0.8.29

Changelog: https://github.com/holgern/py-scrypt/releases/tag/v0.8.29
---
 pkgs/development/python-modules/scrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scrypt/default.nix b/pkgs/development/python-modules/scrypt/default.nix
index df3ad53ff9cb..431d1e0da634 100644
--- a/pkgs/development/python-modules/scrypt/default.nix
+++ b/pkgs/development/python-modules/scrypt/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "scrypt";
-  version = "0.8.27";
+  version = "0.8.29";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "holgern";
     repo = "py-scrypt";
     tag = "v${version}";
-    hash = "sha256-r5tXRq4VFieqw3Plx6W5imDIeGIldW1BREdm6/Kav3M=";
+    hash = "sha256-vO7TLLF+TMp8sr55sLaUWA9erwaHj5YipqchmIX6EOE=";
   };
 
   build-system = [ setuptools ];

From 174d72c9529be1655464d1472b5d7ec46881a7bc Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 3 Aug 2025 13:45:12 +0200
Subject: [PATCH 026/230] palemoon-bin: 33.8.0 -> 33.8.1.1

---
 pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index 20658e875909..c974e96d7119 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.8.0";
+  version = "33.8.1.1";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-cdPFMYlVEr6D+0mH7Mg5nGpf0KvePGLm3Y/ZytdFHHA=";
+          hash = "sha256-zUStYcCOwiP/LHDUVzu1E8Req0Erk96/Pp1zu+FvK5s=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-dgWKmkHl5B1ri3uev63MNz/+E767ip9wJ/YzSog8vdQ=";
+          hash = "sha256-OfShUQiFtX+3cb035EbE4FgpohDcNXqOa5i75IxGo0o=";
         };
       };
 

From 0258f52c9e23c15bd95a6c7fa32f6cf1babc9254 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 3 Aug 2025 13:48:08 +0200
Subject: [PATCH 027/230] palemoon-gtk2-bin: init at 33.8.1.1

To make testing the variant override more convenient.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19ea2ce1706d..891390e70348 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13242,6 +13242,7 @@ with pkgs;
   };
 
   palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { };
+  palemoon-gtk2-bin = palemoon-bin.override { withGTK3 = false; };
 
   pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };
 

From 77bd5a72b6378cfb19a2ad5af9c65f1de6ad46a1 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sun, 3 Aug 2025 13:22:00 -0400
Subject: [PATCH 028/230] duckstation: remove

Remove duckstation due to absence of upstream for nearly a year now.
---
 .../duckstation/001-fix-test-inclusion.diff   |  11 --
 .../du/duckstation/002-hardcode-vars.diff     |  19 --
 .../duckstation/003-fix-NEON-intrinsics.patch |  70 --------
 pkgs/by-name/du/duckstation/package.nix       | 147 ----------------
 .../du/duckstation/remove-cubeb-vendor.patch  |  33 ----
 .../du/duckstation/shaderc-patched.nix        |  20 ---
 pkgs/by-name/du/duckstation/sources.nix       | 166 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 8 files changed, 1 insertion(+), 466 deletions(-)
 delete mode 100644 pkgs/by-name/du/duckstation/001-fix-test-inclusion.diff
 delete mode 100644 pkgs/by-name/du/duckstation/002-hardcode-vars.diff
 delete mode 100644 pkgs/by-name/du/duckstation/003-fix-NEON-intrinsics.patch
 delete mode 100644 pkgs/by-name/du/duckstation/package.nix
 delete mode 100644 pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch
 delete mode 100644 pkgs/by-name/du/duckstation/shaderc-patched.nix
 delete mode 100644 pkgs/by-name/du/duckstation/sources.nix

diff --git a/pkgs/by-name/du/duckstation/001-fix-test-inclusion.diff b/pkgs/by-name/du/duckstation/001-fix-test-inclusion.diff
deleted file mode 100644
index b2dabe0262db..000000000000
--- a/pkgs/by-name/du/duckstation/001-fix-test-inclusion.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 879d46bc..95570f6b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -20,5 +20,5 @@ if(BUILD_REGTEST)
- endif()
- 
- if(BUILD_TESTS)
--  add_subdirectory(common-tests EXCLUDE_FROM_ALL)
-+  add_subdirectory(common-tests)
- endif()
diff --git a/pkgs/by-name/du/duckstation/002-hardcode-vars.diff b/pkgs/by-name/du/duckstation/002-hardcode-vars.diff
deleted file mode 100644
index edba33fce7ce..000000000000
--- a/pkgs/by-name/du/duckstation/002-hardcode-vars.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh
-index 9122cd8..50ed8f9 100755
---- a/src/scmversion/gen_scmversion.sh
-+++ b/src/scmversion/gen_scmversion.sh
-@@ -10,10 +10,10 @@ else
- fi
- 
- 
--HASH=$(git rev-parse HEAD)
--BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n')
--TAG=$(git describe --dirty | tr -d '\r\n')
--DATE=$(git log -1 --date=iso8601-strict --format=%cd)
-+HASH="@gitHash@"
-+BRANCH="@gitBranch@"
-+TAG="@gitTag@"
-+DATE="@gitDate@"
- 
- cd $CURDIR
- 
diff --git a/pkgs/by-name/du/duckstation/003-fix-NEON-intrinsics.patch b/pkgs/by-name/du/duckstation/003-fix-NEON-intrinsics.patch
deleted file mode 100644
index 571a15d4aad6..000000000000
--- a/pkgs/by-name/du/duckstation/003-fix-NEON-intrinsics.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 19e094e5c7aaaf375a13424044521701e85c8313 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Thu, 9 Jan 2025 17:46:25 +0100
-Subject: [PATCH] Fix usage of NEON intrinsics
-
----
- src/common/gsvector_neon.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/common/gsvector_neon.h b/src/common/gsvector_neon.h
-index e4991af5e..61b8dc09b 100644
---- a/src/common/gsvector_neon.h
-+++ b/src/common/gsvector_neon.h
-@@ -867,7 +867,7 @@ public:
- 
-   ALWAYS_INLINE int mask() const
-   {
--    const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_s32(v2s), 31);
-+    const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_f32(v2s), 31);
-     return (vget_lane_u32(masks, 0) | (vget_lane_u32(masks, 1) << 1));
-   }
- 
-@@ -2882,7 +2882,7 @@ public:
-   ALWAYS_INLINE GSVector4 gt64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] > v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
-@@ -2894,7 +2894,7 @@ public:
-   ALWAYS_INLINE GSVector4 eq64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] == v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
-@@ -2906,7 +2906,7 @@ public:
-   ALWAYS_INLINE GSVector4 lt64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] < v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
-@@ -2918,7 +2918,7 @@ public:
-   ALWAYS_INLINE GSVector4 ge64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] >= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
-@@ -2930,7 +2930,7 @@ public:
-   ALWAYS_INLINE GSVector4 le64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] <= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
--- 
-2.47.0
-
diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix
deleted file mode 100644
index c84a3cdf5a0f..000000000000
--- a/pkgs/by-name/du/duckstation/package.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{
-  lib,
-  stdenv,
-  llvmPackages,
-  SDL2,
-  callPackage,
-  cmake,
-  cpuinfo,
-  cubeb,
-  curl,
-  extra-cmake-modules,
-  libXrandr,
-  libbacktrace,
-  libwebp,
-  makeWrapper,
-  ninja,
-  pkg-config,
-  qt6,
-  vulkan-loader,
-  wayland,
-  wayland-scanner,
-}:
-
-let
-  sources = callPackage ./sources.nix { };
-  inherit (qt6)
-    qtbase
-    qtsvg
-    qttools
-    qtwayland
-    wrapQtAppsHook
-    ;
-in
-llvmPackages.stdenv.mkDerivation (finalAttrs: {
-  inherit (sources.duckstation) pname version src;
-
-  patches = [
-    # Tests are not built by default
-    ./001-fix-test-inclusion.diff
-    # Patching yet another script that fills data based on git commands . . .
-    ./002-hardcode-vars.diff
-    # Fix NEON intrinsics usage
-    ./003-fix-NEON-intrinsics.patch
-    ./remove-cubeb-vendor.patch
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    ninja
-    pkg-config
-    qttools
-    wayland-scanner
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    SDL2
-    cpuinfo
-    cubeb
-    curl
-    libXrandr
-    libbacktrace
-    libwebp
-    qtbase
-    qtsvg
-    qtwayland
-    sources.discord-rpc-patched
-    sources.lunasvg
-    sources.shaderc-patched
-    sources.soundtouch-patched
-    sources.spirv-cross-patched
-    wayland
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "BUILD_TESTS" true)
-  ];
-
-  strictDeps = true;
-
-  doInstallCheck = true;
-
-  postPatch = ''
-    gitHash=$(cat .nixpkgs-auxfiles/git_hash) \
-    gitBranch=$(cat .nixpkgs-auxfiles/git_branch) \
-    gitTag=$(cat .nixpkgs-auxfiles/git_tag) \
-    gitDate=$(cat .nixpkgs-auxfiles/git_date) \
-      substituteAllInPlace src/scmversion/gen_scmversion.sh
-  '';
-
-  # error: cannot convert 'int16x8_t' to '__Int32x4_t'
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-flax-vector-conversions";
-
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    $out/share/duckstation/common-tests
-
-    runHook postInstallCheck
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin $out/share
-
-    cp -r bin $out/share/duckstation
-    ln -s $out/share/duckstation/duckstation-qt $out/bin/
-
-    install -Dm644 $src/scripts/org.duckstation.DuckStation.desktop $out/share/applications/org.duckstation.DuckStation.desktop
-    install -Dm644 $src/scripts/org.duckstation.DuckStation.png $out/share/pixmaps/org.duckstation.DuckStation.png
-
-    runHook postInstall
-  '';
-
-  qtWrapperArgs =
-    let
-      libPath = lib.makeLibraryPath ([
-        sources.shaderc-patched
-        sources.spirv-cross-patched
-        vulkan-loader
-      ]);
-    in
-    [
-      "--prefix LD_LIBRARY_PATH : ${libPath}"
-    ];
-
-  # https://github.com/stenzek/duckstation/blob/master/scripts/appimage/apprun-hooks/default-to-x11.sh
-  # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run
-  postFixup = ''
-    source "${makeWrapper}/nix-support/setup-hook"
-    wrapProgram $out/bin/duckstation-qt \
-      --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi'
-  '';
-
-  meta = {
-    homepage = "https://github.com/stenzek/duckstation";
-    description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64";
-    license = lib.licenses.gpl3Only;
-    mainProgram = "duckstation-qt";
-    maintainers = with lib.maintainers; [
-      guibou
-    ];
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch
deleted file mode 100644
index e740b0619338..000000000000
--- a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
-index af35687..8347825 100644
---- a/dep/CMakeLists.txt
-+++ b/dep/CMakeLists.txt
-@@ -22,9 +22,8 @@ add_subdirectory(rcheevos EXCLUDE_FROM_ALL)
- disable_compiler_warnings_for_target(rcheevos)
- add_subdirectory(rapidyaml EXCLUDE_FROM_ALL)
- disable_compiler_warnings_for_target(rapidyaml)
--add_subdirectory(cubeb EXCLUDE_FROM_ALL)
--disable_compiler_warnings_for_target(cubeb)
--disable_compiler_warnings_for_target(speex)
-+find_package(cubeb REQUIRED GLOBAL)
-+add_library(cubeb ALIAS cubeb::cubeb)
- add_subdirectory(kissfft EXCLUDE_FROM_ALL)
- disable_compiler_warnings_for_target(kissfft)
- 
-diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp
-index 85579c4..339190a 100644
---- a/src/util/cubeb_audio_stream.cpp
-+++ b/src/util/cubeb_audio_stream.cpp
-@@ -261,9 +261,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
-   std::vector<std::pair<std::string, std::string>> names;
-   names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
- 
--  const char** cubeb_names = cubeb_get_backend_names();
--  for (u32 i = 0; cubeb_names[i] != nullptr; i++)
--    names.emplace_back(cubeb_names[i], cubeb_names[i]);
-+  cubeb_backend_names backends = cubeb_get_backend_names();
-+  for (u32 i = 0; i < backends.count; i++)
-+    names.emplace_back(backends.names[i], backends.names[i]);
-   return names;
- }
-
diff --git a/pkgs/by-name/du/duckstation/shaderc-patched.nix b/pkgs/by-name/du/duckstation/shaderc-patched.nix
deleted file mode 100644
index 3211925699e1..000000000000
--- a/pkgs/by-name/du/duckstation/shaderc-patched.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  fetchpatch,
-  duckstation,
-  shaderc,
-}:
-
-shaderc.overrideAttrs (old: {
-  pname = "shaderc-patched-for-duckstation";
-  patches = (old.patches or [ ]) ++ [
-    (fetchpatch {
-      url = "file://${duckstation.src}/scripts/shaderc-changes.patch";
-      hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo=";
-      excludes = [
-        "CHANGES"
-        "CMakeLists.txt"
-        "libshaderc/CMakeLists.txt"
-      ];
-    })
-  ];
-})
diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix
deleted file mode 100644
index 8261f08de9be..000000000000
--- a/pkgs/by-name/du/duckstation/sources.nix
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-  lib,
-  duckstation,
-  fetchFromGitHub,
-  fetchpatch,
-  shaderc,
-  spirv-cross,
-  discord-rpc,
-  stdenv,
-  cmake,
-  ninja,
-}:
-
-{
-  duckstation =
-    let
-      self = {
-        pname = "duckstation";
-        version = "0.1-7465";
-        src = fetchFromGitHub {
-          owner = "stenzek";
-          repo = "duckstation";
-          rev = "aa955b8ae28314ae061613f0ddf13183a98aca03";
-          #
-          # Some files are filled by using Git commands; it requires deepClone.
-          # More info at `checkout_ref` function in nix-prefetch-git.
-          # However, `.git` is a bit nondeterministic (and Git itself makes no
-          # guarantees whatsoever).
-          # Then, in order to enhance reproducibility, what we will do here is:
-          #
-          # - Execute the desired Git commands;
-          # - Save the obtained info into files;
-          # - Remove `.git` afterwards.
-          #
-          deepClone = true;
-          postFetch = ''
-            cd $out
-            mkdir -p .nixpkgs-auxfiles/
-            git rev-parse HEAD > .nixpkgs-auxfiles/git_hash
-            git rev-parse --abbrev-ref HEAD | tr -d '\r\n' > .nixpkgs-auxfiles/git_branch
-            git describe --dirty | tr -d '\r\n' > .nixpkgs-auxfiles/git_tag
-            git log -1 --date=iso8601-strict --format=%cd > .nixpkgs-auxfiles/git_date
-            find $out -name .git -print0 | xargs -0 rm -fr
-          '';
-          hash = "sha256-ixrlr7Rm6GZAn/kh2sSeCCiK/qdmQ5+5jbbhAKjTx/E=";
-        };
-      };
-    in
-    self;
-
-  shaderc-patched = shaderc.overrideAttrs (
-    old:
-    let
-      version = "2024.3-unstable-2024-08-24";
-      src = fetchFromGitHub {
-        owner = "stenzek";
-        repo = "shaderc";
-        rev = "f60bb80e255144e71776e2ad570d89b78ea2ab4f";
-        hash = "sha256-puZxkrEVhhUT4UcCtEDmtOMX4ugkB6ooMhKRBlb++lE=";
-      };
-    in
-    {
-      pname = "shaderc-patched-for-duckstation";
-      inherit version src;
-      patches = (old.patches or [ ]);
-      cmakeFlags = (old.cmakeFlags or [ ]) ++ [
-        (lib.cmakeBool "SHADERC_SKIP_EXAMPLES" true)
-        (lib.cmakeBool "SHADERC_SKIP_TESTS" true)
-      ];
-      outputs = [
-        "out"
-        "lib"
-        "dev"
-      ];
-      postFixup = '''';
-    }
-  );
-  spirv-cross-patched = spirv-cross.overrideAttrs (
-    old:
-    let
-      version = "1.3.290.0";
-      src = fetchFromGitHub {
-        owner = "KhronosGroup";
-        repo = "SPIRV-Cross";
-        rev = "vulkan-sdk-${version}";
-        hash = "sha256-h5My9PbPq1l03xpXQQFolNy7G1RhExtTH6qPg7vVF/8=";
-      };
-    in
-    {
-      pname = "spirv-cross-patched-for-duckstation";
-      inherit version src;
-      patches = (old.patches or [ ]);
-      cmakeFlags = (old.cmakeFlags or [ ]) ++ [
-        (lib.cmakeBool "SPIRV_CROSS_CLI" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_CPP" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_C_API" true)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_GLSL" true)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_HLSL" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_MSL" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_REFLECT" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_TESTS" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_UTIL" true)
-        (lib.cmakeBool "SPIRV_CROSS_SHARED" true)
-        (lib.cmakeBool "SPIRV_CROSS_STATIC" false)
-      ];
-    }
-  );
-  discord-rpc-patched = discord-rpc.overrideAttrs (old: {
-    pname = "discord-rpc-patched-for-duckstation";
-    version = "3.4.0-unstable-2024-08-02";
-    src = fetchFromGitHub {
-      owner = "stenzek";
-      repo = "discord-rpc";
-      rev = "144f3a3f1209994d8d9e8a87964a989cb9911c1e";
-      hash = "sha256-VyL8bEjY001eHWcEoUPIAFDAmaAbwcNb1hqlV2a3cWs=";
-    };
-    patches = (old.patches or [ ]);
-  });
-
-  soundtouch-patched = stdenv.mkDerivation (finalAttrs: {
-    pname = "soundtouch-patched-for-duckstation";
-    version = "2.2.3-unstable-2024-08-02";
-    src = fetchFromGitHub {
-      owner = "stenzek";
-      repo = "soundtouch";
-      rev = "463ade388f3a51da078dc9ed062bf28e4ba29da7";
-      hash = "sha256-hvBW/z+fmh/itNsJnlDBtiI1DZmUMO9TpHEztjo2pA0=";
-    };
-
-    nativeBuildInputs = [
-      cmake
-      ninja
-    ];
-
-    meta = {
-      homepage = "https://github.com/stenzek/soundtouch";
-      description = "SoundTouch Audio Processing Library (forked from https://codeberg.org/soundtouch/soundtouch)";
-      license = lib.licenses.lgpl21;
-      platforms = lib.platforms.linux;
-    };
-
-  });
-
-  lunasvg = stdenv.mkDerivation (finalAttrs: {
-    pname = "lunasvg-patched-for-duckstation";
-    version = "2.4.1-unstable-2024-08-24";
-    src = fetchFromGitHub {
-      owner = "stenzek";
-      repo = "lunasvg";
-      rev = "9af1ac7b90658a279b372add52d6f77a4ebb482c";
-      hash = "sha256-ZzOe84ZF5JRrJ9Lev2lwYOccqtEGcf76dyCDBDTvI2o=";
-    };
-
-    nativeBuildInputs = [
-      cmake
-      ninja
-    ];
-
-    meta = {
-      homepage = "https://github.com/stenzek/lunasvg";
-      description = "Standalone SVG rendering library in C++";
-      license = lib.licenses.mit;
-      platforms = lib.platforms.linux;
-    };
-  });
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eb16c933f6e8..2ebf1dc6afed 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -588,6 +588,7 @@ mapAliases {
   dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
   dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
   du-dust = dust; # Added 2024-01-19
+  duckstation = throw "'duckstation' has been removed due to being unmaintained"; # Added 2025-08-03
   dump1090 = dump1090-fa; # Added 2024-02-12
   dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance";
   dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17

From 4ffa30a0f02fd91cd1746317b8d5459abad9b81d Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sun, 3 Aug 2025 13:21:02 -0400
Subject: [PATCH 029/230] duckstation-bin: remove

Remove duckstation-bin due to absence of upstream for nearly a year now.
---
 pkgs/by-name/du/duckstation-bin/package.nix | 45 ---------------------
 pkgs/by-name/du/duckstation-bin/update.sh   | 20 ---------
 pkgs/top-level/aliases.nix                  |  1 +
 3 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 pkgs/by-name/du/duckstation-bin/package.nix
 delete mode 100755 pkgs/by-name/du/duckstation-bin/update.sh

diff --git a/pkgs/by-name/du/duckstation-bin/package.nix b/pkgs/by-name/du/duckstation-bin/package.nix
deleted file mode 100644
index 8349b98ef84f..000000000000
--- a/pkgs/by-name/du/duckstation-bin/package.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  unzip,
-}:
-
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "duckstation-bin";
-  version = "0.1-7371";
-
-  src = fetchurl {
-    url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip";
-    hash = "sha256-ukORbTG0lZIsUInkEnyPB9+PwFxxK5hbgj9D6tjOEAY=";
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  dontPatch = true;
-  dontConfigure = true;
-  dontBuild = true;
-
-  sourceRoot = ".";
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/Applications
-    cp -r DuckStation.app $out/Applications/DuckStation.app
-    runHook postInstall
-  '';
-
-  passthru = {
-    updateScript = ./update.sh;
-  };
-
-  meta = {
-    homepage = "https://github.com/stenzek/duckstation";
-    description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64";
-    changelog = "https://github.com/stenzek/duckstation/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ matteopacini ];
-    platforms = lib.platforms.darwin;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-})
diff --git a/pkgs/by-name/du/duckstation-bin/update.sh b/pkgs/by-name/du/duckstation-bin/update.sh
deleted file mode 100755
index 50d6017f7ccc..000000000000
--- a/pkgs/by-name/du/duckstation-bin/update.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq gnused
-
-set -euo pipefail
-
-cd "$(dirname "$0")" || exit 1
-
-# Grab latest version, ignoring "latest" and "preview" tags
-LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/stenzek/duckstation/releases" | jq -r '.[].tag_name' | grep '^v' | head -n 1 | sed 's/^v//')"
-CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)"
-
-if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then
-    echo "duckstation-bin is up-to-date"
-    exit 0
-fi
-
-HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/stenzek/duckstation/releases/download/v${LATEST_VER}/duckstation-mac-release.zip")")"
-
-sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix
-sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2ebf1dc6afed..9ae71d8dc641 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -589,6 +589,7 @@ mapAliases {
   dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
   du-dust = dust; # Added 2024-01-19
   duckstation = throw "'duckstation' has been removed due to being unmaintained"; # Added 2025-08-03
+  duckstation-bin = throw "'duckstation-bin' has been removed due to being unmaintained"; # Added 2025-08-03
   dump1090 = dump1090-fa; # Added 2024-02-12
   dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance";
   dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17

From 0162d1179e0205a17fd7bd70772c76500b537e7b Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Sun, 3 Aug 2025 12:44:24 +0200
Subject: [PATCH 030/230] ip2asn: init at 0.1.2

---
 pkgs/by-name/ip/ip2asn/package.nix | 61 ++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 pkgs/by-name/ip/ip2asn/package.nix

diff --git a/pkgs/by-name/ip/ip2asn/package.nix b/pkgs/by-name/ip/ip2asn/package.nix
new file mode 100644
index 000000000000..cac2fd031c1e
--- /dev/null
+++ b/pkgs/by-name/ip/ip2asn/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "ip2asn";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "x123";
+    repo = "ip2asn";
+    tag = finalAttrs.version;
+    hash = "sha256-2wuxBwllrkPdmmBCt7DPQ38E2k3igAjbICun51bhopY=";
+  };
+
+  cargoHash = "sha256-fYg0aIU8usueMg6cMWUcwMIFCinHdm6H7k9ywZGYfg8=";
+
+  passthru.updateScript = nix-update-script { };
+
+  cargoBuildFlags = [
+    "-p"
+    "ip2asn-cli"
+  ];
+
+  # disable network based tests that download data
+  cargoTestFlags = [
+    "-p"
+    "ip2asn-cli"
+    "--"
+    "--skip"
+    "auto_update_tests::test_auto_update_triggers_download"
+    "--skip"
+    "auto_update_tests::test_auto_update_skips_check_for_recent_cache"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  meta = {
+    description = "CLI tool for mapping IP addresses to Autonomous System information";
+    homepage = "https://github.com/x123/ip2asn/tree/master/ip2asn-cli";
+    changelog = "https://github.com/x123/ip2asn/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ x123 ];
+    mainProgram = "ip2asn";
+  };
+})

From 1c4abea5c6e649f83c48b671118ff0f76419b1bc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 22:54:17 +0200
Subject: [PATCH 031/230] python313Packages.google-cloud-securitycenter: 1.38.1
 -> 1.39.0

Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-securitycenter-v1.39.0/packages/google-cloud-securitycenter/CHANGELOG.md
---
 .../python-modules/google-cloud-securitycenter/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index 6e16c2775a7f..b680ce0e7ca2 100644
--- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-securitycenter";
-  version = "1.38.1";
+  version = "1.39.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_securitycenter";
     inherit version;
-    hash = "sha256-XsR+gNtFCWhe0PEmaS8lIgGl0+ri7MR/omK+bch4Too=";
+    hash = "sha256-F3yEa7DTppVr2X9ufWVOQ/kkeytGKZmeOY661gUlzP8=";
   };
 
   build-system = [ setuptools ];

From 5f5ab96aa65be84bc84cf1e82b7edf52196a1025 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 3 Aug 2025 17:37:41 -0400
Subject: [PATCH 032/230] python3Packages.weasyprint: fix darwin build

Tests rely on local darwin networking, enable.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/development/python-modules/weasyprint/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index fce0a2c3baca..84f96cdfc1e7 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -35,6 +35,8 @@ buildPythonPackage rec {
   version = "65.1";
   pyproject = true;
 
+  __darwinAllowLocalNetworking = true;
+
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "WeasyPrint";
@@ -112,10 +114,5 @@ buildPythonPackage rec {
     homepage = "https://weasyprint.org/";
     license = lib.licenses.bsd3;
     teams = [ lib.teams.apm ];
-    badPlatforms = [
-      # Fatal Python error: Segmentation fault
-      # "...weasyprint/pdf/fonts.py", line 221 in _harfbuzz_subset
-      lib.systems.inspect.patterns.isDarwin
-    ];
   };
 }

From 0383e316408c41c45874c37111bf18e26a379a0b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 3 Aug 2025 17:12:58 +0200
Subject: [PATCH 033/230] libre: 3.10.0 -> 3.24.0

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

diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix
index 1058fe8b16d1..5ace0617d47d 100644
--- a/pkgs/by-name/li/libre/package.nix
+++ b/pkgs/by-name/li/libre/package.nix
@@ -8,13 +8,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.10.0";
+  version = "3.24.0";
   pname = "libre";
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "re";
     rev = "v${version}";
-    sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4=";
+    sha256 = "sha256-wcntgFKpVxDlRMF8a7s9UxeXihguiGxTL/PGv9ImB80=";
   };
 
   buildInputs = [

From 1c764027890354dad03732d9a11ed3b1fe78128f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 3 Aug 2025 17:14:20 +0200
Subject: [PATCH 034/230] baresip: 3.10.1 -> 3.24.0

---
 pkgs/by-name/ba/baresip/package.nix | 135 ++++++++++++++--------------
 1 file changed, 69 insertions(+), 66 deletions(-)

diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index 904042be942e..f841e562f5fd 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -30,13 +30,13 @@
   dbusSupport ? true,
 }:
 stdenv.mkDerivation rec {
-  version = "3.10.1";
+  version = "3.24.0";
   pname = "baresip";
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
     rev = "v${version}";
-    hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
+    hash = "sha256-32XyMblHF+ST+TpIbdyPFdRtWnIugYMr4lYZnfeFm/c=";
   };
   prePatch = ''
     substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER ""
@@ -102,72 +102,75 @@ stdenv.mkDerivation rec {
     -D__need_timeval -D__need_timespec -D__need_time_t
   '';
 
-  doInstallCheck = true;
   # CMake feature detection is prone to breakage between upgrades:
   # spot-check that the optional modules we care about were compiled
-  postInstallCheck = lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [
-    "account"
-    "alsa"
-    "aubridge"
-    "auconv"
-    "aufile"
-    "auresamp"
-    "ausine"
-    "avcodec"
-    "avfilter"
-    "avformat"
-    "cons"
-    "contact"
-    "ctrl_dbus"
-    "ctrl_tcp"
-    "debug_cmd"
-    "dtls_srtp"
-    "ebuacip"
-    "echo"
-    "evdev"
-    "fakevideo"
-    "g711"
-    "g722"
-    "g726"
-    "gst"
-    "gtk"
-    "httpd"
-    "httpreq"
-    "ice"
-    "l16"
-    "menu"
-    "mixausrc"
-    "mixminus"
-    "multicast"
-    "mwi"
-    "natpmp"
-    "netroam"
-    "pcp"
-    "pipewire"
-    "plc"
-    "portaudio"
-    "presence"
-    "rtcpsummary"
-    "sdl"
-    "selfview"
-    "serreg"
-    "snapshot"
-    "sndfile"
-    "srtp"
-    "stdio"
-    "stun"
-    "swscale"
-    "syslog"
-    "turn"
-    "uuid"
-    "v4l2"
-    "vidbridge"
-    "vidinfo"
-    "vp8"
-    "vp9"
-    "vumeter"
-    "x11"
-  ];
+  installCheckPhase = ''
+    runHook preInstallCheck
+    ${lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [
+      "account"
+      "alsa"
+      "aubridge"
+      "auconv"
+      "aufile"
+      "auresamp"
+      "ausine"
+      "avcodec"
+      "avfilter"
+      "avformat"
+      "cons"
+      "contact"
+      "ctrl_dbus"
+      "ctrl_tcp"
+      "debug_cmd"
+      "dtls_srtp"
+      "ebuacip"
+      "echo"
+      "evdev"
+      "fakevideo"
+      "g711"
+      "g722"
+      "g726"
+      "gst"
+      "gtk"
+      "httpd"
+      "httpreq"
+      "ice"
+      "l16"
+      "menu"
+      "mixausrc"
+      "mixminus"
+      "multicast"
+      "mwi"
+      "natpmp"
+      "netroam"
+      "pcp"
+      "pipewire"
+      "plc"
+      "portaudio"
+      "presence"
+      "rtcpsummary"
+      "sdl"
+      "selfview"
+      "serreg"
+      "snapshot"
+      "sndfile"
+      "srtp"
+      "stdio"
+      "stun"
+      "swscale"
+      "syslog"
+      "turn"
+      "uuid"
+      "v4l2"
+      "vidbridge"
+      "vidinfo"
+      "vp8"
+      "vp9"
+      "vumeter"
+      "x11"
+    ]}
+    runHook postInstallCheck
+  '';
 
   meta = {
     description = "Modular SIP User-Agent with audio and video support";

From ea8db5549c76a4636c4f10ec83a46d45e997c010 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 3 Aug 2025 17:15:06 +0200
Subject: [PATCH 035/230] baresip: fix module path depending on store path

---
 .../by-name/ba/baresip/fix-modules-path.patch | 29 +++++++++++++++++++
 pkgs/by-name/ba/baresip/package.nix           |  8 +++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/ba/baresip/fix-modules-path.patch

diff --git a/pkgs/by-name/ba/baresip/fix-modules-path.patch b/pkgs/by-name/ba/baresip/fix-modules-path.patch
new file mode 100644
index 000000000000..b02c830057c2
--- /dev/null
+++ b/pkgs/by-name/ba/baresip/fix-modules-path.patch
@@ -0,0 +1,29 @@
+commit 46479c52695cc5f8c01370fd2594468666c45c8e
+Author: rnhmjoj <rnhmjoj@inventati.org>
+Date:   Sun Aug 3 00:18:47 2025 +0200
+
+    Fix the modules path at build time
+    
+    The location of the modules is determined by reading the `module_path`
+    setting, which is set to "$out/lib/baresip/modules" when the
+    configuration file is generated during the first run. If the package is
+    updated and the store path changes, baresip breaks completely, forcing
+    the user to manually fix the configuration.
+    
+    This patch fixes the location of the modules at build time, ignoring the
+    `module_path` setting, to avoid this issue.
+
+diff --git a/src/module.c b/src/module.c
+index 9f2135c6..b62d0bdd 100644
+--- a/src/module.c
++++ b/src/module.c
+@@ -141,8 +141,7 @@ int module_init(const struct conf *conf)
+ 	if (!conf)
+ 		return EINVAL;
+ 
+-	if (conf_get(conf, "module_path", &path))
+-		pl_set_str(&path, ".");
++	pl_set_str(&path, MOD_PATH);
+ 
+ 	err = conf_apply(conf, "module", module_handler, &path);
+ 	if (err)
diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index f841e562f5fd..4c4a0210156e 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -29,21 +29,29 @@
   zlib,
   dbusSupport ? true,
 }:
+
 stdenv.mkDerivation rec {
   version = "3.24.0";
   pname = "baresip";
+
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
     rev = "v${version}";
     hash = "sha256-32XyMblHF+ST+TpIbdyPFdRtWnIugYMr4lYZnfeFm/c=";
   };
+
+  patches = [
+    ./fix-modules-path.patch
+  ];
+
   prePatch = ''
     substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER ""
   ''
   + lib.optionalString (!dbusSupport) ''
     substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' ""
   '';
+
   nativeBuildInputs = [
     cmake
     pkg-config

From fad3a03c4ba7967b0ef602bd0416aaf009cd837f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 3 Aug 2025 17:15:38 +0200
Subject: [PATCH 036/230] baresip: add rnhmjoj as maintainer

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

diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index 4c4a0210156e..1bf303ffbc9e 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -186,6 +186,7 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [
       raskin
       ehmry
+      rnhmjoj
     ];
     mainProgram = "baresip";
     license = lib.licenses.bsd3;

From cf8caed16990c1812bf7defdcccd0095de01b304 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 24 Jun 2025 11:25:09 -0300
Subject: [PATCH 037/230] dotnet: add buildDotnetModule tests to sdk
 passthru.tests

---
 pkgs/development/compilers/dotnet/wrapper.nix    | 11 +++++++++++
 pkgs/test/dotnet/use-dotnet-from-env/default.nix |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix
index 2fcaa17f3c6a..e303e1d948d2 100644
--- a/pkgs/development/compilers/dotnet/wrapper.nix
+++ b/pkgs/development/compilers/dotnet/wrapper.nix
@@ -18,6 +18,7 @@
   replaceVars,
   nugetPackageHook,
   xmlstarlet,
+  pkgs,
 }:
 type: unwrapped:
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -280,6 +281,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         };
       }
       // lib.optionalAttrs (type == "sdk") ({
+        buildDotnetModule =
+          (pkgs.appendOverlays [
+            (self: super: {
+              dotnet-sdk = finalAttrs.finalPackage;
+              dotnet-runtime = finalAttrs.finalPackage.runtime;
+            })
+          ]).callPackage
+            ../../../test/dotnet/default.nix
+            { };
+
         console = lib.recurseIntoAttrs {
           # yes, older SDKs omit the comma
           cs = mkConsoleTests "C#" "cs" "Hello,?\\ World!";
diff --git a/pkgs/test/dotnet/use-dotnet-from-env/default.nix b/pkgs/test/dotnet/use-dotnet-from-env/default.nix
index 97f4b139a673..5e9d20aa1c97 100644
--- a/pkgs/test/dotnet/use-dotnet-from-env/default.nix
+++ b/pkgs/test/dotnet/use-dotnet-from-env/default.nix
@@ -26,7 +26,7 @@ let
     '';
   });
 
-  runtimeVersion = lib.getVersion dotnet-runtime;
+  runtimeVersion = lib.head (lib.splitString "-" (lib.getVersion dotnet-runtime));
   runtimeVersionFile = builtins.toFile "dotnet-version.txt" runtimeVersion;
 in
 {

From fbdbf0f6495a96ad6cedbe6fb6ce4902677ca4c5 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 26 Jun 2025 10:14:32 -0300
Subject: [PATCH 038/230] pinta: disable restore in dotnet build

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

diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix
index 61a7888805fe..b179a3e85e6f 100644
--- a/pkgs/by-name/pi/pinta/package.nix
+++ b/pkgs/by-name/pi/pinta/package.nix
@@ -57,6 +57,7 @@ buildDotnetModule rec {
 
     # Build translations
     dotnet build Pinta \
+      --no-restore \
       -p:ContinuousIntegrationBuild=true \
       -p:Deterministic=true \
       -target:CompileTranslations,PublishTranslations \

From 0a734f6b3aa107e1df6924809fea882bd7cac1bd Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 26 Jun 2025 10:48:00 -0300
Subject: [PATCH 039/230] buildDotnetModule: combine hooks

---
 .../dotnet/build-dotnet-module/default.nix    |  14 +-
 .../build-dotnet-module/hook/default.nix      |  32 ++
 .../build-dotnet-module/hook/dotnet-hook.sh   | 469 ++++++++++++++++++
 .../build-dotnet-module/hooks/default.nix     |  54 --
 .../hooks/dotnet-build-hook.sh                |  91 ----
 .../hooks/dotnet-check-hook.sh                |  81 ---
 .../hooks/dotnet-configure-hook.sh            |  78 ---
 .../hooks/dotnet-fixup-hook.sh                | 101 ----
 .../hooks/dotnet-install-hook.sh              | 114 -----
 pkgs/development/compilers/dotnet/wrapper.nix |   6 +-
 10 files changed, 507 insertions(+), 533 deletions(-)
 create mode 100644 pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix
 create mode 100644 pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
 delete mode 100644 pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix
 delete mode 100644 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh
 delete mode 100644 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh
 delete mode 100644 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
 delete mode 100644 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh
 delete mode 100644 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 418e21b36c70..4a1cf49440df 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -98,13 +98,7 @@ let
         else
           dotnet-sdk.meta.platforms;
 
-      inherit (callPackage ./hooks { inherit dotnet-sdk dotnet-runtime; })
-        dotnetConfigureHook
-        dotnetBuildHook
-        dotnetCheckHook
-        dotnetInstallHook
-        dotnetFixupHook
-        ;
+      hook = callPackage ./hook { inherit dotnet-sdk dotnet-runtime; };
 
       inherit (dotnetCorePackages) systemToDotnetRid;
     in
@@ -140,11 +134,7 @@ let
         ;
 
       nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
-        dotnetConfigureHook
-        dotnetBuildHook
-        dotnetCheckHook
-        dotnetInstallHook
-        dotnetFixupHook
+        hook
 
         cacert
         makeWrapper
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix
new file mode 100644
index 000000000000..d3d5b23ea31c
--- /dev/null
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  which,
+  coreutils,
+  zlib,
+  openssl,
+  makeSetupHook,
+  zip,
+  # Passed from ../default.nix
+  dotnet-sdk,
+  dotnet-runtime,
+}:
+makeSetupHook {
+  name = "dotnet-hook";
+  substitutions = {
+    dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker";
+    libPath = lib.makeLibraryPath [
+      stdenv.cc.cc
+      stdenv.cc.libc
+      dotnet-sdk.passthru.icu
+      zlib
+      openssl
+    ];
+    inherit zip;
+    dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null;
+    wrapperPath = lib.makeBinPath [
+      which
+      coreutils
+    ];
+  };
+} ./dotnet-hook.sh
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
new file mode 100644
index 000000000000..ab1a760e3c75
--- /dev/null
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
@@ -0,0 +1,469 @@
+dotnetConfigureHook() {
+    echo "Executing dotnetConfigureHook"
+
+    runHook preConfigure
+
+    local -r dynamicLinker=@dynamicLinker@
+    local -r libPath=@libPath@
+
+    if [[ -n $__structuredAttrs ]]; then
+        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
+        local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
+        local dotnetFlagsArray=( "${dotnetFlags[@]}" )
+        local dotnetRestoreFlagsArray=( "${dotnetRestoreFlags[@]}" )
+        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+    else
+        local dotnetProjectFilesArray=($dotnetProjectFiles)
+        local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
+        local dotnetFlagsArray=($dotnetFlags)
+        local dotnetRestoreFlagsArray=($dotnetRestoreFlags)
+        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+    fi
+
+    if [[ -z ${enableParallelBuilding-} ]]; then
+        local -r parallelFlag="--disable-parallel"
+    fi
+
+    if [[ -v dotnetSelfContainedBuild ]]; then
+        if [[ -n $dotnetSelfContainedBuild ]]; then
+            dotnetRestoreFlagsArray+=("-p:SelfContained=true")
+        else
+            dotnetRestoreFlagsArray+=("-p:SelfContained=false")
+        fi
+    fi
+
+    dotnetRestore() {
+        local -r projectFile="${1-}"
+        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+            dotnet restore ${1+"$projectFile"} \
+                -p:ContinuousIntegrationBuild=true \
+                -p:Deterministic=true \
+                -p:NuGetAudit=false \
+                --runtime "$runtimeId" \
+                ${parallelFlag-} \
+                "${dotnetRestoreFlagsArray[@]}" \
+                "${dotnetFlagsArray[@]}"
+        done
+    }
+
+    if [[ -f .config/dotnet-tools.json || -f dotnet-tools.json ]]; then
+        dotnet tool restore
+    fi
+
+    # dotnetGlobalTool is set in buildDotnetGlobalTool to patch dependencies but
+    # avoid other project-specific logic. This is a hack, but the old behavior
+    # is worse as it relied on a bug: setting projectFile to an empty string
+    # made the hooks actually skip all project-specific logic. It’s hard to keep
+    # backwards compatibility with this odd behavior now since we are using
+    # arrays, so instead we just pass a variable to indicate that we don’t have
+    # projects.
+    if [[ -z ${dotnetGlobalTool-} ]]; then
+        if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+            dotnetRestore
+        fi
+
+        local projectFile
+        for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
+            dotnetRestore "$projectFile"
+        done
+    fi
+
+    runHook postConfigure
+
+    echo "Finished dotnetConfigureHook"
+}
+
+if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then
+    configurePhase=dotnetConfigureHook
+fi
+
+dotnetBuildHook() {
+    echo "Executing dotnetBuildHook"
+
+    runHook preBuild
+
+    local -r dotnetBuildType="${dotnetBuildType-Release}"
+
+    if [[ -n $__structuredAttrs ]]; then
+        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
+        local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
+        local dotnetFlagsArray=( "${dotnetFlags[@]}" )
+        local dotnetBuildFlagsArray=( "${dotnetBuildFlags[@]}" )
+        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+    else
+        local dotnetProjectFilesArray=($dotnetProjectFiles)
+        local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
+        local dotnetFlagsArray=($dotnetFlags)
+        local dotnetBuildFlagsArray=($dotnetBuildFlags)
+        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+    fi
+
+    if [[ -n "${enableParallelBuilding-}" ]]; then
+        local -r maxCpuFlag="$NIX_BUILD_CORES"
+        local -r parallelBuildFlag="true"
+    else
+        local -r maxCpuFlag="1"
+        local -r parallelBuildFlag="false"
+    fi
+
+    if [[ -v dotnetSelfContainedBuild ]]; then
+        if [[ -n $dotnetSelfContainedBuild ]]; then
+            dotnetBuildFlagsArray+=("-p:SelfContained=true")
+        else
+            dotnetBuildFlagsArray+=("-p:SelfContained=false")
+        fi
+    fi
+
+    if [[ -n ${dotnetUseAppHost-} ]]; then
+        dotnetBuildFlagsArray+=("-p:UseAppHost=true")
+    fi
+
+    local versionFlagsArray=()
+    if [[ -n ${version-} ]]; then
+        versionFlagsArray+=("-p:InformationalVersion=$version")
+    fi
+
+    if [[ -n ${versionForDotnet-} ]]; then
+        versionFlagsArray+=("-p:Version=$versionForDotnet")
+    fi
+
+    dotnetBuild() {
+        local -r projectFile="${1-}"
+
+        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+            local runtimeIdFlagsArray=()
+            if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
+                runtimeIdFlagsArray+=("--runtime" "$runtimeId")
+            fi
+
+            dotnet build ${1+"$projectFile"} \
+                -maxcpucount:"$maxCpuFlag" \
+                -p:BuildInParallel="$parallelBuildFlag" \
+                -p:ContinuousIntegrationBuild=true \
+                -p:Deterministic=true \
+                -p:OverwriteReadOnlyFiles=true \
+                --configuration "$dotnetBuildType" \
+                --no-restore \
+                "${versionFlagsArray[@]}" \
+                "${runtimeIdFlagsArray[@]}" \
+                "${dotnetBuildFlagsArray[@]}" \
+                "${dotnetFlagsArray[@]}"
+        done
+    }
+
+    if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+        dotnetBuild
+    fi
+
+    local projectFile
+    for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
+        dotnetBuild "$projectFile"
+    done
+
+    runHook postBuild
+
+    echo "Finished dotnetBuildHook"
+}
+
+if [[ -z ${dontDotnetBuild-} && -z ${buildPhase-} ]]; then
+    buildPhase=dotnetBuildHook
+fi
+
+dotnetCheckHook() {
+    echo "Executing dotnetCheckHook"
+
+    runHook preCheck
+
+    local -r dotnetBuildType="${dotnetBuildType-Release}"
+
+    if [[ -n $__structuredAttrs ]]; then
+        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
+        local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
+        local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" )
+        local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" )
+        local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" )
+        local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
+        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+    else
+        local dotnetProjectFilesArray=($dotnetProjectFiles)
+        local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
+        local dotnetTestFlagsArray=($dotnetTestFlags)
+        local dotnetTestFiltersArray=($dotnetTestFilters)
+        local dotnetDisabledTestsArray=($dotnetDisabledTests)
+        local dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
+        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+    fi
+
+    if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then
+        local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}")
+        dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" )
+    fi
+
+    if (( ${#dotnetTestFiltersArray[@]} > 0 )); then
+        local OLDIFS="$IFS" IFS='&'
+        dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}")
+        IFS="$OLDIFS"
+    fi
+
+    local libraryPath="${LD_LIBRARY_PATH-}"
+    if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
+        local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
+        local OLDIFS="$IFS" IFS=':'
+        libraryPath="${libraryPathArray[*]}${libraryPath:+':'}$libraryPath"
+        IFS="$OLDIFS"
+    fi
+
+    if [[ -n ${enableParallelBuilding-} ]]; then
+        local -r maxCpuFlag="$NIX_BUILD_CORES"
+    else
+        local -r maxCpuFlag="1"
+    fi
+
+    local projectFile runtimeId
+    for projectFile in "${dotnetTestProjectFilesArray[@]-${dotnetProjectFilesArray[@]}}"; do
+        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+            local runtimeIdFlagsArray=()
+            if [[ $projectFile == *.csproj ]]; then
+                runtimeIdFlagsArray=("--runtime" "$runtimeId")
+            fi
+
+            LD_LIBRARY_PATH=$libraryPath \
+                dotnet test "$projectFile" \
+                -maxcpucount:"$maxCpuFlag" \
+                -p:ContinuousIntegrationBuild=true \
+                -p:Deterministic=true \
+                --configuration "$dotnetBuildType" \
+                --no-restore \
+                --no-build \
+                --logger "console;verbosity=normal" \
+                "${runtimeIdFlagsArray[@]}" \
+                "${dotnetTestFlagsArray[@]}" \
+                "${dotnetFlagsArray[@]}"
+        done
+    done
+
+    runHook postCheck
+
+    echo "Finished dotnetCheckHook"
+}
+
+if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then
+    checkPhase=dotnetCheckHook
+fi
+
+# For compatibility, convert makeWrapperArgs to an array unless we are using
+# structured attributes. That is, we ensure that makeWrapperArgs is always an
+# array.
+# See https://github.com/NixOS/nixpkgs/blob/858f4db3048c5be3527e183470e93c1a72c5727c/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh#L1-L3
+# and https://github.com/NixOS/nixpkgs/pull/313005#issuecomment-2175482920
+if [[ -z $__structuredAttrs ]]; then
+    makeWrapperArgs=( ${makeWrapperArgs-} )
+fi
+
+# First argument is the executable you want to wrap,
+# the second is the destination for the wrapper.
+wrapDotnetProgram() {
+    local -r dotnetRuntime=@dotnetRuntime@
+    local -r wrapperPath=@wrapperPath@
+
+    local -r dotnetFromEnvScript='dotnetFromEnv() {
+    local dotnetPath
+    if command -v dotnet 2>&1 >/dev/null; then
+        dotnetPath=$(which dotnet) && \
+            dotnetPath=$(realpath "$dotnetPath") && \
+            dotnetPath=$(dirname "$dotnetPath") && \
+            export DOTNET_ROOT="$dotnetPath"
+    fi
+}
+dotnetFromEnv'
+
+    if [[ -n $__structuredAttrs ]]; then
+        local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
+    else
+        local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
+    fi
+
+    local dotnetRuntimeDepsFlags=()
+    if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
+        local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
+        local OLDIFS="$IFS" IFS=':'
+        dotnetRuntimeDepsFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPathArray[*]}")
+        IFS="$OLDIFS"
+    fi
+
+    local dotnetRootFlagsArray=()
+    if [[ -z ${dotnetSelfContainedBuild-} ]]; then
+        if [[ -n ${useDotnetFromEnv-} ]]; then
+            # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
+            dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$wrapperPath")
+            dotnetRootFlagsArray+=("--run" "$dotnetFromEnvScript")
+            if [[ -n $dotnetRuntime ]]; then
+                dotnetRootFlagsArray+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
+                dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$dotnetRuntime/bin")
+            fi
+        elif [[ -n $dotnetRuntime ]]; then
+            dotnetRootFlagsArray+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
+            dotnetRootFlagsArray+=("--prefix" "PATH" ":" "$dotnetRuntime/bin")
+        fi
+    fi
+
+    makeWrapper "$1" "$2" \
+        "${dotnetRuntimeDepsFlags[@]}" \
+        "${dotnetRootFlagsArray[@]}" \
+        "${gappsWrapperArgs[@]}" \
+        "${makeWrapperArgs[@]}"
+
+    echo "installed wrapper to "$2""
+}
+
+dotnetFixupHook() {
+    local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
+
+    local executable executableBasename
+
+    # check if dotnetExecutables is declared (including empty values, in which case we generate no executables)
+    if declare -p dotnetExecutables &>/dev/null; then
+        if [[ -n $__structuredAttrs ]]; then
+            local dotnetExecutablesArray=( "${dotnetExecutables[@]}" )
+        else
+            local dotnetExecutablesArray=($dotnetExecutables)
+        fi
+        for executable in "${dotnetExecutablesArray[@]}"; do
+            executableBasename=$(basename "$executable")
+
+            local path="$dotnetInstallPath/$executable"
+
+            if test -x "$path"; then
+                wrapDotnetProgram "$path" "$out/bin/$executableBasename"
+            else
+                echo "Specified binary \"$executable\" is either not an executable or does not exist!"
+                echo "Looked in $path"
+                exit 1
+            fi
+        done
+    else
+        while IFS= read -d '' executable; do
+            executableBasename=$(basename "$executable")
+            wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \;
+        done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0)
+    fi
+}
+
+if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then
+    appendToVar preFixupPhases dotnetFixupHook
+fi
+
+dotnetInstallHook() {
+    echo "Executing dotnetInstallHook"
+
+    runHook preInstall
+
+    local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
+    local -r dotnetBuildType="${dotnetBuildType-Release}"
+
+    if [[ -n $__structuredAttrs ]]; then
+        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
+        local dotnetFlagsArray=( "${dotnetFlags[@]}" )
+        local dotnetInstallFlagsArray=( "${dotnetInstallFlags[@]}" )
+        local dotnetPackFlagsArray=( "${dotnetPackFlags[@]}" )
+        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+    else
+        local dotnetProjectFilesArray=($dotnetProjectFiles)
+        local dotnetFlagsArray=($dotnetFlags)
+        local dotnetInstallFlagsArray=($dotnetInstallFlags)
+        local dotnetPackFlagsArray=($dotnetPackFlags)
+        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+    fi
+
+    if [[ -v dotnetSelfContainedBuild ]]; then
+        if [[ -n $dotnetSelfContainedBuild ]]; then
+            dotnetInstallFlagsArray+=("--self-contained")
+        else
+            dotnetInstallFlagsArray+=("--no-self-contained")
+            # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained
+            # Trimming is only available for self-contained build, so force disable it here
+            dotnetInstallFlagsArray+=("-p:PublishTrimmed=false")
+        fi
+    fi
+
+    if [[ -n ${dotnetUseAppHost-} ]]; then
+        dotnetInstallFlagsArray+=("-p:UseAppHost=true")
+    fi
+
+    if [[ -n ${enableParallelBuilding-} ]]; then
+        local -r maxCpuFlag="$NIX_BUILD_CORES"
+    else
+        local -r maxCpuFlag="1"
+    fi
+
+    dotnetPublish() {
+        local -r projectFile="${1-}"
+
+        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+            runtimeIdFlagsArray=()
+            if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
+                runtimeIdFlagsArray+=("--runtime" "$runtimeId")
+            fi
+
+            dotnet publish ${1+"$projectFile"} \
+                -maxcpucount:"$maxCpuFlag" \
+                -p:ContinuousIntegrationBuild=true \
+                -p:Deterministic=true \
+                -p:OverwriteReadOnlyFiles=true \
+                --output "$dotnetInstallPath" \
+                --configuration "$dotnetBuildType" \
+                --no-restore \
+                --no-build \
+                "${runtimeIdFlagsArray[@]}" \
+                "${dotnetInstallFlagsArray[@]}" \
+                "${dotnetFlagsArray[@]}"
+        done
+    }
+
+    dotnetPack() {
+        local -r projectFile="${1-}"
+
+        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+            dotnet pack ${1+"$projectFile"} \
+                   -maxcpucount:"$maxCpuFlag" \
+                   -p:ContinuousIntegrationBuild=true \
+                   -p:Deterministic=true \
+                   -p:OverwriteReadOnlyFiles=true \
+                   --output "$out/share/nuget/source" \
+                   --configuration "$dotnetBuildType" \
+                   --no-restore \
+                   --no-build \
+                   --runtime "$runtimeId" \
+                   "${dotnetPackFlagsArray[@]}" \
+                   "${dotnetFlagsArray[@]}"
+        done
+    }
+
+    if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+        dotnetPublish
+    else
+        local projectFile
+        for projectFile in "${dotnetProjectFilesArray[@]}"; do
+            dotnetPublish "$projectFile"
+        done
+    fi
+
+    if [[ -n ${packNupkg-} ]]; then
+        if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+            dotnetPack
+        else
+            local projectFile
+            for projectFile in "${dotnetProjectFilesArray[@]}"; do
+                dotnetPack "$projectFile"
+            done
+        fi
+    fi
+
+    runHook postInstall
+
+    echo "Finished dotnetInstallHook"
+}
+
+if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then
+    installPhase=dotnetInstallHook
+fi
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix
deleted file mode 100644
index a30b1b19fef7..000000000000
--- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  stdenv,
-  which,
-  coreutils,
-  zlib,
-  openssl,
-  makeSetupHook,
-  zip,
-  # Passed from ../default.nix
-  dotnet-sdk,
-  dotnet-runtime,
-}:
-{
-  dotnetConfigureHook = makeSetupHook {
-    name = "dotnet-configure-hook";
-    substitutions = {
-      dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker";
-      libPath = lib.makeLibraryPath [
-        stdenv.cc.cc
-        stdenv.cc.libc
-        dotnet-sdk.passthru.icu
-        zlib
-        openssl
-      ];
-    };
-  } ./dotnet-configure-hook.sh;
-
-  dotnetBuildHook = makeSetupHook {
-    name = "dotnet-build-hook";
-  } ./dotnet-build-hook.sh;
-
-  dotnetCheckHook = makeSetupHook {
-    name = "dotnet-check-hook";
-  } ./dotnet-check-hook.sh;
-
-  dotnetInstallHook = makeSetupHook {
-    name = "dotnet-install-hook";
-    substitutions = {
-      inherit zip;
-    };
-  } ./dotnet-install-hook.sh;
-
-  dotnetFixupHook = makeSetupHook {
-    name = "dotnet-fixup-hook";
-    substitutions = {
-      dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null;
-      wrapperPath = lib.makeBinPath [
-        which
-        coreutils
-      ];
-    };
-  } ./dotnet-fixup-hook.sh;
-}
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh
deleted file mode 100644
index c45204c574de..000000000000
--- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-dotnetBuildHook() {
-    echo "Executing dotnetBuildHook"
-
-    runHook preBuild
-
-    local -r dotnetBuildType="${dotnetBuildType-Release}"
-
-    if [[ -n $__structuredAttrs ]]; then
-        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-        local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
-        local dotnetFlagsArray=( "${dotnetFlags[@]}" )
-        local dotnetBuildFlagsArray=( "${dotnetBuildFlags[@]}" )
-        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-    else
-        local dotnetProjectFilesArray=($dotnetProjectFiles)
-        local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
-        local dotnetFlagsArray=($dotnetFlags)
-        local dotnetBuildFlagsArray=($dotnetBuildFlags)
-        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
-    fi
-
-    if [[ -n "${enableParallelBuilding-}" ]]; then
-        local -r maxCpuFlag="$NIX_BUILD_CORES"
-        local -r parallelBuildFlag="true"
-    else
-        local -r maxCpuFlag="1"
-        local -r parallelBuildFlag="false"
-    fi
-
-    if [[ -v dotnetSelfContainedBuild ]]; then
-        if [[ -n $dotnetSelfContainedBuild ]]; then
-            dotnetBuildFlagsArray+=("-p:SelfContained=true")
-        else
-            dotnetBuildFlagsArray+=("-p:SelfContained=false")
-        fi
-    fi
-
-    if [[ -n ${dotnetUseAppHost-} ]]; then
-        dotnetBuildFlagsArray+=("-p:UseAppHost=true")
-    fi
-
-    local versionFlagsArray=()
-    if [[ -n ${version-} ]]; then
-        versionFlagsArray+=("-p:InformationalVersion=$version")
-    fi
-
-    if [[ -n ${versionForDotnet-} ]]; then
-        versionFlagsArray+=("-p:Version=$versionForDotnet")
-    fi
-
-    dotnetBuild() {
-        local -r projectFile="${1-}"
-
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            local runtimeIdFlagsArray=()
-            if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
-                runtimeIdFlagsArray+=("--runtime" "$runtimeId")
-            fi
-
-            dotnet build ${1+"$projectFile"} \
-                -maxcpucount:"$maxCpuFlag" \
-                -p:BuildInParallel="$parallelBuildFlag" \
-                -p:ContinuousIntegrationBuild=true \
-                -p:Deterministic=true \
-                -p:OverwriteReadOnlyFiles=true \
-                --configuration "$dotnetBuildType" \
-                --no-restore \
-                "${versionFlagsArray[@]}" \
-                "${runtimeIdFlagsArray[@]}" \
-                "${dotnetBuildFlagsArray[@]}" \
-                "${dotnetFlagsArray[@]}"
-        done
-    }
-
-    if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
-        dotnetBuild
-    fi
-
-    local projectFile
-    for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
-        dotnetBuild "$projectFile"
-    done
-
-    runHook postBuild
-
-    echo "Finished dotnetBuildHook"
-}
-
-if [[ -z ${dontDotnetBuild-} && -z ${buildPhase-} ]]; then
-    buildPhase=dotnetBuildHook
-fi
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh
deleted file mode 100644
index 38ded5874ad2..000000000000
--- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-dotnetCheckHook() {
-    echo "Executing dotnetCheckHook"
-
-    runHook preCheck
-
-    local -r dotnetBuildType="${dotnetBuildType-Release}"
-
-    if [[ -n $__structuredAttrs ]]; then
-        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-        local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
-        local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" )
-        local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" )
-        local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" )
-        local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
-        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-    else
-        local dotnetProjectFilesArray=($dotnetProjectFiles)
-        local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
-        local dotnetTestFlagsArray=($dotnetTestFlags)
-        local dotnetTestFiltersArray=($dotnetTestFilters)
-        local dotnetDisabledTestsArray=($dotnetDisabledTests)
-        local dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
-        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
-    fi
-
-    if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then
-        local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}")
-        dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" )
-    fi
-
-    if (( ${#dotnetTestFiltersArray[@]} > 0 )); then
-        local OLDIFS="$IFS" IFS='&'
-        dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}")
-        IFS="$OLDIFS"
-    fi
-
-    local libraryPath="${LD_LIBRARY_PATH-}"
-    if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
-        local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
-        local OLDIFS="$IFS" IFS=':'
-        libraryPath="${libraryPathArray[*]}${libraryPath:+':'}$libraryPath"
-        IFS="$OLDIFS"
-    fi
-
-    if [[ -n ${enableParallelBuilding-} ]]; then
-        local -r maxCpuFlag="$NIX_BUILD_CORES"
-    else
-        local -r maxCpuFlag="1"
-    fi
-
-    local projectFile runtimeId
-    for projectFile in "${dotnetTestProjectFilesArray[@]-${dotnetProjectFilesArray[@]}}"; do
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            local runtimeIdFlagsArray=()
-            if [[ $projectFile == *.csproj ]]; then
-                runtimeIdFlagsArray=("--runtime" "$runtimeId")
-            fi
-
-            LD_LIBRARY_PATH=$libraryPath \
-                dotnet test "$projectFile" \
-                -maxcpucount:"$maxCpuFlag" \
-                -p:ContinuousIntegrationBuild=true \
-                -p:Deterministic=true \
-                --configuration "$dotnetBuildType" \
-                --no-restore \
-                --no-build \
-                --logger "console;verbosity=normal" \
-                "${runtimeIdFlagsArray[@]}" \
-                "${dotnetTestFlagsArray[@]}" \
-                "${dotnetFlagsArray[@]}"
-        done
-    done
-
-    runHook postCheck
-
-    echo "Finished dotnetCheckHook"
-}
-
-if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then
-    checkPhase=dotnetCheckHook
-fi
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
deleted file mode 100644
index 542f0af79f63..000000000000
--- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-dotnetConfigureHook() {
-    echo "Executing dotnetConfigureHook"
-
-    runHook preConfigure
-
-    local -r dynamicLinker=@dynamicLinker@
-    local -r libPath=@libPath@
-
-    if [[ -n $__structuredAttrs ]]; then
-        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-        local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
-        local dotnetFlagsArray=( "${dotnetFlags[@]}" )
-        local dotnetRestoreFlagsArray=( "${dotnetRestoreFlags[@]}" )
-        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-    else
-        local dotnetProjectFilesArray=($dotnetProjectFiles)
-        local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
-        local dotnetFlagsArray=($dotnetFlags)
-        local dotnetRestoreFlagsArray=($dotnetRestoreFlags)
-        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
-    fi
-
-    if [[ -z ${enableParallelBuilding-} ]]; then
-        local -r parallelFlag="--disable-parallel"
-    fi
-
-    if [[ -v dotnetSelfContainedBuild ]]; then
-        if [[ -n $dotnetSelfContainedBuild ]]; then
-            dotnetRestoreFlagsArray+=("-p:SelfContained=true")
-        else
-            dotnetRestoreFlagsArray+=("-p:SelfContained=false")
-        fi
-    fi
-
-    dotnetRestore() {
-        local -r projectFile="${1-}"
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            dotnet restore ${1+"$projectFile"} \
-                -p:ContinuousIntegrationBuild=true \
-                -p:Deterministic=true \
-                -p:NuGetAudit=false \
-                --runtime "$runtimeId" \
-                ${parallelFlag-} \
-                "${dotnetRestoreFlagsArray[@]}" \
-                "${dotnetFlagsArray[@]}"
-        done
-    }
-
-    if [[ -f .config/dotnet-tools.json || -f dotnet-tools.json ]]; then
-        dotnet tool restore
-    fi
-
-    # dotnetGlobalTool is set in buildDotnetGlobalTool to patch dependencies but
-    # avoid other project-specific logic. This is a hack, but the old behavior
-    # is worse as it relied on a bug: setting projectFile to an empty string
-    # made the hooks actually skip all project-specific logic. It’s hard to keep
-    # backwards compatibility with this odd behavior now since we are using
-    # arrays, so instead we just pass a variable to indicate that we don’t have
-    # projects.
-    if [[ -z ${dotnetGlobalTool-} ]]; then
-        if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
-            dotnetRestore
-        fi
-
-        local projectFile
-        for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
-            dotnetRestore "$projectFile"
-        done
-    fi
-
-    runHook postConfigure
-
-    echo "Finished dotnetConfigureHook"
-}
-
-if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then
-    configurePhase=dotnetConfigureHook
-fi
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh
deleted file mode 100644
index 8d4315350ad5..000000000000
--- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-# For compatibility, convert makeWrapperArgs to an array unless we are using
-# structured attributes. That is, we ensure that makeWrapperArgs is always an
-# array.
-# See https://github.com/NixOS/nixpkgs/blob/858f4db3048c5be3527e183470e93c1a72c5727c/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh#L1-L3
-# and https://github.com/NixOS/nixpkgs/pull/313005#issuecomment-2175482920
-if [[ -z $__structuredAttrs ]]; then
-    makeWrapperArgs=( ${makeWrapperArgs-} )
-fi
-
-# First argument is the executable you want to wrap,
-# the second is the destination for the wrapper.
-wrapDotnetProgram() {
-    local -r dotnetRuntime=@dotnetRuntime@
-    local -r wrapperPath=@wrapperPath@
-
-    local -r dotnetFromEnvScript='dotnetFromEnv() {
-    local dotnetPath
-    if command -v dotnet 2>&1 >/dev/null; then
-        dotnetPath=$(which dotnet) && \
-            dotnetPath=$(realpath "$dotnetPath") && \
-            dotnetPath=$(dirname "$dotnetPath") && \
-            export DOTNET_ROOT="$dotnetPath"
-    fi
-}
-dotnetFromEnv'
-
-    if [[ -n $__structuredAttrs ]]; then
-        local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
-    else
-        local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
-    fi
-
-    local dotnetRuntimeDepsFlags=()
-    if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
-        local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
-        local OLDIFS="$IFS" IFS=':'
-        dotnetRuntimeDepsFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPathArray[*]}")
-        IFS="$OLDIFS"
-    fi
-
-    local dotnetRootFlagsArray=()
-    if [[ -z ${dotnetSelfContainedBuild-} ]]; then
-        if [[ -n ${useDotnetFromEnv-} ]]; then
-            # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
-            dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$wrapperPath")
-            dotnetRootFlagsArray+=("--run" "$dotnetFromEnvScript")
-            if [[ -n $dotnetRuntime ]]; then
-                dotnetRootFlagsArray+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
-                dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$dotnetRuntime/bin")
-            fi
-        elif [[ -n $dotnetRuntime ]]; then
-            dotnetRootFlagsArray+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
-            dotnetRootFlagsArray+=("--prefix" "PATH" ":" "$dotnetRuntime/bin")
-        fi
-    fi
-
-    makeWrapper "$1" "$2" \
-        "${dotnetRuntimeDepsFlags[@]}" \
-        "${dotnetRootFlagsArray[@]}" \
-        "${gappsWrapperArgs[@]}" \
-        "${makeWrapperArgs[@]}"
-
-    echo "installed wrapper to "$2""
-}
-
-dotnetFixupHook() {
-    local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
-
-    local executable executableBasename
-
-    # check if dotnetExecutables is declared (including empty values, in which case we generate no executables)
-    if declare -p dotnetExecutables &>/dev/null; then
-        if [[ -n $__structuredAttrs ]]; then
-            local dotnetExecutablesArray=( "${dotnetExecutables[@]}" )
-        else
-            local dotnetExecutablesArray=($dotnetExecutables)
-        fi
-        for executable in "${dotnetExecutablesArray[@]}"; do
-            executableBasename=$(basename "$executable")
-
-            local path="$dotnetInstallPath/$executable"
-
-            if test -x "$path"; then
-                wrapDotnetProgram "$path" "$out/bin/$executableBasename"
-            else
-                echo "Specified binary \"$executable\" is either not an executable or does not exist!"
-                echo "Looked in $path"
-                exit 1
-            fi
-        done
-    else
-        while IFS= read -d '' executable; do
-            executableBasename=$(basename "$executable")
-            wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \;
-        done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0)
-    fi
-}
-
-if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then
-    appendToVar preFixupPhases dotnetFixupHook
-fi
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh
deleted file mode 100644
index 8b731b4feab1..000000000000
--- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh
+++ /dev/null
@@ -1,114 +0,0 @@
-dotnetInstallHook() {
-    echo "Executing dotnetInstallHook"
-
-    runHook preInstall
-
-    local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
-    local -r dotnetBuildType="${dotnetBuildType-Release}"
-
-    if [[ -n $__structuredAttrs ]]; then
-        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-        local dotnetFlagsArray=( "${dotnetFlags[@]}" )
-        local dotnetInstallFlagsArray=( "${dotnetInstallFlags[@]}" )
-        local dotnetPackFlagsArray=( "${dotnetPackFlags[@]}" )
-        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-    else
-        local dotnetProjectFilesArray=($dotnetProjectFiles)
-        local dotnetFlagsArray=($dotnetFlags)
-        local dotnetInstallFlagsArray=($dotnetInstallFlags)
-        local dotnetPackFlagsArray=($dotnetPackFlags)
-        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
-    fi
-
-    if [[ -v dotnetSelfContainedBuild ]]; then
-        if [[ -n $dotnetSelfContainedBuild ]]; then
-            dotnetInstallFlagsArray+=("--self-contained")
-        else
-            dotnetInstallFlagsArray+=("--no-self-contained")
-            # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained
-            # Trimming is only available for self-contained build, so force disable it here
-            dotnetInstallFlagsArray+=("-p:PublishTrimmed=false")
-        fi
-    fi
-
-    if [[ -n ${dotnetUseAppHost-} ]]; then
-        dotnetInstallFlagsArray+=("-p:UseAppHost=true")
-    fi
-
-    if [[ -n ${enableParallelBuilding-} ]]; then
-        local -r maxCpuFlag="$NIX_BUILD_CORES"
-    else
-        local -r maxCpuFlag="1"
-    fi
-
-    dotnetPublish() {
-        local -r projectFile="${1-}"
-
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            runtimeIdFlagsArray=()
-            if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
-                runtimeIdFlagsArray+=("--runtime" "$runtimeId")
-            fi
-
-            dotnet publish ${1+"$projectFile"} \
-                -maxcpucount:"$maxCpuFlag" \
-                -p:ContinuousIntegrationBuild=true \
-                -p:Deterministic=true \
-                -p:OverwriteReadOnlyFiles=true \
-                --output "$dotnetInstallPath" \
-                --configuration "$dotnetBuildType" \
-                --no-restore \
-                --no-build \
-                "${runtimeIdFlagsArray[@]}" \
-                "${dotnetInstallFlagsArray[@]}" \
-                "${dotnetFlagsArray[@]}"
-        done
-    }
-
-    dotnetPack() {
-        local -r projectFile="${1-}"
-
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            dotnet pack ${1+"$projectFile"} \
-                   -maxcpucount:"$maxCpuFlag" \
-                   -p:ContinuousIntegrationBuild=true \
-                   -p:Deterministic=true \
-                   -p:OverwriteReadOnlyFiles=true \
-                   --output "$out/share/nuget/source" \
-                   --configuration "$dotnetBuildType" \
-                   --no-restore \
-                   --no-build \
-                   --runtime "$runtimeId" \
-                   "${dotnetPackFlagsArray[@]}" \
-                   "${dotnetFlagsArray[@]}"
-        done
-    }
-
-    if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
-        dotnetPublish
-    else
-        local projectFile
-        for projectFile in "${dotnetProjectFilesArray[@]}"; do
-            dotnetPublish "$projectFile"
-        done
-    fi
-
-    if [[ -n ${packNupkg-} ]]; then
-        if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
-            dotnetPack
-        else
-            local projectFile
-            for projectFile in "${dotnetProjectFilesArray[@]}"; do
-                dotnetPack "$projectFile"
-            done
-        fi
-    fi
-
-    runHook postInstall
-
-    echo "Finished dotnetInstallHook"
-}
-
-if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then
-    installPhase=dotnetInstallHook
-fi
diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix
index e303e1d948d2..6de2acb85620 100644
--- a/pkgs/development/compilers/dotnet/wrapper.nix
+++ b/pkgs/development/compilers/dotnet/wrapper.nix
@@ -19,6 +19,7 @@
   nugetPackageHook,
   xmlstarlet,
   pkgs,
+  recurseIntoAttrs,
 }:
 type: unwrapped:
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -281,7 +282,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         };
       }
       // lib.optionalAttrs (type == "sdk") ({
-        buildDotnetModule =
+        buildDotnetModule = recurseIntoAttrs (
           (pkgs.appendOverlays [
             (self: super: {
               dotnet-sdk = finalAttrs.finalPackage;
@@ -289,7 +290,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
             })
           ]).callPackage
             ../../../test/dotnet/default.nix
-            { };
+            { }
+        );
 
         console = lib.recurseIntoAttrs {
           # yes, older SDKs omit the comma

From c8ae12c5319bcab12f4226ad3652f82c88047af9 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 26 Jun 2025 11:27:52 -0300
Subject: [PATCH 040/230] dotnetHook: rename phase functions Hook -> Phase

---
 .../build-dotnet-module/hook/dotnet-hook.sh   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
index ab1a760e3c75..38c07ea7ba10 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
@@ -1,4 +1,4 @@
-dotnetConfigureHook() {
+dotnetConfigurePhase() {
     echo "Executing dotnetConfigureHook"
 
     runHook preConfigure
@@ -74,10 +74,10 @@ dotnetConfigureHook() {
 }
 
 if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then
-    configurePhase=dotnetConfigureHook
+    configurePhase=dotnetConfigurePhase
 fi
 
-dotnetBuildHook() {
+dotnetBuildPhase() {
     echo "Executing dotnetBuildHook"
 
     runHook preBuild
@@ -166,10 +166,10 @@ dotnetBuildHook() {
 }
 
 if [[ -z ${dontDotnetBuild-} && -z ${buildPhase-} ]]; then
-    buildPhase=dotnetBuildHook
+    buildPhase=dotnetBuildPhase
 fi
 
-dotnetCheckHook() {
+dotnetCheckPhase() {
     echo "Executing dotnetCheckHook"
 
     runHook preCheck
@@ -248,7 +248,7 @@ dotnetCheckHook() {
 }
 
 if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then
-    checkPhase=dotnetCheckHook
+    checkPhase=dotnetCheckPhase
 fi
 
 # For compatibility, convert makeWrapperArgs to an array unless we are using
@@ -316,7 +316,7 @@ dotnetFromEnv'
     echo "installed wrapper to "$2""
 }
 
-dotnetFixupHook() {
+dotnetFixupPhase() {
     local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
 
     local executable executableBasename
@@ -350,10 +350,10 @@ dotnetFixupHook() {
 }
 
 if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then
-    appendToVar preFixupPhases dotnetFixupHook
+    appendToVar preFixupPhases dotnetFixupPhase
 fi
 
-dotnetInstallHook() {
+dotnetInstallPhase() {
     echo "Executing dotnetInstallHook"
 
     runHook preInstall
@@ -465,5 +465,5 @@ dotnetInstallHook() {
 }
 
 if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then
-    installPhase=dotnetInstallHook
+    installPhase=dotnetInstallPhase
 fi

From e84eb87a639f0b5cfaf700f27728432ada4bf7f4 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 26 Jun 2025 11:35:20 -0300
Subject: [PATCH 041/230] dotnetHook: remove unused substitutions

---
 .../dotnet/build-dotnet-module/default.nix       |  2 +-
 .../dotnet/build-dotnet-module/hook/default.nix  | 16 +---------------
 .../build-dotnet-module/hook/dotnet-hook.sh      |  3 ---
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 4a1cf49440df..393aa155eec5 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -98,7 +98,7 @@ let
         else
           dotnet-sdk.meta.platforms;
 
-      hook = callPackage ./hook { inherit dotnet-sdk dotnet-runtime; };
+      hook = callPackage ./hook { inherit dotnet-runtime; };
 
       inherit (dotnetCorePackages) systemToDotnetRid;
     in
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix
index d3d5b23ea31c..54b802b6a1a0 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix
@@ -1,29 +1,15 @@
 {
   lib,
-  stdenv,
   which,
   coreutils,
-  zlib,
-  openssl,
   makeSetupHook,
-  zip,
   # Passed from ../default.nix
-  dotnet-sdk,
   dotnet-runtime,
 }:
 makeSetupHook {
   name = "dotnet-hook";
   substitutions = {
-    dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker";
-    libPath = lib.makeLibraryPath [
-      stdenv.cc.cc
-      stdenv.cc.libc
-      dotnet-sdk.passthru.icu
-      zlib
-      openssl
-    ];
-    inherit zip;
-    dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null;
+    dotnetRuntime = dotnet-runtime;
     wrapperPath = lib.makeBinPath [
       which
       coreutils
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
index 38c07ea7ba10..e7f6f14cb3c1 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
@@ -3,9 +3,6 @@ dotnetConfigurePhase() {
 
     runHook preConfigure
 
-    local -r dynamicLinker=@dynamicLinker@
-    local -r libPath=@libPath@
-
     if [[ -n $__structuredAttrs ]]; then
         local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
         local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )

From 861ed441f6ae9a572eeff6561cc8dbf4a36ad810 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 26 Jun 2025 14:14:32 -0300
Subject: [PATCH 042/230] dotnet-hook.sh: indent

---
 .../build-dotnet-module/hook/dotnet-hook.sh   | 732 +++++++++---------
 1 file changed, 366 insertions(+), 366 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
index e7f6f14cb3c1..15c35ca58511 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
@@ -1,251 +1,251 @@
 dotnetConfigurePhase() {
-    echo "Executing dotnetConfigureHook"
+  echo "Executing dotnetConfigureHook"
 
-    runHook preConfigure
+  runHook preConfigure
 
-    if [[ -n $__structuredAttrs ]]; then
-        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-        local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
-        local dotnetFlagsArray=( "${dotnetFlags[@]}" )
-        local dotnetRestoreFlagsArray=( "${dotnetRestoreFlags[@]}" )
-        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+  if [[ -n $__structuredAttrs ]]; then
+    local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
+    local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
+    local dotnetFlagsArray=( "${dotnetFlags[@]}" )
+    local dotnetRestoreFlagsArray=( "${dotnetRestoreFlags[@]}" )
+    local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+  else
+    local dotnetProjectFilesArray=($dotnetProjectFiles)
+    local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
+    local dotnetFlagsArray=($dotnetFlags)
+    local dotnetRestoreFlagsArray=($dotnetRestoreFlags)
+    local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+  fi
+
+  if [[ -z ${enableParallelBuilding-} ]]; then
+    local -r parallelFlag="--disable-parallel"
+  fi
+
+  if [[ -v dotnetSelfContainedBuild ]]; then
+    if [[ -n $dotnetSelfContainedBuild ]]; then
+      dotnetRestoreFlagsArray+=("-p:SelfContained=true")
     else
-        local dotnetProjectFilesArray=($dotnetProjectFiles)
-        local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
-        local dotnetFlagsArray=($dotnetFlags)
-        local dotnetRestoreFlagsArray=($dotnetRestoreFlags)
-        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+      dotnetRestoreFlagsArray+=("-p:SelfContained=false")
     fi
+  fi
 
-    if [[ -z ${enableParallelBuilding-} ]]; then
-        local -r parallelFlag="--disable-parallel"
-    fi
+  dotnetRestore() {
+    local -r projectFile="${1-}"
+    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+      dotnet restore ${1+"$projectFile"} \
+             -p:ContinuousIntegrationBuild=true \
+             -p:Deterministic=true \
+             -p:NuGetAudit=false \
+             --runtime "$runtimeId" \
+             ${parallelFlag-} \
+             "${dotnetRestoreFlagsArray[@]}" \
+             "${dotnetFlagsArray[@]}"
+    done
+  }
 
-    if [[ -v dotnetSelfContainedBuild ]]; then
-        if [[ -n $dotnetSelfContainedBuild ]]; then
-            dotnetRestoreFlagsArray+=("-p:SelfContained=true")
-        else
-            dotnetRestoreFlagsArray+=("-p:SelfContained=false")
-        fi
-    fi
-
-    dotnetRestore() {
-        local -r projectFile="${1-}"
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            dotnet restore ${1+"$projectFile"} \
-                -p:ContinuousIntegrationBuild=true \
-                -p:Deterministic=true \
-                -p:NuGetAudit=false \
-                --runtime "$runtimeId" \
-                ${parallelFlag-} \
-                "${dotnetRestoreFlagsArray[@]}" \
-                "${dotnetFlagsArray[@]}"
-        done
-    }
-
-    if [[ -f .config/dotnet-tools.json || -f dotnet-tools.json ]]; then
-        dotnet tool restore
-    fi
-
-    # dotnetGlobalTool is set in buildDotnetGlobalTool to patch dependencies but
-    # avoid other project-specific logic. This is a hack, but the old behavior
-    # is worse as it relied on a bug: setting projectFile to an empty string
-    # made the hooks actually skip all project-specific logic. It’s hard to keep
-    # backwards compatibility with this odd behavior now since we are using
-    # arrays, so instead we just pass a variable to indicate that we don’t have
-    # projects.
-    if [[ -z ${dotnetGlobalTool-} ]]; then
-        if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
-            dotnetRestore
-        fi
-
-        local projectFile
-        for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
-            dotnetRestore "$projectFile"
-        done
-    fi
-
-    runHook postConfigure
-
-    echo "Finished dotnetConfigureHook"
-}
-
-if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then
-    configurePhase=dotnetConfigurePhase
-fi
-
-dotnetBuildPhase() {
-    echo "Executing dotnetBuildHook"
-
-    runHook preBuild
-
-    local -r dotnetBuildType="${dotnetBuildType-Release}"
-
-    if [[ -n $__structuredAttrs ]]; then
-        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-        local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
-        local dotnetFlagsArray=( "${dotnetFlags[@]}" )
-        local dotnetBuildFlagsArray=( "${dotnetBuildFlags[@]}" )
-        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-    else
-        local dotnetProjectFilesArray=($dotnetProjectFiles)
-        local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
-        local dotnetFlagsArray=($dotnetFlags)
-        local dotnetBuildFlagsArray=($dotnetBuildFlags)
-        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
-    fi
-
-    if [[ -n "${enableParallelBuilding-}" ]]; then
-        local -r maxCpuFlag="$NIX_BUILD_CORES"
-        local -r parallelBuildFlag="true"
-    else
-        local -r maxCpuFlag="1"
-        local -r parallelBuildFlag="false"
-    fi
-
-    if [[ -v dotnetSelfContainedBuild ]]; then
-        if [[ -n $dotnetSelfContainedBuild ]]; then
-            dotnetBuildFlagsArray+=("-p:SelfContained=true")
-        else
-            dotnetBuildFlagsArray+=("-p:SelfContained=false")
-        fi
-    fi
-
-    if [[ -n ${dotnetUseAppHost-} ]]; then
-        dotnetBuildFlagsArray+=("-p:UseAppHost=true")
-    fi
-
-    local versionFlagsArray=()
-    if [[ -n ${version-} ]]; then
-        versionFlagsArray+=("-p:InformationalVersion=$version")
-    fi
-
-    if [[ -n ${versionForDotnet-} ]]; then
-        versionFlagsArray+=("-p:Version=$versionForDotnet")
-    fi
-
-    dotnetBuild() {
-        local -r projectFile="${1-}"
-
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            local runtimeIdFlagsArray=()
-            if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
-                runtimeIdFlagsArray+=("--runtime" "$runtimeId")
-            fi
-
-            dotnet build ${1+"$projectFile"} \
-                -maxcpucount:"$maxCpuFlag" \
-                -p:BuildInParallel="$parallelBuildFlag" \
-                -p:ContinuousIntegrationBuild=true \
-                -p:Deterministic=true \
-                -p:OverwriteReadOnlyFiles=true \
-                --configuration "$dotnetBuildType" \
-                --no-restore \
-                "${versionFlagsArray[@]}" \
-                "${runtimeIdFlagsArray[@]}" \
-                "${dotnetBuildFlagsArray[@]}" \
-                "${dotnetFlagsArray[@]}"
-        done
-    }
+  if [[ -f .config/dotnet-tools.json || -f dotnet-tools.json ]]; then
+    dotnet tool restore
+  fi
 
+  # dotnetGlobalTool is set in buildDotnetGlobalTool to patch dependencies but
+  # avoid other project-specific logic. This is a hack, but the old behavior
+  # is worse as it relied on a bug: setting projectFile to an empty string
+  # made the hooks actually skip all project-specific logic. It’s hard to keep
+  # backwards compatibility with this odd behavior now since we are using
+  # arrays, so instead we just pass a variable to indicate that we don’t have
+  # projects.
+  if [[ -z ${dotnetGlobalTool-} ]]; then
     if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
-        dotnetBuild
+      dotnetRestore
     fi
 
     local projectFile
     for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
-        dotnetBuild "$projectFile"
+      dotnetRestore "$projectFile"
     done
+  fi
 
-    runHook postBuild
+  runHook postConfigure
 
-    echo "Finished dotnetBuildHook"
+  echo "Finished dotnetConfigureHook"
+}
+
+if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then
+  configurePhase=dotnetConfigurePhase
+fi
+
+dotnetBuildPhase() {
+  echo "Executing dotnetBuildHook"
+
+  runHook preBuild
+
+  local -r dotnetBuildType="${dotnetBuildType-Release}"
+
+  if [[ -n $__structuredAttrs ]]; then
+    local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
+    local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
+    local dotnetFlagsArray=( "${dotnetFlags[@]}" )
+    local dotnetBuildFlagsArray=( "${dotnetBuildFlags[@]}" )
+    local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+  else
+    local dotnetProjectFilesArray=($dotnetProjectFiles)
+    local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
+    local dotnetFlagsArray=($dotnetFlags)
+    local dotnetBuildFlagsArray=($dotnetBuildFlags)
+    local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+  fi
+
+  if [[ -n "${enableParallelBuilding-}" ]]; then
+    local -r maxCpuFlag="$NIX_BUILD_CORES"
+    local -r parallelBuildFlag="true"
+  else
+    local -r maxCpuFlag="1"
+    local -r parallelBuildFlag="false"
+  fi
+
+  if [[ -v dotnetSelfContainedBuild ]]; then
+    if [[ -n $dotnetSelfContainedBuild ]]; then
+      dotnetBuildFlagsArray+=("-p:SelfContained=true")
+    else
+      dotnetBuildFlagsArray+=("-p:SelfContained=false")
+    fi
+  fi
+
+  if [[ -n ${dotnetUseAppHost-} ]]; then
+    dotnetBuildFlagsArray+=("-p:UseAppHost=true")
+  fi
+
+  local versionFlagsArray=()
+  if [[ -n ${version-} ]]; then
+    versionFlagsArray+=("-p:InformationalVersion=$version")
+  fi
+
+  if [[ -n ${versionForDotnet-} ]]; then
+    versionFlagsArray+=("-p:Version=$versionForDotnet")
+  fi
+
+  dotnetBuild() {
+    local -r projectFile="${1-}"
+
+    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+      local runtimeIdFlagsArray=()
+      if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
+        runtimeIdFlagsArray+=("--runtime" "$runtimeId")
+      fi
+
+      dotnet build ${1+"$projectFile"} \
+             -maxcpucount:"$maxCpuFlag" \
+             -p:BuildInParallel="$parallelBuildFlag" \
+             -p:ContinuousIntegrationBuild=true \
+             -p:Deterministic=true \
+             -p:OverwriteReadOnlyFiles=true \
+             --configuration "$dotnetBuildType" \
+             --no-restore \
+             "${versionFlagsArray[@]}" \
+             "${runtimeIdFlagsArray[@]}" \
+             "${dotnetBuildFlagsArray[@]}" \
+             "${dotnetFlagsArray[@]}"
+    done
+  }
+
+  if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+    dotnetBuild
+  fi
+
+  local projectFile
+  for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
+    dotnetBuild "$projectFile"
+  done
+
+  runHook postBuild
+
+  echo "Finished dotnetBuildHook"
 }
 
 if [[ -z ${dontDotnetBuild-} && -z ${buildPhase-} ]]; then
-    buildPhase=dotnetBuildPhase
+  buildPhase=dotnetBuildPhase
 fi
 
 dotnetCheckPhase() {
-    echo "Executing dotnetCheckHook"
+  echo "Executing dotnetCheckHook"
 
-    runHook preCheck
+  runHook preCheck
 
-    local -r dotnetBuildType="${dotnetBuildType-Release}"
+  local -r dotnetBuildType="${dotnetBuildType-Release}"
 
-    if [[ -n $__structuredAttrs ]]; then
-        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-        local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
-        local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" )
-        local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" )
-        local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" )
-        local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
-        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-    else
-        local dotnetProjectFilesArray=($dotnetProjectFiles)
-        local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
-        local dotnetTestFlagsArray=($dotnetTestFlags)
-        local dotnetTestFiltersArray=($dotnetTestFilters)
-        local dotnetDisabledTestsArray=($dotnetDisabledTests)
-        local dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
-        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
-    fi
+  if [[ -n $__structuredAttrs ]]; then
+    local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
+    local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
+    local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" )
+    local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" )
+    local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" )
+    local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
+    local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+  else
+    local dotnetProjectFilesArray=($dotnetProjectFiles)
+    local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
+    local dotnetTestFlagsArray=($dotnetTestFlags)
+    local dotnetTestFiltersArray=($dotnetTestFilters)
+    local dotnetDisabledTestsArray=($dotnetDisabledTests)
+    local dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
+    local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+  fi
 
-    if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then
-        local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}")
-        dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" )
-    fi
+  if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then
+    local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}")
+    dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" )
+  fi
 
-    if (( ${#dotnetTestFiltersArray[@]} > 0 )); then
-        local OLDIFS="$IFS" IFS='&'
-        dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}")
-        IFS="$OLDIFS"
-    fi
+  if (( ${#dotnetTestFiltersArray[@]} > 0 )); then
+    local OLDIFS="$IFS" IFS='&'
+    dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}")
+    IFS="$OLDIFS"
+  fi
 
-    local libraryPath="${LD_LIBRARY_PATH-}"
-    if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
-        local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
-        local OLDIFS="$IFS" IFS=':'
-        libraryPath="${libraryPathArray[*]}${libraryPath:+':'}$libraryPath"
-        IFS="$OLDIFS"
-    fi
+  local libraryPath="${LD_LIBRARY_PATH-}"
+  if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
+    local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
+    local OLDIFS="$IFS" IFS=':'
+    libraryPath="${libraryPathArray[*]}${libraryPath:+':'}$libraryPath"
+    IFS="$OLDIFS"
+  fi
 
-    if [[ -n ${enableParallelBuilding-} ]]; then
-        local -r maxCpuFlag="$NIX_BUILD_CORES"
-    else
-        local -r maxCpuFlag="1"
-    fi
+  if [[ -n ${enableParallelBuilding-} ]]; then
+    local -r maxCpuFlag="$NIX_BUILD_CORES"
+  else
+    local -r maxCpuFlag="1"
+  fi
 
-    local projectFile runtimeId
-    for projectFile in "${dotnetTestProjectFilesArray[@]-${dotnetProjectFilesArray[@]}}"; do
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            local runtimeIdFlagsArray=()
-            if [[ $projectFile == *.csproj ]]; then
-                runtimeIdFlagsArray=("--runtime" "$runtimeId")
-            fi
+  local projectFile runtimeId
+  for projectFile in "${dotnetTestProjectFilesArray[@]-${dotnetProjectFilesArray[@]}}"; do
+    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+      local runtimeIdFlagsArray=()
+      if [[ $projectFile == *.csproj ]]; then
+        runtimeIdFlagsArray=("--runtime" "$runtimeId")
+      fi
 
-            LD_LIBRARY_PATH=$libraryPath \
-                dotnet test "$projectFile" \
-                -maxcpucount:"$maxCpuFlag" \
-                -p:ContinuousIntegrationBuild=true \
-                -p:Deterministic=true \
-                --configuration "$dotnetBuildType" \
-                --no-restore \
-                --no-build \
-                --logger "console;verbosity=normal" \
-                "${runtimeIdFlagsArray[@]}" \
-                "${dotnetTestFlagsArray[@]}" \
-                "${dotnetFlagsArray[@]}"
-        done
+      LD_LIBRARY_PATH=$libraryPath \
+        dotnet test "$projectFile" \
+        -maxcpucount:"$maxCpuFlag" \
+        -p:ContinuousIntegrationBuild=true \
+        -p:Deterministic=true \
+        --configuration "$dotnetBuildType" \
+        --no-restore \
+        --no-build \
+        --logger "console;verbosity=normal" \
+        "${runtimeIdFlagsArray[@]}" \
+        "${dotnetTestFlagsArray[@]}" \
+        "${dotnetFlagsArray[@]}"
     done
+  done
 
-    runHook postCheck
+  runHook postCheck
 
-    echo "Finished dotnetCheckHook"
+  echo "Finished dotnetCheckHook"
 }
 
 if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then
-    checkPhase=dotnetCheckPhase
+  checkPhase=dotnetCheckPhase
 fi
 
 # For compatibility, convert makeWrapperArgs to an array unless we are using
@@ -254,16 +254,16 @@ fi
 # See https://github.com/NixOS/nixpkgs/blob/858f4db3048c5be3527e183470e93c1a72c5727c/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh#L1-L3
 # and https://github.com/NixOS/nixpkgs/pull/313005#issuecomment-2175482920
 if [[ -z $__structuredAttrs ]]; then
-    makeWrapperArgs=( ${makeWrapperArgs-} )
+  makeWrapperArgs=( ${makeWrapperArgs-} )
 fi
 
 # First argument is the executable you want to wrap,
 # the second is the destination for the wrapper.
 wrapDotnetProgram() {
-    local -r dotnetRuntime=@dotnetRuntime@
-    local -r wrapperPath=@wrapperPath@
+  local -r dotnetRuntime=@dotnetRuntime@
+  local -r wrapperPath=@wrapperPath@
 
-    local -r dotnetFromEnvScript='dotnetFromEnv() {
+  local -r dotnetFromEnvScript='dotnetFromEnv() {
     local dotnetPath
     if command -v dotnet 2>&1 >/dev/null; then
         dotnetPath=$(which dotnet) && \
@@ -274,193 +274,193 @@ wrapDotnetProgram() {
 }
 dotnetFromEnv'
 
-    if [[ -n $__structuredAttrs ]]; then
-        local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
-    else
-        local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
+  if [[ -n $__structuredAttrs ]]; then
+    local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
+  else
+    local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
+  fi
+
+  local dotnetRuntimeDepsFlags=()
+  if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
+    local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
+    local OLDIFS="$IFS" IFS=':'
+    dotnetRuntimeDepsFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPathArray[*]}")
+    IFS="$OLDIFS"
+  fi
+
+  local dotnetRootFlagsArray=()
+  if [[ -z ${dotnetSelfContainedBuild-} ]]; then
+    if [[ -n ${useDotnetFromEnv-} ]]; then
+      # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
+      dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$wrapperPath")
+      dotnetRootFlagsArray+=("--run" "$dotnetFromEnvScript")
+      if [[ -n $dotnetRuntime ]]; then
+        dotnetRootFlagsArray+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
+        dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$dotnetRuntime/bin")
+      fi
+    elif [[ -n $dotnetRuntime ]]; then
+      dotnetRootFlagsArray+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
+      dotnetRootFlagsArray+=("--prefix" "PATH" ":" "$dotnetRuntime/bin")
     fi
+  fi
 
-    local dotnetRuntimeDepsFlags=()
-    if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
-        local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
-        local OLDIFS="$IFS" IFS=':'
-        dotnetRuntimeDepsFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPathArray[*]}")
-        IFS="$OLDIFS"
-    fi
+  makeWrapper "$1" "$2" \
+              "${dotnetRuntimeDepsFlags[@]}" \
+              "${dotnetRootFlagsArray[@]}" \
+              "${gappsWrapperArgs[@]}" \
+              "${makeWrapperArgs[@]}"
 
-    local dotnetRootFlagsArray=()
-    if [[ -z ${dotnetSelfContainedBuild-} ]]; then
-        if [[ -n ${useDotnetFromEnv-} ]]; then
-            # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
-            dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$wrapperPath")
-            dotnetRootFlagsArray+=("--run" "$dotnetFromEnvScript")
-            if [[ -n $dotnetRuntime ]]; then
-                dotnetRootFlagsArray+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
-                dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$dotnetRuntime/bin")
-            fi
-        elif [[ -n $dotnetRuntime ]]; then
-            dotnetRootFlagsArray+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
-            dotnetRootFlagsArray+=("--prefix" "PATH" ":" "$dotnetRuntime/bin")
-        fi
-    fi
-
-    makeWrapper "$1" "$2" \
-        "${dotnetRuntimeDepsFlags[@]}" \
-        "${dotnetRootFlagsArray[@]}" \
-        "${gappsWrapperArgs[@]}" \
-        "${makeWrapperArgs[@]}"
-
-    echo "installed wrapper to "$2""
+  echo "installed wrapper to "$2""
 }
 
 dotnetFixupPhase() {
-    local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
+  local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
 
-    local executable executableBasename
+  local executable executableBasename
 
-    # check if dotnetExecutables is declared (including empty values, in which case we generate no executables)
-    if declare -p dotnetExecutables &>/dev/null; then
-        if [[ -n $__structuredAttrs ]]; then
-            local dotnetExecutablesArray=( "${dotnetExecutables[@]}" )
-        else
-            local dotnetExecutablesArray=($dotnetExecutables)
-        fi
-        for executable in "${dotnetExecutablesArray[@]}"; do
-            executableBasename=$(basename "$executable")
-
-            local path="$dotnetInstallPath/$executable"
-
-            if test -x "$path"; then
-                wrapDotnetProgram "$path" "$out/bin/$executableBasename"
-            else
-                echo "Specified binary \"$executable\" is either not an executable or does not exist!"
-                echo "Looked in $path"
-                exit 1
-            fi
-        done
+  # check if dotnetExecutables is declared (including empty values, in which case we generate no executables)
+  if declare -p dotnetExecutables &>/dev/null; then
+    if [[ -n $__structuredAttrs ]]; then
+      local dotnetExecutablesArray=( "${dotnetExecutables[@]}" )
     else
-        while IFS= read -d '' executable; do
-            executableBasename=$(basename "$executable")
-            wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \;
-        done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0)
+      local dotnetExecutablesArray=($dotnetExecutables)
     fi
+    for executable in "${dotnetExecutablesArray[@]}"; do
+      executableBasename=$(basename "$executable")
+
+      local path="$dotnetInstallPath/$executable"
+
+      if test -x "$path"; then
+        wrapDotnetProgram "$path" "$out/bin/$executableBasename"
+      else
+        echo "Specified binary \"$executable\" is either not an executable or does not exist!"
+        echo "Looked in $path"
+        exit 1
+      fi
+    done
+  else
+    while IFS= read -d '' executable; do
+      executableBasename=$(basename "$executable")
+      wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \;
+    done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0)
+  fi
 }
 
 if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then
-    appendToVar preFixupPhases dotnetFixupPhase
+  appendToVar preFixupPhases dotnetFixupPhase
 fi
 
 dotnetInstallPhase() {
-    echo "Executing dotnetInstallHook"
+  echo "Executing dotnetInstallHook"
 
-    runHook preInstall
+  runHook preInstall
 
-    local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
-    local -r dotnetBuildType="${dotnetBuildType-Release}"
+  local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
+  local -r dotnetBuildType="${dotnetBuildType-Release}"
 
-    if [[ -n $__structuredAttrs ]]; then
-        local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-        local dotnetFlagsArray=( "${dotnetFlags[@]}" )
-        local dotnetInstallFlagsArray=( "${dotnetInstallFlags[@]}" )
-        local dotnetPackFlagsArray=( "${dotnetPackFlags[@]}" )
-        local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+  if [[ -n $__structuredAttrs ]]; then
+    local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
+    local dotnetFlagsArray=( "${dotnetFlags[@]}" )
+    local dotnetInstallFlagsArray=( "${dotnetInstallFlags[@]}" )
+    local dotnetPackFlagsArray=( "${dotnetPackFlags[@]}" )
+    local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
+  else
+    local dotnetProjectFilesArray=($dotnetProjectFiles)
+    local dotnetFlagsArray=($dotnetFlags)
+    local dotnetInstallFlagsArray=($dotnetInstallFlags)
+    local dotnetPackFlagsArray=($dotnetPackFlags)
+    local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+  fi
+
+  if [[ -v dotnetSelfContainedBuild ]]; then
+    if [[ -n $dotnetSelfContainedBuild ]]; then
+      dotnetInstallFlagsArray+=("--self-contained")
     else
-        local dotnetProjectFilesArray=($dotnetProjectFiles)
-        local dotnetFlagsArray=($dotnetFlags)
-        local dotnetInstallFlagsArray=($dotnetInstallFlags)
-        local dotnetPackFlagsArray=($dotnetPackFlags)
-        local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+      dotnetInstallFlagsArray+=("--no-self-contained")
+      # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained
+      # Trimming is only available for self-contained build, so force disable it here
+      dotnetInstallFlagsArray+=("-p:PublishTrimmed=false")
     fi
+  fi
 
-    if [[ -v dotnetSelfContainedBuild ]]; then
-        if [[ -n $dotnetSelfContainedBuild ]]; then
-            dotnetInstallFlagsArray+=("--self-contained")
-        else
-            dotnetInstallFlagsArray+=("--no-self-contained")
-            # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained
-            # Trimming is only available for self-contained build, so force disable it here
-            dotnetInstallFlagsArray+=("-p:PublishTrimmed=false")
-        fi
-    fi
+  if [[ -n ${dotnetUseAppHost-} ]]; then
+    dotnetInstallFlagsArray+=("-p:UseAppHost=true")
+  fi
 
-    if [[ -n ${dotnetUseAppHost-} ]]; then
-        dotnetInstallFlagsArray+=("-p:UseAppHost=true")
-    fi
+  if [[ -n ${enableParallelBuilding-} ]]; then
+    local -r maxCpuFlag="$NIX_BUILD_CORES"
+  else
+    local -r maxCpuFlag="1"
+  fi
 
-    if [[ -n ${enableParallelBuilding-} ]]; then
-        local -r maxCpuFlag="$NIX_BUILD_CORES"
-    else
-        local -r maxCpuFlag="1"
-    fi
+  dotnetPublish() {
+    local -r projectFile="${1-}"
 
-    dotnetPublish() {
-        local -r projectFile="${1-}"
+    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+      runtimeIdFlagsArray=()
+      if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
+        runtimeIdFlagsArray+=("--runtime" "$runtimeId")
+      fi
 
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            runtimeIdFlagsArray=()
-            if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
-                runtimeIdFlagsArray+=("--runtime" "$runtimeId")
-            fi
+      dotnet publish ${1+"$projectFile"} \
+             -maxcpucount:"$maxCpuFlag" \
+             -p:ContinuousIntegrationBuild=true \
+             -p:Deterministic=true \
+             -p:OverwriteReadOnlyFiles=true \
+             --output "$dotnetInstallPath" \
+             --configuration "$dotnetBuildType" \
+             --no-restore \
+             --no-build \
+             "${runtimeIdFlagsArray[@]}" \
+             "${dotnetInstallFlagsArray[@]}" \
+             "${dotnetFlagsArray[@]}"
+    done
+  }
 
-            dotnet publish ${1+"$projectFile"} \
-                -maxcpucount:"$maxCpuFlag" \
-                -p:ContinuousIntegrationBuild=true \
-                -p:Deterministic=true \
-                -p:OverwriteReadOnlyFiles=true \
-                --output "$dotnetInstallPath" \
-                --configuration "$dotnetBuildType" \
-                --no-restore \
-                --no-build \
-                "${runtimeIdFlagsArray[@]}" \
-                "${dotnetInstallFlagsArray[@]}" \
-                "${dotnetFlagsArray[@]}"
-        done
-    }
+  dotnetPack() {
+    local -r projectFile="${1-}"
 
-    dotnetPack() {
-        local -r projectFile="${1-}"
+    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+      dotnet pack ${1+"$projectFile"} \
+             -maxcpucount:"$maxCpuFlag" \
+             -p:ContinuousIntegrationBuild=true \
+             -p:Deterministic=true \
+             -p:OverwriteReadOnlyFiles=true \
+             --output "$out/share/nuget/source" \
+             --configuration "$dotnetBuildType" \
+             --no-restore \
+             --no-build \
+             --runtime "$runtimeId" \
+             "${dotnetPackFlagsArray[@]}" \
+             "${dotnetFlagsArray[@]}"
+    done
+  }
 
-        for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-            dotnet pack ${1+"$projectFile"} \
-                   -maxcpucount:"$maxCpuFlag" \
-                   -p:ContinuousIntegrationBuild=true \
-                   -p:Deterministic=true \
-                   -p:OverwriteReadOnlyFiles=true \
-                   --output "$out/share/nuget/source" \
-                   --configuration "$dotnetBuildType" \
-                   --no-restore \
-                   --no-build \
-                   --runtime "$runtimeId" \
-                   "${dotnetPackFlagsArray[@]}" \
-                   "${dotnetFlagsArray[@]}"
-        done
-    }
+  if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+    dotnetPublish
+  else
+    local projectFile
+    for projectFile in "${dotnetProjectFilesArray[@]}"; do
+      dotnetPublish "$projectFile"
+    done
+  fi
 
+  if [[ -n ${packNupkg-} ]]; then
     if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
-        dotnetPublish
+      dotnetPack
     else
-        local projectFile
-        for projectFile in "${dotnetProjectFilesArray[@]}"; do
-            dotnetPublish "$projectFile"
-        done
+      local projectFile
+      for projectFile in "${dotnetProjectFilesArray[@]}"; do
+        dotnetPack "$projectFile"
+      done
     fi
+  fi
 
-    if [[ -n ${packNupkg-} ]]; then
-        if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
-            dotnetPack
-        else
-            local projectFile
-            for projectFile in "${dotnetProjectFilesArray[@]}"; do
-                dotnetPack "$projectFile"
-            done
-        fi
-    fi
+  runHook postInstall
 
-    runHook postInstall
-
-    echo "Finished dotnetInstallHook"
+  echo "Finished dotnetInstallHook"
 }
 
 if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then
-    installPhase=dotnetInstallPhase
+  installPhase=dotnetInstallPhase
 fi

From 6fbf1d8a15c8a07b195803198714525ed6ea87db Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 26 Jun 2025 14:24:44 -0300
Subject: [PATCH 043/230] dotnet-hook.sh: fix shellcheck warnings

---
 .../build-dotnet-module/hook/dotnet-hook.sh   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
index 15c35ca58511..0d2023c89e44 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
@@ -1,8 +1,11 @@
+# shellcheck shell=bash
+
 dotnetConfigurePhase() {
   echo "Executing dotnetConfigureHook"
 
   runHook preConfigure
 
+  # shellcheck disable=2206
   if [[ -n $__structuredAttrs ]]; then
     local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
     local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
@@ -18,7 +21,7 @@ dotnetConfigurePhase() {
   fi
 
   if [[ -z ${enableParallelBuilding-} ]]; then
-    local -r parallelFlag="--disable-parallel"
+    dotnetRestoreFlagsArray+=(--disable-parallel)
   fi
 
   if [[ -v dotnetSelfContainedBuild ]]; then
@@ -37,7 +40,6 @@ dotnetConfigurePhase() {
              -p:Deterministic=true \
              -p:NuGetAudit=false \
              --runtime "$runtimeId" \
-             ${parallelFlag-} \
              "${dotnetRestoreFlagsArray[@]}" \
              "${dotnetFlagsArray[@]}"
     done
@@ -81,6 +83,7 @@ dotnetBuildPhase() {
 
   local -r dotnetBuildType="${dotnetBuildType-Release}"
 
+  # shellcheck disable=2206
   if [[ -n $__structuredAttrs ]]; then
     local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
     local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
@@ -173,6 +176,7 @@ dotnetCheckPhase() {
 
   local -r dotnetBuildType="${dotnetBuildType-Release}"
 
+  # shellcheck disable=2206
   if [[ -n $__structuredAttrs ]]; then
     local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
     local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
@@ -253,6 +257,7 @@ fi
 # array.
 # See https://github.com/NixOS/nixpkgs/blob/858f4db3048c5be3527e183470e93c1a72c5727c/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh#L1-L3
 # and https://github.com/NixOS/nixpkgs/pull/313005#issuecomment-2175482920
+# shellcheck disable=2206
 if [[ -z $__structuredAttrs ]]; then
   makeWrapperArgs=( ${makeWrapperArgs-} )
 fi
@@ -263,6 +268,7 @@ wrapDotnetProgram() {
   local -r dotnetRuntime=@dotnetRuntime@
   local -r wrapperPath=@wrapperPath@
 
+  # shellcheck disable=2016
   local -r dotnetFromEnvScript='dotnetFromEnv() {
     local dotnetPath
     if command -v dotnet 2>&1 >/dev/null; then
@@ -274,6 +280,7 @@ wrapDotnetProgram() {
 }
 dotnetFromEnv'
 
+  # shellcheck disable=2206
   if [[ -n $__structuredAttrs ]]; then
     local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
   else
@@ -304,13 +311,14 @@ dotnetFromEnv'
     fi
   fi
 
+  # shellcheck disable=2154
   makeWrapper "$1" "$2" \
               "${dotnetRuntimeDepsFlags[@]}" \
               "${dotnetRootFlagsArray[@]}" \
               "${gappsWrapperArgs[@]}" \
               "${makeWrapperArgs[@]}"
 
-  echo "installed wrapper to "$2""
+  echo "installed wrapper to $2"
 }
 
 dotnetFixupPhase() {
@@ -319,7 +327,9 @@ dotnetFixupPhase() {
   local executable executableBasename
 
   # check if dotnetExecutables is declared (including empty values, in which case we generate no executables)
+  # shellcheck disable=2154
   if declare -p dotnetExecutables &>/dev/null; then
+    # shellcheck disable=2206
     if [[ -n $__structuredAttrs ]]; then
       local dotnetExecutablesArray=( "${dotnetExecutables[@]}" )
     else
@@ -339,7 +349,7 @@ dotnetFixupPhase() {
       fi
     done
   else
-    while IFS= read -d '' executable; do
+    while IFS= read -r -d '' executable; do
       executableBasename=$(basename "$executable")
       wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \;
     done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0)
@@ -358,6 +368,7 @@ dotnetInstallPhase() {
   local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
   local -r dotnetBuildType="${dotnetBuildType-Release}"
 
+  # shellcheck disable=2206
   if [[ -n $__structuredAttrs ]]; then
     local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
     local dotnetFlagsArray=( "${dotnetFlags[@]}" )

From 8713126d0f7d07fc56cc0ac4d901ae0a597a62b2 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 26 Jun 2025 16:03:52 -0300
Subject: [PATCH 044/230] dotnet-hook.sh: clean up array handling

---
 .../build-dotnet-module/hook/dotnet-hook.sh   | 229 +++++++-----------
 1 file changed, 89 insertions(+), 140 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
index 0d2023c89e44..5edaa1b89dc4 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
@@ -5,43 +5,32 @@ dotnetConfigurePhase() {
 
   runHook preConfigure
 
-  # shellcheck disable=2206
-  if [[ -n $__structuredAttrs ]]; then
-    local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-    local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
-    local dotnetFlagsArray=( "${dotnetFlags[@]}" )
-    local dotnetRestoreFlagsArray=( "${dotnetRestoreFlags[@]}" )
-    local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-  else
-    local dotnetProjectFilesArray=($dotnetProjectFiles)
-    local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
-    local dotnetFlagsArray=($dotnetFlags)
-    local dotnetRestoreFlagsArray=($dotnetRestoreFlags)
-    local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
-  fi
+  local -a projectFiles flags runtimeIds
+  concatTo projectFiles dotnetProjectFiles dotnetTestProjectFiles
+  concatTo flags dotnetFlags dotnetRestoreFlags
+  concatTo runtimeIds dotnetRuntimeIds
 
   if [[ -z ${enableParallelBuilding-} ]]; then
-    dotnetRestoreFlagsArray+=(--disable-parallel)
+    flags+=(--disable-parallel)
   fi
 
   if [[ -v dotnetSelfContainedBuild ]]; then
     if [[ -n $dotnetSelfContainedBuild ]]; then
-      dotnetRestoreFlagsArray+=("-p:SelfContained=true")
+      flags+=("-p:SelfContained=true")
     else
-      dotnetRestoreFlagsArray+=("-p:SelfContained=false")
+      flags+=("-p:SelfContained=false")
     fi
   fi
 
   dotnetRestore() {
     local -r projectFile="${1-}"
-    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+    for runtimeId in "${runtimeIds[@]}"; do
       dotnet restore ${1+"$projectFile"} \
              -p:ContinuousIntegrationBuild=true \
              -p:Deterministic=true \
              -p:NuGetAudit=false \
              --runtime "$runtimeId" \
-             "${dotnetRestoreFlagsArray[@]}" \
-             "${dotnetFlagsArray[@]}"
+             "${flags[@]}"
     done
   }
 
@@ -57,12 +46,12 @@ dotnetConfigurePhase() {
   # arrays, so instead we just pass a variable to indicate that we don’t have
   # projects.
   if [[ -z ${dotnetGlobalTool-} ]]; then
-    if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+    if (( ${#projectFiles[@]} == 0 )); then
       dotnetRestore
     fi
 
     local projectFile
-    for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
+    for projectFile in "${projectFiles[@]}"; do
       dotnetRestore "$projectFile"
     done
   fi
@@ -83,20 +72,10 @@ dotnetBuildPhase() {
 
   local -r dotnetBuildType="${dotnetBuildType-Release}"
 
-  # shellcheck disable=2206
-  if [[ -n $__structuredAttrs ]]; then
-    local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-    local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
-    local dotnetFlagsArray=( "${dotnetFlags[@]}" )
-    local dotnetBuildFlagsArray=( "${dotnetBuildFlags[@]}" )
-    local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-  else
-    local dotnetProjectFilesArray=($dotnetProjectFiles)
-    local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
-    local dotnetFlagsArray=($dotnetFlags)
-    local dotnetBuildFlagsArray=($dotnetBuildFlags)
-    local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
-  fi
+  local -a projectFiles flags runtimeIds
+  concatTo projectFiles dotnetProjectFiles dotnetTestProjectFiles
+  concatTo flags dotnetFlags dotnetBuildFlags
+  concatTo runtimeIds dotnetRuntimeIds
 
   if [[ -n "${enableParallelBuilding-}" ]]; then
     local -r maxCpuFlag="$NIX_BUILD_CORES"
@@ -108,32 +87,31 @@ dotnetBuildPhase() {
 
   if [[ -v dotnetSelfContainedBuild ]]; then
     if [[ -n $dotnetSelfContainedBuild ]]; then
-      dotnetBuildFlagsArray+=("-p:SelfContained=true")
+      flags+=("-p:SelfContained=true")
     else
-      dotnetBuildFlagsArray+=("-p:SelfContained=false")
+      flags+=("-p:SelfContained=false")
     fi
   fi
 
   if [[ -n ${dotnetUseAppHost-} ]]; then
-    dotnetBuildFlagsArray+=("-p:UseAppHost=true")
+    flags+=("-p:UseAppHost=true")
   fi
 
-  local versionFlagsArray=()
   if [[ -n ${version-} ]]; then
-    versionFlagsArray+=("-p:InformationalVersion=$version")
+    flags+=("-p:InformationalVersion=$version")
   fi
 
   if [[ -n ${versionForDotnet-} ]]; then
-    versionFlagsArray+=("-p:Version=$versionForDotnet")
+    flags+=("-p:Version=$versionForDotnet")
   fi
 
   dotnetBuild() {
     local -r projectFile="${1-}"
 
-    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-      local runtimeIdFlagsArray=()
+    for runtimeId in "${runtimeIds[@]}"; do
+      local runtimeIdFlags=()
       if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
-        runtimeIdFlagsArray+=("--runtime" "$runtimeId")
+        runtimeIdFlags+=("--runtime" "$runtimeId")
       fi
 
       dotnet build ${1+"$projectFile"} \
@@ -144,19 +122,17 @@ dotnetBuildPhase() {
              -p:OverwriteReadOnlyFiles=true \
              --configuration "$dotnetBuildType" \
              --no-restore \
-             "${versionFlagsArray[@]}" \
-             "${runtimeIdFlagsArray[@]}" \
-             "${dotnetBuildFlagsArray[@]}" \
-             "${dotnetFlagsArray[@]}"
+             "${runtimeIdFlags[@]}" \
+             "${flags[@]}"
     done
   }
 
-  if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+  if (( ${#projectFiles[@]} == 0 )); then
     dotnetBuild
   fi
 
   local projectFile
-  for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
+  for projectFile in "${projectFiles[@]}"; do
     dotnetBuild "$projectFile"
   done
 
@@ -176,41 +152,31 @@ dotnetCheckPhase() {
 
   local -r dotnetBuildType="${dotnetBuildType-Release}"
 
-  # shellcheck disable=2206
-  if [[ -n $__structuredAttrs ]]; then
-    local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-    local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
-    local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" )
-    local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" )
-    local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" )
-    local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
-    local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-  else
-    local dotnetProjectFilesArray=($dotnetProjectFiles)
-    local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
-    local dotnetTestFlagsArray=($dotnetTestFlags)
-    local dotnetTestFiltersArray=($dotnetTestFilters)
-    local dotnetDisabledTestsArray=($dotnetDisabledTests)
-    local dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
-    local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
+  local -a projectFiles testProjectFiles testFilters disabledTests flags runtimeIds runtimeDeps
+  concatTo projectFiles dotnetProjectFiles
+  concatTo testProjectFiles dotnetTestProjectFiles
+  concatTo testFilters dotnetTestFilters
+  concatTo disabledTests dotnetDisabledTests
+  concatTo flags dotnetFlags dotnetTestFlags
+  concatTo runtimeIds dotnetRuntimeIds
+  concatTo runtimeDeps dotnetRuntimeDeps
+
+  if (( ${#disabledTests[@]} > 0 )); then
+    local disabledTestsFilters=("${disabledTests[@]/#/FullyQualifiedName!=}")
+    testFilters=( "${testFilters[@]}" "${disabledTestsFilters[@]//,/%2C}" )
   fi
 
-  if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then
-    local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}")
-    dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" )
-  fi
-
-  if (( ${#dotnetTestFiltersArray[@]} > 0 )); then
+  if (( ${#testFilters[@]} > 0 )); then
     local OLDIFS="$IFS" IFS='&'
-    dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}")
+    flags+=("--filter:${testFilters[*]}")
     IFS="$OLDIFS"
   fi
 
   local libraryPath="${LD_LIBRARY_PATH-}"
-  if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
-    local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
+  if (( ${#runtimeDeps[@]} > 0 )); then
+    local libraryPaths=("${runtimeDeps[@]/%//lib}")
     local OLDIFS="$IFS" IFS=':'
-    libraryPath="${libraryPathArray[*]}${libraryPath:+':'}$libraryPath"
+    libraryPath="${libraryPaths[*]}${libraryPath:+':'}$libraryPath"
     IFS="$OLDIFS"
   fi
 
@@ -221,11 +187,11 @@ dotnetCheckPhase() {
   fi
 
   local projectFile runtimeId
-  for projectFile in "${dotnetTestProjectFilesArray[@]-${dotnetProjectFilesArray[@]}}"; do
-    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-      local runtimeIdFlagsArray=()
+  for projectFile in "${testProjectFiles[@]-${projectFiles[@]}}"; do
+    for runtimeId in "${runtimeIds[@]}"; do
+      local runtimeIdFlags=()
       if [[ $projectFile == *.csproj ]]; then
-        runtimeIdFlagsArray=("--runtime" "$runtimeId")
+        runtimeIdFlags=("--runtime" "$runtimeId")
       fi
 
       LD_LIBRARY_PATH=$libraryPath \
@@ -237,9 +203,8 @@ dotnetCheckPhase() {
         --no-restore \
         --no-build \
         --logger "console;verbosity=normal" \
-        "${runtimeIdFlagsArray[@]}" \
-        "${dotnetTestFlagsArray[@]}" \
-        "${dotnetFlagsArray[@]}"
+        "${runtimeIdFlags[@]}" \
+        "${flags[@]}"
     done
   done
 
@@ -281,40 +246,35 @@ wrapDotnetProgram() {
 dotnetFromEnv'
 
   # shellcheck disable=2206
-  if [[ -n $__structuredAttrs ]]; then
-    local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
-  else
-    local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
-  fi
+  local -a runtimeDeps
+  concatTo runtimeDeps dotnetRuntimeDeps
 
-  local dotnetRuntimeDepsFlags=()
-  if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
-    local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
+  local wrapperFlags=()
+  if (( ${#runtimeDeps[@]} > 0 )); then
+    local libraryPath=("${dotnetRuntimeDeps[@]/%//lib}")
     local OLDIFS="$IFS" IFS=':'
-    dotnetRuntimeDepsFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPathArray[*]}")
+    wrapperFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPath[*]}")
     IFS="$OLDIFS"
   fi
 
-  local dotnetRootFlagsArray=()
   if [[ -z ${dotnetSelfContainedBuild-} ]]; then
     if [[ -n ${useDotnetFromEnv-} ]]; then
       # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
-      dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$wrapperPath")
-      dotnetRootFlagsArray+=("--run" "$dotnetFromEnvScript")
+      wrapperFlags+=("--suffix" "PATH" ":" "$wrapperPath")
+      wrapperFlags+=("--run" "$dotnetFromEnvScript")
       if [[ -n $dotnetRuntime ]]; then
-        dotnetRootFlagsArray+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
-        dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$dotnetRuntime/bin")
+        wrapperFlags+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
+        wrapperFlags+=("--suffix" "PATH" ":" "$dotnetRuntime/bin")
       fi
     elif [[ -n $dotnetRuntime ]]; then
-      dotnetRootFlagsArray+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
-      dotnetRootFlagsArray+=("--prefix" "PATH" ":" "$dotnetRuntime/bin")
+      wrapperFlags+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
+      wrapperFlags+=("--prefix" "PATH" ":" "$dotnetRuntime/bin")
     fi
   fi
 
   # shellcheck disable=2154
   makeWrapper "$1" "$2" \
-              "${dotnetRuntimeDepsFlags[@]}" \
-              "${dotnetRootFlagsArray[@]}" \
+              "${wrapperFlags[@]}" \
               "${gappsWrapperArgs[@]}" \
               "${makeWrapperArgs[@]}"
 
@@ -330,12 +290,9 @@ dotnetFixupPhase() {
   # shellcheck disable=2154
   if declare -p dotnetExecutables &>/dev/null; then
     # shellcheck disable=2206
-    if [[ -n $__structuredAttrs ]]; then
-      local dotnetExecutablesArray=( "${dotnetExecutables[@]}" )
-    else
-      local dotnetExecutablesArray=($dotnetExecutables)
-    fi
-    for executable in "${dotnetExecutablesArray[@]}"; do
+    local -a executables
+    concatTo executables dotnetExecutables
+    for executable in "${executables[@]}"; do
       executableBasename=$(basename "$executable")
 
       local path="$dotnetInstallPath/$executable"
@@ -368,34 +325,26 @@ dotnetInstallPhase() {
   local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
   local -r dotnetBuildType="${dotnetBuildType-Release}"
 
-  # shellcheck disable=2206
-  if [[ -n $__structuredAttrs ]]; then
-    local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
-    local dotnetFlagsArray=( "${dotnetFlags[@]}" )
-    local dotnetInstallFlagsArray=( "${dotnetInstallFlags[@]}" )
-    local dotnetPackFlagsArray=( "${dotnetPackFlags[@]}" )
-    local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
-  else
-    local dotnetProjectFilesArray=($dotnetProjectFiles)
-    local dotnetFlagsArray=($dotnetFlags)
-    local dotnetInstallFlagsArray=($dotnetInstallFlags)
-    local dotnetPackFlagsArray=($dotnetPackFlags)
-    local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
-  fi
+  local -a projectFiles flags installFlags packFlags runtimeIds
+  concatTo projectFiles dotnetProjectFiles
+  concatTo flags dotnetFlags
+  concatTo installFlags dotnetInstallFlags
+  concatTo packFlags dotnetPackFlags
+  concatTo runtimeIds dotnetRuntimeIds
 
   if [[ -v dotnetSelfContainedBuild ]]; then
     if [[ -n $dotnetSelfContainedBuild ]]; then
-      dotnetInstallFlagsArray+=("--self-contained")
+      installFlags+=("--self-contained")
     else
-      dotnetInstallFlagsArray+=("--no-self-contained")
+      installFlags+=("--no-self-contained")
       # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained
       # Trimming is only available for self-contained build, so force disable it here
-      dotnetInstallFlagsArray+=("-p:PublishTrimmed=false")
+      installFlags+=("-p:PublishTrimmed=false")
     fi
   fi
 
   if [[ -n ${dotnetUseAppHost-} ]]; then
-    dotnetInstallFlagsArray+=("-p:UseAppHost=true")
+    installFlags+=("-p:UseAppHost=true")
   fi
 
   if [[ -n ${enableParallelBuilding-} ]]; then
@@ -407,10 +356,10 @@ dotnetInstallPhase() {
   dotnetPublish() {
     local -r projectFile="${1-}"
 
-    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
-      runtimeIdFlagsArray=()
+    for runtimeId in "${runtimeIds[@]}"; do
+      runtimeIdFlags=()
       if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
-        runtimeIdFlagsArray+=("--runtime" "$runtimeId")
+        runtimeIdFlags+=("--runtime" "$runtimeId")
       fi
 
       dotnet publish ${1+"$projectFile"} \
@@ -422,16 +371,16 @@ dotnetInstallPhase() {
              --configuration "$dotnetBuildType" \
              --no-restore \
              --no-build \
-             "${runtimeIdFlagsArray[@]}" \
-             "${dotnetInstallFlagsArray[@]}" \
-             "${dotnetFlagsArray[@]}"
+             "${runtimeIdFlags[@]}" \
+             "${flags[@]}" \
+             "${installFlags[@]}"
     done
   }
 
   dotnetPack() {
     local -r projectFile="${1-}"
 
-    for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
+    for runtimeId in "${runtimeIds[@]}"; do
       dotnet pack ${1+"$projectFile"} \
              -maxcpucount:"$maxCpuFlag" \
              -p:ContinuousIntegrationBuild=true \
@@ -442,26 +391,26 @@ dotnetInstallPhase() {
              --no-restore \
              --no-build \
              --runtime "$runtimeId" \
-             "${dotnetPackFlagsArray[@]}" \
-             "${dotnetFlagsArray[@]}"
+             "${flags[@]}" \
+             "${packFlags[@]}"
     done
   }
 
-  if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+  if (( ${#projectFiles[@]} == 0 )); then
     dotnetPublish
   else
     local projectFile
-    for projectFile in "${dotnetProjectFilesArray[@]}"; do
+    for projectFile in "${projectFiles[@]}"; do
       dotnetPublish "$projectFile"
     done
   fi
 
   if [[ -n ${packNupkg-} ]]; then
-    if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
+    if (( ${#projectFiles[@]} == 0 )); then
       dotnetPack
     else
       local projectFile
-      for projectFile in "${dotnetProjectFilesArray[@]}"; do
+      for projectFile in "${projectFiles[@]}"; do
         dotnetPack "$projectFile"
       done
     fi

From ea43ddefeba770e230720ff4cf44bf6fc4681ad7 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 4 Aug 2025 16:55:55 +0200
Subject: [PATCH 045/230] {palemoon-bin,palemoon-gtk2-bin}: 33.8.1.1 ->
 33.8.1.2

---
 pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index c974e96d7119..f126b71e64f3 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.8.1.1";
+  version = "33.8.1.2";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-zUStYcCOwiP/LHDUVzu1E8Req0Erk96/Pp1zu+FvK5s=";
+          hash = "sha256-qgabtZ/8nBaOGP0pIXd/byd9XCxulT8w+7uczJE4SAg=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-OfShUQiFtX+3cb035EbE4FgpohDcNXqOa5i75IxGo0o=";
+          hash = "sha256-qeA8EYRY9STsezWrvlVt73fgxPB0mynkxtTV71HFMgU=";
         };
       };
 

From b5475346e2526297c9556a6a1fbb753ba487a709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 4 Aug 2025 01:36:30 +0200
Subject: [PATCH 046/230] nixos/tailscale-derper: drop unused
 keepalive_timeout, bump proxy_read_timeout to an hour

Otherwise derper reconnects every 60s which still works good enough but
spams the logs with lots of noise and it probably improves stability, too.
---
 nixos/modules/services/networking/tailscale-derper.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/tailscale-derper.nix b/nixos/modules/services/networking/tailscale-derper.nix
index 6e172a40a529..3f8c788f7f52 100644
--- a/nixos/modules/services/networking/tailscale-derper.nix
+++ b/nixos/modules/services/networking/tailscale-derper.nix
@@ -82,10 +82,11 @@ in
           locations."/" = {
             proxyPass = "http://127.0.0.1:${toString cfg.port}";
             proxyWebsockets = true;
-            extraConfig = ''
-              keepalive_timeout 0;
-              proxy_buffering off;
-            '';
+            extraConfig = # nginx
+              ''
+                proxy_buffering off;
+                proxy_read_timeout 3600s;
+              '';
           };
         };
       };

From f7bde756ac981d1f325e64126de89929591e1372 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 4 Aug 2025 18:33:41 +0000
Subject: [PATCH 047/230] heimdall: move override to improve eval

---
 pkgs/by-name/he/heimdall-gui/package.nix | 7 +++++++
 pkgs/top-level/all-packages.nix          | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/he/heimdall-gui/package.nix

diff --git a/pkgs/by-name/he/heimdall-gui/package.nix b/pkgs/by-name/he/heimdall-gui/package.nix
new file mode 100644
index 000000000000..6a54d496fe50
--- /dev/null
+++ b/pkgs/by-name/he/heimdall-gui/package.nix
@@ -0,0 +1,7 @@
+{
+  heimdall,
+}:
+
+heimdall.override {
+  enableGUI = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 436c58acff81..d4f3f30c650e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3233,8 +3233,6 @@ with pkgs;
 
   heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { };
 
-  heimdall-gui = heimdall.override { enableGUI = true; };
-
   headscale = callPackage ../servers/headscale { };
 
   highlight = callPackage ../tools/text/highlight {

From 07e9cfea7cf1481ba77618229ec29398c57a26cd Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 2 Aug 2025 21:37:04 -0400
Subject: [PATCH 048/230] windows.mingw_w64_headers: Add updateScript and
 passthru tests

---
 .../os-specific/windows/mingw-w64/default.nix |  5 --
 .../os-specific/windows/mingw-w64/headers.nix | 12 ++-
 pkgs/os-specific/windows/mingw-w64/update.nu  | 77 +++++++++++++++++++
 3 files changed, 85 insertions(+), 9 deletions(-)
 create mode 100755 pkgs/os-specific/windows/mingw-w64/update.nu

diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index 2ea83e49054b..d183f505b3c6 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -7,11 +7,6 @@
   crt ? stdenv.hostPlatform.libc,
 }:
 
-assert lib.assertOneOf "crt" crt [
-  "msvcrt"
-  "ucrt"
-];
-
 stdenv.mkDerivation {
   pname = "mingw-w64";
   inherit (mingw_w64_headers) version src meta;
diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix
index 2cb86651fc86..033df0dd8a96 100644
--- a/pkgs/os-specific/windows/mingw-w64/headers.nix
+++ b/pkgs/os-specific/windows/mingw-w64/headers.nix
@@ -1,13 +1,10 @@
 {
   lib,
+  nixosTests,
   stdenvNoCC,
   fetchurl,
   crt ? stdenvNoCC.hostPlatform.libc,
 }:
-assert lib.assertOneOf "crt" crt [
-  "msvcrt"
-  "ucrt"
-];
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mingw_w64-headers";
   version = "12.0.0";
@@ -25,6 +22,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     cd mingw-w64-headers
   '';
 
+  passthru = {
+    tests = {
+      inherit (nixosTests) wine;
+    };
+    updateScript = ./update.nu;
+  };
+
   meta = {
     homepage = "https://www.mingw-w64.org/";
     downloadPage = "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/";
diff --git a/pkgs/os-specific/windows/mingw-w64/update.nu b/pkgs/os-specific/windows/mingw-w64/update.nu
new file mode 100755
index 000000000000..4862aae5e37e
--- /dev/null
+++ b/pkgs/os-specific/windows/mingw-w64/update.nu
@@ -0,0 +1,77 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i nu -p nushell nix
+
+use std/log
+
+def replace [ p: path old: string new: string ] {
+  open $p
+  | str replace $old $new
+  | save -f $p
+}
+
+def eval [ attr: string ] {
+  with-env {
+    NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM: 1
+  } {
+    nix eval -f ./. $attr --json
+  }
+  | from json
+}
+
+def main [] {
+  # List of all the link in the RSS feed for
+  # https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/
+  let links = http get https://sourceforge.net/projects/mingw-w64/rss?path=/mingw-w64/mingw-w64-release/
+  | from xml
+  | get content.content.0
+  | where tag == item
+  | get content
+  | flatten
+  | where tag == title
+  | get content
+  | flatten
+  | get content
+
+  # Select only files ending in "tar.bz2", then select the largest value
+  # We only consider values with at least two digits cause they are at
+  # 13.0 and sorting strings doesn't work well if they aren't the same length
+  let newest = $links
+    | where { ($in | str ends-with "tar.bz2") and ($in =~ v[0-9][0-9]\.) }
+    | sort -r
+    | get 0
+
+  # Extract the newest version out of the URL
+  let new_version = $newest
+    | split column /
+    | get column4.0
+    | split column -
+    | get column3.0
+    | str replace .tar.bz2 ""
+    | str trim -c v
+
+  # Get the current version in the drv
+  let current_version = eval "windows.mingw_w64_headers.version"
+
+  if $new_version == $current_version {
+    log info "Current mingw-w64 version matches the latest, exiting..."
+    return
+  } else {
+    log info $"Current version is ($current_version)\nLatest version is ($new_version)"
+  }
+
+  # Get the current hash
+  let current_hash = eval "windows.mingw_w64_headers.src.outputHash"
+
+  # Set to the new version
+  replace ./pkgs/os-specific/windows/mingw-w64/headers.nix $current_version $new_version
+
+  # The nix derivation creates the URL from the version, so just grab that.
+  let new_url = eval "windows.mingw_w64_headers.src.url"
+
+  # Prefetch to get the new hash
+  let new_hash = nix-prefetch-url --type sha256 $new_url
+  | nix hash to-sri --type sha256 $in
+
+  # Set the hash
+  replace ./pkgs/os-specific/windows/mingw-w64/headers.nix $current_hash $new_hash
+}

From 04a6d489fd1b45211021a3f0bad121e530fd8ccb Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 1 Aug 2025 17:54:56 -0400
Subject: [PATCH 049/230] windows.mingw_w64: 12.0.0 -> 13.0.0

---
 pkgs/os-specific/windows/mingw-w64/headers.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix
index 033df0dd8a96..a60455b38700 100644
--- a/pkgs/os-specific/windows/mingw-w64/headers.nix
+++ b/pkgs/os-specific/windows/mingw-w64/headers.nix
@@ -7,11 +7,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mingw_w64-headers";
-  version = "12.0.0";
+  version = "13.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/mingw-w64/mingw-w64-v${finalAttrs.version}.tar.bz2";
-    hash = "sha256-zEGJiqxLbo3Vz/1zMbnZUVuRLfRCCjphK16ilVu+7S8=";
+    hash = "sha256-Wv6CKvXE7b9n2q9F7sYdU49J7vaxlSTeZIl8a5WCjK8=";
   };
 
   configureFlags = [

From f97109a469fd8dc1424a7eb092bb96268ff5130e Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 4 Aug 2025 20:41:13 -0300
Subject: [PATCH 050/230] dotnetCorePackages.dotnet_10.vmr: fix build on bash
 5.3

Fixes: #430989
---
 pkgs/development/compilers/dotnet/vmr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index d86dfd42f8fd..abb1bada08d1 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -230,6 +230,8 @@ stdenv.mkDerivation rec {
       substituteInPlace \
         src/runtime/src/coreclr/ilasm/CMakeLists.txt \
         --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' ""
+    ''
+    + lib.optionalString (lib.versionOlder version "10") ''
 
       # https://github.com/dotnet/source-build/issues/4444
       xmlstarlet ed \
@@ -237,8 +239,6 @@ stdenv.mkDerivation rec {
         -s '//Project/Target/MSBuild[@Targets="Restore"]' \
         -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \
         src/aspnetcore/eng/Tools.props
-    ''
-    + lib.optionalString (lib.versionOlder version "10") ''
       # patch packages installed from npm cache
       xmlstarlet ed \
         --inplace \

From fbe4cf6ae3e4436a061319d5b8b407c7660eba05 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 4 Aug 2025 21:08:01 -0700
Subject: [PATCH 051/230] cryptop: use callPackage

---
 pkgs/applications/blockchains/cryptop/default.nix | 10 +++-------
 pkgs/top-level/all-packages.nix                   |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix
index c4689d82f4ca..3537243de857 100644
--- a/pkgs/applications/blockchains/cryptop/default.nix
+++ b/pkgs/applications/blockchains/cryptop/default.nix
@@ -1,13 +1,9 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  requests,
-  requests-cache,
-  setuptools,
 }:
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cryptop";
   version = "0.2.0";
   format = "setuptools";
@@ -17,7 +13,7 @@ buildPythonApplication rec {
     sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     setuptools
     requests
     requests-cache
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a2b319170a0..6611e9b75612 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14237,7 +14237,7 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
+  cryptop = callPackage ../applications/blockchains/cryptop { };
 
   elements = libsForQt5.callPackage ../applications/blockchains/elements {
     withGui = true;

From ed81ad23a306bde0e385b3d92e7f0fa821f6faa9 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 4 Aug 2025 21:09:20 -0700
Subject: [PATCH 052/230] cryptop: do not use list for single license

---
 pkgs/applications/blockchains/cryptop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix
index 3537243de857..07430c794792 100644
--- a/pkgs/applications/blockchains/cryptop/default.nix
+++ b/pkgs/applications/blockchains/cryptop/default.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     homepage = "https://github.com/huwwp/cryptop";
     description = "Command line Cryptocurrency Portfolio";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bhipple ];
     mainProgram = "cryptop";
   };

From 047f027ad7e1a658f0cf2bff1e1373a6422d4c22 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 4 Aug 2025 21:10:39 -0700
Subject: [PATCH 053/230] cryptop: move to by-name

---
 .../cryptop/default.nix => by-name/cr/cryptop/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/blockchains/cryptop/default.nix => by-name/cr/cryptop/package.nix} (100%)

diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/by-name/cr/cryptop/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/cryptop/default.nix
rename to pkgs/by-name/cr/cryptop/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6611e9b75612..244767fc50e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14237,8 +14237,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  cryptop = callPackage ../applications/blockchains/cryptop { };
-
   elements = libsForQt5.callPackage ../applications/blockchains/elements {
     withGui = true;
     inherit (darwin) autoSignDarwinBinariesHook;

From 136b2e0c85dc900b22fc0bd8b6bf4c66524fe96c Mon Sep 17 00:00:00 2001
From: Alexis Praga <alexis@praga.dev>
Date: Tue, 5 Aug 2025 10:15:19 +0200
Subject: [PATCH 054/230] snpeff: symlink to camelCase

Upstream packages it as camelCase.
---
 pkgs/by-name/sn/snpeff/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sn/snpeff/package.nix b/pkgs/by-name/sn/snpeff/package.nix
index c5706f22fd11..554c517fd2f1 100644
--- a/pkgs/by-name/sn/snpeff/package.nix
+++ b/pkgs/by-name/sn/snpeff/package.nix
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     makeWrapper ${jre}/bin/java $out/bin/snpeff --add-flags "-jar $out/libexec/snpeff/snpEff.jar"
     makeWrapper ${jre}/bin/java $out/bin/snpsift --add-flags "-jar $out/libexec/snpeff/SnpSift.jar"
+    # camelCase is the default
+    ln -s $out/bin/snpeff $out/bin/snpEff
+    ln -s $out/bin/snpsift $out/bin/snpSift
   '';
 
   meta = with lib; {

From 88f2257cd56b497af0f379bf36af2988999963ed Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 5 Aug 2025 12:57:25 +0200
Subject: [PATCH 055/230] k3s: fix prefetching of traefik charts in update
 script

---
 pkgs/applications/networking/cluster/k3s/update-script.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh
index b1c7c2915d3c..0a1d06a656c0 100755
--- a/pkgs/applications/networking/cluster/k3s/update-script.sh
+++ b/pkgs/applications/networking/cluster/k3s/update-script.sh
@@ -61,17 +61,19 @@ fi
 cd "${NIXPKGS_K3S_PATH}/${MAJOR_VERSION}_${MINOR_VERSION}"
 
 CHARTS_URL=https://k3s.io/k3s-charts/assets
+TRAEFIK_CRD_CHART_SHA256=$(nix-hash --type sha256 --base32 --flat <(curl -o - "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}"))
+TRAEFIK_CHART_SHA256=$(nix-hash --type sha256 --base32 --flat <(curl -o - "${CHARTS_URL}/traefik/${CHART_FILES[1]}"))
 # Get metadata for both files
 rm -f chart-versions.nix.update
 cat > chart-versions.nix.update <<EOF
 {
   traefik-crd = {
     url = "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}";
-    sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}")";
+    sha256 = "$TRAEFIK_CRD_CHART_SHA256";
   };
   traefik = {
     url = "${CHARTS_URL}/traefik/${CHART_FILES[1]}";
-    sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik/${CHART_FILES[1]}")";
+    sha256 = "$TRAEFIK_CHART_SHA256";
   };
 }
 EOF

From 5eda3a402fd3111d37752675a08919e6e5a89176 Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Tue, 5 Aug 2025 13:00:56 +0200
Subject: [PATCH 056/230] python3Packages.presto-python-client: fix building

---
 .../development/python-modules/presto-python-client/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/presto-python-client/default.nix b/pkgs/development/python-modules/presto-python-client/default.nix
index 1a02b277f178..d9541c08954b 100644
--- a/pkgs/development/python-modules/presto-python-client/default.nix
+++ b/pkgs/development/python-modules/presto-python-client/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   click,
-  future,
   httpretty,
   pytestCheckHook,
   requests,
@@ -28,7 +27,6 @@ buildPythonPackage rec {
 
   dependencies = [
     click
-    future
     requests
     requests-kerberos
     six

From 020d5012b2b7a1f4dd034f5d954ac93caffa68dd Mon Sep 17 00:00:00 2001
From: znaniye <zn4niye@proton.me>
Date: Tue, 5 Aug 2025 08:37:45 -0300
Subject: [PATCH 057/230] renode: 1.15.3 -> 1.16.0

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

diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix
index 1a4c4d79f987..acc70157fd77 100644
--- a/pkgs/by-name/re/renode/package.nix
+++ b/pkgs/by-name/re/renode/package.nix
@@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renode";
-  version = "1.15.3";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
-    hash = "sha256-0CZWIwIG85nT7uSHhmBkH21S5mTx2womYWV0HG+g8Mk=";
+    hash = "sha256-oNlTz5LBggPkjKM4TJO2UDKQdt2Ga7rBTdgyGjN8/zA=";
   };
 
   nativeBuildInputs = [

From 7e7aa99ba8c97397cca4688c38cbf96ae842f565 Mon Sep 17 00:00:00 2001
From: znaniye <zn4niye@proton.me>
Date: Tue, 5 Aug 2025 08:40:42 -0300
Subject: [PATCH 058/230] renode-unstable: 1.15.3+20250720git2309db7fd ->
 1.16.0+20250805git769469683

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

diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index 3f64f88924bb..af344a2e1608 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -7,11 +7,11 @@
 renode.overrideAttrs (
   finalAttrs: _: {
     pname = "renode-unstable";
-    version = "1.15.3+20250801git3f8169b88";
+    version = "1.16.0+20250805git769469683";
 
     src = fetchurl {
       url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
-      hash = "sha256-1GtLD69h0oYLXqs5n+0Vzc00WtK6mdPR9BkP4tjOmW8=";
+      hash = "sha256-UZSfdJ14igoqaFCwCZmy29MfKZcxr7j8RtI/epHs2WI=";
     };
 
     passthru.updateScript =

From 49f1a77ffea701acd6fd2add0bb0a77af19380d7 Mon Sep 17 00:00:00 2001
From: znaniye <zn4niye@proton.me>
Date: Tue, 5 Aug 2025 11:50:15 -0300
Subject: [PATCH 059/230] renode: add znaniye as maintainer

---
 pkgs/by-name/re/renode/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix
index acc70157fd77..edf34d337346 100644
--- a/pkgs/by-name/re/renode/package.nix
+++ b/pkgs/by-name/re/renode/package.nix
@@ -102,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Virtual development framework for complex embedded systems";
     homepage = "https://renode.io";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ otavio ];
+    maintainers = with lib.maintainers; [
+      otavio
+      znaniye
+    ];
     platforms = [ "x86_64-linux" ];
   };
 })

From 92f37c82b85a8b28ce6bff94e497658cff8626cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 15:11:02 +0000
Subject: [PATCH 060/230] oci-cli: 3.63.0 -> 3.63.3

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

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

From ea9bf8f355f5e163ca176bbe406651e3f82b7ed0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 21:04:15 +0000
Subject: [PATCH 061/230] python3Packages.cloup: 3.0.7 -> 3.0.8

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

diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix
index a11b1a75ae14..06d946e3fc80 100644
--- a/pkgs/development/python-modules/cloup/default.nix
+++ b/pkgs/development/python-modules/cloup/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "cloup";
-  version = "3.0.7";
+  version = "3.0.8";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yFLgoFQapDPGqzGpuLUD9j2Ygekd2vA4TWknll8rQhw=";
+    hash = "sha256-+RwICnJRlt33T+q9YlAmb0Zul/wW3+Iadiz2vGvrPss=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 0d1573a9eb4ee3a57cd5812a13d6bdba324ddd32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 21:11:03 +0000
Subject: [PATCH 062/230] deepsource: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix
index 00f5b34b76f9..87581be72ce7 100644
--- a/pkgs/by-name/de/deepsource/package.nix
+++ b/pkgs/by-name/de/deepsource/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "deepsource";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "DeepSourceCorp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-GWIQT6VIvU4ZIHwK3v2bGasE4mJc2cMpUAJvIQ2zJR4=";
+    hash = "sha256-kmP3U6SRvolmi7QA0rFNTg+w+DJEQUHOmbSE4sdEBK4=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From d87223be4b4cd28feda38966f823e3ab5d34918f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 5 Aug 2025 16:33:16 -0500
Subject: [PATCH 063/230] sherlock-launcher: fix stack overflow on launch

Add `wrapGAppsHook`, like upstream uses, to resolve issue that causes a
stack overflow on trying to launch the application.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/sh/sherlock-launcher/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/sh/sherlock-launcher/package.nix b/pkgs/by-name/sh/sherlock-launcher/package.nix
index f16eda87dca0..96f481984d75 100644
--- a/pkgs/by-name/sh/sherlock-launcher/package.nix
+++ b/pkgs/by-name/sh/sherlock-launcher/package.nix
@@ -13,6 +13,7 @@
   gdk-pixbuf,
   librsvg,
   nix-update-script,
+  wrapGAppsHook4,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -29,6 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     glib
+    wrapGAppsHook4
   ];
 
   buildInputs = [

From 7df017914ab96c4f42f43393eb68bfa500472fe2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 23:13:45 +0000
Subject: [PATCH 064/230] ethercat: 1.6.6 -> 1.6.7

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

diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix
index d31cead97136..13fb5bff4816 100644
--- a/pkgs/by-name/et/ethercat/package.nix
+++ b/pkgs/by-name/et/ethercat/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ethercat";
-  version = "1.6.6";
+  version = "1.6.7";
 
   src = fetchFromGitLab {
     owner = "etherlab.org";
     repo = "ethercat";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-11Y4qGJlbZYnFZ3pI18kjE2aIht30ZtN4eTsYhWqg+g=";
+    hash = "sha256-UNd8PLdudI5TMdKKNH6BQP2VQ0LSPvsA/sEYnIuZRRA=";
   };
 
   separateDebugInfo = true;

From ee2a712eb80f270c64964c04ea07c9d57c893186 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 00:04:58 +0000
Subject: [PATCH 065/230] python3Packages.ipycanvas: 0.13.3 -> 0.14.1

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

diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix
index 2a0e06c9ec02..eba53b1b7e9c 100644
--- a/pkgs/development/python-modules/ipycanvas/default.nix
+++ b/pkgs/development/python-modules/ipycanvas/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "ipycanvas";
-  version = "0.13.3";
+  version = "0.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ToZ8UJsB9cTPwAn32SHjLloSoCmshW54wE/xW2VpLEo=";
+    hash = "sha256-kh8UgiWLWSm1mTF7XBKZMdgOFr41+jgwCjLnqkz+n4k=";
   };
 
   # We relax dependencies here instead of pulling in a patch because upstream

From d5f7f2b9423e2ba97b0ff11d1baf7a30c4abfc97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 01:09:29 +0000
Subject: [PATCH 066/230] gh-gei: 1.17.0 -> 1.18.0

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

diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index ec168edcb5df..bc51f396b661 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "gh-gei";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
     rev = "v${version}";
-    hash = "sha256-mV7lqwC8S5ms79IIcmgDIsUlPKaLSWElXZ00Tm8qs4Y=";
+    hash = "sha256-AMmeuobgJ+DSRG4zS7RP5l3/BraqQxXB+ygLDc3XnOs=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;

From d05fb33aa3f4d74016ef83bbbfd092c887ab364d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 02:14:36 +0000
Subject: [PATCH 067/230] codebuff: 1.0.441 -> 1.0.451

---
 pkgs/by-name/co/codebuff/package-lock.json | 8 ++++----
 pkgs/by-name/co/codebuff/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json
index 497642fbb38d..6e2a8c5789ea 100644
--- a/pkgs/by-name/co/codebuff/package-lock.json
+++ b/pkgs/by-name/co/codebuff/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "codebuff": "^1.0.441"
+        "codebuff": "^1.0.451"
       }
     },
     "node_modules/chownr": {
@@ -18,9 +18,9 @@
       }
     },
     "node_modules/codebuff": {
-      "version": "1.0.441",
-      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.441.tgz",
-      "integrity": "sha512-2/u30sGXiEd1caB+doYWy34lbv8DJhQ2SomHXpCmmeEKITUgd9ckdVMLaaEgrR/FIUHyFBcu7aCVzmwsBEfnuQ==",
+      "version": "1.0.451",
+      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.451.tgz",
+      "integrity": "sha512-LYzX+cu1zMnU/qntnRMQzQ+iPT436OYphFyIrEvx5DarfEEns5UIMDyWp0E9PWxbU4WsJfHJnL6srYxC/T8hUg==",
       "cpu": [
         "x64",
         "arm64"
diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix
index affe6a4129e8..1c134a5a052a 100644
--- a/pkgs/by-name/co/codebuff/package.nix
+++ b/pkgs/by-name/co/codebuff/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "codebuff";
-  version = "1.0.441";
+  version = "1.0.451";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
-    hash = "sha256-l57ZQTvvIR8mpFJGJeF6AqE6sbjIUkQdjlvdQ4UAQ9g=";
+    hash = "sha256-98NiHDb0PrK71I28y7DwDJf2i+mKTQBp22PY4WJh5ig=";
   };
 
-  npmDepsHash = "sha256-/LiXKA0HdFg3K7xyioL0SKjWicktCpih1oJkEPLDzIA=";
+  npmDepsHash = "sha256-qtBi5OT7UBsCIriO6Fk33gLOFNp5Ae0bT9qN+37b2sg=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 3fbb7089ae8dafe0d1f0ad14927c338ac762a906 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 03:47:08 +0000
Subject: [PATCH 068/230] phel: 0.18.1 -> 0.19.1

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

diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 9d14d111067c..b0cac4c2e54f 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phel";
-  version = "0.18.1";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YwmDTj1uc71rpp5Iq/7cDq0gLLy8Bh96bu0RaYqi5J0=";
+    hash = "sha256-uJnxCReo/GR/zAwQEV1Gp9Hv6ydGbf4EiVNL7q0cRRw=";
   };
 
-  vendorHash = "sha256-zZK4v9IncoOurf2yUeFqwmAkqsMBlLfuZTUm9cWQBCA=";
+  vendorHash = "sha256-/7A71XQdMfirqfN9VIKFZxJ1HNBva5c2NOsbo6NMRzQ=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From b205368d3dfcdc72e1b930f90c4fb11a50b5998d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 04:29:35 +0000
Subject: [PATCH 069/230] csharpier: 1.0.3 -> 1.1.1

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

diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix
index 7c5043cad4ee..97bebd35bab1 100644
--- a/pkgs/by-name/cs/csharpier/package.nix
+++ b/pkgs/by-name/cs/csharpier/package.nix
@@ -2,10 +2,10 @@
 
 buildDotnetGlobalTool {
   pname = "csharpier";
-  version = "1.0.3";
+  version = "1.1.1";
   executables = "csharpier";
 
-  nugetHash = "sha256-DJe3zpzFCBjmsNmLMgIC1clLxo/exPZ+xHUmdpKMaMo=";
+  nugetHash = "sha256-B0ijqWm3eZ31T+C5zRr4TkmfPsOfseaHpGPYZf5Yiw4=";
 
   meta = with lib; {
     description = "Opinionated code formatter for C#";

From c072908a3ecb3a41ca5c31c186751c487890a43d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 04:47:51 +0000
Subject: [PATCH 070/230] python3Packages.pysoma: 0.0.13 -> 0.0.14

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

diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix
index c27991b8ca09..e568b82024b0 100644
--- a/pkgs/development/python-modules/pysoma/default.nix
+++ b/pkgs/development/python-modules/pysoma/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pysoma";
-  version = "0.0.13";
+  version = "0.0.14";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1bS9zafuqxwcuqpM/AA3ZjNbFpxBNXtoHYFsQOWmLXQ=";
+    hash = "sha256-DlyOQmhseCIeaYlzTmkQBSlDjJlPZn7FRExil5gQjdY=";
   };
 
   # Project has no test

From 4b38ec0b1b49981d095eb36f9d7e0ebfebdcc672 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 05:18:33 +0000
Subject: [PATCH 071/230] platform-folders: 4.2.0 -> 4.3.0

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

diff --git a/pkgs/by-name/pl/platform-folders/package.nix b/pkgs/by-name/pl/platform-folders/package.nix
index 5fa41c391595..7c5efe394074 100644
--- a/pkgs/by-name/pl/platform-folders/package.nix
+++ b/pkgs/by-name/pl/platform-folders/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "platform-folders";
-  version = "4.2.0";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "sago007";
     repo = "PlatformFolders";
     rev = version;
-    hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA=";
+    hash = "sha256-8dKW9nmxiqt47Z9RBNuHjFRyOhwmi+9mR7prUOxXIRE=";
   };
 
   nativeBuildInputs = [ cmake ];

From e5079c37122c0e108abc70ffa45da71d3da79807 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 06:45:27 +0000
Subject: [PATCH 072/230] dotenvx: 1.48.3 -> 1.48.4

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

diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 239cdab1a6b9..cb2ba10c41ae 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.48.3";
+  version = "1.48.4";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${version}";
-    hash = "sha256-5clMrH9r7CltZ2oEfDvyubFroOq/YVRaPkBfRnMyHNc=";
+    hash = "sha256-reWOFI17YSaCTFriCpJELdDj9K2MintKt9OBy/2aXE4=";
   };
 
-  npmDepsHash = "sha256-O8w5gyG2PDUSGuAcSQ4ccvkYhb9pQL5NjWXjSoXk6gQ=";
+  npmDepsHash = "sha256-XPkqJVkShCzft4LEobCUgbsyl5W/vHXRPNPKltFO5hc=";
 
   dontNpmBuild = true;
 

From d0a8b6f3b419ffc723b55c66144a9df1f3c4a523 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 06:48:35 +0000
Subject: [PATCH 073/230] r2modman: 3.2.1 -> 3.2.3

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

diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix
index d9504d7c99de..1a858483234b 100644
--- a/pkgs/by-name/r2/r2modman/package.nix
+++ b/pkgs/by-name/r2/r2modman/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "r2modman";
-  version = "3.2.1";
+  version = "3.2.3";
 
   src = fetchFromGitHub {
     owner = "ebkr";
     repo = "r2modmanPlus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-l1xrp+Gl26kiWqh5pIKp4QiETrzr5mTrUP10T0DhUCw=";
+    hash = "sha256-0LlZsyUSVuDakbNUzJ1ZUBe9KxWNd0ONKkPafwbCINY=";
   };
 
   offlineCache = fetchYarnDeps {

From 8a230cd7800ba51d68d869967b16b3a6beb717b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 07:08:44 +0000
Subject: [PATCH 074/230] fh: 0.1.24 -> 0.1.25

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

diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix
index fde448661513..754e226bd150 100644
--- a/pkgs/by-name/fh/fh/package.nix
+++ b/pkgs/by-name/fh/fh/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fh";
-  version = "0.1.24";
+  version = "0.1.25";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "fh";
     rev = "v${version}";
-    hash = "sha256-t7IZlG7rKNbkt2DIU5H0/B0+b4e9YEVJx14ijpOycCw=";
+    hash = "sha256-YVtFzJMdHpshtRqBDVw3Kr88psAPfcdOI0XVDGnFkq0=";
   };
 
-  cargoHash = "sha256-IXzqcIVk7F/MgWofzlwEkXfu7s8e7GdjYhdFbXUTeeo=";
+  cargoHash = "sha256-D/8YYv9V1ny9AWFkVPgcE9doq+OxN+yiCCt074FKgn0=";
 
   nativeBuildInputs = [
     installShellFiles

From 46ea598c74c40a811d4e9c74178610b139c19aa8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 07:25:16 +0000
Subject: [PATCH 075/230] kodiPackages.controller-topology-project: 1.0.4 ->
 1.0.5

---
 .../video/kodi/addons/controller-topology-project/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
index d38c85da3760..c601366e683e 100644
--- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
@@ -8,13 +8,13 @@
 let
   drv = stdenv.mkDerivation rec {
     pname = "controller-topology-project";
-    version = "1.0.4";
+    version = "1.0.5";
 
     src = fetchFromGitHub {
       owner = "kodi-game";
       repo = "controller-topology-project";
       rev = "v${version}";
-      sha256 = "sha256-0h2Qbnym8XxUVao7aEN25uIKSIreutH272OiqtG4Obc=";
+      sha256 = "sha256-9NqupL/LAshME7GlzKAT6i3kx2MPEBU7Jw2nPele1W8=";
     };
 
     postPatch = ''

From 5207a8043ccfda1e185f00686acdcc9c0b05dc8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 08:18:28 +0000
Subject: [PATCH 076/230] tana: 1.0.37 -> 1.0.38

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

diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix
index 48c92f4e6ed9..bb072cb504c3 100644
--- a/pkgs/by-name/ta/tana/package.nix
+++ b/pkgs/by-name/ta/tana/package.nix
@@ -62,7 +62,7 @@ let
     stdenv.cc.cc
     stdenv.cc.libc
   ];
-  version = "1.0.37";
+  version = "1.0.38";
 in
 stdenv.mkDerivation {
   pname = "tana";
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
-    hash = "sha256-S7aihKoeP1zJpMd+mdb6D9QEtFBghyVU+K0nSzGd2ew=";
+    hash = "sha256-40yhEOgIfb2PalrNYn10QMW5oHsxJZwHRoal8//GDnk=";
   };
 
   nativeBuildInputs = [

From 0d897b4feed94b05c10e6a4d976e7d9ca873fac9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 09:15:18 +0000
Subject: [PATCH 077/230] restate: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix
index 552c3d2e0abf..19adc8192e57 100644
--- a/pkgs/by-name/re/restate/package.nix
+++ b/pkgs/by-name/re/restate/package.nix
@@ -25,16 +25,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "restate";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "restatedev";
     repo = "restate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0p3pH2lQnb3oOsGtKP8olVUefobGa3DsnB2LMx06+no=";
+    hash = "sha256-s7HoPuye31zATAtekWAqJz8gc/vy+vWoM68QwpjdH3o=";
   };
 
-  cargoHash = "sha256-9EeS599rZLLKkdBS1bTX7y7CTmeTBlgHZ8c0WBlbZmk=";
+  cargoHash = "sha256-jkwi533Vem62vxq47EXIy/2mTHMB61DGmUyQfm3/BCE=";
 
   env = {
     PROTOC = lib.getExe protobuf;

From f2abb2fbc865094f63b1fed5e30003bacd6ce60c Mon Sep 17 00:00:00 2001
From: Alexis Praga <alexis@praga.dev>
Date: Tue, 5 Aug 2025 15:03:55 +0200
Subject: [PATCH 078/230] python3Packages.pomegranate: fix for cnvkit tests.

---
 .../python-modules/pomegranate/default.nix    | 54 ++++++-------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index f674461d928c..5c2fab375a15 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -3,20 +3,15 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-
-  # build-system
+  fetchpatch,
+  pytestCheckHook,
   setuptools,
-
-  # dependencies
   apricot-select,
   networkx,
   numpy,
   scikit-learn,
   scipy,
   torch,
-
-  # tests
-  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -27,34 +22,10 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "pomegranate";
     owner = "jmschrei";
-    # tag = "v${version}";
-    # No tag for 1.1.2
-    rev = "e9162731f4f109b7b17ecffde768734cacdb839b";
-    hash = "sha256-vVoAoZ+mph11ZfINT+yxRyk9rXv6FBDgxBz56P2K95Y=";
+    tag = "v${version}";
+    hash = "sha256-p2Gn0FXnsAHvRUeAqx4M1KH0+XvDl3fmUZZ7MiMvPSs=";
   };
 
-  # _pickle.UnpicklingError: Weights only load failed.
-  # https://pytorch.org/docs/stable/generated/torch.load.html
-  postPatch = ''
-    substituteInPlace \
-      tests/distributions/test_bernoulli.py \
-      tests/distributions/test_categorical.py \
-      tests/distributions/test_exponential.py \
-      tests/distributions/test_gamma.py \
-      tests/distributions/test_independent_component.py \
-      tests/distributions/test_normal_diagonal.py \
-      tests/distributions/test_normal_full.py \
-      tests/distributions/test_poisson.py \
-      tests/distributions/test_student_t.py \
-      tests/distributions/test_uniform.py \
-      tests/test_bayes_classifier.py \
-      tests/test_gmm.py \
-      tests/test_kmeans.py \
-      --replace-fail \
-        'torch.load(".pytest.torch")' \
-        'torch.load(".pytest.torch", weights_only=False)'
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -72,11 +43,20 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+  patches = [
+    # Fix tests for pytorch 2.6
+    (fetchpatch {
+      name = "python-2.6.patch";
+      url = "https://github.com/jmschrei/pomegranate/pull/1142/commits/9ff5d5e2c959b44e569937e777b26184d1752a7b.patch";
+      hash = "sha256-BXsVhkuL27QqK/n6Fa9oJCzrzNcL3EF6FblBeKXXSts=";
+    })
+  ];
+
+  pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
     # AssertionError: Arrays are not almost equal to 6 decimals
-    "=tests/distributions/test_normal_full.py::test_fit"
-    "=tests/distributions/test_normal_full.py::test_from_summaries"
-    "=tests/distributions/test_normal_full.py::test_serialization"
+    "--deselect=tests/distributions/test_normal_full.py::test_fit"
+    "--deselect=tests/distributions/test_normal_full.py::test_from_summaries"
+    "--deselect=tests/distributions/test_normal_full.py::test_serialization"
   ];
 
   disabledTests = [

From 03fd0021caeea17aeb7ddd6fa6cdedc2b4f29137 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 12:48:43 +0000
Subject: [PATCH 079/230] ly: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix
index 931dcc94576a..da8a7908cf37 100644
--- a/pkgs/by-name/ly/ly/package.nix
+++ b/pkgs/by-name/ly/ly/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ly";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "AnErrupTion";
     repo = "ly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q/MFI02YdAkPdkbi8FtsM46MNalraz2MJf4Oav3fCZA=";
+    hash = "sha256-xD1FLW8LT+6szfjZbP++qJThf4xxbmw4jRHB8TdrG70=";
   };
 
   nativeBuildInputs = [

From cbbb5a917307b2eb5c1f49efb1604775db7e5812 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 13:10:20 +0000
Subject: [PATCH 080/230] schemat: 0.4.2 -> 0.4.5

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

diff --git a/pkgs/by-name/sc/schemat/package.nix b/pkgs/by-name/sc/schemat/package.nix
index d15226c28f31..24dfc89e8da8 100644
--- a/pkgs/by-name/sc/schemat/package.nix
+++ b/pkgs/by-name/sc/schemat/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "schemat";
-  version = "0.4.2";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "schemat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JOrBQvrnA/qSmI+jJjGjcxEWFDCfiUmtJaZPI3N0rMk=";
+    hash = "sha256-gGHAkNFEkcbWqel3kr6fUiUDHwZJdf9FLHfQjD9RPUc=";
   };
 
-  cargoHash = "sha256-zGP8m05g6zEQ/dx9ChLhUCM2x9q3bltPW+9ku05rzCE=";
+  cargoHash = "sha256-qbn/s5wMRt0Qj/H4SVP8fCcb5cMAXETzuPm68NdgkBE=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From d56f9135a1ecfecf617293f1db9d5dc848d6e75b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 6 Aug 2025 21:29:58 +0800
Subject: [PATCH 081/230] cinnamon-screensaver: 6.4.0 -> 6.4.1

https://github.com/linuxmint/cinnamon-screensaver/compare/6.4.0...6.4.1
---
 pkgs/by-name/ci/cinnamon-screensaver/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
index 50e97ecea209..77e434714b65 100644
--- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix
+++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-screensaver";
-  version = "6.4.0";
+  version = "6.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-screensaver";
     rev = version;
-    hash = "sha256-XlEu/aBwNeu+CC6IRnFTF6LUnb7VY2+OOGsdCvQYweA=";
+    hash = "sha256-CK4WP5IafNII81e8HxUNN3Vp36Ln78Xvv5lIMvL+nbk=";
   };
 
   patches = [

From 1fcc3e382bb062a76187d2b6d053309bac42e349 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 14:21:25 +0000
Subject: [PATCH 082/230] okteto: 3.9.0 -> 3.10.0

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

diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix
index 12ba7e6d22c0..65e7d615ecf9 100644
--- a/pkgs/by-name/ok/okteto/package.nix
+++ b/pkgs/by-name/ok/okteto/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "okteto";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     tag = finalAttrs.version;
-    hash = "sha256-gGtQrhetIWV7ZvnmPYcGzz718uGyAdRiraiKODrJS4w=";
+    hash = "sha256-ZMvZP7p/Ew3TvPLV5U1v0TG0FCWU8VTAcSMtOJLrWVQ=";
   };
 
-  vendorHash = "sha256-P+N8PYh6+qj1sEp1s9yswA3HOVlI87+XOj6j9hijSuw=";
+  vendorHash = "sha256-Pun9LgQAv/wlX0CwU4AJuEkMeZgPTL+ExmUevURvjYE=";
 
   postPatch = ''
     # Disable some tests that need file system & network access.

From a73058fa6ae9fbed89d41045db77c620e93b38b6 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Wed, 6 Aug 2025 10:55:37 -0400
Subject: [PATCH 083/230] windsurf: 1.11.2 -> 1.11.3

---
 pkgs/by-name/wi/windsurf/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index fe4fae664deb..e1501138ee2b 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.11.2",
+    "version": "1.11.3",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-darwin-arm64-1.11.2.zip",
-    "sha256": "d0deea25454cef4fda962436980dcf9a7d374e30e681933e1b036258179e8cd1"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/b623f33d83cdc5b0d5eaf6ebc9e4d8193a0b5f50/Windsurf-darwin-arm64-1.11.3.zip",
+    "sha256": "83df03ffe0ef8e03301355f101192e81734841e8c658b2bc2fb238e7a83679d4"
   },
   "x86_64-darwin": {
-    "version": "1.11.2",
+    "version": "1.11.3",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-darwin-x64-1.11.2.zip",
-    "sha256": "e874198d263dbbfcc46283151d50a20187460d7c42c1988b6165016b17a33351"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/b623f33d83cdc5b0d5eaf6ebc9e4d8193a0b5f50/Windsurf-darwin-x64-1.11.3.zip",
+    "sha256": "e5bda964d69f52bf49d92bd0f2e0a824c2c45dc708f2dcfd93b9797d5fecb80c"
   },
   "x86_64-linux": {
-    "version": "1.11.2",
+    "version": "1.11.3",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-linux-x64-1.11.2.tar.gz",
-    "sha256": "b0b5439245ca9c05ac4a600da2835757641820005c219c971a294acb91f3f114"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/b623f33d83cdc5b0d5eaf6ebc9e4d8193a0b5f50/Windsurf-linux-x64-1.11.3.tar.gz",
+    "sha256": "d4f5848f152c5c185c9aa7c89a34700455d41d7388592fa90e05c0329f1943bd"
   }
 }

From db5969bfbbb1462379cb21eded89bdd482aa32f1 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Wed, 6 Aug 2025 11:29:18 -0400
Subject: [PATCH 084/230] code-cursor: 1.3.8 -> 1.3.9

---
 pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 11111b5322ea..c80f1fa3d25e 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -16,20 +16,20 @@ let
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/x64/Cursor-1.3.8-x86_64.AppImage";
-      hash = "sha256-qR1Wu3H0JUCKIoUP/QFC1YyYiRaQ9PVN7ZT9TjHwn1k=";
+      url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/x64/Cursor-1.3.9-x86_64.AppImage";
+      hash = "sha256-0kkTL6ZCnLxGBQSVoZ7UEOBNtTZVQolVAk/2McCV0Rw=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/arm64/Cursor-1.3.8-aarch64.AppImage";
-      hash = "sha256-UrUstEFP8W8Y9WUCR5kt3434bKCBBK/NaSu2UK8+gII=";
+      url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/arm64/Cursor-1.3.9-aarch64.AppImage";
+      hash = "sha256-5g26fm+tpm8xQTutygI20TcUHL08gKlG0uZSHixK2Ao=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-FGjqbOdr1HSjVlDYP/+vp4bVQoqdJww3U4t59QLg1kk=";
+      url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-IJV35JNpoUybArz2NhvX8IzDUmvzN+GVq/MyDtXgVeI=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-tsVPS48APst7kbEh7cjhJ2zYKcKBDdjH+NXMpAe4Ixs=";
+      url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-TYdv8UKoBtv0WUHWBqJtpG9vHDkEBBPLS/7BZhdxR1M=";
     };
   };
 
@@ -39,7 +39,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.3.8";
+  version = "1.3.9";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:

From 584227329781b8e74c9391440fd17e5704ac3502 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 6 Aug 2025 23:42:44 +0800
Subject: [PATCH 085/230] cinnamon-common: 6.4.7 -> 6.4.10

https://github.com/linuxmint/cinnamon/compare/6.4.7...6.4.10
---
 pkgs/by-name/ci/cinnamon-common/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix
index 567e51445700..3a9f33995283 100644
--- a/pkgs/by-name/ci/cinnamon-common/package.nix
+++ b/pkgs/by-name/ci/cinnamon-common/package.nix
@@ -76,13 +76,13 @@ in
 # TODO (after 25.05 branch-off): Rename to pkgs.cinnamon
 stdenv.mkDerivation rec {
   pname = "cinnamon-common";
-  version = "6.4.7";
+  version = "6.4.10";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
     rev = version;
-    hash = "sha256-WBdzlourYf2oEXUMbzNcNNsc8lBo6ujAy/K1Y6nGOjU=";
+    hash = "sha256-8yg39x5rWxJ2IcDFO4AjqrctPSjqdUSfmrKbjT3Yx+0=";
   };
 
   patches = [

From 0fcadaa470133f9744d3a8ecb462331a1e8c65b8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 6 Aug 2025 23:45:59 +0800
Subject: [PATCH 086/230] cjs: 6.4.0 -> 128.0

https://github.com/linuxmint/cjs/compare/6.4.0...128.0
---
 pkgs/by-name/cj/cjs/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix
index 6a55db2dea23..ac0a5d2f22e2 100644
--- a/pkgs/by-name/cj/cjs/package.nix
+++ b/pkgs/by-name/cj/cjs/package.nix
@@ -8,7 +8,7 @@
   glib,
   readline,
   libsysprof-capture,
-  spidermonkey_115,
+  spidermonkey_128,
   meson,
   mesonEmulatorHook,
   dbus,
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cjs";
-  version = "6.4.0";
+  version = "128.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cjs";
     rev = version;
-    hash = "sha256-2lkIWroOo3hxu9/L/Ty7CADzVrZ0ohyHVmm65NoNlD4=";
+    hash = "sha256-B9N/oNRvsnr3MLkpcH/aBST6xOJSFdvSUFuD6EldE38=";
   };
 
   outputs = [
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     cairo
     readline
     libsysprof-capture
-    spidermonkey_115
+    spidermonkey_128
   ];
 
   propagatedBuildInputs = [

From 9f7985c055f0e0b34799ca61a10390b179f84d1a Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 6 Aug 2025 17:38:22 +0200
Subject: [PATCH 087/230] lkl: fix hijack and zpoline when building in parallel

because they both share object files, which may result in symbols
missing from the resulting build outputs.

E.g. `liblkl-hijack.so` is used by `nftables-check` and would fail
because of missing symbols caused by this:

~~~
/nix/store/x6mqw6qfcmya8jvhrmk938zirvqb6hhr-nftables-1.1.3/bin/nft: symbol lookup error: /nix/store/fgzk4jdjhmz86d8vmgdjg6l42gbmfa1m-lkl-2025-03-20-lib/lib/liblkl-hijack.so: undefined symbol: dual_fds
~~~

Note: The patch is vendored, because upstream has not merged this PR yet
due to Makefile compatibility concerns with older distros.

Co-authored-by: Raito Bezarius <masterancpp@gmail.com>
---
 ...x-hijack-and-zpoline-parallel-builds.patch | 48 +++++++++++++++++++
 pkgs/by-name/lk/lkl/package.nix               |  8 ++++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch

diff --git a/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch b/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch
new file mode 100644
index 000000000000..1ed9b4a97b7a
--- /dev/null
+++ b/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch
@@ -0,0 +1,48 @@
+From 4ee5d9b78ca1425b4473ede98602b656f28027e8 Mon Sep 17 00:00:00 2001
+From: David Disseldorp <ddiss@suse.de>
+Date: Fri, 4 Jul 2025 15:51:14 +1000
+Subject: [PATCH] lkl: fix hijack and zpoline parallel builds
+
+This is a follow up change for commit 3c97822a40cb1 ("lkl: add tests
+build barrier") tracked via https://github.com/lkl/linux/issues/558.
+The hijack and zpoline libraries also share object files, so need a
+barrier to avoid parallel build failures.
+
+Signed-off-by: David Disseldorp <ddiss@suse.de>
+---
+ tools/lkl/Makefile | 7 ++++---
+ tools/lkl/Targets  | 2 ++
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile
+index 9ca22b7605e3ad..dfe7f6aef5fe02 100644
+--- a/tools/lkl/Makefile
++++ b/tools/lkl/Makefile
+@@ -176,10 +176,11 @@ headers_install: $(TARGETS)
+ 	      include/lkl_config.h $(DESTDIR)$(INCDIR) ; \
+ 	    cp -r $(OUTPUT)include/lkl $(DESTDIR)$(INCDIR)
+ 
+-libraries_install: $(libs-y:%=$(OUTPUT)%$(SOSUF)) $(OUTPUT)liblkl.a
+-	$(call QUIET_INSTALL, libraries) \
++libraries_install: $(call expand-targets,$(libs-y),$(SOSUF)) $(OUTPUT)liblkl.a
++	# filter out special .WAIT targets from install
++	$(if $(filter .%,$^),,$(call QUIET_INSTALL, libraries) \
+ 	    install -d $(DESTDIR)$(LIBDIR) ; \
+-	    install -m 644 $^ $(DESTDIR)$(LIBDIR)
++	    install -m 644 $^ $(DESTDIR)$(LIBDIR))
+ 
+ programs_install: $(call expand-targets,$(progs-y),$(EXESUF))
+ 	$(call QUIET_INSTALL, programs) \
+diff --git a/tools/lkl/Targets b/tools/lkl/Targets
+index 3d30bd8be3c840..089a832ee23627 100644
+--- a/tools/lkl/Targets
++++ b/tools/lkl/Targets
+@@ -2,6 +2,8 @@ libs-y += lib/liblkl
+ 
+ ifneq ($(LKL_HOST_CONFIG_BSD),y)
+ libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-hijack
++# hijack and zpoline targets share object files, breaking parallel builds
++libs-$(LKL_HOST_CONFIG_POSIX) += .WAIT
+ libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-zpoline
+ endif
+ LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs
diff --git a/pkgs/by-name/lk/lkl/package.nix b/pkgs/by-name/lk/lkl/package.nix
index 5c545428ef5e..2585c2d3a62a 100644
--- a/pkgs/by-name/lk/lkl/package.nix
+++ b/pkgs/by-name/lk/lkl/package.nix
@@ -43,6 +43,14 @@ stdenv.mkDerivation {
     libarchive
   ];
 
+  patches = [
+    # Fix corruption in hijack and zpoline libraries when building in parallel,
+    # because both hijack and zpoline share object files, which may result in
+    # missing symbols.
+    # https://github.com/lkl/linux/pull/612/commits/4ee5d9b78ca1425b4473ede98602b656f28027e8
+    ./fix-hijack-and-zpoline-parallel-builds.patch
+  ];
+
   postPatch = ''
     # Fix a /usr/bin/env reference in here that breaks sandboxed builds
     patchShebangs arch/lkl/scripts

From 2c551ea2d35051b0e4f166b8a7fa659b01205c6c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 6 Aug 2025 23:51:16 +0800
Subject: [PATCH 088/230] cinnamon: Renamed from cinnamon-common

This is the upstream project name.
---
 .../modules/services/x11/desktop-managers/cinnamon.nix | 10 +++++-----
 pkgs/by-name/ar/arc-theme/package.nix                  |  4 ++--
 pkgs/by-name/ci/cinnamon-desktop/package.nix           |  2 +-
 .../ci/cinnamon-gsettings-overrides/package.nix        |  4 ++--
 pkgs/by-name/ci/cinnamon-screensaver/package.nix       |  4 ++--
 .../ci/{cinnamon-common => cinnamon}/libdir.patch      |  0
 .../ci/{cinnamon-common => cinnamon}/package.nix       |  3 +--
 .../use-sane-install-dir.patch                         |  0
 pkgs/top-level/aliases.nix                             |  2 +-
 9 files changed, 14 insertions(+), 15 deletions(-)
 rename pkgs/by-name/ci/{cinnamon-common => cinnamon}/libdir.patch (100%)
 rename pkgs/by-name/ci/{cinnamon-common => cinnamon}/package.nix (98%)
 rename pkgs/by-name/ci/{cinnamon-common => cinnamon}/use-sane-install-dir.patch (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index ef8e2000e21c..ddb9b00c3e49 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -66,7 +66,7 @@ in
 
   config = mkMerge [
     (mkIf cfg.enable {
-      services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];
+      services.displayManager.sessionPackages = [ pkgs.cinnamon ];
 
       services.xserver.displayManager.lightdm.greeters.slick = {
         enable = mkDefault true;
@@ -114,7 +114,7 @@ in
       services.accounts-daemon.enable = true;
       services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.dbus.packages = with pkgs; [
-        cinnamon-common
+        cinnamon
         cinnamon-screensaver
         nemo-with-extensions
         xapp
@@ -166,7 +166,7 @@ in
             desktop-file-utils
 
             # common-files
-            cinnamon-common
+            cinnamon
             cinnamon-session
             cinnamon-desktop
             cinnamon-menus
@@ -177,7 +177,7 @@ in
 
             # session requirements
             cinnamon-screensaver
-            # cinnamon-killer-daemon: provided by cinnamon-common
+            # cinnamon-killer-daemon: provided by cinnamon
             networkmanagerapplet # session requirement - also nm-applet not needed
 
             # packages
@@ -225,7 +225,7 @@ in
 
       services.orca.enable = mkDefault (notExcluded pkgs.orca);
 
-      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];
+      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
diff --git a/pkgs/by-name/ar/arc-theme/package.nix b/pkgs/by-name/ar/arc-theme/package.nix
index 8f6e90986c6f..d92f85e0c870 100644
--- a/pkgs/by-name/ar/arc-theme/package.nix
+++ b/pkgs/by-name/ar/arc-theme/package.nix
@@ -10,7 +10,7 @@
   gnome-themes-extra,
   gtk-engine-murrine,
   inkscape,
-  cinnamon-common,
+  cinnamon,
   makeFontsConf,
   python3,
 }:
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
     # "-Dvariants=light,darker,dark,lighter"
-    "-Dcinnamon_version=${cinnamon-common.version}"
+    "-Dcinnamon_version=${cinnamon.version}"
     "-Dgnome_shell_version=${gnome-shell.version}"
     # You will need to patch gdm to make use of this.
     "-Dgnome_shell_gresource=true"
diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix
index a58b09a422d3..ece170d57a4c 100644
--- a/pkgs/by-name/ci/cinnamon-desktop/package.nix
+++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file
     patchShebangs install-scripts/meson_install_schemas.py
-    sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon
+    sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon/share/cinnamon
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
index e2984b5e00a3..ecbe130d8f5f 100644
--- a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
+++ b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
@@ -15,7 +15,7 @@
   cinnamon-desktop,
   cinnamon-session,
   cinnamon-settings-daemon,
-  cinnamon-common,
+  cinnamon,
   bulky,
 }:
 
@@ -35,7 +35,7 @@ let
     cinnamon-desktop
     cinnamon-session
     cinnamon-settings-daemon
-    cinnamon-common
+    cinnamon
     gnome-terminal
     gsettings-desktop-schemas
     gtk3
diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
index 77e434714b65..14fc59669d4a 100644
--- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix
+++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
@@ -9,7 +9,7 @@
   dbus,
   gettext,
   cinnamon-desktop,
-  cinnamon-common,
+  cinnamon,
   intltool,
   libxslt,
   gtk3,
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     pam
     cairo
     cinnamon-desktop
-    cinnamon-common
+    cinnamon
     libgnomekbd
     caribou
   ];
diff --git a/pkgs/by-name/ci/cinnamon-common/libdir.patch b/pkgs/by-name/ci/cinnamon/libdir.patch
similarity index 100%
rename from pkgs/by-name/ci/cinnamon-common/libdir.patch
rename to pkgs/by-name/ci/cinnamon/libdir.patch
diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon/package.nix
similarity index 98%
rename from pkgs/by-name/ci/cinnamon-common/package.nix
rename to pkgs/by-name/ci/cinnamon/package.nix
index 3a9f33995283..5d47b88cc244 100644
--- a/pkgs/by-name/ci/cinnamon-common/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -73,9 +73,8 @@ let
     ]
   );
 in
-# TODO (after 25.05 branch-off): Rename to pkgs.cinnamon
 stdenv.mkDerivation rec {
-  pname = "cinnamon-common";
+  pname = "cinnamon";
   version = "6.4.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch b/pkgs/by-name/ci/cinnamon/use-sane-install-dir.patch
similarity index 100%
rename from pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch
rename to pkgs/by-name/ci/cinnamon/use-sane-install-dir.patch
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9d4edfce56d6..8590df37049c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -443,7 +443,7 @@ mapAliases {
   CHOWTapeModel = chow-tape-model; # Added 2024-06-12
   chromatic = throw "chromatic has been removed due to being unmaintained and failing to build"; # Added 2025-04-18
   chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
-  cinnamon = throw "The cinnamon scope has been removed and all packages have been moved to the top-level"; # Added 2024-11-25
+  cinnamon-common = cinnamon; # Added 2025-08-06
   citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
   citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
   citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04

From 56bf09a9c37d0cc4847c151933e6238bc92bc558 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 16:28:53 +0000
Subject: [PATCH 089/230] dosage-tracker: 1.9.9 -> 1.9.10

Diff: https://github.com/diegopvlk/Dosage/compare/v1.9.9...v1.9.10
---
 pkgs/by-name/do/dosage-tracker/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix
index f31b2603c289..192d9017452c 100644
--- a/pkgs/by-name/do/dosage-tracker/package.nix
+++ b/pkgs/by-name/do/dosage-tracker/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dosage";
-  version = "1.9.9";
+  version = "1.9.10";
 
   src = fetchFromGitHub {
     owner = "diegopvlk";
     repo = "Dosage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UVcbZgPk35VsYvyzIJrR79vAhSByJjn8kh+y0KQcwpM=";
+    hash = "sha256-aLZ1Jl2h5KmZQ8zNyNqivAkf4Gjqh2eQfoKLabdXhBI=";
   };
 
   # https://github.com/NixOS/nixpkgs/issues/318830

From 7e5e3b30692287c16ee7ce2c03f9ac001a8fb299 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 17:03:18 +0000
Subject: [PATCH 090/230] vscode-extensions.llvm-vs-code-extensions.lldb-dap:
 0.2.15 -> 0.2.16

---
 .../extensions/llvm-vs-code-extensions.lldb-dap/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix
index 00b1fbf8a7a6..110d5fa78058 100644
--- a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "lldb-dap";
     publisher = "llvm-vs-code-extensions";
-    version = "0.2.15";
-    hash = "sha256-Xr/TUpte9JqdvQ8eoD0l8ztg0tR8qwX/Ju1eVU6Xc0s=";
+    version = "0.2.16";
+    hash = "sha256-q0wBPSQHy/R8z5zb3iMdapzrn7c9y9X6Ow9CXY3lwtc=";
   };
 
   meta = {

From 86f81ffbb899e2ed25d50b7df2289f973c9c7eee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 17:03:42 +0000
Subject: [PATCH 091/230] python3Packages.scalar-fastapi: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/development/python-modules/scalar-fastapi/default.nix b/pkgs/development/python-modules/scalar-fastapi/default.nix
index 29f0037601d2..51bc7aac30ba 100644
--- a/pkgs/development/python-modules/scalar-fastapi/default.nix
+++ b/pkgs/development/python-modules/scalar-fastapi/default.nix
@@ -23,13 +23,13 @@
 
 buildPythonPackage rec {
   pname = "scalar-fastapi";
-  version = "1.2.2";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "scalar_fastapi";
     inherit version;
-    hash = "sha256-r5GoX6f7Ru078WcRvGNyhyYDxL1w4yjbfHvlf+ZF/sc=";
+    hash = "sha256-z5ujaUfqGwQC/B+jEfMKaQs547rt7x97RVPPVwAtrOs=";
   };
 
   build-system = [

From c8759cd0e1c496751ad7df69f841ef3152340f83 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 16:30:18 +0000
Subject: [PATCH 092/230] lock: 1.6.7 -> 1.7.0

Diff: https://github.com/konstantintutsch/Lock/compare/v1.6.7...v1.7.0
---
 pkgs/by-name/lo/lock/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index 26985e209485..a6b9f8450d9f 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lock";
-  version = "1.6.7";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5wbt+zZANWNbKJtcptovkPsGMUjGHmiX2vniLRqrQNc=";
+    hash = "sha256-RuxlMPboNODfSQXeGQWCpeNDI3HQNjx+ILsKAEttL6A=";
   };
 
   strictDeps = true;

From eb926c8e89cad19e992772967e317baca980d77b Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 16:30:27 +0000
Subject: [PATCH 093/230] garnet: 1.0.79 -> 1.0.80

Diff: https://github.com/microsoft/garnet/compare/v1.0.79...v1.0.80
Changelog: https://github.com/microsoft/garnet/releases/tag/v1.0.80
---
 pkgs/by-name/ga/garnet/deps.json   | 4 ++--
 pkgs/by-name/ga/garnet/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json
index 9e5c1b7001a2..67c016f383cc 100644
--- a/pkgs/by-name/ga/garnet/deps.json
+++ b/pkgs/by-name/ga/garnet/deps.json
@@ -31,8 +31,8 @@
   },
   {
     "pname": "KeraLua",
-    "version": "1.4.4",
-    "hash": "sha256-MF7DBdc8xNiEcauNer7YFRgjbUU4ANmc2uQKrzVDRDs="
+    "version": "1.4.6",
+    "hash": "sha256-7lXJhhQlEuRoaF18XiZYJDyhA8RIWpYWNB9kr4aARQc="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index 211eff07fb64..af25400a3657 100644
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@@ -8,13 +8,13 @@
 
 buildDotnetModule rec {
   pname = "garnet";
-  version = "1.0.79";
+  version = "1.0.80";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-EXI/6yctbAX2tcUYsb9sHXed5pik/uttXoY0gCnH9H8=";
+    hash = "sha256-9B2Ai+W6+rZ8xLrrO7d8jd6LYWaMGIq3a+lz8rY32uA=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From 3a40e7463108b7c736c33ea98f472978397532a8 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 13:24:16 -0400
Subject: [PATCH 094/230] skim: 0.20.3 -> 0.20.4

Diff: https://github.com/skim-rs/skim/compare/refs/tags/v0.20.3...refs/tags/v0.20.4

Changelog: https://github.com/skim-rs/skim/releases/tag/v0.20.4
---
 pkgs/by-name/sk/skim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 2381bb3967e2..a1e81a57f949 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.20.3";
+  version = "0.20.4";
 
   outputs = [
     "out"
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
     owner = "skim-rs";
     repo = "skim";
     tag = "v${version}";
-    hash = "sha256-DyrndFT4gPLLdBtvS/QI0UDMtKKeK8oX2K2h4/6xvb0=";
+    hash = "sha256-KgJ22Q0+tAfO6fHLYBM5mxqYJjjfmIb7hY+FcQM4j3c=";
   };
 
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
   '';
 
-  cargoHash = "sha256-BcWszU7S0imGlXgQ5e1L9yLfXzYzseK0z2BnqIqKkzg=";
+  cargoHash = "sha256-H9hCYPpsefLu35RIr3qURmrwnAOIevsd2E5LkK6Ay+4=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b04bd4bd77f63ea7f1724834999d25e68d2bd299 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 17:29:09 +0000
Subject: [PATCH 095/230] python3Packages.qcengine: 0.32.0 -> 0.33.0

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

diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix
index 459edd42b611..8b36477d2342 100644
--- a/pkgs/development/python-modules/qcengine/default.nix
+++ b/pkgs/development/python-modules/qcengine/default.nix
@@ -19,12 +19,12 @@
 
 buildPythonPackage rec {
   pname = "qcengine";
-  version = "0.32.0";
+  version = "0.33.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HvvWak7a2djF6wDJaHsBltaG1dTGbKH7wjsngO+fh2U=";
+    hash = "sha256-Ute8puO2qc679ttZgzQRnVO8OuBmYnqLT3y7faHpRgA=";
   };
 
   build-system = [ setuptools ];

From 667278c6e4d6fb220612a8dd986225c492efac75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 17:34:03 +0000
Subject: [PATCH 096/230] libretro.genesis-plus-gx: 0-unstable-2025-07-18 ->
 0-unstable-2025-08-03

---
 .../emulators/libretro/cores/genesis-plus-gx.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index d09b19cdfedf..9756b8159385 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2025-07-18";
+  version = "0-unstable-2025-08-03";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "0cfb7a22b129f42feb3b48095871c122acf45158";
-    hash = "sha256-Fonxi2RQJ/iqSLAfun2anHCzVnM7TkJFkc8PtWkNsQY=";
+    rev = "a69c81e44a3a25e5a9254a18652eae2dad875003";
+    hash = "sha256-vjh8NxoQgGU/u8XZLLQslYSlJdlMqU5quOjyWnUm3Ig=";
   };
 
   meta = {

From 8c32828aafbdb0068cad5c8830b2f1e3d936539a Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 6 Aug 2025 15:34:27 +0200
Subject: [PATCH 097/230] librdata: init at 0-unstable-2023-10-03

---
 pkgs/by-name/li/librdata/gettext-fix.patch | 12 ++++++++
 pkgs/by-name/li/librdata/package.nix       | 32 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/li/librdata/gettext-fix.patch
 create mode 100644 pkgs/by-name/li/librdata/package.nix

diff --git a/pkgs/by-name/li/librdata/gettext-fix.patch b/pkgs/by-name/li/librdata/gettext-fix.patch
new file mode 100644
index 000000000000..9f048d9b7e83
--- /dev/null
+++ b/pkgs/by-name/li/librdata/gettext-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 19bd5be..d12a927 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,6 @@ AC_ARG_ENABLE([sanitizers], AS_HELP_STRING([--enable-sanitizers], [Enable addres
+     [SANITIZERS="-fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp"], [SANITIZERS=""])
+ AC_SUBST([SANITIZERS])
+ 
+-AM_ICONV
+ 
+ AC_CANONICAL_HOST
+ AS_CASE([$host],
diff --git a/pkgs/by-name/li/librdata/package.nix b/pkgs/by-name/li/librdata/package.nix
new file mode 100644
index 000000000000..fc077f2fb698
--- /dev/null
+++ b/pkgs/by-name/li/librdata/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+}:
+
+stdenv.mkDerivation {
+  pname = "librdata";
+  version = "0-unstable-2023-10-03";
+
+  src = fetchFromGitHub {
+    owner = "WizardMac";
+    repo = "librdata";
+    rev = "33bd276ecb0bbcd8997ccc71a544149b3da0d940";
+    hash = "sha256-njTlKK++v7IbaRWJw8hWpE4tXh8MjPRijacqor7Rwes=";
+  };
+
+  patches = [ ./gettext-fix.patch ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = {
+    description = "Read and write R data frames from C";
+    homepage = "https://github.com/WizardMac/librdata";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = lib.platforms.all;
+  };
+}

From 2fe30ea1e8c73178ae00672094a2283709cc2c0f Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 6 Aug 2025 19:22:24 +0200
Subject: [PATCH 098/230] jasp-desktop: 0.19.3 -> 0.95.0

---
 pkgs/by-name/ja/jasp-desktop/cmake.patch |   86 +-
 pkgs/by-name/ja/jasp-desktop/modules.nix | 1229 +++++++++++++---------
 pkgs/by-name/ja/jasp-desktop/package.nix |   19 +-
 3 files changed, 800 insertions(+), 534 deletions(-)

diff --git a/pkgs/by-name/ja/jasp-desktop/cmake.patch b/pkgs/by-name/ja/jasp-desktop/cmake.patch
index 60cf1814a031..48b297b21548 100644
--- a/pkgs/by-name/ja/jasp-desktop/cmake.patch
+++ b/pkgs/by-name/ja/jasp-desktop/cmake.patch
@@ -1,5 +1,34 @@
+diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake
+index edd96b0..1fbdb3c 100644
+--- a/Tools/CMake/Install.cmake
++++ b/Tools/CMake/Install.cmake
+@@ -229,24 +229,10 @@ if(LINUX)
+   install(DIRECTORY ${CMAKE_SOURCE_DIR}/Resources/
+           DESTINATION ${JASP_INSTALL_RESOURCEDIR})
+ 
+-  install(
+-    DIRECTORY ${MODULES_BINARY_PATH}/binary_pkgs ${MODULES_BINARY_PATH}/manifests ${MODULES_BINARY_PATH}/module_libs ${MODULES_BINARY_PATH}/Tools
+-    DESTINATION ${JASP_INSTALL_MODULEDIR}
+-    REGEX ${FILES_EXCLUDE_PATTERN} EXCLUDE
+-    REGEX ${FOLDERS_EXCLUDE_PATTERN} EXCLUDE)
+-
+   install(
+     FILES ${MODULES_BINARY_PATH}/modules-settings.json
+     DESTINATION ${JASP_INSTALL_MODULEDIR}
+   )
+-  # we do not need renv-root in an install
+-  #install(DIRECTORY ${MODULES_RENV_ROOT_PATH}/
+-  #        DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-root)
+-
+-if(NOT FLATPAK_USED) #because flatpak already puts renv-cache in /app/lib64 anyway
+-  install(DIRECTORY ${MODULES_RENV_CACHE_PATH}/
+-          DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-cache)
+-endif()
+ 
+   #Flatpak wrapper that sets some environment variables that JASP needs
+   install(PROGRAMS ${CMAKE_SOURCE_DIR}/Tools/flatpak/org.jaspstats.JASP
 diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake
-index a95ef78..6ee84cd 100644
+index a6673d9..a079021 100644
 --- a/Tools/CMake/Libraries.cmake
 +++ b/Tools/CMake/Libraries.cmake
 @@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32))
@@ -20,8 +49,32 @@ index a95ef78..6ee84cd 100644
              HINTS ${LIBREADSTAT_LIBRARY_DIRS} REQUIRED)
  
    if(EXISTS ${LIBREADSTAT_LIBRARIES})
+diff --git a/Tools/CMake/Modules.cmake b/Tools/CMake/Modules.cmake
+index ca8e040..875db1f 100644
+--- a/Tools/CMake/Modules.cmake
++++ b/Tools/CMake/Modules.cmake
+@@ -13,19 +13,6 @@ configure_file(${PROJECT_SOURCE_DIR}/Modules/modules-settings.json
+ configure_file(${PROJECT_SOURCE_DIR}/Modules/install-modules.R.in
+ 		           ${SCRIPT_DIRECTORY}/install-modules.R @ONLY)
+ 
+-#create modules install target
+-add_custom_target(
+-  Modules
+-  USES_TERMINAL
+-  WORKING_DIRECTORY ${R_HOME_PATH}
+-  DEPENDS ${JASP_MODULE_BUNDLE_MANAGER_LIBRARY}/jaspModuleBundleManager
+-  DEPENDS ${SCRIPT_DIRECTORY}/install-modules.R
+-  COMMAND ${CMAKE_COMMAND}  -E env "JASP_R_HOME=${R_HOME_PATH}" ${R_EXECUTABLE} --slave --no-restore --no-save
+-        --file=${SCRIPT_DIRECTORY}/install-modules.R
+-  BYPRODUCTS  ${MODULES_BINARY_PATH}/bundles-downloaded.txt
+-  BYPRODUCTS  ${MODULES_BINARY_PATH}/bundles-installed.txt
+-  COMMENT "------ Installing Modules"
+-)
+ 
+ 
+ 
 diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake
-index bfdc8dc..af5ac03 100644
+index 4e7c052..abb5b48 100644
 --- a/Tools/CMake/Programs.cmake
 +++ b/Tools/CMake/Programs.cmake
 @@ -38,8 +38,9 @@ if(NOT WIN32)
@@ -37,35 +90,26 @@ index bfdc8dc..af5ac03 100644
    message(CHECK_START "Looking for 'gfortran'")
    find_program(
 diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake
-index 9ae27d4..64fd96a 100644
+index 42e7b88..405b434 100644
 --- a/Tools/CMake/R.cmake
 +++ b/Tools/CMake/R.cmake
-@@ -841,11 +841,6 @@ message(STATUS "R_CPP_INCLUDES_LIBRARY = ${R_CPP_INCLUDES_LIBRARY}")
- configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_renv.R.in
-                 ${SCRIPT_DIRECTORY}/setup_renv.R @ONLY)
+@@ -867,14 +867,6 @@ else()
+ configure_file(${PROJECT_SOURCE_DIR}/Modules/install-renv.R.in
+                 ${SCRIPT_DIRECTORY}/install-renv.R @ONLY)
  
+-              
 -execute_process(
 -  COMMAND_ECHO STDOUT
 -  #ERROR_QUIET OUTPUT_QUIET
 -  WORKING_DIRECTORY ${R_HOME_PATH}
--  COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_renv.R)
+-  COMMAND 
+-    ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/install-renv.R
+-)
  
  if(APPLE)
    # Patch renv
-@@ -867,11 +862,6 @@ endif()
- configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_rcpp_rinside.R.in
-                 ${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R @ONLY)
- 
--execute_process(
--  COMMAND_ECHO STDOUT
--  #ERROR_QUIET OUTPUT_QUIET
--  WORKING_DIRECTORY ${R_HOME_PATH}
--  COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R)
- 
- if(APPLE)
-   # Patch RInside and RCpp
-@@ -892,8 +882,8 @@ endif()
- 
+@@ -937,8 +929,8 @@ execute_process(
+           
  include(FindRPackagePath)
  
 -find_package_path(RCPP_PATH       ${R_CPP_INCLUDES_LIBRARY} "Rcpp")
diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix
index c211946d76d9..040b3a258947 100644
--- a/pkgs/by-name/ja/jasp-desktop/modules.nix
+++ b/pkgs/by-name/ja/jasp-desktop/modules.nix
@@ -7,19 +7,18 @@
 
 with rPackages;
 let
-  jaspColumnEncoder-src = fetchFromGitHub {
-    owner = "jasp-stats";
-    repo = "jaspColumnEncoder";
-    rev = "c54987bb25de8963866ae69ad3a6ae5a9a9f1240";
-    hash = "sha256-aWfRG7DXO1MYFvmMLkX/xtHvGeIhFRcRDrVBrhkvYuI=";
-  };
+  buildRPackage' = args: buildRPackage ({ name = "${args.pname}-${args.version}"; } // args);
 
-  jaspGraphs = buildRPackage {
-    name = "jaspGraphs-${jasp-version}";
-    version = jasp-version;
+  jaspGraphs = buildRPackage' {
+    pname = "jaspGraphs";
+    version = "0.19.2-unstable-2025-07-25";
 
-    src = jasp-src;
-    sourceRoot = "${jasp-src.name}/Engine/jaspGraphs";
+    src = fetchFromGitHub {
+      owner = "jasp-stats";
+      repo = "jaspGraphs";
+      rev = "e721a631c8357d42c1371a978db7cb5765bc7044";
+      hash = "sha256-DOOKHBVTF9bVhAa/LZCH1J7A821H4mGEfy6KAEtDBNk=";
+    };
 
     propagatedBuildInputs = [
       ggplot2
@@ -35,8 +34,15 @@ let
     ];
   };
 
-  jaspBase = buildRPackage {
-    name = "jaspBase-${jasp-version}";
+  jaspColumnEncoder-src = fetchFromGitHub {
+    owner = "jasp-stats";
+    repo = "jaspColumnEncoder";
+    rev = "32c53153da95087feb109c0f5f69534ffa3f32b7";
+    hash = "sha256-VOMcoXpLH24auQfZCWW6hQ10u6n2GxuEQHMaXrvGTnI=";
+  };
+
+  jaspBase = buildRPackage' {
+    pname = "jaspBase";
     version = jasp-version;
 
     src = jasp-src;
@@ -44,9 +50,6 @@ let
 
     env.INCLUDE_DIR = "../inst/include/jaspColumnEncoder";
 
-    # necessary for R 4.4.0
-    hardeningDisable = [ "format" ];
-
     postPatch = ''
       mkdir -p inst/include
       cp -r --no-preserve=all ${jaspColumnEncoder-src} inst/include/jaspColumnEncoder
@@ -79,14 +82,17 @@ let
     ];
   };
 
-  stanova = buildRPackage {
-    name = "stanova";
+  stanova = buildRPackage' {
+    pname = "stanova";
+    version = "0.3-unstable-2021-06-06";
+
     src = fetchFromGitHub {
       owner = "bayesstuff";
       repo = "stanova";
       rev = "988ad8e07cda1674b881570a85502be7795fbd4e";
       hash = "sha256-tAeHqTHao2KVRNFBDWmuF++H31aNN6O1ss1Io500QBY=";
     };
+
     propagatedBuildInputs = [
       emmeans
       lme4
@@ -96,14 +102,17 @@ let
     ];
   };
 
-  bstats = buildRPackage {
-    name = "bstats";
+  bstats = buildRPackage' {
+    pname = "bstats";
+    version = "0.0.0.9004-unstable-2023-09-08";
+
     src = fetchFromGitHub {
       owner = "AlexanderLyNL";
       repo = "bstats";
       rev = "42d34c18df08d233825bae34fdc0dfa0cd70ce8c";
       hash = "sha256-N2KmbTPbyvzsZTWBRE2x7bteccnzokUWDOB4mOWUdJk=";
     };
+
     propagatedBuildInputs = [
       hypergeo
       purrr
@@ -111,14 +120,17 @@ let
     ];
   };
 
-  flexplot = buildRPackage {
-    name = "flexplot";
+  flexplot = buildRPackage' {
+    pname = "flexplot";
+    version = "0.25.5";
+
     src = fetchFromGitHub {
       owner = "dustinfife";
       repo = "flexplot";
-      rev = "303a03968f677e71c99a5e22f6352c0811b7b2fb";
-      hash = "sha256-iT5CdtNk0Oi8gga76L6YtyWGACAwpN8A/yTBy7JJERc=";
+      rev = "9a39de871d48364dd5f096b2380a4c9907adf4c3";
+      hash = "sha256-yf5wbhfffztT5iF6h/JSg4NSbuaexk+9JEOfT5Is1vE=";
     };
+
     propagatedBuildInputs = [
       cowplot
       MASS
@@ -141,14 +153,17 @@ let
   };
 
   # conting has been removed from CRAN
-  conting' = buildRPackage {
-    name = "conting";
+  conting' = buildRPackage' {
+    pname = "conting";
+    version = "1.7.9999";
+
     src = fetchFromGitHub {
       owner = "vandenman";
       repo = "conting";
       rev = "03a4eb9a687e015d602022a01d4e638324c110c8";
       hash = "sha256-Sp09YZz1WGyefn31Zy1qGufoKjtuEEZHO+wJvoLArf0=";
     };
+
     propagatedBuildInputs = [
       mvtnorm
       gtools
@@ -158,14 +173,22 @@ let
   };
 
   buildJaspModule =
-    name: deps:
-    buildRPackage {
-      name = "${name}-${jasp-version}";
-      version = jasp-version;
-      src = jasp-src;
-      sourceRoot = "${jasp-src.name}/Modules/${name}";
+    {
+      pname,
+      version,
+      hash,
+      deps,
+    }:
+    buildRPackage' {
+      inherit pname version;
+      src = fetchFromGitHub {
+        name = "${pname}-${version}-source";
+        owner = "jasp-stats";
+        repo = pname;
+        tag = "v${version}";
+        inherit hash;
+      };
       propagatedBuildInputs = deps;
-
       # some packages have a .Rprofile that tries to activate renv
       # we disable this by removing .Rprofile
       postPatch = ''
@@ -174,477 +197,677 @@ let
     };
 in
 {
-  engine = {
-    inherit jaspBase jaspGraphs;
-  };
+  inherit jaspBase;
 
   modules = rec {
-    jaspAcceptanceSampling = buildJaspModule "jaspAcceptanceSampling" [
-      abtest
-      BayesFactor
-      conting'
-      ggplot2
-      jaspBase
-      jaspGraphs
-      plyr
-      stringr
-      vcd
-      vcdExtra
-      AcceptanceSampling
-    ];
-    jaspAnova = buildJaspModule "jaspAnova" [
-      afex
-      BayesFactor
-      boot
-      car
-      colorspace
-      emmeans
-      effectsize
-      ggplot2
-      jaspBase
-      jaspDescriptives
-      jaspGraphs
-      jaspTTests
-      KernSmooth
-      matrixStats
-      multcomp
-      multcompView
-      mvShapiroTest
-      onewaytests
-      plyr
-      stringi
-      stringr
-      restriktor
-    ];
-    jaspAudit = buildJaspModule "jaspAudit" [
-      bstats
-      extraDistr
-      ggplot2
-      ggrepel
-      jaspBase
-      jaspGraphs
-      jfa
-    ];
-    jaspBain = buildJaspModule "jaspBain" [
-      bain
-      lavaan
-      ggplot2
-      semPlot
-      stringr
-      jaspBase
-      jaspGraphs
-      jaspSem
-    ];
-    jaspBFF = buildJaspModule "jaspBFF" [
-      BFF
-      jaspBase
-      jaspGraphs
-    ];
-    jaspBfpack = buildJaspModule "jaspBfpack" [
-      BFpack
-      bain
-      ggplot2
-      stringr
-      coda
-      jaspBase
-      jaspGraphs
-    ];
-    jaspBsts = buildJaspModule "jaspBsts" [
-      Boom
-      bsts
-      ggplot2
-      jaspBase
-      jaspGraphs
-      matrixStats
-      reshape2
-    ];
-    jaspCircular = buildJaspModule "jaspCircular" [
-      jaspBase
-      jaspGraphs
-      circular
-      ggplot2
-    ];
-    jaspCochrane = buildJaspModule "jaspCochrane" [
-      jaspBase
-      jaspGraphs
-      jaspDescriptives
-      jaspMetaAnalysis
-    ];
-    jaspDescriptives = buildJaspModule "jaspDescriptives" [
-      ggplot2
-      ggrepel
-      jaspBase
-      jaspGraphs
-      jaspTTests
-      forecast
-      flexplot
-      ggrain
-      ggpp
-      ggtext
-      dplyr
-    ];
-    jaspDistributions = buildJaspModule "jaspDistributions" [
-      car
-      fitdistrplus
-      ggplot2
-      goftest
-      gnorm
-      jaspBase
-      jaspGraphs
-      MASS
-      sgt
-      sn
-    ];
-    jaspEquivalenceTTests = buildJaspModule "jaspEquivalenceTTests" [
-      BayesFactor
-      ggplot2
-      jaspBase
-      jaspGraphs
-      metaBMA
-      TOSTER
-      jaspTTests
-    ];
-    jaspFactor = buildJaspModule "jaspFactor" [
-      ggplot2
-      jaspBase
-      jaspGraphs
-      jaspSem
-      lavaan
-      psych
-      qgraph
-      reshape2
-      semPlot
-      GPArotation
-      Rcsdp
-      semTools
-    ];
-    jaspFrequencies = buildJaspModule "jaspFrequencies" [
-      abtest
-      BayesFactor
-      bridgesampling
-      conting'
-      multibridge
-      ggplot2
-      interp
-      jaspBase
-      jaspGraphs
-      plyr
-      stringr
-      vcd
-      vcdExtra
-    ];
-    jaspJags = buildJaspModule "jaspJags" [
-      coda
-      ggplot2
-      ggtext
-      hexbin
-      jaspBase
-      jaspGraphs
-      rjags
-      runjags
-      scales
-      stringr
-    ];
-    jaspLearnBayes = buildJaspModule "jaspLearnBayes" [
-      extraDistr
-      ggplot2
-      HDInterval
-      jaspBase
-      jaspGraphs
-      MASS
-      MCMCpack
-      MGLM
-      scales
-      ggalluvial
-      ragg
-      rjags
-      runjags
-      ggdist
-      png
-      posterior
-    ];
-    jaspLearnStats = buildJaspModule "jaspLearnStats" [
-      extraDistr
-      ggplot2
-      jaspBase
-      jaspGraphs
-      jaspDistributions
-      jaspDescriptives
-      jaspTTests
-      ggforce
-      tidyr
-      igraph
-      HDInterval
-      metafor
-    ];
-    jaspMachineLearning = buildJaspModule "jaspMachineLearning" [
-      kknn
-      AUC
-      cluster
-      colorspace
-      DALEX
-      dbscan
-      e1071
-      fpc
-      gbm
-      Gmedian
-      ggparty
-      ggdendro
-      ggnetwork
-      ggplot2
-      ggrepel
-      ggridges
-      glmnet
-      jaspBase
-      jaspGraphs
-      MASS
-      mclust
-      mvnormalTest
-      neuralnet
-      network
-      partykit
-      plyr
-      randomForest
-      rpart
-      ROCR
-      Rtsne
-      signal
-      VGAM
-    ];
-    jaspMetaAnalysis = buildJaspModule "jaspMetaAnalysis" [
-      dplyr
-      ggplot2
-      jaspBase
-      jaspGraphs
-      MASS
-      metaBMA
-      metafor
-      psych
-      purrr
-      rstan
-      stringr
-      tibble
-      tidyr
-      weightr
-      BayesTools
-      RoBMA
-      metamisc
-      ggmcmc
-      pema
-      clubSandwich
-      CompQuadForm
-      sp
-      dfoptim
-      nleqslv
-      patchwork
-    ];
-    jaspMixedModels = buildJaspModule "jaspMixedModels" [
-      afex
-      emmeans
-      ggplot2
-      ggpol
-      jaspBase
-      jaspGraphs
-      lme4
-      loo
-      mgcv
-      rstan
-      rstanarm
-      stanova
-      withr
-    ];
-    jaspNetwork = buildJaspModule "jaspNetwork" [
-      bootnet
-      BDgraph
-      corpcor
-      dplyr
-      foreach
-      ggplot2
-      gtools
-      HDInterval
-      huge
-      IsingSampler
-      jaspBase
-      jaspGraphs
-      mvtnorm
-      qgraph
-      reshape2
-      snow
-      stringr
-    ];
-    jaspPower = buildJaspModule "jaspPower" [
-      pwr
-      jaspBase
-      jaspGraphs
-    ];
-    jaspPredictiveAnalytics = buildJaspModule "jaspPredictiveAnalytics" [
-      jaspBase
-      jaspGraphs
-      bsts
-      bssm
-      precrec
-      reshape2
-      Boom
-      lubridate
-      prophet
-      BART
-      EBMAforecast
-      imputeTS
-      scoringRules
-      scoringutils
-    ];
-    jaspProcess = buildJaspModule "jaspProcess" [
-      blavaan
-      dagitty
-      ggplot2
-      ggraph
-      jaspBase
-      jaspGraphs
-      jaspJags
-      runjags
-    ];
-    jaspProphet = buildJaspModule "jaspProphet" [
-      rstan
-      ggplot2
-      jaspBase
-      jaspGraphs
-      prophet
-      scales
-    ];
-    jaspQualityControl = buildJaspModule "jaspQualityControl" [
-      car
-      cowplot
-      daewr
-      desirability
-      DoE_base
-      EnvStats
-      FAdist
-      fitdistrplus
-      FrF2
-      ggplot2
-      ggrepel
-      goftest
-      ggpp
-      irr
-      jaspBase
-      jaspDescriptives
-      jaspGraphs
-      mle_tools
-      psych
-      qcc
-      rsm
-      Rspc
-      tidyr
-      tibble
-      vipor
-      weibullness
-    ];
-    jaspRegression = buildJaspModule "jaspRegression" [
-      BAS
-      boot
-      bstats
-      combinat
-      emmeans
-      ggplot2
-      ggrepel
-      hmeasure
-      jaspAnova
-      jaspBase
-      jaspDescriptives
-      jaspGraphs
-      jaspTTests
-      lmtest
-      logistf
-      MASS
-      matrixStats
-      mdscore
-      ppcor
-      purrr
-      Rcpp
-      statmod
-      VGAM
-    ];
-    jaspReliability = buildJaspModule "jaspReliability" [
-      Bayesrel
-      coda
-      ggplot2
-      ggridges
-      irr
-      jaspBase
-      jaspGraphs
-      LaplacesDemon
-      lme4
-      MASS
-      psych
-      mirt
-    ];
-    jaspRobustTTests = buildJaspModule "jaspRobustTTests" [
-      RoBTT
-      ggplot2
-      jaspBase
-      jaspGraphs
-    ];
-    jaspSem = buildJaspModule "jaspSem" [
-      forcats
-      ggplot2
-      lavaan
-      cSEM
-      reshape2
-      jaspBase
-      jaspGraphs
-      semPlot
-      semTools
-      stringr
-      tibble
-      tidyr
-      SEMsens
-    ];
-    jaspSummaryStatistics = buildJaspModule "jaspSummaryStatistics" [
-      BayesFactor
-      bstats
-      jaspBase
-      jaspFrequencies
-      jaspGraphs
-      jaspRegression
-      jaspTTests
-      jaspAnova
-      jaspDescriptives
-      SuppDists
-      bayesplay
-    ];
-    jaspSurvival = buildJaspModule "jaspSurvival" [
-      survival
-      ggsurvfit
-      jaspBase
-      jaspGraphs
-    ];
-    jaspTTests = buildJaspModule "jaspTTests" [
-      BayesFactor
-      car
-      ggplot2
-      jaspBase
-      jaspGraphs
-      logspline
-      plotrix
-      plyr
-    ];
-    jaspTestModule = buildJaspModule "jaspTestModule" [
-      jaspBase
-      jaspGraphs
-      svglite
-      stringi
-    ];
-    jaspTimeSeries = buildJaspModule "jaspTimeSeries" [
-      jaspBase
-      jaspGraphs
-      jaspDescriptives
-      forecast
-    ];
-    jaspVisualModeling = buildJaspModule "jaspVisualModeling" [
-      flexplot
-      jaspBase
-      jaspGraphs
-      jaspDescriptives
-    ];
+    jaspAcceptanceSampling = buildJaspModule {
+      pname = "jaspAcceptanceSampling";
+      version = "0.95.0";
+      hash = "sha256-MzuijLBrCd/aIACzyEWWbQoyuYl/c7iMplsIpScbqK4=";
+      deps = [
+        abtest
+        BayesFactor
+        conting'
+        ggplot2
+        jaspBase
+        jaspGraphs
+        plyr
+        stringr
+        vcd
+        vcdExtra
+        AcceptanceSampling
+      ];
+    };
+    jaspAnova = buildJaspModule {
+      pname = "jaspAnova";
+      version = "0.95.0";
+      hash = "sha256-elunqlNy7krnoL31aeS4B7SkpKCD42S8Z8HsPeFTjEM=";
+      deps = [
+        afex
+        BayesFactor
+        boot
+        car
+        colorspace
+        emmeans
+        effectsize
+        ggplot2
+        jaspBase
+        jaspDescriptives
+        jaspGraphs
+        jaspTTests
+        KernSmooth
+        matrixStats
+        multcomp
+        multcompView
+        mvShapiroTest
+        onewaytests
+        plyr
+        stringi
+        stringr
+        restriktor
+      ];
+    };
+    jaspAudit = buildJaspModule {
+      pname = "jaspAudit";
+      version = "0.95.0";
+      hash = "sha256-CqrjrNm7DEyzOTg69TzksYczGBSCvhHfdfZ/HaNkhcI=";
+      deps = [
+        bstats
+        extraDistr
+        ggplot2
+        ggrepel
+        jaspBase
+        jaspGraphs
+        jfa
+      ];
+    };
+    jaspBain = buildJaspModule {
+      pname = "jaspBain";
+      version = "0.95.0";
+      hash = "sha256-E6j7dH6jbXWhR03QVQjY30/pylrMHU6PNX13gr5KvV4=";
+      deps = [
+        bain
+        lavaan
+        ggplot2
+        semPlot
+        stringr
+        jaspBase
+        jaspGraphs
+        jaspSem
+      ];
+    };
+    jaspBFF = buildJaspModule {
+      pname = "jaspBFF";
+      version = "0.95.0";
+      hash = "sha256-fgAUdzgSNt34WL/U3/0ac1kTB5PYAvmpXeQUuNEUhuE=";
+      deps = [
+        BFF
+        jaspBase
+        jaspGraphs
+      ];
+    };
+    jaspBfpack = buildJaspModule {
+      pname = "jaspBfpack";
+      version = "0.95.0";
+      hash = "sha256-4c7ORf0epHSdv6AB1UVMwiSEwCfVHAg0jzifBdHInoc=";
+      deps = [
+        BFpack
+        bain
+        ggplot2
+        stringr
+        coda
+        jaspBase
+        jaspGraphs
+      ];
+    };
+    jaspBsts = buildJaspModule {
+      pname = "jaspBsts";
+      version = "0.95.0";
+      hash = "sha256-pClbOuA255mHJSy7/TpQE+oaYQbxJut9AqZRMqm8Rhg=";
+      deps = [
+        Boom
+        bsts
+        ggplot2
+        jaspBase
+        jaspGraphs
+        matrixStats
+        reshape2
+      ];
+    };
+    jaspCircular = buildJaspModule {
+      pname = "jaspCircular";
+      version = "0.95.0";
+      hash = "sha256-Sx63VGtOZvwHF1jIjnd6aPmN1WtHHf35iQ0dzCWs1eU=";
+      deps = [
+        jaspBase
+        jaspGraphs
+        circular
+        ggplot2
+      ];
+    };
+    jaspCochrane = buildJaspModule {
+      pname = "jaspCochrane";
+      version = "0.95.0";
+      hash = "sha256-ZYMe1BJ0+HKKyHVY5riEcGE+6vZsAurWzHmPF5I7nk8=";
+      deps = [
+        jaspBase
+        jaspGraphs
+        jaspDescriptives
+        jaspMetaAnalysis
+      ];
+    };
+    jaspDescriptives = buildJaspModule {
+      pname = "jaspDescriptives";
+      version = "0.95.0";
+      hash = "sha256-gaGgSSv1D0GB8Rmzg9TYl460TjWHkK0abHDm5DHhOJg=";
+      deps = [
+        ggplot2
+        ggrepel
+        jaspBase
+        jaspGraphs
+        jaspTTests
+        forecast
+        flexplot
+        ggrain
+        ggpp
+        ggtext
+        dplyr
+        tidyplots
+        ggpubr
+        forcats
+        patchwork
+      ];
+    };
+
+    jaspDistributions = buildJaspModule {
+      pname = "jaspDistributions";
+      version = "0.95.0";
+      hash = "sha256-jtPYx2wOAY7ItrkPqyMsKp7sTrL9M1TtTmR0IjxU1nw=";
+      deps = [
+        car
+        fitdistrplus
+        ggplot2
+        goftest
+        gnorm
+        jaspBase
+        jaspGraphs
+        MASS
+        nortest
+        sgt
+        sn
+      ];
+    };
+    jaspEquivalenceTTests = buildJaspModule {
+      pname = "jaspEquivalenceTTests";
+      version = "0.95.0";
+      hash = "sha256-b/I6lb6I8rzOyyRgmsQTBMfHXfJDkrZPdwe5Kh2IVnc=";
+      deps = [
+        BayesFactor
+        ggplot2
+        jaspBase
+        jaspGraphs
+        metaBMA
+        TOSTER
+        jaspTTests
+      ];
+    };
+    jaspEsci = buildJaspModule {
+      pname = "jaspEsci";
+      version = "0.95.0";
+      hash = "sha256-0YBC54VdVNuGdkfjWEIJnW3n/Wbch4E6tkauVm45/9c=";
+      deps = [
+        jaspBase
+        jaspGraphs
+        esci
+        glue
+        vdiffr
+        legendry
+      ];
+    };
+    jaspFactor = buildJaspModule {
+      pname = "jaspFactor";
+      version = "0.95.0";
+      hash = "sha256-gK4GdwADrPt2UB/UUx+2Kx5IOlFolYjNArrYpTGK9ic=";
+      deps = [
+        ggplot2
+        jaspBase
+        jaspGraphs
+        jaspSem
+        lavaan
+        psych
+        qgraph
+        reshape2
+        semPlot
+        GPArotation
+        Rcsdp
+        semTools
+      ];
+    };
+    jaspFrequencies = buildJaspModule {
+      pname = "jaspFrequencies";
+      version = "0.95.0";
+      hash = "sha256-aK4t+q6NRHGiszJa6rWx1bQddxzwynM9TOckxofdgsw";
+      deps = [
+        abtest
+        BayesFactor
+        bridgesampling
+        conting'
+        multibridge
+        ggplot2
+        interp
+        jaspBase
+        jaspGraphs
+        plyr
+        stringr
+        vcd
+        vcdExtra
+      ];
+    };
+    jaspJags = buildJaspModule {
+      pname = "jaspJags";
+      version = "0.95.0";
+      hash = "sha256-DxLy3NgqvLIROBut30ne3hCUd67rCRutgM7zGvwkKNU=";
+      deps = [
+        coda
+        ggplot2
+        ggtext
+        hexbin
+        jaspBase
+        jaspGraphs
+        rjags
+        runjags
+        scales
+        stringr
+      ];
+    };
+    jaspLearnBayes = buildJaspModule {
+      pname = "jaspLearnBayes";
+      version = "0.95.0";
+      hash = "sha256-mka93YglICKxPXNO85Kv/gzSRAMuTkWcnAlwIExDpi0=";
+      deps = [
+        extraDistr
+        ggplot2
+        HDInterval
+        jaspBase
+        jaspGraphs
+        MASS
+        MCMCpack
+        MGLM
+        scales
+        ggalluvial
+        ragg
+        rjags
+        runjags
+        ggdist
+        png
+        posterior
+      ];
+    };
+    jaspLearnStats = buildJaspModule {
+      pname = "jaspLearnStats";
+      version = "0.95.0";
+      hash = "sha256-AcdSmAGr1ITZV/OXNpyOz0wwBlho76lvEGgt5FUHnsg=";
+      deps = [
+        extraDistr
+        ggplot2
+        jaspBase
+        jaspGraphs
+        jaspDistributions
+        jaspDescriptives
+        jaspTTests
+        ggforce
+        tidyr
+        igraph
+        HDInterval
+        metafor
+      ];
+    };
+    jaspMachineLearning = buildJaspModule {
+      pname = "jaspMachineLearning";
+      version = "0.95.0";
+      hash = "sha256-oCsXrcEAteFGfFHU65FV3jm1majA1q1w+TYCwAsvf70=";
+      deps = [
+        kknn
+        AUC
+        cluster
+        colorspace
+        DALEX
+        dbscan
+        e1071
+        fpc
+        gbm
+        Gmedian
+        ggparty
+        ggdendro
+        ggnetwork
+        ggplot2
+        ggrepel
+        ggridges
+        glmnet
+        jaspBase
+        jaspGraphs
+        MASS
+        mclust
+        mvnormalTest
+        neuralnet
+        network
+        partykit
+        plyr
+        randomForest
+        rpart
+        ROCR
+        Rtsne
+        signal
+        VGAM
+      ];
+    };
+    jaspMetaAnalysis = buildJaspModule {
+      pname = "jaspMetaAnalysis";
+      version = "0.95.0";
+      hash = "sha256-5zmLCx6HuM/oBxfaAgo4y7/CYJJkiJEP9RvAsc1h/5w=";
+      deps = [
+        dplyr
+        ggplot2
+        jaspBase
+        jaspGraphs
+        jaspSem
+        MASS
+        metaBMA
+        metafor
+        metaSEM
+        psych
+        purrr
+        rstan
+        stringr
+        tibble
+        tidyr
+        weightr
+        BayesTools
+        RoBMA
+        metamisc
+        ggmcmc
+        pema
+        clubSandwich
+        CompQuadForm
+        sp
+        dfoptim
+        nleqslv
+        patchwork
+      ];
+    };
+    jaspMixedModels = buildJaspModule {
+      pname = "jaspMixedModels";
+      version = "0.95.0";
+      hash = "sha256-EbB7rwlfRiGPI+QIi8/SygxJgsU5nOpZ2ZEg+mETX5Y=";
+      deps = [
+        afex
+        emmeans
+        ggplot2
+        ggpol
+        jaspBase
+        jaspGraphs
+        lme4
+        loo
+        mgcv
+        rstan
+        rstanarm
+        stanova
+        withr
+      ];
+    };
+    jaspNetwork = buildJaspModule {
+      pname = "jaspNetwork";
+      version = "0.95.0";
+      hash = "sha256-1RDkKRgNV6cToM2pVdHwIDE41UpFV0snIU54BEesVJw=";
+      deps = [
+        bootnet
+        easybgm
+        corpcor
+        dplyr
+        foreach
+        ggplot2
+        gtools
+        HDInterval
+        huge
+        IsingSampler
+        jaspBase
+        jaspGraphs
+        mvtnorm
+        qgraph
+        reshape2
+        snow
+        stringr
+      ];
+    };
+    jaspPower = buildJaspModule {
+      pname = "jaspPower";
+      version = "0.95.0";
+      hash = "sha256-sLLJ6yqKbFlXrHPlm2G7NuHp+/kBl+kPRvi6vAy32Ds=";
+      deps = [
+        pwr
+        jaspBase
+        jaspGraphs
+      ];
+    };
+    jaspPredictiveAnalytics = buildJaspModule {
+      pname = "jaspPredictiveAnalytics";
+      version = "0.95.0";
+      hash = "sha256-850PruQnCGab0g3Vdlh1LSqWYLFJUCbGNt3gWjEWP34=";
+      deps = [
+        jaspBase
+        jaspGraphs
+        bsts
+        bssm
+        precrec
+        reshape2
+        Boom
+        lubridate
+        prophet
+        BART
+        EBMAforecast
+        imputeTS
+        scoringRules
+        scoringutils
+      ];
+    };
+    jaspProcess = buildJaspModule {
+      pname = "jaspProcess";
+      version = "0.95.0";
+      hash = "sha256-LUlk9Iy538Zenzy+W1oJiCr7dcrBQVrl4gzflwnJVyc=";
+      deps = [
+        blavaan
+        dagitty
+        ggplot2
+        ggraph
+        jaspBase
+        jaspGraphs
+        jaspJags
+        runjags
+      ];
+    };
+    jaspProphet = buildJaspModule {
+      pname = "jaspProphet";
+      version = "0.95.0";
+      hash = "sha256-lCgqH3CfZxRImq5VndZepiy/JaXJHHh1Haj+7XhZUSE=";
+      deps = [
+        rstan
+        ggplot2
+        jaspBase
+        jaspGraphs
+        prophet
+        scales
+      ];
+    };
+    jaspQualityControl = buildJaspModule {
+      pname = "jaspQualityControl";
+      version = "0.95.0";
+      hash = "sha256-6SvLe++9ipvHfX0Hi1xeBeoQeq+PdG9YTE5sewhqUHA=";
+      deps = [
+        car
+        cowplot
+        daewr
+        desirability
+        DoE_base
+        EnvStats
+        FAdist
+        fitdistrplus
+        FrF2
+        ggplot2
+        ggrepel
+        goftest
+        ggpp
+        irr
+        jaspBase
+        jaspDescriptives
+        jaspGraphs
+        mle_tools
+        psych
+        qcc
+        rsm
+        Rspc
+        tidyr
+        tibble
+        vipor
+        weibullness
+      ];
+    };
+    jaspRegression = buildJaspModule {
+      pname = "jaspRegression";
+      version = "0.95.0";
+      hash = "sha256-9Q5Ei9vjFaDte//1seCj9++ftbDctkHzP8ZpGVETXH0=";
+      deps = [
+        BAS
+        boot
+        bstats
+        combinat
+        emmeans
+        ggplot2
+        ggrepel
+        hmeasure
+        jaspAnova
+        jaspBase
+        jaspDescriptives
+        jaspGraphs
+        jaspTTests
+        lmtest
+        logistf
+        MASS
+        matrixStats
+        mdscore
+        ppcor
+        purrr
+        Rcpp
+        statmod
+        VGAM
+      ];
+    };
+    jaspReliability = buildJaspModule {
+      pname = "jaspReliability";
+      version = "0.95.0";
+      hash = "sha256-wxx1ECm7QKDvLLKQZbEVYTHfyn3ieks69HSP/cg5dDQ=";
+      deps = [
+        Bayesrel
+        coda
+        ggplot2
+        ggridges
+        irr
+        jaspBase
+        jaspGraphs
+        LaplacesDemon
+        lme4
+        MASS
+        psych
+        mirt
+      ];
+    };
+    jaspRobustTTests = buildJaspModule {
+      pname = "jaspRobustTTests";
+      version = "0.95.0";
+      hash = "sha256-nw+7eZycdJ+DHlLaTSBWdHocnaZk95PBqYj8sVFlPSg=";
+      deps = [
+        RoBTT
+        ggplot2
+        jaspBase
+        jaspGraphs
+      ];
+    };
+    jaspSem = buildJaspModule {
+      pname = "jaspSem";
+      version = "0.95.0";
+      hash = "sha256-+cgP6KqSK4tXQ+Dg6OTEoXfzEJFNdnwAat6tyWyzSkU=";
+      deps = [
+        forcats
+        ggplot2
+        lavaan
+        cSEM
+        reshape2
+        jaspBase
+        jaspGraphs
+        semPlot
+        semTools
+        stringr
+        tibble
+        tidyr
+        SEMsens
+      ];
+    };
+    jaspSummaryStatistics = buildJaspModule {
+      pname = "jaspSummaryStatistics";
+      version = "0.95.0";
+      hash = "sha256-VuBDJtkDifDeatY3eX5RBd5ix6fB0QnJ1ZoM7am9SOA=";
+      deps = [
+        BayesFactor
+        bstats
+        jaspBase
+        jaspFrequencies
+        jaspGraphs
+        jaspRegression
+        jaspTTests
+        jaspAnova
+        jaspDescriptives
+        SuppDists
+        bayesplay
+      ];
+    };
+    jaspSurvival = buildJaspModule {
+      pname = "jaspSurvival";
+      version = "0.95.0";
+      hash = "sha256-IVN3Tcd+OgD4pancwyNomQMOfOvUnKIWG/nxKdjNxcw=";
+      deps = [
+        survival
+        ggsurvfit
+        flexsurv
+        jaspBase
+        jaspGraphs
+      ];
+    };
+    jaspTTests = buildJaspModule {
+      pname = "jaspTTests";
+      version = "0.95.0";
+      hash = "sha256-CLrfa5X/q2Ruc+y3ruHnT/NhYQ4ESvxtJCH2JM/hf4o=";
+      deps = [
+        BayesFactor
+        car
+        ggplot2
+        jaspBase
+        jaspGraphs
+        logspline
+        plotrix
+        plyr
+      ];
+    };
+    jaspTestModule = buildJaspModule {
+      pname = "jaspTestModule";
+      version = "0.95.0";
+      hash = "sha256-r+VzUxfvWYl/Fppq/TxCw1jI8F3dohsvb6qwlQHlFDA=";
+      deps = [
+        jaspBase
+        jaspGraphs
+        svglite
+        stringi
+      ];
+    };
+    jaspTimeSeries = buildJaspModule {
+      pname = "jaspTimeSeries";
+      version = "0.95.0";
+      hash = "sha256-hQh9p6mX3NlkToh4uQRbPtwpNLlVwsILxH+9D2caZXk=";
+      deps = [
+        jaspBase
+        jaspGraphs
+        jaspDescriptives
+        forecast
+      ];
+    };
+    jaspVisualModeling = buildJaspModule {
+      pname = "jaspVisualModeling";
+      version = "0.95.0";
+      hash = "sha256-MX3NvfVoFPp2NLWYIYIoCdWKHxpcRhfyMCWj3VdIBC0=";
+      deps = [
+        flexplot
+        jaspBase
+        jaspGraphs
+        jaspDescriptives
+      ];
+    };
   };
 }
diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix
index 8304009e20ee..9ab3be87e49d 100644
--- a/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -14,6 +14,7 @@
   boost,
   freexl,
   libarchive,
+  librdata,
   qt6,
   R,
   readstat,
@@ -21,14 +22,14 @@
 }:
 
 let
-  version = "0.19.3";
+  version = "0.95.0";
 
   src = fetchFromGitHub {
     owner = "jasp-stats";
     repo = "jasp-desktop";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-p489Q3jMQ7UWOCdAGskRF9KSLoRSatUwGVfj0/g4aPo=";
+    hash = "sha256-RR7rJJb0qKqZs7K3zP6GxlDXpmSNnGQ3WDExUgm9pKQ=";
   };
 
   moduleSet = import ./modules.nix {
@@ -37,7 +38,7 @@ let
     jasp-version = version;
   };
 
-  inherit (moduleSet) engine modules;
+  inherit (moduleSet) jaspBase modules;
 
   # Merges ${R}/lib/R with all used R packages (even propagated ones)
   customREnv = buildEnv {
@@ -45,12 +46,12 @@ let
     paths = [
       "${R}/lib/R"
       rPackages.RInside
-      engine.jaspBase # Should already be propagated from modules, but include it again, just in case
+      jaspBase # Should already be propagated from modules, but include it again, just in case
     ]
     ++ lib.attrValues modules;
   };
 
-  modulesDir = linkFarm "jasp-${version}-modules" (
+  moduleLibs = linkFarm "jasp-${version}-module-libs" (
     lib.mapAttrsToList (name: drv: {
       name = name;
       path = "${drv}/library";
@@ -89,6 +90,7 @@ stdenv.mkDerivation {
     customREnv
     freexl
     libarchive
+    librdata
     readstat
 
     qt6.qtbase
@@ -102,20 +104,17 @@ stdenv.mkDerivation {
   env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib";
 
   postInstall = ''
-    # Remove unused cache locations
-    rm -r $out/lib64 $out/Modules
-
     # Remove flatpak proxy script
     rm $out/bin/org.jaspstats.JASP
     substituteInPlace $out/share/applications/org.jaspstats.JASP.desktop \
       --replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP"
 
     # symlink modules from the store
-    ln -s ${modulesDir} $out/Modules
+    ln -s ${moduleLibs} $out/Modules/module_libs
   '';
 
   passthru = {
-    inherit modules engine;
+    inherit jaspBase modules;
     env = customREnv;
   };
 

From 9b076d978ab7aca0994c21c5959c21f4c3a50b4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 17:41:58 +0000
Subject: [PATCH 099/230] bluemap: 5.10 -> 5.11

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

diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix
index 40ce46ad9c40..fbb826c89b9e 100644
--- a/pkgs/by-name/bl/bluemap/package.nix
+++ b/pkgs/by-name/bl/bluemap/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "bluemap";
-  version = "5.10";
+  version = "5.11";
 
   src = fetchurl {
     url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar";
-    hash = "sha256-vz6ReXfgqWYnyFQNBgqaWLZ0sOJqHOmFcAnuwbbOmGA=";
+    hash = "sha256-DhsnuwVDvIb7eR4Hs2jOTufY2ysd+Awo0b8xg84quGU=";
   };
 
   dontUnpack = true;

From b6ad09faf730412cd01049a5165b59160a5620ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 17:56:04 +0000
Subject: [PATCH 100/230] trace-cmd: 3.3.2 -> 3.3.3

---
 pkgs/os-specific/linux/trace-cmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 1768aa98e226..192f8ff35901 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -16,11 +16,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "trace-cmd";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz";
-    hash = "sha256-35BEzuevGiRQFqvWOQK1m20juhSd5101a8bBsNtM8Eo=";
+    hash = "sha256-B3bwHV+f6IuoNESz5B4ij5KsIcCcpUPmoSnJeJj0J0Y=";
   };
 
   # Don't build and install html documentation

From 4fb8458eecf27aae59949c9b5eeb5d7837599dc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 18:04:12 +0000
Subject: [PATCH 101/230] thunderbird-esr-bin-unwrapped: 140.1.0esr ->
 140.1.1esr

---
 .../thunderbird-bin/release_esr_sources.nix   | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index f089cd1c1bcc..1908f322506d 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "140.1.0esr";
+  version = "140.1.1esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/af/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/af/thunderbird-140.1.1esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "0949364bab751990fc5d02354a0352c8c919f8606594bd0302f30ae1fb931cd1";
+      sha256 = "919982590b3b6354c6856cc20b7fb7776d75c61f829992d10932bc684810bf38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ar/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ar/thunderbird-140.1.1esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "5a3ecef8ffcabbbc60123ba3745b1b1fcf1d37af68b7132ab6e85b8e7dc34c07";
+      sha256 = "6ec79300bdd71d797258b4c9e8f943857f69a0ad5cf948fe326fe0dc9517e502";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ast/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ast/thunderbird-140.1.1esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "90bdf01ef3ca297f83e94829f8357a899c036e8c8bad32d1ab81730e14c8539c";
+      sha256 = "703b0797401fb7eed922522a8467ba3445ad5a71c0f81c7f4858f42cc080fcef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/be/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/be/thunderbird-140.1.1esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "c8db05ebd470c2850519cc69c6b6aec72e1e1a9586807ef73e6e4522064f669f";
+      sha256 = "b0a3f3a4e4a9453b054289e5d939b77db4effcf4667e219c4caf348653e5050f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/bg/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/bg/thunderbird-140.1.1esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "f0aef122695b374b8d5d9aa645510e829c3980305892121a11ed35e9646fd08b";
+      sha256 = "36bfe0d1acb2ba63bbf8ae34e2c39f3ff90b26f8f5c2bec73fdc9b31d70464e3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/br/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/br/thunderbird-140.1.1esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "b63fe552f4dd1696b0ded0be712d3277d297ab884321229bac0aff578dfb0b8a";
+      sha256 = "0d3a252e23df6de8898912fef53e53b2d050c0dff75dbab4644b7371d27ffb59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ca/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ca/thunderbird-140.1.1esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "19247cbb6f6994fb1c97cafdadcbec72eb3c3c9e4cbc848ae2ba3ed1227c0a9d";
+      sha256 = "37e0a46052d49472f75e45d82656aad56b202ba1cd094e271f875e5fe8137a4a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cak/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/cak/thunderbird-140.1.1esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "8c029d10efac92d8b8482770cebf6347199c6dd5a4f96fd2e8cf29a32a6a6cf0";
+      sha256 = "d7e29fb063478024d7772a867062381252b0db1c4832da0a5254918701ee58c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cs/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/cs/thunderbird-140.1.1esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "be900224dc75df6ce962daabadcc0e9efc170baead516b746af5ed7e98337190";
+      sha256 = "30f6aac467c61950a4e4bf95692d2d68eb1c1e1de3d5987350a8510c413c9991";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cy/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/cy/thunderbird-140.1.1esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "f2fc6503cc88c1719ba1524dd031d05aac225bee7f6785f239530ce5192be322";
+      sha256 = "c94dcd1dc7d235e5c8876bd319aeee64d76747e51a007bdabc2c91ded07da83d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/da/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/da/thunderbird-140.1.1esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "55d06c3117b26098f17edda9deb84706ba38bd4a6c22adc7270bf6e431a15949";
+      sha256 = "56ec5ec6044ac84fd669445d4a69a181a62f922b4cd9cbd3e8f7d516f0625a30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/de/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/de/thunderbird-140.1.1esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "83125097e4c240b3a230d4f1915deaba9e356509eb3f100f8deba7d352d32e20";
+      sha256 = "3fe9deaf6deacba4572081b69e8d872bc98f640515153d7bba203544c5de2a43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/dsb/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/dsb/thunderbird-140.1.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "528346d87600d87f25aadfc22a568fb6b5d80ed879905f623fa778daf4f40430";
+      sha256 = "2be0e2b0d8a7d3d9bb5ccb8124e60ee93bf58a5c60ea0290f30e57724ab1f01c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/el/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/el/thunderbird-140.1.1esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "2cb9aea9ed1830294506c3622ade8af3f368405f91bd15157a6149548e8ed77d";
+      sha256 = "f260a4ac4dd618f26386aa0b58e439e6071573ddae17dd851bba1e6ec0b56270";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-CA/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/en-CA/thunderbird-140.1.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "9e213ae92ddd13118e3b17b9ec55b078e4386d14b4c003af6a4ec33bcaf1eb53";
+      sha256 = "1e11b27a7ad2734cc0a05290e60ad9d9c52ab14cfc79ce3ca8c7628021bf86a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-GB/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/en-GB/thunderbird-140.1.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "9d81bc9585e787ccc86a49793a8d68763527685472974fb6bd48d8af849982d4";
+      sha256 = "f8a5c570c2db66cff6579a3849c2a2ee732b7bcb9d08fc78c0b60b809a28655a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-US/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/en-US/thunderbird-140.1.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "94a7e55b8b072150d7195b3fd83a1dfb92c4cc459f4f1584025cdf55fdcbb9b9";
+      sha256 = "13932d2417a5b88f392e52390ef90b43b3e21b2406d2c3c75879acc7a9737d49";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-AR/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/es-AR/thunderbird-140.1.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "bb7636ef599eec8055030092faac2edfd5c54ad1b50e3520d93b7b379e138b8f";
+      sha256 = "23abeb1a746f68bf41756de800e28eb713f0e4c2bb3e45af753d60ff82ff102a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-ES/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/es-ES/thunderbird-140.1.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "810b48fa291c0d19c1a0d3a3cf1b4edf646cd7f5f7e4bf6712a414262dac45fa";
+      sha256 = "6899c7b9216211cfcf8508234feddd40bd0f3878c075fcaa9786154aeb5d761e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-MX/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/es-MX/thunderbird-140.1.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "cce7a9edfb6ff43376c328c7013ef50c2da23b8ab91e6c61e39100089259b9e7";
+      sha256 = "161197e28416206f216985796fcb131ec29e2a64170d7ab7be91e686fbcdc014";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/et/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/et/thunderbird-140.1.1esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "77bb2e7ee0201c546fba6e06008aada446c5c69d1afe8e459845e1fb49cde5dd";
+      sha256 = "f5a693e7d141e9085ed072f1192effd76298e3a3b81517f41994b2b317208447";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/eu/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/eu/thunderbird-140.1.1esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "96c6423c9621b0cf1e701067ff0e03f9039fca140fe96da98f025a0256142324";
+      sha256 = "db90b40e330738e19cdc29fe5386117e363a7980003bf407005278b4a44d43a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fi/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/fi/thunderbird-140.1.1esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "b882e094df72799ad134687f71f3c90a367413664c91005b7da1ec408d8a953f";
+      sha256 = "7629a5087f7ba516b6ac202b10f9324458f9e7a65151a0e7a0d01d9b1c40805a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/fr/thunderbird-140.1.1esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "ae57f0fd421c0e21f274c56f7a1ef4ab28a2721a48c1a19394ec6a19b937e0f3";
+      sha256 = "8a7f97f15a3d4659cf1effbc4afa8e176e4aed48a0b279e6628dd29e0db6fed0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fy-NL/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/fy-NL/thunderbird-140.1.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "5a9a57ff7688a83cabbff454058907ebda160b744766878b097de7622bf4e565";
+      sha256 = "7a0164fc992c1705e7927f5654a091e824cb39e120a99c9767d17555a4019567";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ga-IE/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ga-IE/thunderbird-140.1.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "39143e0a585cd77adb7d3389c3f0bfda2201461f591612712af992bf9c803b3c";
+      sha256 = "cf1e7321db36792779fb6edfe35cc45a3795cc055dcc178aba42d17015873c3e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/gd/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/gd/thunderbird-140.1.1esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "5628e78b0ebb53b1d3c176c0f73561a388c040e96f22ad50032ccd40033f9385";
+      sha256 = "008ee962be825a4e087051ddf15af624e8a42f75006bcb1b22d44719a30ba66f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/gl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/gl/thunderbird-140.1.1esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "312750092889dc23ea3f4bc96e17096984523ac22317b119dff93ce3aa3a5a0b";
+      sha256 = "69ac658f4f79c962382275a126672e4a5ea5dadd987220a5ae05a429f79a7aa1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/he/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/he/thunderbird-140.1.1esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "12414b9fe4173bc6f36b6bd806fde3155031c09cb3e04b278985610a05fe6420";
+      sha256 = "0dfa668cf92869c2da406f3646b004a2549333894468ee3343c6c270ead7400d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hr/thunderbird-140.1.1esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "52438992ef99f56aa7bbf1b9d9e57c430bcb217cf5f2f9513bc0822da3f6ac8e";
+      sha256 = "8fb0c300ae7d8cab35d0048173f75264d6558245ecbf8cdb88db6019f3607800";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hsb/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hsb/thunderbird-140.1.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "b69f099a5849568965cf8b6e2104c367327b376f68772e3b3aac4d1687b733aa";
+      sha256 = "13b239a77e545dd331c446abb8c2d0cc93f26a4264a0a8c0d9a477273d908591";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hu/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hu/thunderbird-140.1.1esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "01436c7fbd357cb222b573722bba0515fbfb91e6784f414d22b0a575ef57b5b1";
+      sha256 = "ad0667c49e91aaf640c290c356a13b109807c9044a5cc38350e688ce336eeada";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hy-AM/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hy-AM/thunderbird-140.1.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "4f8ed268403590398836fa2410fdb07217e8065e7ab908e5c692d37587bce82c";
+      sha256 = "efd985cf24abba96128993d5dacd664023c2d5ee9cb4ad0e93fdf8857f31634c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/id/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/id/thunderbird-140.1.1esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "8dd3c99050f1da269fc90ee70723443c52b2fdc8730c959541dc84c3caa55ca8";
+      sha256 = "511ab012c1cdfd7904177f7f1abd6cdeb360c26aaaa37174fdf7b3af687adcc4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/is/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/is/thunderbird-140.1.1esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8ad1ec0dbbc85dfdf76ec593bdd377b8bc74c70ba0692736c69348365cba06a2";
+      sha256 = "5e038f13e5b22d6c78647b58451f4b4b762f92da311907a01acb4c8f52228bbc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/it/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/it/thunderbird-140.1.1esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "51672db7ad0976a9964bdbaf64a10e749a972b813c48512c342160cf48633502";
+      sha256 = "0a6138a7da3416ead8a22810b70a8a135a86755bf3cfe6a69523e484ccdb6d07";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ja/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ja/thunderbird-140.1.1esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "50fb4726f63397bfe15c7c8d3272b35fc6190fedfddb5b43b761c70bf22433d1";
+      sha256 = "26d56b6dbc8fda2f3475b286db25629fa7775d9929f773074889a6940368950c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ka/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ka/thunderbird-140.1.1esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "57acefd6fecf702ac89d0f35c852578dcf8e8d44bc357f403e408cb634e3776e";
+      sha256 = "07c323d8311f01432bdeb86c7b1ba627b07640a3d692de8d007265a04779ebc0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/kab/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/kab/thunderbird-140.1.1esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "803ba9ca63fff30fe3287565156678936b677d7afb45f7d59c63f012f53282ba";
+      sha256 = "e78aec3f7cac1c7898c04f9970aa757fb30372787793bd0cf6cb188d1b5b66bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/kk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/kk/thunderbird-140.1.1esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "447396b9d5a4ce9b110d9dad0ebe8357cfdfee65258911ac6192b6c3e7970946";
+      sha256 = "c4eaf2b352af08cadae21c0b8237b36b8694f867dd9c01fa12fc80068d2629a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ko/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ko/thunderbird-140.1.1esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "468d1eb467665b84915ca3c57689abc9cd62cda51afc61a7ed4d63b28748da47";
+      sha256 = "5bd2d44c41dfeff1cbc771353d66c01bbbbf2d7796d581cfc5dad85c2f20470a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/lt/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/lt/thunderbird-140.1.1esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "87b5832b108358903736bfa0cfb013e295b72006c17b552590349261afc4565d";
+      sha256 = "e7578f394f4ce64fd85007588ec7f4903b01631207f508222cefd5cb00d6b5b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/lv/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/lv/thunderbird-140.1.1esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "14cf11465692c14239a0076752010b7ff54d302493f5bfef58920ad1cbbde6fa";
+      sha256 = "3ba8716be0a3ac3a85902cdca9b2de5923bf32904ef206412b77341f441d5ebb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ms/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ms/thunderbird-140.1.1esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "2b0721f403a74f8be55005d12d94285eaf91987ce5825226229d1b46d3253487";
+      sha256 = "444c096f12e7121f3891224ea533529937d825e7d167e6e962280cb990e8498f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nb-NO/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/nb-NO/thunderbird-140.1.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "ad58811895a5d76e06747c042f71c73985316be4461f21c72508b571281d0aae";
+      sha256 = "16d316019ceb2bb89f7982d8989f87a77795c020bb4b0144f8572b335ccddefa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/nl/thunderbird-140.1.1esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "31dc88fdddd5c5d1e57eb4af966e3422dae1576dcc02c37ef8bff1c8537eef85";
+      sha256 = "9f23477305f39b70c587fd821090f13236a5e159802837f5a1f0a928e420ca94";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nn-NO/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/nn-NO/thunderbird-140.1.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "9f9a0c43cccd2deca4427202b65a950eb6e36d9023cad37db8aa6ab69c5bb0db";
+      sha256 = "2b9dd6d30206a3c19216745bf97f928ed67e343189056ed78fa0f3d90267a8a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pa-IN/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pa-IN/thunderbird-140.1.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "98c87b5a49884e4672b82b2ef8df347437dd73ff5c4f8b69a4449b34c0c79862";
+      sha256 = "1b053c1d7a869649450aaf1c8eaba6e2655ce41dbdc631475094e8cf27877cef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pl/thunderbird-140.1.1esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "aa6a633d3311ef1973a0150244ebc57bc6503e8ac7993aa351633d3af5f1b98d";
+      sha256 = "0d6e31b038fb43ee8289bd0a55558afc108ee0962719bcbe9da37fac4cbeff2d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pt-BR/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pt-BR/thunderbird-140.1.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "67d348c101be5f0e94420f754e4461c9df7f01ac530363c80805cd5046cd5deb";
+      sha256 = "9627781755d71d886cd2204af2b650880cc2fcb58eaaecf4499f3a6053b5f208";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pt-PT/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pt-PT/thunderbird-140.1.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "22e6c640ae2bc2b5051a0859160b2352a066b82cef47d1552581a526e26c134d";
+      sha256 = "366026969b6aae8ffef5e2ee7acd42038749e45e13e754b42e6ee77366fbd2ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/rm/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/rm/thunderbird-140.1.1esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "38336e796e173197c97d25ff9d929937ab7970a8b45fa69194354877b29bbef5";
+      sha256 = "cdb9f3cb48dcabb38e75c0ec41660c8d82f0c0dfbb2b13784a09276466a3384e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ro/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ro/thunderbird-140.1.1esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "58fb4e078e97b5a8429ba5fbc2b1d519d222acc45684688d0007225647a293b2";
+      sha256 = "a0c34df83fa5cc06e65db07a922b569eca3e56f49745967c11102dfafc368788";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ru/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ru/thunderbird-140.1.1esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "3c9a8de3c90f5c15d80a408d91dfa3cb32fb6cee4ba0361459322e75edcdab39";
+      sha256 = "b9f209bb54d649cdcc48f0c6595f06211c90fbe8f2e3c1f5849f0ccace760e40";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sk/thunderbird-140.1.1esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "2a3e892f97bc8510c259dd321cfaf56278cffbbb2c0384708be4c39c1ffd3655";
+      sha256 = "4966be49d3205d4e1b8787f905cd6324e4ae7944bbf62211711a019fc76870d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sl/thunderbird-140.1.1esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "fe6924dcaa38c6c2c0d1cd15e7a5d1377cb84d0fc012a2f5287df293e1af082b";
+      sha256 = "3a7099b21c59d7ab78121a690201d1cc11ccd833a83dc0ca8a21803917154594";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sq/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sq/thunderbird-140.1.1esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "dcbdf0dc98cb36014af7aa6eed992a0f59aa675187aca18654087ec89af567bc";
+      sha256 = "1e6c192a966e370b71635c3b667f751d030ec94647ea4375935c27adfeaa5d77";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sr/thunderbird-140.1.1esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "4c1fb26634504c25f90d9f7ef068fe24a6b45e74b71fc0f1ea286d76a9a6a237";
+      sha256 = "430c02a5a7be79135503fd0ce959dfecee7e5de44018c4cb27901bc8a727c33b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sv-SE/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sv-SE/thunderbird-140.1.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "bb5050a394dd02fdbf2ec66a81b0743df1fd222ff4d3739ac15783e55a253076";
+      sha256 = "f1925d6fd429133598c8b79ad11ffb01f27ccc3f016da9321204ca92fd4848ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/th/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/th/thunderbird-140.1.1esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "45ce34a41fd4c791d0908e5cbce8c40dbd0cf6afe91092afc6b1220da4e7a622";
+      sha256 = "e19e8d275e1c898f7c69b9f76012808ce55d5ecbacc841beb603bfc7a6fd27f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/tr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/tr/thunderbird-140.1.1esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "517376a8eb347f46122ed145fd3ea857f54848055777dad9fa1e0747086300c1";
+      sha256 = "dc628f393b9090fd4609cce6866af90a704c9ee0f64ca4cfff09f23b8b0b45c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/uk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/uk/thunderbird-140.1.1esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "ac4b3d55d37d372accc01ff898aeb9b63567c896ca26cf11ab3e6a606b4be502";
+      sha256 = "adafffc44db7c8eb9f1725803da72012b17aa6df3ce5321aed953d607f6fcbc9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/uz/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/uz/thunderbird-140.1.1esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "c6dd141c2a3287c67d9a8d0291e229b0959c5d60fc2a1f364e27a4cca5b5e9e4";
+      sha256 = "09221ee37ce66aff9f63bb2a5217f3b7219754b8b7b920fb607ef301f164e547";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/vi/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/vi/thunderbird-140.1.1esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "10c501d1f7c7b19419c93e96e1d16b979a716a413e95dc564f716d3a17e4e57c";
+      sha256 = "a0a1234ce4d2370d263d50a3467c5327095c386943da4c01be4dd0ae95bd2c97";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/zh-CN/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/zh-CN/thunderbird-140.1.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "4c03277dffdb5fad1746a25084a1acd1c5598385b7637a814cbd50a451367a0c";
+      sha256 = "f89fee533f778038626f3c7fa69e09cbad6a1f79f8dd5045cdf645d3f16ba774";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/zh-TW/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/zh-TW/thunderbird-140.1.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "4caa008fd9db5a8857235dec756b65e699cae7fab055891fb18815bae3208097";
+      sha256 = "bcb095905122172714cb4a8f587c2eba8b882a71fa51c9668bd957a0cfad0eef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/af/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/af/thunderbird-140.1.1esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "5f4b14c25933ec409fb3d9572e014dac2684e5ca22453154906d51a3eae9c40c";
+      sha256 = "6cc4f11c76fbe3f2e3ee273e10ae69e58c0fd8ff14893e2e3077ede0a046ce6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ar/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ar/thunderbird-140.1.1esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "6b750f6fc7cfbbf1d31c9abba2eb6cf0e5dea5b453e00321ecdf2cbf37003580";
+      sha256 = "aa6572aa65a2049d5aae97740822f1ce6405328de8c28c51a43f161a4473d517";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ast/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ast/thunderbird-140.1.1esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "0ece544cfd1ef3ed853292a301571617ef2713997f79ef4085fecfdfb3fcb574";
+      sha256 = "1caae0a85b4b4f70336fafdf6f422213df8f1702ed3c2a5da19a261f7834426a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/be/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/be/thunderbird-140.1.1esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "8445c73f54a103d9877e88bc6e84488519a2b8505e079c13f3b76debe68dce63";
+      sha256 = "79e43954c8ec7f1a81f2145158d58a78f660dc7e09b1f0355b65199678c4ad76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/bg/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/bg/thunderbird-140.1.1esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "47761fd0d34f933752805e5cc9dc3f7442a3cce39935b286f5fcd0ecab843fad";
+      sha256 = "231a740b88896635a72857d592f004963ff0445885f107198a9562066ae81810";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/br/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/br/thunderbird-140.1.1esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "d020d8b0ab7d8c074ce039ed74ef99e9165019fd4133411c6cf3f265bcc307a1";
+      sha256 = "05b58365bb73e856bfd245ee8826ab3184c2ffd5614a8e2b163d942dbcc50e8b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ca/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ca/thunderbird-140.1.1esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "7c180bb8e449d82a572c278e454ab7a1f5d46df2da2c24bffedd688b8bfeb1d9";
+      sha256 = "a71da18c8bcd197aaf02041005abef2215f4ce4ac0ed3928572664e945e8e114";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cak/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/cak/thunderbird-140.1.1esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "c9b24186d006890348c41ede9d2dfce402ccbc2cb2ba5185a238fb59d1197c6b";
+      sha256 = "e4e5e7a6640c1e44d8ecb14ae850fb4d1b799a553ff3331ee601c5d324c93a04";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cs/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/cs/thunderbird-140.1.1esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "bbcca13731b5c39176703339b60085660bc16e282cff3741fbfa413f06cafc15";
+      sha256 = "7d9f928ee3762f1263e7d7e62cd4b64a1187bb4b35fe4585d909a2204fa41ccc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cy/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/cy/thunderbird-140.1.1esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "583351d8a8f03abc2d3fe3cac92f7ddf28c3fc5d718970361a168d223e46574a";
+      sha256 = "d82180d62d4d76f2fb2fe95d9f25f5e409910ef6d0d96d1de98b56bd11a70b2c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/da/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/da/thunderbird-140.1.1esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "27952731923609b9572b57376dc8da178dcda0b79a40bae31602a17da34ae9ee";
+      sha256 = "4fd3babf16ca6b7e5eb7572a887b4b7ef52740d6f3c6163a53321bfd61f55c11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/de/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/de/thunderbird-140.1.1esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "1800c1ca5215096e32a7df7a24186658630a57b493e9a44e4f74bbadb40aaaae";
+      sha256 = "0c365cccdd4b0de3f66f2b72858fc6bb28a7bc0a14787d3b3f41d8cfd5b5dde3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/dsb/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/dsb/thunderbird-140.1.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "eedd3e40313857803179ca96b748a533d7065cf259f9d124c780269a61629918";
+      sha256 = "7db8f759632c59b9ed6748f0749edd1ecbef9f3b2d6a3e298cd77f752ee091d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/el/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/el/thunderbird-140.1.1esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "84de3cd0f556c594ebe6e10dd899b366715f7000f9e73353c24514b70b35bd8e";
+      sha256 = "a8d1a0161c10f1f169bf55840813994f8c1b548bdec13a588f7fd87729ce4423";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-CA/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/en-CA/thunderbird-140.1.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "92e186709974e6d8bdc60d0045c25cb2bd7bdaab3ccdcb3421c30fa2e26dfc16";
+      sha256 = "8ef975087636a58dbc7466f4aebddedbc8f9d0708300fccbdcaf3a588f3610c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-GB/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/en-GB/thunderbird-140.1.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "7d1d61600099a211b44a2fe4b7c3995ca5965a501b1ae3326b513dbc26595072";
+      sha256 = "c1da1df9c9fea23f71cd03523d362931eb1e45f8c03cf89e3793dbcb76fc8f84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-US/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/en-US/thunderbird-140.1.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "4623dcd577de6a7bf1c27d62511577a92fb385fff78d1b6e3b8833ff33cd76e4";
+      sha256 = "c0047d20438a99c7d2bc936e6c5b713673c028c786b526c89a432d42b7defad3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-AR/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/es-AR/thunderbird-140.1.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "850acfc9a555c1f2804e97da30f49ef0d9fa599cb105607576a9667f2b21e5ef";
+      sha256 = "9a72134b0d3d0c8c9d927f4b62ac46abdc95a0c356588729beb03ca72d27db27";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-ES/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/es-ES/thunderbird-140.1.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "d7a020c404ac8410dd0e3232dd5b3e86678cffd6daf7f0426257450530b3e454";
+      sha256 = "2803618d6d57e7f684baedbbd363f3630ce0c1aad9cb20b8628258663846dc38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-MX/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/es-MX/thunderbird-140.1.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "6061acc4ef2d31807b05c040a6fcc6ff7ee4163fe2b7f1c2b2c328ddddf7f49a";
+      sha256 = "4b27c807a8924f15ec970247d4004e04761a6a03900becf9b92f97317d933bfa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/et/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/et/thunderbird-140.1.1esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "7d89492e8a4163f5a2ed0af2076dfe8cfbb61a0d520c857852d6b2a16a4c5d63";
+      sha256 = "c27b006c65b2a4be498d71e7db794d9071c3b57db797fee96fea88e78ff87f9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/eu/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/eu/thunderbird-140.1.1esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "a7d9a8587dbd66998640f4acf14ca68804007abc974beb6ce41f301e2a3a80bf";
+      sha256 = "72a63b9531ef73dfa331f3440e3e8963ad33aa6ccfb712c8a466ab2025451004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fi/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/fi/thunderbird-140.1.1esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "b73eece96944a0a2f1b09ba60669e38228fe70a936052c4c1c65373a6348bdfc";
+      sha256 = "4533513888fe7e5b14933f2171478f4694bc18da21d84762024407b2240a6729";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/fr/thunderbird-140.1.1esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "c5fd675249401d7fff4edf40b96359fbac733ab27001932e1adbb67f386d77d9";
+      sha256 = "fce8ed9c53637a57ec649b4246a8770e1e0ff6303820f329decb09d0f2f30af8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fy-NL/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/fy-NL/thunderbird-140.1.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "3f3c6b9114b3c41a543a9314a1157adb796480dec492c3db6445d93ca4cd111e";
+      sha256 = "8ad62f7d30d366e29debb8c38d2b34519773d33eb7cbb042b780d66c30a1a8db";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ga-IE/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ga-IE/thunderbird-140.1.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "f81b5f741586d19b9e501b26ec4f3a1e132a730d2368add86b25df10a152eabf";
+      sha256 = "089e521b1690ed1878e9bff96329c0d7b659d1dd0c51d134b23e29d6fd494f0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/gd/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/gd/thunderbird-140.1.1esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "330524b234f42f3828362a31e7daafd021cef7abe800e3c5a12829d7f91b22eb";
+      sha256 = "c697bb069bc2a01ff952fb5a6b735aebbcfcd5430c369078c50be945a082a4ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/gl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/gl/thunderbird-140.1.1esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "2be9e30b796eba8a282abbd8cc94fc311f0a9d5501e7a30c6112ceccaaa67a58";
+      sha256 = "1b68ede56cfe8e3e60760d9e18581570cf1733396c028a83f74c6ae9b8280e0c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/he/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/he/thunderbird-140.1.1esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "3c47ebe0dd8597b126215fd19b491cc9aa88287f8626832f0ce2fd7dcd65790f";
+      sha256 = "5d9c73f63868a2faec39837b500a37ea7187da3d468caa4333da666cea259a59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hr/thunderbird-140.1.1esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "86d4e30f4079e7582bf14d01e83a91585095dd0b5fccd95e169a8496d720d8f4";
+      sha256 = "4ce9e441a7945c3f400f262b48b6ecd7db576b131144bcdd9769d11677ac3b3a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hsb/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hsb/thunderbird-140.1.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "45b75eab27d8a74f5f7be211c7382612d37dcf9a9ad33d838648883b96a510bf";
+      sha256 = "823fc181b40237cb569634ee2cbaf1538e5b508fec748d92ec3b0bed7ee1615d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hu/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hu/thunderbird-140.1.1esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "c621ad7ff9a01e22cde05394a68ac4b54393bb58650b7763efe95617e0cd7242";
+      sha256 = "aaf03a448ed57b22e1c87dcf6de24a937099611699d6b5e567192c9f03f2c8f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hy-AM/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hy-AM/thunderbird-140.1.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "ec2afa8ac29bab5ff0c67fd1abfde2404db43c087ef860637ca0a933b2fef159";
+      sha256 = "e751a26797c842dd64ce6fc3712cb9101fcd15b7f7548a11efa7db8382af6191";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/id/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/id/thunderbird-140.1.1esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "aa0a1398aca929c4a9f2bced462434e05ae5d0562c0fba833d16c0961e9a1150";
+      sha256 = "e081ca14bb75d1c266e210ddc015276197303cea85744a3bde34999f8cc30bbd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/is/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/is/thunderbird-140.1.1esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "70ebc00f1bf1743c07abda9bf98df1c737753a27cd760b5d6a222a96b4043fcd";
+      sha256 = "7638ea46add63843183d2af644ba2fc0de7f5bc2c5e7e0fd8160edeabf962b3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/it/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/it/thunderbird-140.1.1esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "b23d8e005269f0ea3d4c97dca1fc21214265cf457ae2f8cba87db0cc60366302";
+      sha256 = "f8089c7ef857bd840e5b6b4639b808a5cf4b2328649f8e9aa6141f185a7aa652";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ja/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ja/thunderbird-140.1.1esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "8fbe63e06fd43c465e7619a819fa14de7b6d50fd04c58f2f3dde90d62cbfe5c1";
+      sha256 = "c860b26c7c4efc666198e5e77bae6be8b8a71695e47138404f2f180bbebdceb4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ka/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ka/thunderbird-140.1.1esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "8c6ecc716720492d4c466129954cf3ec83ed9ea8cff062a38cdb4b0a1712a697";
+      sha256 = "e7358880c8d23a1b8b3bb1cf422b36d729570005c4402b8d45a303017ed8356b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/kab/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/kab/thunderbird-140.1.1esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "bf3c6d10f74e3c02f5a17e92835218c4bd3130a1262902953bef49e767179c2a";
+      sha256 = "c8c4ccb172473da7ddf1c0ddaa02893841e7a626e8637a0e8131a9b5ac977339";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/kk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/kk/thunderbird-140.1.1esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "6da2e59a7cbd4e57f69e2a22b1bcd1afb502bfa10dd81c7b6190107c18bece02";
+      sha256 = "65f18363990578d048a278d26050bef7dd63aebc39e1ddbb4da7402f0ece5a8b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ko/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ko/thunderbird-140.1.1esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "b96b273d2dbaa51180a8c308b72a564a967b2fb0dc08497fdf1ac71354c16c55";
+      sha256 = "53cc7aa0a4514463bc9763e7e647c23b72222aa0e6b0967bb8ec4ace1c25ed87";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/lt/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/lt/thunderbird-140.1.1esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "db3a83fe0de9072d81710a0b8c1db55086a5d93cb3a10bfee9ec92e484a8310b";
+      sha256 = "413d6886dccab5d313c0e6ac960b46844116b65ba3f126ba7c3bee84bdb32c86";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/lv/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/lv/thunderbird-140.1.1esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "e5aec4225d1390edc4d69d1a4f501eda93b6ca282f37e229d82461ecf42d1eb5";
+      sha256 = "a778eec1eabf317759db6378e0aaeabc7cc371906424f257ea0660abc510c17b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ms/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ms/thunderbird-140.1.1esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "aaf32b80d7aa529ac7fa9aad46ad7cbd0c037f1cc6185f47b1a7ee4fd77bbcbf";
+      sha256 = "b36044e05b85912a270314d65ef32644b5eb65db219538c4e7830233b5760b9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nb-NO/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/nb-NO/thunderbird-140.1.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "720568948fd135e9d28631fa726ce3975c1a2c40f6f82081b9fb7b2b726861ad";
+      sha256 = "addba688057aa799ef23bcb5193016d1f31ed1673ae19d6db1daa7a1f6903eac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/nl/thunderbird-140.1.1esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "dc1859071f8c0dc792adc4782c13d09a05524b300ab3727a3bddc84526264271";
+      sha256 = "3099e74e36e02f895c5cc4881b2ccd1406e6b77093400d65c14938790bf0dbab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nn-NO/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/nn-NO/thunderbird-140.1.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "3efdaafa510c361ecf86ebe39b2ebf8cf43abeed88722021bdd1260e011c2257";
+      sha256 = "8b6d9515c24a85da4bafa1bbd295d254cd67fa5d741805d1c0fe889aea6dea6a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pa-IN/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pa-IN/thunderbird-140.1.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "d7897851dc39898ad4a37c14cd972dc05f8fd9b86d9ccda941e796ae396992c3";
+      sha256 = "ef189585918f5fdaad181c75603c7c5c3ec9902e56f05eb75e1508061a4c3a51";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pl/thunderbird-140.1.1esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "39d97c41476c2d15e8c6ec0f965faa0b7b5119a052478809f3f3fe6c65813169";
+      sha256 = "bdd972b7c3950f7cdaced6c9d860effd9be1fd14dfaddd9e1547ce828293b836";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pt-BR/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pt-BR/thunderbird-140.1.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "66118eeba5eed2de5cf39e98433d15f73ea3762560947d4f2c85eb7239cf5b7b";
+      sha256 = "408b669965291276cf31fba0f9aeb0343b42c2e1b8d03ce3a96ca65f09ddf483";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pt-PT/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pt-PT/thunderbird-140.1.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "d66ffea15d43ca7f13b8d66f73e2ea25c16e1ad193f2ba3bdd1f59e5a1c3a65d";
+      sha256 = "e80e3bec252fe673f481dbb22c48ebc1c45784817fcb6142d3ce5205039ca64c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/rm/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/rm/thunderbird-140.1.1esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "bb483f454a245c6ccca2b50703f434b08a88399ce2f1f9377dcaada2421d5bdc";
+      sha256 = "3b426eb5d30e63a1496addde69e486db32a72ea8daf0eb3c04dc7fdb32d9b926";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ro/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ro/thunderbird-140.1.1esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "6434fdf0b2deab3cff6a30247fa2157e385507f24ee8fee00b765b9291f7ec35";
+      sha256 = "56aa69817b8f9164832fd682f3f81d8c15d5b1e5332795861f1300bdd2a2611a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ru/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ru/thunderbird-140.1.1esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "17165a4d397223f0e5e5f36d1c7c16cc4deb8d45a0f8589b557375ba2d2c9f77";
+      sha256 = "3fbbdba3b49631c86a0f755da39f1326635732fd626c33ca01bb58fd2cc41c04";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sk/thunderbird-140.1.1esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "c698c16229b53cb9f5551a4fff8373ba5d21568aff3d9cfd32bd5dff4aac5697";
+      sha256 = "c044ae22b720fddef843627ca24deda9900dd10dac8556f1cfc3954d63b7a4f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sl/thunderbird-140.1.1esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "a391ba43c7bec4542d7e1ba5d79de802cb48622ce03548b8e275b38b8c6f683d";
+      sha256 = "1db44283d603e10e20e1957ead276ab7fd32b096b886304250f9379af8f0d246";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sq/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sq/thunderbird-140.1.1esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "19ceb1b451813da0b8583b9d22a1ad26fcec5abec1bad67add1ba6665eff8903";
+      sha256 = "c7e41bf70ba0f63896c2268a274aa5b21b73f30b9053d039c1ee2ecb55116123";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sr/thunderbird-140.1.1esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "717184b8698347eff1eff74e16ca8bb3e2d92ad98b511b12778291237aea5e8f";
+      sha256 = "0be7c47f1f7eb7367c91eaa7077d0fc737ee1a682007500232b84ef840b18a3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sv-SE/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sv-SE/thunderbird-140.1.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "9b4d6b8ab51492a70551dcdd3483672300b6d831e5c960033d8aa259fba1343e";
+      sha256 = "970561eebbfa661d3b57e8afb79cbc29430e8977f17c92f39da540ae74f9fe37";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/th/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/th/thunderbird-140.1.1esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "c3f534415fd18e98d38c91062abcc6e63d72dd32eed8dc28d28f51cec0f101b9";
+      sha256 = "a893872e1b2a61ffa15479be4531a94c3f0f9cce2a14474442de7213637739ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/tr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/tr/thunderbird-140.1.1esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "7f7a2f6f6e4e33bbbf5ccc7fc1913681ba1e15c1a79eb334896b10bec3e37c55";
+      sha256 = "debe95a6215f1216386fc02e6b2ce6fe06a2da81aa1bea21706ed549c26e39d8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/uk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/uk/thunderbird-140.1.1esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "90d4e6a42842549c7ae9e4a70ee268d66b1f0b9ce1554d293db6eaf727f4c01a";
+      sha256 = "3f9e93456ea40bad341c3c42100bda9293c594b3e0db935008078566962e6aea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/uz/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/uz/thunderbird-140.1.1esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "01cc8b145ce5e583ee8c466a0a6a206bf31c52034ee3c78f7383f4ee6f14877f";
+      sha256 = "5c50b03eb4ef9334ac6c7113131e0b6fe54753af4a5d167a8acb94b7e48fbf72";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/vi/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/vi/thunderbird-140.1.1esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "1d6e07c6c0bbb8a49d5b99215161820b1d4a88c429d21833eaa24b3d16c4267d";
+      sha256 = "be0eb2780b1b809173f0598e365b41a92370f732de753ae1d23e0a7fbaa59277";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/zh-CN/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/zh-CN/thunderbird-140.1.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "abcc3eec1c94cbae0f8018cf9c1969d2eb130fbf047e5b1e2800b0ec5331025f";
+      sha256 = "6f47a9e79002415581c03c909000a9906ab075259e70464e949aeb55261997cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/zh-TW/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/zh-TW/thunderbird-140.1.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "4d4eac590f9daa34b8b3fd0f9f5301c229c588bc0d21387e12da8e2abc061817";
+      sha256 = "c400336cd38d41aeb35a53b970c54db9a99e19e5dda98622be5e9a4cb1dff647";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/af/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/af/Thunderbird%20140.1.1esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "6a797be943da6f43fc98d37d5ee736889289944e1d45f45a5d1b3d5945cc4717";
+      sha256 = "797575efd5b5b12a3a99bf3f84e10f7f94521874708fead35b06ac12de67e4f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ar/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ar/Thunderbird%20140.1.1esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "c455e6854aa0a469b936f8522de9b597218d7beeb2216c740ff612118f9dbc24";
+      sha256 = "42525d2e79aa4e12868930952b7e1c6c609d25f7b0630c3f96daed87e446a7f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ast/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ast/Thunderbird%20140.1.1esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "80be9a5ca8052196a3aee5ee7700500128f56bb056f923909657b8d143a3ecc3";
+      sha256 = "29c634a3d625ce3be73efcc845b895603cfb68f37ea910447a297ef8c8078244";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/be/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/be/Thunderbird%20140.1.1esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "70203fb88a2bf57c58e6377c3155aa1ce1654f70e81063fd97255957839b5e16";
+      sha256 = "fe7f25672c7dd739dfdb54e0a403994de346eb2035dec31d64b7a7685f413874";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/bg/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/bg/Thunderbird%20140.1.1esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "355ec61efbc0bd6ecf3b9a3f67d9a7580409c731b34b24a13838f143c35d0f33";
+      sha256 = "d7bec82a811af8e1206ab9a5cee403c935c295d563aecd60cdb0bb019b195d78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/br/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/br/Thunderbird%20140.1.1esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "e5e815a56e0f18e9ab9b1c6eb294b91a92331485ad192f4b1852384dc8563586";
+      sha256 = "aae5b514cc03291e5910f0ce3527b0f36835192bb044541d2fc0083501de918a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ca/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ca/Thunderbird%20140.1.1esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "227a1f0c6116b84b983e049fee9b0d522262fec59e0803499fd1f1868bf64ceb";
+      sha256 = "f0c145866c6c75c6b8ca6945ab8490eed0520ab6ed7c62a22084fba5adcd01f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cak/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/cak/Thunderbird%20140.1.1esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "0dba62df1d3f0a9365980dd07898b8ae1bde285b17873eaa8464814430de6565";
+      sha256 = "4b1771496eb50682927c50defb86d0c4608b072c70d0bcc95f48e698d55af226";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cs/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/cs/Thunderbird%20140.1.1esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "e748f567c80162960b4331f53701feafae1ecb40c039e021083cc2abcc67560c";
+      sha256 = "d87b6287f3ff9aaa5bf6009d7f3a17b6e2e10f8ef97918182a45eeafcf3054cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cy/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/cy/Thunderbird%20140.1.1esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "eca67c8a05a65fd06f449f84ea5975ac0b59caaa077857da14b9a4f0fd098297";
+      sha256 = "ea62044eb217560f94a4238050c6a00825ee436ad6cf5bb9132015e0dc6b6e73";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/da/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/da/Thunderbird%20140.1.1esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "b6d2941d048312759f22dfb955cd1801253d7e2a45c233959f5e98f9eb5287ec";
+      sha256 = "ea9ee0aef81160c3b8c9d0429320967b868511f5e1f5bc74a7bf74b215d81a8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/de/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/de/Thunderbird%20140.1.1esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "006d50345a36eadde5f0bf5f0ff6261ee36d8131c400da96dc9204c0a2a8b38e";
+      sha256 = "85f90087813a73e85d8541314d4543dac0fbd0bff3053922b34539fc6253c453";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/dsb/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/dsb/Thunderbird%20140.1.1esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "43504f37d0354e41487fdf46ee7b195088cc8e2f0cab3d09f13c9d536aded828";
+      sha256 = "486cdbf698ed78d493d6cccf1a7f6eeac25db7226e29c5ca6024e59c1226d6cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/el/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/el/Thunderbird%20140.1.1esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "a674fdb18f0eaff4ee79f487d24255342871c4d2a29bccdb2a18657f223b91ed";
+      sha256 = "7b19d065927e6ff2dc3ec1fe2cfe147d84e60f2e50d91e788bfb0c46f1f6c1d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-CA/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/en-CA/Thunderbird%20140.1.1esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "f73ca1b9d7ac6298b4fe0fe4f5acc24cce1a8364753770d2b7377f0d6fcbefe9";
+      sha256 = "96f9b9e3f10e06111cb2f2f3889a21ba52e02691542fbe5db92e14b6157a215e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-GB/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/en-GB/Thunderbird%20140.1.1esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "595835f5feb16c4ab8d750a9e3f789938251b6a9d96a49f52259970e3c8186fa";
+      sha256 = "d96bab18d6f5d90f399be928796e5b83f713d36798f70dca31a98476594e9d9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-US/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/en-US/Thunderbird%20140.1.1esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "024189d914d2c9a53394eb05028774cca6abe99d47e8e300021e34db64887c22";
+      sha256 = "934eb7a4ed8516600c2bf8bccff3888e68448c8c77320e2a0097835b6639f922";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-AR/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/es-AR/Thunderbird%20140.1.1esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "1943196f84d02b9babd1533b6e92f8b5ad9d9806a4788ba8ff26c6e1214dc692";
+      sha256 = "f6fe9a754111f6103bab2de4d071e9178c141180cc0576df1680c1620c624e8d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-ES/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/es-ES/Thunderbird%20140.1.1esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "2d0cf209cfe79f4475cb3b7c04a35c44a1b4ebb1d48389a35e27916b588261ee";
+      sha256 = "e9d3f75885ff8d1b0e7094bf3e33b5752704c531928c38c75d56064b3bfa6810";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-MX/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/es-MX/Thunderbird%20140.1.1esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "0a481830400bef485fd6ac940ea316d1f9369392a982a87e96d8107118fe43d4";
+      sha256 = "c6ff81be8b3b25e019481ae6aa7e9bf5368c40b1f7d044cd1bf29023c322f274";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/et/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/et/Thunderbird%20140.1.1esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "dca18e1de621d50a755bbefbdfacad15d31b004b110c1e76005c1e83cfc64eb6";
+      sha256 = "96987565f5a1aef4cb515340d91b1fc876ee53da711f9d5af3e6641cceabdc84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/eu/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/eu/Thunderbird%20140.1.1esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "aecbb212b8cc978e7b419f4abef61bd8229658ddc8ce460c3cf32d6b9985db08";
+      sha256 = "66aacca35cc54596e9e1876609eb72a2f92af1692d5fd6cce81477decd92915e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fi/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/fi/Thunderbird%20140.1.1esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "e1bda1196cce483e4f00dfbdf89bce2c2ca90a42dedce17530db2e4f8cfa9b10";
+      sha256 = "8cb1a78debfebc3d54c2c7f5da45c3c05b06bcba85e7ccb51f222aa6d79e1739";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fr/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/fr/Thunderbird%20140.1.1esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "15d1952adb3602e2edbde88d5098b13153e5dc6161cd66578fa87252fccd25d2";
+      sha256 = "9d4cad3bef814f0718a69a6b3a9e676346c266dd8bf0b0b1e4451858e8d4c0e5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fy-NL/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/fy-NL/Thunderbird%20140.1.1esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "09d087f3d90c9ce4848d19e510e6edc03b11299c539f0ea943a15dc8e7fcac7b";
+      sha256 = "61b7b484547e911bc645e1b1673b5bede4b9a874090c12ac7d8c935a4ef09da2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ga-IE/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ga-IE/Thunderbird%20140.1.1esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "c216dbf1ff5e7a58aac7296415080b60ab7f6e691e4471799dba2850cfed93c5";
+      sha256 = "2198a3ef1bfd5c9d089a0a4a4e0a693695b82c07dd063c26536e15178c5d6ccb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/gd/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/gd/Thunderbird%20140.1.1esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "67c768d8f1968a2555456a9cb7a1c6775c12288ded166e53d438f9b6103d95e7";
+      sha256 = "76a58b5b79f38f6921d1011e58ec61e61a2f3e1e8dcf5d293e5da4a7112d4928";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/gl/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/gl/Thunderbird%20140.1.1esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "9865f2fe16c50f270b5c4c40982a4fc76f560f53520eac37f59d3a7826856799";
+      sha256 = "02459b648de1ead3884a81c2b34f4d55cb54350545834779a6bd8370a0e99e7e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/he/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/he/Thunderbird%20140.1.1esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "1073db739302522833fbfc9c0601365df0c5c6a4f65cc599d35b103fc377daf0";
+      sha256 = "d703010093db63fafcddb0476151fa5cac32f239d86744a79ff76dd2e418b273";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hr/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hr/Thunderbird%20140.1.1esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "e9097a7cdef7dca442ec139edc157e24639d54016345ef1551867a57351f3460";
+      sha256 = "8c61715202f7ebaa565a23fccf843b4a12fde8003d86ca682390cbeb78fc957f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hsb/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hsb/Thunderbird%20140.1.1esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "eafc388354c38c70ceee314f185707f042c870a4fccbe0241af6f47873a67348";
+      sha256 = "c59eaa7a992350649cf490ee00e7e03e3c9a581d5cd5b60779990578fb361d45";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hu/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hu/Thunderbird%20140.1.1esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "f2ad45f85a4a50bcdb954459e5eeeae334d014b00365d48d0043b506f329d3ad";
+      sha256 = "81a3e11b53bdf5418d60a5b527e4b1198a4e4c7fee7f9d92b07efa7a88a681c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hy-AM/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hy-AM/Thunderbird%20140.1.1esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "32db776e1ac01f9adc25e307099b0b17f381954a9929e58d7e1b6f101287aa74";
+      sha256 = "862f3693b60e3a35048ffaa408829433975390030b6a6a7da8d597205eac763d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/id/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/id/Thunderbird%20140.1.1esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "67e73e22fae4c379cb51caf399b2f2b867751ffb2156d2548be8af8ad13a09b8";
+      sha256 = "005b06b94a27268c4363d8185b61b0ca0a2b7e559e7b6adb7a07d3e20e4939bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/is/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/is/Thunderbird%20140.1.1esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "1f85b717feab1c85fdac4287cee002b81b215328955dee9ccf579dc004173d19";
+      sha256 = "55355ca4c324638b653ee1c574dd617205b65ab4147dba8e5426d6ddf9f1d28b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/it/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/it/Thunderbird%20140.1.1esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "2946891e2ccc87cdb74a60e25f27248d11ffa061c5890d2b02f8a6230ea9c851";
+      sha256 = "3ebb7b8188cd8c6793a549de0af43fedf3f8a7ae8d9d2a4334d752136164d61f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ja-JP-mac/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ja-JP-mac/Thunderbird%20140.1.1esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "2d53d41264d37c697a6c1730588197ac0fc0a91c835975473fccce8e46c8bca0";
+      sha256 = "e3b776bfcf7e78baf1b0702537c527e9c81ec1f7617056d530a4cf9f1410132b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ka/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ka/Thunderbird%20140.1.1esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "764825a8f1254b4d59fcbabca0a7850fbfb520ff116eff85c5dc48eca10743ad";
+      sha256 = "4837e71ad60f6c20404a643a29ffab095593b5a235da1fe6d9be6a932a07c0da";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/kab/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/kab/Thunderbird%20140.1.1esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "0e01d710f1bb3ac4441748f967a475f1c12444647d6d6eb67ed9605c2a77156d";
+      sha256 = "b4e97d509004c3c87fe1dd3ec2a45566d4b3b36de88fe41ea67a81864ba0958a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/kk/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/kk/Thunderbird%20140.1.1esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "afcc4d61b0a4733ed9addd694aca7e770c5db534b3a8bca905482dd45c2f03c5";
+      sha256 = "89a368c446c9a05fd32fc075106d49c9f9514f0439a67696d573695a050a2e24";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ko/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ko/Thunderbird%20140.1.1esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "2ddf7356e8f4e974a6b39599ca534334b651ba2ecf4f7617754e1245cce71083";
+      sha256 = "e06b01a16d1b236bf550a7c3646080845559abfeae21e6a3e3017a664864002d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/lt/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/lt/Thunderbird%20140.1.1esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "e3f5cdfcd01dd8b4f393a46cc5244acca057f0b149b36740ae08120721ea49eb";
+      sha256 = "369da53d044d5eb3e2ebaf3f7d03dce9777dd3052415330fbda37bf23f58cc98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/lv/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/lv/Thunderbird%20140.1.1esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "43ad9897e00bf8c45cfcdd52f8a92cff6227802ae7d7127e712153540d6a1b9f";
+      sha256 = "533e1725b732c4ce9ccffe96c3748e481298d660d0fc190c03816c8929ca0848";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ms/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ms/Thunderbird%20140.1.1esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "893260d2fbfd0d86d0242237c015eeba0d10ddbfab273df6249be2ea6cf1617b";
+      sha256 = "a6452269b4d9248da45fb9b2b9740685d4abf7e32f4e1c52ca3360560e3c0a49";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nb-NO/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/nb-NO/Thunderbird%20140.1.1esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "7f2237f0497b12b586e925e884e9759c1f973e3a59e24fb4cd79f113a2a10373";
+      sha256 = "59a82f4c4a20159eb7ed35882f87720a6c047a31e78e61a222c7480bcd1c711e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nl/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/nl/Thunderbird%20140.1.1esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "5326cb77442d6c547fb0e2010947f3433056d1f241f8eed8430b1af18ab7dc5b";
+      sha256 = "c1032863f047cdcc59504027572c0719500a6388368f61578a937c0d11d316b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nn-NO/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/nn-NO/Thunderbird%20140.1.1esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "0d6f2dbe354e679d4feb02a4cb56769435a20c25fc62730e5c0ec366c860510a";
+      sha256 = "7617c3582e2a4d1bab02ee76ac4e2f6cb301f0d9f764cf178a8e5b135add80b9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pa-IN/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pa-IN/Thunderbird%20140.1.1esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "e6170af13789dccc75a8ecb157f5b0eafb98bffc0963e10232a477e04a82aaef";
+      sha256 = "8a014b567aca2f29be9b2b12235f3bce26e632292a3ec5dfb5abe02156c62d66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pl/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pl/Thunderbird%20140.1.1esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "3ded93a7e935f40384ffabd539db653b1333537340c543ab672d8f2bd752a79b";
+      sha256 = "75459b73f1697314d7efd71f75c0fc722312a688f63cf408b11f63d228623065";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pt-BR/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pt-BR/Thunderbird%20140.1.1esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "483f1ca184263e15183b69e723c1bb0d91e44460eeb2610dc9e01534dd7a6fcf";
+      sha256 = "fe4643a894823a43b8026a71f1f2d98a83eaae61c295e2139d59325a5edeb78e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pt-PT/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pt-PT/Thunderbird%20140.1.1esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "3f151d6ace1296689a9e799ba603aa0c3d7f4a9d403d850697f620402b165626";
+      sha256 = "1d97c378456248514e8b0874c3c4e407c7a4b0a971d46d3e28ff9fd88ea03652";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/rm/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/rm/Thunderbird%20140.1.1esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "c6cf94d2a41ebdb82f6ff3fb8afd0f288f4333608f8d4134ccbf3a2fb4b9a97c";
+      sha256 = "9701c817cb919f0c75b08589837197f4c8d65c59c5fb2572014d14664eac04ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ro/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ro/Thunderbird%20140.1.1esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "815fa90ea0140a295e22e0c96c8fad12e65588cd1c3c63d045d65a29f408438c";
+      sha256 = "cfe268bfae42cf72baf53a65ab5b59f07c897e53650b8c4f7fc4e22e037cfe68";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ru/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ru/Thunderbird%20140.1.1esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "0e1e7ad53e63cb7aa861324fc501d3e49748168bcce0da3f943f7de18233c57c";
+      sha256 = "a904ded4e1e6554d8ec358a6355f44e091b2632595683c76dd1ebc1ed405e054";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sk/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sk/Thunderbird%20140.1.1esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "1f9b5b10cbecc8654722ea31d75a5c5ff64a5b894b27fa14d3ec749a57f9c276";
+      sha256 = "b0e5dde48ee7f62b94d88790e85cd39d4c43cea30bbff8c45dfd1d8e8ea2e007";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sl/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sl/Thunderbird%20140.1.1esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "10a132922864f0762c8efa63740227d2a3c6f9cb19ddfffd405690ecaa2e9765";
+      sha256 = "82922b0d994cea8f8f2746f729b06e827200801b3d7bfdfd52c043961630d6a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sq/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sq/Thunderbird%20140.1.1esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "51fdc11dec939d838afedf1c4d11b713c7c92e67338c2bcbe900f95fbd104614";
+      sha256 = "2ba790ad85c6ee2902be523e324de55723f03185d75c3678f191fbba1150a550";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sr/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sr/Thunderbird%20140.1.1esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "b31f2a1b388176288af887966e94dd01ff4b8e1f130b4dd3f4abf83118b016ad";
+      sha256 = "7598622285914fde08afbf7e3bfd7a73d45e45babe026f66da8df49303c84226";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sv-SE/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sv-SE/Thunderbird%20140.1.1esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "eb0fb0c40ca617a81955056f127ad39f859e4fde4af2ac41e1fc3aaed4a082f1";
+      sha256 = "c1da913ad66d451e39745af397e778470cec80fa1defad493cd2dd820e7bc94e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/th/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/th/Thunderbird%20140.1.1esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "38284a1aee298b6882fa421a5db528a8471f9878752fa159845fce2a724d9b67";
+      sha256 = "a3a50dacb30e3fc60f8bf9e71ed1f2edc7442ff88e0ec55b8903fe083bc06991";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/tr/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/tr/Thunderbird%20140.1.1esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "9c2744698829c19651c3de84cee70ad2ce1652d2c42519ab29b5ab18ff9d9805";
+      sha256 = "882e37d632ab22d7dc27d46e29b37f772b4fe5d54d6b5029d73382fcb5473e46";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/uk/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/uk/Thunderbird%20140.1.1esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "b2b1854ba1695fbdc66e14a8dd98409a20becc48e0ddefeda94fd3ed8a63953a";
+      sha256 = "70885ce0f0060db46c3ccb808ddf2c15020b489ff856b43825d8f065cb43a9e7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/uz/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/uz/Thunderbird%20140.1.1esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "8ba55a0821749f09d2ff038a30a9a8a0e75266b3c6bc327daed02e3060c21953";
+      sha256 = "4dd5fa09a91df2c274d53f638ae925fb543a10d6e8e265d624c861ac99ef6fc5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/vi/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/vi/Thunderbird%20140.1.1esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "db2b83dc7e7fec6792aa0a6749e516e1e75f7fe9253a59ab74289bd55b4307c0";
+      sha256 = "8017586e7c3f025e4f9f17839f744fec8f5eedf2a8ead01628b2d8e96dd4e3bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/zh-CN/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/zh-CN/Thunderbird%20140.1.1esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "0546cc58f6dedb258e6c01562099c93e373ba9f8b31c861976a8c99ab0776244";
+      sha256 = "e6d109cc54679a3dad37b183737762d74622629797896de20cc83752af3ae8a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/zh-TW/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/zh-TW/Thunderbird%20140.1.1esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "ac8e771b637cf67ac40644bb55945c09c6affd6292a925410368c5bc243d1782";
+      sha256 = "4d4736b5d11221baea9d5b30a10506cadc2a99deb90181d0714d90b164474145";
     }
   ];
 }

From c11587a49c653041d1a0e45cb240af940e3ea9ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 18:26:34 +0000
Subject: [PATCH 102/230] stevenblack-blocklist: 3.16.6 -> 3.16.9

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

diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 3e1eab82a26a..c1adec89769b 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.16.6";
+  version = "3.16.9";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-QrJGRXmyOz7sAxDeefZ/vdeX07RwNqX00WPuw6KOnsI=";
+    hash = "sha256-GLQLaiWBVdRatbq6OaydAddDREHPlHs/kr1QvQp/n1g=";
   };
 
   outputs = [

From f9af69f0b523a61913ceeacfcd6f2d17139a7994 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 6 Aug 2025 20:46:42 +0200
Subject: [PATCH 103/230] python313Packages.ytmusicapi: 1.10.3 -> 1.11.0

Diff: https://github.com/sigma67/ytmusicapi/compare/refs/tags/1.10.3...refs/tags/1.11.0

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

diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
index 8c9d734b5dc5..749bca4f0e89 100644
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ytmusicapi";
-  version = "1.10.3";
+  version = "1.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "sigma67";
     repo = "ytmusicapi";
     tag = version;
-    hash = "sha256-0JTuTGHAWG4lMKMvvtuNTRiYlfPsbhCNoGS0TJBZdCc=";
+    hash = "sha256-7GaxWLGmyxy5RlLoqXXmTM67eoIDf9IB3qjohZcNupU=";
   };
 
   build-system = [ setuptools-scm ];

From 46f007ef05cfe2e3e8f767dce933dd25a1a524db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 18:46:59 +0000
Subject: [PATCH 104/230] gosmee: 0.27.0 -> 0.28.0

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

diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix
index 91ae45ec3f46..f84542002a00 100644
--- a/pkgs/by-name/go/gosmee/package.nix
+++ b/pkgs/by-name/go/gosmee/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gosmee";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "gosmee";
     rev = "v${version}";
-    hash = "sha256-MoSfEnciYn+Lv695aZUl27o8VtmmKf0KbELLJb06hqY=";
+    hash = "sha256-RJYa6bpd3OUhHhj1vECy8LKSyfIdl2SHedhGgsJclSo=";
   };
   vendorHash = null;
 

From e2d26cb6772070e82ff35a784a1c8db04bc63b0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 18:48:52 +0000
Subject: [PATCH 105/230] tidy-viewer: 1.5.2 -> 1.6.0

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

diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 5917a06ec4dd..a10f60404767 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tidy-viewer";
-  version = "1.5.2";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "alexhallam";
     repo = "tv";
     rev = version;
-    sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4=";
+    sha256 = "sha256-ZiwZS7fww1dphEhJsScFfu1sBs35CB9LsGnI3qsyvrk=";
   };
 
-  cargoHash = "sha256-k/8crmGkFOLcakL5roYrSBVoYyGMELh1Mu/X6SlUeds=";
+  cargoHash = "sha256-Cd3yNqDZcvaO8H9IwSOvZ+HGQ85fubbBYztOCgy60ls=";
 
   # this test parses command line arguments
   # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context

From 1b5c7c7ee869655f2aa10a83c9b2211722f179f4 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 6 Aug 2025 18:51:37 +0000
Subject: [PATCH 106/230] =?UTF-8?q?apacheKafka:=203=5F9:=203.9.0=20?=
 =?UTF-8?q?=E2=86=92=203.9.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/servers/apache-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 71e3e6c97e1e..86a4d8f4f592 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -22,9 +22,9 @@ let
       nixosTest = nixosTests.kafka.base.kafka_4_0;
     };
     "3_9" = {
-      kafkaVersion = "3.9.0";
+      kafkaVersion = "3.9.1";
       scalaVersion = "2.13";
-      sha256 = "sha256-q8REAt3xA+OPGbDktE5l2pqDG6nlj9dyUEGxqhaO6NE=";
+      sha256 = "sha256-3UOZgW5niUbKt2470WhhA1VeabyPKrhobNpxqhW8MaM=";
       jre = jdk17_headless;
       nixosTest = nixosTests.kafka.base.kafka_3_9;
     };

From fd0d2966078485ae9635eb3a9293fc4c96fd152c Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 6 Aug 2025 18:54:08 +0000
Subject: [PATCH 107/230] =?UTF-8?q?apacheKafka:=203=5F7:=203.7.1=20?=
 =?UTF-8?q?=E2=86=92=203.7.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/servers/apache-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 86a4d8f4f592..0e7bcb3768c8 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -36,9 +36,9 @@ let
       nixosTest = nixosTests.kafka.base.kafka_3_8;
     };
     "3_7" = {
-      kafkaVersion = "3.7.1";
+      kafkaVersion = "3.7.2";
       scalaVersion = "2.13";
-      sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k=";
+      sha256 = "sha256-eZgLcO2D8R4so3qU1k6+QS1ImeI+YKAsJdQILzooLW8=";
       jre = jdk17_headless;
       nixosTest = nixosTests.kafka.base.kafka_3_7;
     };

From 755bf1b23778d99e09d124177041d38e47996299 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 6 Aug 2025 21:13:53 +0200
Subject: [PATCH 108/230] ntfy-sh: 2.13.0 -> 2.14.0

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

diff --git a/pkgs/by-name/nt/ntfy-sh/package.nix b/pkgs/by-name/nt/ntfy-sh/package.nix
index e35f59a6d09a..0a437fd65e31 100644
--- a/pkgs/by-name/nt/ntfy-sh/package.nix
+++ b/pkgs/by-name/nt/ntfy-sh/package.nix
@@ -17,7 +17,7 @@ buildGoModule (
     ui = buildNpmPackage {
       inherit (finalAttrs) src version;
       pname = "ntfy-sh-ui";
-      npmDepsHash = "sha256-oiOv4d+Gxk43gUAZXrTpcsfuEEpGyJMYS19ZRHf9oF8=";
+      npmDepsHash = "sha256-LmEJ7JuaAdjB816VspVXAQC+I46lpNAjwfLTxeNeLPc=";
 
       prePatch = ''
         cd web/
@@ -37,16 +37,16 @@ buildGoModule (
   in
   {
     pname = "ntfy-sh";
-    version = "2.13.0";
+    version = "2.14.0";
 
     src = fetchFromGitHub {
       owner = "binwiederhier";
       repo = "ntfy";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-D4wLIGVItH5lZlfmgd2+QsqB4PHlyX4ORpwT1NGdV60=";
+      hash = "sha256-8BqJ2/u+g5P68ekYu/ztzjdQ91c8dIazeNdLRFpqVy0=";
     };
 
-    vendorHash = "sha256-7+nvkyLcdQZ/B4Lly4ygcOGxSLkXXqCqu7xvCB4+8Wo=";
+    vendorHash = "sha256-3adQNZ2G0wKW3aV+gsGo/il6NsrIhGPbI7P4elWrKZQ=";
 
     doCheck = false;
 

From b9f7f0b6518898bec3d0abd5c2301973dc1e30dd Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 6 Aug 2025 11:54:54 -0700
Subject: [PATCH 109/230] python3Packages.langgraph-runtime-inmem: init at
 0.6.8

---
 .../langgraph-runtime-inmem/default.nix       | 61 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/python-modules/langgraph-runtime-inmem/default.nix

diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
new file mode 100644
index 000000000000..3dd52a5f6c7b
--- /dev/null
+++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  blockbuster,
+  langgraph,
+  langgraph-checkpoint,
+  sse-starlette,
+  starlette,
+  structlog,
+}:
+
+buildPythonPackage rec {
+  pname = "langgraph-runtime-inmem";
+  version = "0.6.8";
+  pyproject = true;
+
+  # Not available in any repository
+  src = fetchPypi {
+    pname = "langgraph_runtime_inmem";
+    inherit version;
+    hash = "sha256-chPmwJ+tUJoRK5xX9+r6mbYf95ZbX4Z3mP6Ra19nBxM=";
+  };
+
+  # 1.5.24 (now 1.5.25) only affects non-cpython builds
+  # upgrade: https://github.com/NixOS/nixpkgs/pull/431547
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "blockbuster>=1.5.24,<2.0.0" \
+     "blockbuster>=1.5.23,<2.0.0"
+  '';
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    blockbuster
+    langgraph
+    langgraph-checkpoint
+    sse-starlette
+    starlette
+    structlog
+  ];
+
+  pythonImportsCheck = [
+    "langgraph_runtime_inmem"
+  ];
+
+  # no tests
+  doCheck = false;
+
+  meta = {
+    description = "Inmem implementation for the LangGraph API server";
+    homepage = "https://pypi.org/project/langgraph-runtime-inmem/";
+    # no changelog
+    license = lib.licenses.elastic20;
+    maintainers = with lib.maintainers; [ sarahec ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5566867bdfd2..52e4c751c1f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7890,6 +7890,8 @@ self: super: with self; {
 
   langgraph-prebuilt = callPackage ../development/python-modules/langgraph-prebuilt { };
 
+  langgraph-runtime-inmem = callPackage ../development/python-modules/langgraph-runtime-inmem { };
+
   langgraph-sdk = callPackage ../development/python-modules/langgraph-sdk { };
 
   langid = callPackage ../development/python-modules/langid { };

From f0b3edd5f458ac460ec808742d1678d7fc21e375 Mon Sep 17 00:00:00 2001
From: Samuel Meenzen <samuel@meenzen.net>
Date: Wed, 6 Aug 2025 21:50:04 +0200
Subject: [PATCH 110/230] maintainers: add meenzen

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fa58894ad190..7668345f3895 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14910,6 +14910,13 @@
     githubId = 318066;
     name = "Mirco Bauer";
   };
+  meenzen = {
+    name = "Samuel Meenzen";
+    email = "samuel@meenzen.net";
+    matrix = "@samuel:mnzn.dev";
+    github = "meenzen";
+    githubId = 22305878;
+  };
   megheaiulian = {
     email = "iulian.meghea@gmail.com";
     github = "megheaiulian";

From 257b6154a9acfac0528624b3706b0ea0b257f828 Mon Sep 17 00:00:00 2001
From: Samuel Meenzen <samuel@meenzen.net>
Date: Wed, 6 Aug 2025 21:54:38 +0200
Subject: [PATCH 111/230] teams/dotnet: add meenzen

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

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index aa77c3245932..c6abddf7a765 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -255,6 +255,7 @@ with lib.maintainers;
       raphaelr
       jamiemagee
       anpin
+      meenzen
     ];
     scope = "Maintainers of the .NET build tools and packages";
     shortName = "dotnet";

From 364d91b2c48f7141d7e10ecd78d2551c43fa704a Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Wed, 6 Aug 2025 21:33:39 +0200
Subject: [PATCH 112/230] codex: 0.11.0 -> 0.14.0

Closes #431430
---
 pkgs/by-name/co/codex/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 0fe7f41b3b9f..266b0a02d045 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -14,18 +14,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.11.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-t7FgR84alnJGhN/dsFtUySFfOpGoBlRfP+D/Q6JPz5M=";
+    hash = "sha256-qpYkD8fpnlTJ7RLAQrfswLFc58l/KY0x8NgGl/msG/I=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-SNl6UXzvtVR+ep7CIoCcpvET8Hs7ew1fmHqOXbzN7kU=";
+  cargoHash = "sha256-oPWkxEMnffDZ7cmjWmmYGurYnHn4vYu64BhG7NhrxhE=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=includes_base_instructions_override_in_request" # Fails with 'stream ended unexpectedly: InternalAgentDied'
     "--skip=includes_user_instructions_message_in_request" # Fails with 'stream ended unexpectedly: InternalAgentDied'
     "--skip=originator_config_override_is_used" # Fails with 'stream ended unexpectedly: InternalAgentDied'
+    "--skip=azure_overrides_assign_properties_used_for_responses_url" # Panics
     "--skip=test_conversation_create_and_send_message_ok" # Version 0.0.0 hardcoded
     "--skip=test_send_message_session_not_found" # Version 0.0.0 hardcoded
     "--skip=test_send_message_success" # Version 0.0.0 hardcoded

From 6c6f15e13023c154a2473e13952330c685b2fcee Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 6 Aug 2025 22:13:43 +0200
Subject: [PATCH 113/230] monophony: 3.3.3 -> 3.4.0

Diff: https://gitlab.com/zehkira/monophony/-/compare/v3.3.3...v3.4.0
---
 pkgs/by-name/mo/monophony/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index 3d56ed07fd4f..1376064f9ac1 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -12,14 +12,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "monophony";
-  version = "3.3.3";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "zehkira";
     repo = "monophony";
     rev = "v${version}";
-    hash = "sha256-ET0cygX/r/YXGWpPU01FnBoLRtjo1ddXEiVIva71aE8=";
+    hash = "sha256-EchbebFSSOBrgk9nilDgzp5jAeEa0tHlJZ5l4wYpw0g=";
   };
 
   sourceRoot = "${src.name}/source";

From 551b38e6e6d86e36cfb0d74c4b0698e2cc90fb0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 20:22:47 +0000
Subject: [PATCH 114/230] vscode-extensions.catppuccin.catppuccin-vsc-icons:
 1.21.0 -> 1.23.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index bccdce35177f..2ed8eac2bb5d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -902,8 +902,8 @@ let
           mktplcRef = {
             name = "catppuccin-vsc-icons";
             publisher = "catppuccin";
-            version = "1.21.0";
-            hash = "sha256-rWExJ9XJ8nKki8TP0UNLCmslw+aCm1hR2h2xxhnY9bg=";
+            version = "1.23.0";
+            hash = "sha256-jnn169toS1zaixiOrtWjgOvv3UskM13vfFcvaQEesjU=";
           };
           meta = {
             changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog";

From 78cc9d109dd02d31e51c567a9bdb208c36e5d5a5 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Wed, 6 Aug 2025 22:36:09 +0200
Subject: [PATCH 115/230] portfolio: 0.78.0 -> 0.78.1

https://github.com/portfolio-performance/portfolio/releases/tag/0.78.1
---
 pkgs/by-name/po/portfolio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix
index 01c22a518f07..840989b77280 100644
--- a/pkgs/by-name/po/portfolio/package.nix
+++ b/pkgs/by-name/po/portfolio/package.nix
@@ -34,11 +34,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "PortfolioPerformance";
-  version = "0.78.0";
+  version = "0.78.1";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-f5xPXBzwa9VOutiG5uYQ5FqC6Avd+VAIyDlLW7db82Y=";
+    hash = "sha256-R6Z201767c61S/KAMtArzIuPjQbXMVym8KLZKMVdr+M=";
   };
 
   nativeBuildInputs = [

From ae5ed14c739d03683fbb87d34fab36140c1c3ec8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 21:03:38 +0000
Subject: [PATCH 116/230] leo-editor: 6.8.4 -> 6.8.6.1

---
 pkgs/applications/editors/leo-editor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index 51ca0eda2f00..59d20907f359 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -10,13 +10,13 @@
 
 mkDerivation rec {
   pname = "leo-editor";
-  version = "6.8.4";
+  version = "6.8.6.1";
 
   src = fetchFromGitHub {
     owner = "leo-editor";
     repo = "leo-editor";
     rev = version;
-    sha256 = "sha256-CSugdfkAMy6VFdNdSGR+iCrK/XhwseoiMQ4mfgu4F/E=";
+    sha256 = "sha256-3ojiIjsGJpPgVSUi0QhIddqwsDxfRWxhxAQ5YmzwZiQ=";
   };
 
   dontBuild = true;

From 8afbcd1eede638dc7bf7cac16ac466dab47a1e86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 21:24:07 +0000
Subject: [PATCH 117/230] gearlever: 3.3.4 -> 3.4.0

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

diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix
index 0841811a9a57..df4279d13344 100644
--- a/pkgs/by-name/ge/gearlever/package.nix
+++ b/pkgs/by-name/ge/gearlever/package.nix
@@ -23,14 +23,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gearlever";
-  version = "3.3.4";
+  version = "3.4.0";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "mijorus";
     repo = "gearlever";
     tag = version;
-    hash = "sha256-n7R4BiNxEy2uL6yg5h/L+l/EiQFTc5uND4ZVdERll08=";
+    hash = "sha256-3kTgYlsVumTVH5X6h3YvS0tdex/OGQyn5MzevQ+GuH4=";
   };
 
   postPatch =

From 6f3bed56f6cc5f576b9640eee4cc3d9c8081a51f Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 29 Jul 2025 12:28:47 +0800
Subject: [PATCH 118/230] paraview: 5.13.2 -> 6.0.0

---
 .../graphics/paraview/default.nix             | 137 ------------------
 pkgs/by-name/pa/paraview/package.nix          | 120 +++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 -
 3 files changed, 120 insertions(+), 139 deletions(-)
 delete mode 100644 pkgs/applications/graphics/paraview/default.nix
 create mode 100644 pkgs/by-name/pa/paraview/package.nix

diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
deleted file mode 100644
index f7c86c5920d7..000000000000
--- a/pkgs/applications/graphics/paraview/default.nix
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  fetchurl,
-  boost,
-  cmake,
-  ffmpeg,
-  libsForQt5,
-  gdal,
-  gfortran,
-  libXt,
-  makeWrapper,
-  ninja,
-  mpi,
-  python312,
-  tbb,
-  libGLU,
-  libGL,
-  withDocs ? true,
-}:
-
-let
-  version = "5.13.2";
-
-  docFiles = [
-    (fetchurl {
-      url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf";
-      name = "Tutorial.pdf";
-      hash = "sha256-jJ6YUT2rgVExfKv900LbSO+MDQ4u73K7cBScHxWoP+g=";
-    })
-    (fetchurl {
-      url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf";
-      name = "GettingStarted.pdf";
-      hash = "sha256-ptPQA8By8Hj0qI5WRtw3ZhklelXeYeJwVaUdfd6msJM=";
-    })
-    (fetchurl {
-      url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf";
-      name = "CatalystGuide.pdf";
-      hash = "sha256-Pl7X5cBj3OralkOw5A29CtXnA+agYr6kWHf/+KZNHow=";
-    })
-  ];
-
-in
-stdenv.mkDerivation rec {
-  pname = "paraview";
-  inherit version;
-
-  src = fetchFromGitLab {
-    domain = "gitlab.kitware.com";
-    owner = "paraview";
-    repo = "paraview";
-    rev = "v${version}";
-    hash = "sha256-29PLXVpvj8RLkSDWQgj5QjBZ6l1/0NoVx/qcJXOSssU=";
-    fetchSubmodules = true;
-  };
-
-  # Find the Qt platform plugin "minimal"
-  preConfigure = ''
-    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
-  '';
-
-  cmakeFlags = [
-    "-DPARAVIEW_ENABLE_FFMPEG=ON"
-    "-DPARAVIEW_ENABLE_GDAL=ON"
-    "-DPARAVIEW_ENABLE_MOTIONFX=ON"
-    "-DPARAVIEW_ENABLE_VISITBRIDGE=ON"
-    "-DPARAVIEW_ENABLE_XDMF3=ON"
-    "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
-    "-DPARAVIEW_USE_MPI=ON"
-    "-DPARAVIEW_USE_PYTHON=ON"
-    "-DVTK_SMP_IMPLEMENTATION_TYPE=TBB"
-    "-DVTKm_ENABLE_MPI=ON"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    "-DCMAKE_INSTALL_BINDIR=bin"
-    "-DOpenGL_GL_PREFERENCE=GLVND"
-    "-GNinja"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    makeWrapper
-    ninja
-    gfortran
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libGLU
-    libGL
-    libXt
-    mpi
-    tbb
-    boost
-    ffmpeg
-    gdal
-    libsForQt5.qtbase
-    libsForQt5.qtx11extras
-    libsForQt5.qttools
-    libsForQt5.qtxmlpatterns
-    libsForQt5.qtsvg
-  ];
-
-  postInstall =
-    let
-      docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc";
-    in
-    lib.optionalString withDocs ''
-      mkdir -p ${docDir};
-      for docFile in ${lib.concatStringsSep " " docFiles}; do
-        cp $docFile ${docDir}/$(stripHash $docFile);
-      done;
-    '';
-
-  propagatedBuildInputs = [
-    (python312.withPackages (
-      ps: with ps; [
-        numpy
-        matplotlib
-        mpi4py
-      ]
-    ))
-  ];
-
-  # 23k objects, >4h on a normal build slot
-  requiredSystemFeatures = [ "big-parallel" ];
-
-  meta = {
-    homepage = "https://www.paraview.org";
-    description = "3D Data analysis and visualization application";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ guibert ];
-    changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion version)}-release-notes";
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/pa/paraview/package.nix b/pkgs/by-name/pa/paraview/package.nix
new file mode 100644
index 000000000000..1c45ad96b1a3
--- /dev/null
+++ b/pkgs/by-name/pa/paraview/package.nix
@@ -0,0 +1,120 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cmake,
+  ninja,
+  qt6Packages,
+  protobuf,
+  vtk-full,
+  testers,
+}:
+let
+  paraviewFilesUrl = "https://www.paraview.org/files";
+  doc = fetchurl {
+    url = "${paraviewFilesUrl}/v6.0/ParaViewGettingStarted-6.0.0.pdf";
+    name = "GettingStarted.pdf";
+    hash = "sha256-2ghvb0UXa0Z/YGWzCchB1NKowRdlC/ZQCI3y0tZUdbo=";
+  };
+  examples = fetchurl {
+    # see https://gitlab.kitware.com/paraview/paraview-superbuild/-/blob/v6.0.0/versions.cmake?ref_type=tags#L21
+    url = "${paraviewFilesUrl}/data/ParaViewTutorialData-20220629.tar.gz";
+    hash = "sha256-OCLvWlwhBL9R981zXWZueMyXVeiqbxsmUYcwIu1doQ4=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "paraview";
+  version = "6.0.0";
+
+  src = fetchurl {
+    url = "${paraviewFilesUrl}/v${lib.versions.majorMinor finalAttrs.version}/ParaView-v${finalAttrs.version}.tar.xz";
+    hash = "sha256-DuB65jd+Xpd2auv4WOuXWGaKUt8EHzGefJdQN6Y78Yk=";
+  };
+
+  # When building paraview with external vtk, we can not infer resource_dir
+  # from the path of vtk's libraries. Thus hardcoding the resource_dir.
+  # See https://gitlab.kitware.com/paraview/paraview/-/issues/23043.
+  postPatch = ''
+    substituteInPlace Remoting/Core/vtkPVFileInformation.cxx \
+      --replace-fail "return resource_dir;" "return \"$out/share/paraview\";"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    qt6Packages.wrapQtAppsHook
+    vtk-full.vtkPackages.python3Packages.pythonRecompileBytecodeHook
+  ];
+
+  # propagation required by paraview-config.cmake
+  propagatedBuildInputs = [
+    qt6Packages.qttools
+    qt6Packages.qt5compat
+    protobuf
+    vtk-full
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "PARAVIEW_VERSIONED_INSTALL" false)
+    (lib.cmakeBool "PARAVIEW_BUILD_WITH_EXTERNAL" true)
+    (lib.cmakeBool "PARAVIEW_USE_EXTERNAL_VTK" true)
+    (lib.cmakeBool "PARAVIEW_USE_QT" true)
+    (lib.cmakeBool "PARAVIEW_USE_MPI" true)
+    (lib.cmakeBool "PARAVIEW_USE_PYTHON" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_WEB" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_CATALYST" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_VISITBRIDGE" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_ADIOS2" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_FFMPEG" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_FIDES" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_ALEMBIC" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_LAS" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_GDAL" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_PDAL" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_OPENTURNS" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_MOTIONFX" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_OCCT" true)
+    (lib.cmakeBool "PARAVIEW_ENABLE_XDMF3" true)
+    (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+    (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/paraview/doc")
+  ];
+
+  postInstall = ''
+    install -Dm644 ${doc} $out/share/paraview/doc/${doc.name}
+    mkdir -p $out/share/paraview/examples
+    tar --strip-components=1 -xzf ${examples} -C $out/share/paraview/examples
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm644 ../Qt/Components/Resources/Icons/pvIcon.svg $out/share/icons/hicolor/scalable/apps/paraview.svg
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ln -s ../Applications/paraview.app/Contents/MacOS/paraview $out/bin/paraview
+  '';
+
+  passthru.tests = {
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "ParaView" ];
+
+      package = finalAttrs.finalPackage;
+
+      nativeBuildInputs = [
+        qt6Packages.wrapQtAppsHook
+      ];
+    };
+  };
+
+  meta = {
+    description = "3D Data analysis and visualization application";
+    homepage = "https://www.paraview.org";
+    changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion finalAttrs.version)}-release-notes";
+    mainProgram = "paraview";
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      guibert
+      qbisi
+    ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b495db757c3a..382d73ca4a4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13350,8 +13350,6 @@ with pkgs;
 
   parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
 
-  paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
-
   pekwm = callPackage ../by-name/pe/pekwm/package.nix {
     awk = gawk;
     grep = gnugrep;

From 05ac252f0b1f8bf7a7f5bb67e6e2c807b1d52494 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 22:03:14 +0000
Subject: [PATCH 119/230] yaralyzer: 1.0.0 -> 1.0.6

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

diff --git a/pkgs/by-name/ya/yaralyzer/package.nix b/pkgs/by-name/ya/yaralyzer/package.nix
index 53f45a74cfc0..c6e488308fea 100644
--- a/pkgs/by-name/ya/yaralyzer/package.nix
+++ b/pkgs/by-name/ya/yaralyzer/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "yaralyzer";
-  version = "1.0.0";
+  version = "1.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "michelcrypt4d4mus";
     repo = "yaralyzer";
     tag = "v${version}";
-    hash = "sha256-HrYO7Fz9aLabx7nsilo/b/xe6OOzIq0P2PzVFtAPNEU=";
+    hash = "sha256-zaC33dlwjMNvvXnxqrEJvk3Umh+4hYsbDWoW6n6KmCk=";
   };
 
   pythonRelaxDeps = [

From ce0a6d379e0ddbb10e126bbcff30e70dcb4e884a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 22:21:45 +0000
Subject: [PATCH 120/230] docker-language-server: 0.14.0 -> 0.15.0

---
 pkgs/by-name/do/docker-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix
index b8e6f88bca78..4b94c4966937 100644
--- a/pkgs/by-name/do/docker-language-server/package.nix
+++ b/pkgs/by-name/do/docker-language-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "docker-language-server";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker-language-server";
     tag = "v${version}";
-    hash = "sha256-ht63NilujpbDhBjkzCNpY95AAuwqya37qchgqKLlTw8=";
+    hash = "sha256-cxLg0fLUC4dj3QUax+vIsJENRXNifbXMoRkldM44i+0=";
   };
 
-  vendorHash = "sha256-w7CDl27178oe/DpfqSbNbyOsR3D34EpcCMZNQ7i3JE4=";
+  vendorHash = "sha256-xvRHxi7aem88mrmdAmSyRNtBUSZD4rjUut2VjPeoejg=";
 
   nativeCheckInputs = [
     docker

From faaf3ce13e93fd26c310ed470422fa18915b983b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 22:21:52 +0000
Subject: [PATCH 121/230] devbox: 0.15.0 -> 0.15.1

---
 pkgs/development/tools/devbox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index a3ebc1d70688..e2c8c4f5b456 100644
--- a/pkgs/development/tools/devbox/default.nix
+++ b/pkgs/development/tools/devbox/default.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "devbox";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "jetify-com";
     repo = pname;
     rev = version;
-    hash = "sha256-LAYGjpaHxlolzzpilD3DOvd+J0eNJ0p+VdRayGQvUWo=";
+    hash = "sha256-ANbIwR3XiphHbaeg3YtwtHZ9UbwK3BOnPb5ZF1EJtEw=";
   };
 
   ldflags = [
@@ -27,7 +27,7 @@ buildGoModule rec {
   # integration tests want file system access
   doCheck = false;
 
-  vendorHash = "sha256-cBRdJUviqtzX1W85/rZr23W51mdjoEPCwXxF754Dhqw=";
+  vendorHash = "sha256-0lDPK9InxoQzndmQvhKCYvqEt2NL2A+rt3sGg+o1HTY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 36096a8100c32748ed32a4738dcdb927975e9bf3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 22:22:27 +0000
Subject: [PATCH 122/230] dnscontrol: 4.22.0 -> 4.23.0

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

diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix
index e0ce8ce31bf0..f32409a95402 100644
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "4.22.0";
+  version = "4.23.0";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = "dnscontrol";
     tag = "v${version}";
-    hash = "sha256-5K2o0qa+19ur6axDrVkhDDoTMzRO/oNYIGJciIKGvII=";
+    hash = "sha256-Jaa+geO2836kQHTRhaQru367iQvqac6sgnpL9244dkw=";
   };
 
-  vendorHash = "sha256-hniL/pFbYOjpLuAHdH0gD0kFKnW9d/pN7283m9V3e/0=";
+  vendorHash = "sha256-PbOqi9vfz46lwoP3aUPl/JKDJtYYF7IwnN9lppZ8KYA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 55246dbd95ec293c39841c59b397e67b61290855 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 22:28:37 +0000
Subject: [PATCH 123/230] cargo-xwin: 0.19.1 -> 0.19.2

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

diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index c1480ed4f380..385ca3818024 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xwin";
-  version = "0.19.1";
+  version = "0.19.2";
 
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
     rev = "v${version}";
-    hash = "sha256-rmbu3WNwCmgojAWAthIQ9/XiSS04d9DoZwGRGAuRfDw=";
+    hash = "sha256-qWHpExVt/a20GrP2uVvGbubF+Nr71Ob6abGLcnlpKJc=";
   };
 
-  cargoHash = "sha256-7xpkxJh5KVJVw6wQZGr2daU1qg0e969EWflf4Z/01oY=";
+  cargoHash = "sha256-HctMp95J8ovYuvh7m5wxrNt+ZCVCzwPSSm71Ma1cVxI=";
 
   meta = with lib; {
     description = "Cross compile Cargo project to Windows MSVC target with ease";

From 66032663e5249b1b50a33f51dbd43639f97d404d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 22:49:32 +0000
Subject: [PATCH 124/230] gitmux: 0.11.3 -> 0.11.5

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

diff --git a/pkgs/by-name/gi/gitmux/package.nix b/pkgs/by-name/gi/gitmux/package.nix
index 34d9b718e0cd..8c8eb0f9aae0 100644
--- a/pkgs/by-name/gi/gitmux/package.nix
+++ b/pkgs/by-name/gi/gitmux/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitmux";
-  version = "0.11.3";
+  version = "0.11.5";
 
   src = fetchFromGitHub {
     owner = "arl";
     repo = "gitmux";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Jw2yl95vCQ5JcRGvBeLlGuAagTHUf+IEF7XvzehcMvU=";
+    sha256 = "sha256-TObnmV/NiMCcyC9zG0OcCuCqUChQZmpqPptQUDtF85A=";
   };
 
   vendorHash = "sha256-MvvJGB9KPMYeqYclmAAF6qlU7vrJFMPToogbGDRoCpU=";

From 84fb6b57573396b671fb533894dd111208a78bf5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 7 Aug 2025 09:04:19 +1000
Subject: [PATCH 125/230] go_1_23: 1.23.11 -> 1.23.12

Changelog: https://go.dev/doc/devel/release#go1.23.12
---
 pkgs/development/compilers/go/1.23.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index 7777d9da57f1..4931643a5c1d 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.23.11";
+  version = "1.23.12";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-KWOBYHpIOoqGZ9dpUzF1L5Sh8jHCBOJSfS8i4ePRJH0=";
+    hash = "sha256-4czpN5ok6JVxSkEsfd0VfSYU2e2+g6hESbbhhAtPEiY=";
   };
 
   strictDeps = true;

From b889ceecae59f7e4b5477607a9688f6706ddc788 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 7 Aug 2025 09:02:25 +1000
Subject: [PATCH 126/230] go_1_25: 1.25rc2 -> 1.25rc3

---
 pkgs/development/compilers/go/1.25.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix
index e16420b80e38..5ca1b35dcebf 100644
--- a/pkgs/development/compilers/go/1.25.nix
+++ b/pkgs/development/compilers/go/1.25.nix
@@ -28,11 +28,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.25rc2";
+  version = "1.25rc3";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-5jFKMjTEwDuNAGvNHRRZTZKBcNGES23/3V+lojM0SeE=";
+    hash = "sha256-Rw4LjnCmjyhV59AJ8TXsgLPRgIXSxOU323Xmrkliv3Q=";
   };
 
   strictDeps = true;

From d64d3a00d14bf656895b9a6e5e7666a4f9394c8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 23:27:56 +0000
Subject: [PATCH 127/230] plasmusic-toolbar: 3.2.0 -> 3.3.0

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

diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
index 689822e6500c..3e115a19e3ab 100644
--- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plasmusic-toolbar";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "ccatterina";
     repo = "plasmusic-toolbar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Epix3gqQGc8MXMcoQ1YxrEXafuPZUOTKdute5eoJ2nI=";
+    hash = "sha256-Kjzutah8CIHN3NZcxGB1FXlCNn5dnTQxJITUptaXNrs=";
   };
 
   installPhase = ''

From e01d96c25ac15c406250b73e071d9dcd337d2093 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 7 Aug 2025 01:34:27 +0200
Subject: [PATCH 128/230] python3Packages.pylance: 0.32.0 -> 0.32.1

Diff: https://github.com/lancedb/lance/compare/refs/tags/v0.32.0...refs/tags/v0.32.1

Changelog: https://github.com/lancedb/lance/releases/tag/v0.32.1
---
 pkgs/development/python-modules/pylance/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 3213913fe641..236d7c69e553 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "pylance";
-  version = "0.32.0";
+  version = "0.32.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${version}";
-    hash = "sha256-hVWyZv978hDjAOdk4S9S9RJOkxqhOL0ZBpi4wGk0h1c=";
+    hash = "sha256-P40m8ak0A2l4zGAYcbvXGidQpIT3+ayERbleWcVuLbE=";
   };
 
   sourceRoot = "${src.name}/python";
@@ -51,7 +51,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-ZUNAZsOpLdpdsKhIp/6QD3Ys7MOeO6H3ve8au7g+riU=";
+    hash = "sha256-rCaLREl2LSfpu0vwa1Vx2rQ7phWsGz58RTjo6yfHKLU=";
   };
 
   nativeBuildInputs = [

From a49c2d006ab07a5e89fa5dbf133d2f4942f4a8a1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 7 Aug 2025 01:35:49 +0200
Subject: [PATCH 129/230] python3Packages.sentence-transformers: 5.0.0 -> 5.1.0

Diff: https://github.com/UKPLab/sentence-transformers/compare/refs/tags/v5.0.0...refs/tags/v5.1.0

Changelog: https://github.com/UKPLab/sentence-transformers/releases/tag/v5.1.0
---
 .../python-modules/sentence-transformers/default.nix         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix
index 4a79c6daf465..4872c23b0d31 100644
--- a/pkgs/development/python-modules/sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/sentence-transformers/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "sentence-transformers";
-  version = "5.0.0";
+  version = "5.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "UKPLab";
     repo = "sentence-transformers";
     tag = "v${version}";
-    hash = "sha256-7HdeNyB3hMJEwHenN2hUEGG2MdQ++nF3nyAYJv7jhyA=";
+    hash = "sha256-snowpTdHelcFjo1+hvqpoVt5ROB0f91yt0GsIvA5cso=";
   };
 
   build-system = [ setuptools ];
@@ -122,6 +122,7 @@ buildPythonPackage rec {
     "tests/test_pretrained_stsb.py"
     "tests/test_sentence_transformer.py"
     "tests/test_train_stsb.py"
+    "tests/util/test_hard_negatives.py"
   ];
 
   # Sentence-transformer needs a writable hf_home cache

From 3af30070e6fe4dce3933ad33adfd1564deca9f4e Mon Sep 17 00:00:00 2001
From: Julius Michaelis <gitter@liftm.de>
Date: Thu, 7 Aug 2025 09:09:39 +0900
Subject: [PATCH 130/230] osrm-backend: evade -Werror, fix build

---
 pkgs/by-name/os/osrm-backend/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix
index accbb1f514c7..db8e0cba01d8 100644
--- a/pkgs/by-name/os/osrm-backend/package.nix
+++ b/pkgs/by-name/os/osrm-backend/package.nix
@@ -45,8 +45,12 @@ stdenv.mkDerivation rec {
     expat
   ];
 
-  # Needed with GCC 12
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=uninitialized";
+  env.NIX_CFLAGS_COMPILE = toString [
+    # Needed with GCC 12
+    "-Wno-error=uninitialized"
+    # Needed with GCC 14
+    "-Wno-error=maybe-uninitialized"
+  ];
 
   postInstall = ''
     mkdir -p $out/share/osrm-backend

From 843b30fb37a37109d10ac30e4c0082a92f201714 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 00:27:06 +0000
Subject: [PATCH 131/230] api-linter: 1.70.1 -> 1.70.2

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

diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix
index 1c3c32f50cf6..6eeb224c6b88 100644
--- a/pkgs/by-name/ap/api-linter/package.nix
+++ b/pkgs/by-name/ap/api-linter/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "api-linter";
-  version = "1.70.1";
+  version = "1.70.2";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "api-linter";
     tag = "v${version}";
-    hash = "sha256-Jztu8xQWLeJVSk+yx3julu0wkQNpgQtzZvrKP71T7Eg=";
+    hash = "sha256-2ILG+FW+58WnmL5Ts1K32ee0SR15yp9NnEtmEo6r6w8=";
   };
 
-  vendorHash = "sha256-wIZdL393uPVqz0rJV5NU6SHm8RU5orrHREhKbjBHTYU=";
+  vendorHash = "sha256-CHObiSQudxZw5KjimQk8myTsLeQMBZU8SewW4I2dNsw=";
 
   subPackages = [ "cmd/api-linter" ];
 

From 299e4f14bd9170f40ea4e9d0bd7a9e9c22ee0dfe Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 7 Aug 2025 00:35:08 +0000
Subject: [PATCH 132/230] chhoto-url: 6.2.11 -> 6.2.12

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.2.12
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.2.11...6.2.12
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index e1af552d8fe9..2f73b19d3f68 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.2.11";
+  version = "6.2.12";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-3VQmTQ6ZlDTRL3nx/sQxWLKgW8ee0Ts+C1CiWkiX2/g=";
+    hash = "sha256-hV/YWxOPRTojVTFIXwzqImBKyQ1dCDq5+bgCdS7T1p0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-QIqLzk/vAOrW0ain0Oq9tnqzCSyK4yDOYsjmil3xPc4=";
+  cargoHash = "sha256-9wXbd56KOQ7suZqtg2cSFf2FGQJADFMHJbwAAxJ2V4g=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From 9d79513527441334ac11824a60bb20fd54d29a77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 01:16:02 +0000
Subject: [PATCH 133/230] go-mockery: 3.5.1 -> 3.5.2

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

diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix
index 88b5fb146541..4979e3a000e1 100644
--- a/pkgs/by-name/go/go-mockery/package.nix
+++ b/pkgs/by-name/go/go-mockery/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-mockery";
-  version = "3.5.1";
+  version = "3.5.2";
 
   src = fetchFromGitHub {
     owner = "vektra";
     repo = "mockery";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x7WniZ4wpnuzUHM2ZC2P7Ns67bIp4V4F9f4xQEJONEk=";
+    hash = "sha256-/OMUL/C/uUKT5GvEd3ylpS72XfGTnD+J7EuOR1LovB0=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-cNMknwlU7ENwN67CtyU1YgYIXCJbh4b7Z3oUK7kkEkk=";
+  vendorHash = "sha256-PAJymNrl83knDXP9ukUbfEdtabE4+k16Ygzwvfu5ZR8=";
 
   ldflags = [
     "-s"

From 51682d51841149d5ef316cd84a95b40add1679ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 01:35:04 +0000
Subject: [PATCH 134/230] mantra: 2.0 -> 3.1

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

diff --git a/pkgs/by-name/ma/mantra/package.nix b/pkgs/by-name/ma/mantra/package.nix
index fb4716103863..23ccad5f42c6 100644
--- a/pkgs/by-name/ma/mantra/package.nix
+++ b/pkgs/by-name/ma/mantra/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mantra";
-  version = "2.0";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "MrEmpy";
     repo = "Mantra";
     tag = "v${version}";
-    hash = "sha256-fBcoKoTBGCyJS8+mzKXLGxcxmRsCcZFZEyMTnA5Rkbw=";
+    hash = "sha256-DnErXuMbCRK3WxhdyPj0dOUtGnCcmynPk/hYmOsOKVU=";
   };
 
   vendorHash = null;

From 27db9027d4fb85a81389cab92f3bd3097113d4ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 01:52:09 +0000
Subject: [PATCH 135/230] n98-magerun2: 9.0.1 -> 9.0.2

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

diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix
index cbba74364510..baa1f07955ec 100644
--- a/pkgs/by-name/n9/n98-magerun2/package.nix
+++ b/pkgs/by-name/n9/n98-magerun2/package.nix
@@ -7,16 +7,16 @@
 
 php83.buildComposerProject2 (finalAttrs: {
   pname = "n98-magerun2";
-  version = "9.0.1";
+  version = "9.0.2";
 
   src = fetchFromGitHub {
     owner = "netz98";
     repo = "n98-magerun2";
     tag = finalAttrs.version;
-    hash = "sha256-Lq9TEwhcsoO4Cau2S7i/idEZYIzBeI0iXX1Ol7LnbAo=";
+    hash = "sha256-v6Be9yODeac4ZLYfHXZTLMcfzjKGDXD7jz7kmI/z8wo=";
   };
 
-  vendorHash = "sha256-JxUVqQjSBh8FYW1JbwooHHkzDRtMRaCuVO6o45UMzOk=";
+  vendorHash = "sha256-vaRRxtHu/ZFc+Z38KJjm0iUncFYUfRLkk7A3+T1p4+I=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From 3eb986966d3ad71326f6d6ec83052932f521bfe4 Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Thu, 7 Aug 2025 01:57:21 +0000
Subject: [PATCH 136/230] zed-editor: 0.197.6 -> 0.198.2

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.198.2
---
 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 b651ddd6dff1..fb0f068266db 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.197.6";
+  version = "0.198.2";
 
   outputs = [
     "out"
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+QynG2YvAxl3v6Rb89+wv4wSSrBKYKeYfmoQ6pGLa4w=";
+    hash = "sha256-0BX8LFoW4VpTN2jSJqp/Y+urpLy8Llxyvfr5O4brCSA=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
     '';
 
-  cargoHash = "sha256-O5HUOVtaxUdanh83JjauUskMnEv+y7BWY6S7T4WbgyE=";
+  cargoHash = "sha256-H8ns6LrHHgND41KyhpXjdtLToIEHBu0I3vNRLAjtPTY=";
 
   nativeBuildInputs = [
     cmake

From 951edb4eaee11ba33f6c2221199cc0afa12baf39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 02:05:23 +0000
Subject: [PATCH 137/230] python3Packages.wavinsentio: 0.5.0 -> 0.5.4

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

diff --git a/pkgs/development/python-modules/wavinsentio/default.nix b/pkgs/development/python-modules/wavinsentio/default.nix
index add20789e5b9..8532e94d4742 100644
--- a/pkgs/development/python-modules/wavinsentio/default.nix
+++ b/pkgs/development/python-modules/wavinsentio/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "wavinsentio";
-  version = "0.5.0";
+  version = "0.5.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YSofEjDehuNlenkAsQzLkX67Um4pkMSeZmVZgNA06vw=";
+    hash = "sha256-FlxeOaqQkJBWQtEUudbwlCzkK6HWmWTIxjgaI80BlxQ=";
   };
 
   build-system = [ setuptools ];

From 6846a2c93480616e34b9633dd603dfdd302f55e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 02:55:40 +0000
Subject: [PATCH 138/230] pulumi-esc: 0.15.0 -> 0.17.0

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

diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix
index 6af30e42da25..63327480a74c 100644
--- a/pkgs/by-name/pu/pulumi-esc/package.nix
+++ b/pkgs/by-name/pu/pulumi-esc/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pulumi-esc";
-  version = "0.15.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "esc";
     rev = "v${version}";
-    hash = "sha256-mBFxR3Sl89TVE+G/+pr5KlMl2oWUmQr41VfZpOyNU6k=";
+    hash = "sha256-rdoq+Zx+NVJZrVon/OfJIAvEyCWEawSHRLxLBUFR9uY=";
   };
 
   subPackages = "cmd/esc";

From 1144413d315ea7cd9083d874c3abcdcacfa05983 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 03:10:31 +0000
Subject: [PATCH 139/230] trayscale: 0.18.1 -> 0.18.3

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

diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix
index 10dbcda3d9ea..1ad444e02763 100644
--- a/pkgs/by-name/tr/trayscale/package.nix
+++ b/pkgs/by-name/tr/trayscale/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "trayscale";
-  version = "0.18.1";
+  version = "0.18.3";
 
   src = fetchFromGitHub {
     owner = "DeedleFake";
     repo = "trayscale";
     tag = "v${version}";
-    hash = "sha256-zbqn0BBL/r03lpZsHszooFkLolS4FdXM8JC6mSlNlVg=";
+    hash = "sha256-rk4JfK0wBvWLis9XvaZuwAoMyLfoySt3SHLJChYl0SE=";
   };
 
-  vendorHash = "sha256-FifYgTWDfUFQShon4PyiiA0UgSQPmwwRaLdEKJrOZcc=";
+  vendorHash = "sha256-8Um5Ps1EEVShJEeCRkGE3pJi2/5PxgEVNqq3JsKdivA=";
 
   subPackages = [ "cmd/trayscale" ];
 

From 265666c65d9d5f8665d6c04d53a992cbd161bf19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 03:32:28 +0000
Subject: [PATCH 140/230] gersemi: 0.21.0 -> 0.22.1

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

diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix
index b7047664dcc2..68c3d58cd5e5 100644
--- a/pkgs/by-name/ge/gersemi/package.nix
+++ b/pkgs/by-name/ge/gersemi/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gersemi";
-  version = "0.21.0";
+  version = "0.22.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "BlankSpruce";
     repo = "gersemi";
     tag = version;
-    hash = "sha256-TOrnaYvI4U7+q7ANNThZ3M3XhZS/Y8m48mNAqwjjBsg=";
+    hash = "sha256-ckK0Tv1aUHJcM1RH20ejBvq49xksUZmqveCcMmpnVGo=";
   };
 
   build-system = with python3Packages; [

From 1c924e5a610156620af8f003d0b7e25bf817e21e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 04:25:39 +0000
Subject: [PATCH 141/230] terraform-providers.sysdig: 1.58.0 -> 1.59.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9890a4b2662b..c2aee8085173 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1309,11 +1309,11 @@
     "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
   },
   "sysdig": {
-    "hash": "sha256-q7HXqmvOiUktGOas9Xjt2hucxqasnPZ2O9uIn1gL1FE=",
+    "hash": "sha256-KAwuE67gNOrDDLxgbxMtub0tMa45IiIOJ9Sq9mncK4c=",
     "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
     "owner": "sysdiglabs",
     "repo": "terraform-provider-sysdig",
-    "rev": "v1.58.0",
+    "rev": "v1.59.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
   },

From 2c1ec14d126c03d2555d1680ca67c82aa64ebd7b Mon Sep 17 00:00:00 2001
From: Ali Jamadi <jamadi1377@gmail.com>
Date: Sat, 14 Jun 2025 15:04:49 +0700
Subject: [PATCH 142/230] lib/modules: extract isDisabled from filterModules

Co-authored-by: Shahar "Dawn" Or <mightyiampresence@gmail.com>
---
 lib/modules.nix | 53 +++++++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index c55d276d4970..76e6de892e82 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -424,8 +424,37 @@ let
         else
           m: m;
 
+      # isDisabled :: String -> [ { disabled, file } ] -> StructuredModule -> bool
+      #
+      # Figures out whether a `StructuredModule` is disabled.
+      isDisabled =
+        modulesPath: disabledList:
+        let
+          moduleKey =
+            file: m:
+            if isString m then
+              if substring 0 1 m == "/" then m else toString modulesPath + "/" + m
+
+            else if isConvertibleWithToString m then
+              if m ? key && m.key != toString m then
+                throw "Module `${file}` contains a disabledModules item that is an attribute set that can be converted to a string (${toString m}) but also has a `.key` attribute (${m.key}) with a different value. This makes it ambiguous which module should be disabled."
+              else
+                toString m
+
+            else if m ? key then
+              m.key
+
+            else if isAttrs m then
+              throw "Module `${file}` contains a disabledModules item that is an attribute set, presumably a module, that does not have a `key` attribute. This means that the module system doesn't have any means to identify the module that should be disabled. Make sure that you've put the correct value in disabledModules: a string path relative to modulesPath, a path value, or an attribute set with a `key` attribute."
+            else
+              throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${typeOf m}.";
+
+          disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabledList;
+        in
+        structuredModule: elem structuredModule.key disabledKeys;
+
       /**
-        Collects all modules recursively into the form
+        Collects all modules recursively into a `[ StructuredModule ]` and a list of disabled modules:
 
           {
             disabled = [ <list of disabled modules> ];
@@ -493,27 +522,7 @@ let
         modulesPath:
         { disabled, modules }:
         let
-          moduleKey =
-            file: m:
-            if isString m then
-              if substring 0 1 m == "/" then m else toString modulesPath + "/" + m
-
-            else if isConvertibleWithToString m then
-              if m ? key && m.key != toString m then
-                throw "Module `${file}` contains a disabledModules item that is an attribute set that can be converted to a string (${toString m}) but also has a `.key` attribute (${m.key}) with a different value. This makes it ambiguous which module should be disabled."
-              else
-                toString m
-
-            else if m ? key then
-              m.key
-
-            else if isAttrs m then
-              throw "Module `${file}` contains a disabledModules item that is an attribute set, presumably a module, that does not have a `key` attribute. This means that the module system doesn't have any means to identify the module that should be disabled. Make sure that you've put the correct value in disabledModules: a string path relative to modulesPath, a path value, or an attribute set with a `key` attribute."
-            else
-              throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${typeOf m}.";
-
-          disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabled;
-          keyFilter = filter (attrs: !elem attrs.key disabledKeys);
+          keyFilter = filter (attrs: !isDisabled modulesPath disabled attrs);
         in
         map (attrs: attrs.module) (genericClosure {
           startSet = keyFilter modules;

From 5186921dedc57d054db8ae6ebfd9fa3385197c45 Mon Sep 17 00:00:00 2001
From: "Shahar \"Dawn\" Or" <mightyiampresence@gmail.com>
Date: Fri, 4 Jul 2025 23:40:53 -0600
Subject: [PATCH 143/230] lib.evalModules: add graph attribute

Co-authored-by: Ali Jamadi <jamadi1377@gmail.com>
---
 doc/module-system/module-system.chapter.md | 10 ++++
 doc/redirects.json                         |  3 +
 lib/modules.nix                            | 62 +++++++++++++--------
 lib/tests/modules.sh                       | 23 +++++++-
 lib/tests/modules/graph/a.nix              |  8 +++
 lib/tests/modules/graph/b.nix              |  3 +
 lib/tests/modules/graph/test.nix           | 64 ++++++++++++++++++++++
 7 files changed, 150 insertions(+), 23 deletions(-)
 create mode 100644 lib/tests/modules/graph/a.nix
 create mode 100644 lib/tests/modules/graph/b.nix
 create mode 100644 lib/tests/modules/graph/test.nix

diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md
index 8c27aea15ffc..8e95580522b2 100644
--- a/doc/module-system/module-system.chapter.md
+++ b/doc/module-system/module-system.chapter.md
@@ -116,6 +116,16 @@ A nominal type marker, always `"configuration"`.
 
 The [`class` argument](#module-system-lib-evalModules-param-class).
 
+#### `graph` {#module-system-lib-evalModules-return-value-graph}
+
+Represents all the modules that took part in the evaluation.
+It is a list of `ModuleGraph` where `ModuleGraph` is defined as an attribute set with the following attributes:
+
+- `key`: `string` for the purpose of module deduplication and `disabledModules`
+- `file`: `string` for the purpose of error messages and warnings
+- `imports`: `[ ModuleGraph ]`
+- `disabled`: `bool`
+
 ## Module arguments {#module-system-module-arguments}
 
 Module arguments are the attribute values passed to modules when they are evaluated.
diff --git a/doc/redirects.json b/doc/redirects.json
index 8f7810698bbc..8210470b5bcb 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -487,6 +487,9 @@
   "module-system-lib-evalModules-return-value-_configurationClass": [
     "index.html#module-system-lib-evalModules-return-value-_configurationClass"
   ],
+  "module-system-lib-evalModules-return-value-graph": [
+    "index.html#module-system-lib-evalModules-return-value-graph"
+  ],
   "part-stdenv": [
     "index.html#part-stdenv"
   ],
diff --git a/lib/modules.nix b/lib/modules.nix
index 76e6de892e82..cc3148b0eea7 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -245,25 +245,26 @@ let
         };
       };
 
-      merged =
-        let
-          collected =
-            collectModules class (specialArgs.modulesPath or "") (regularModules ++ [ internalModule ])
-              (
-                {
-                  inherit
-                    lib
-                    options
-                    specialArgs
-                    ;
-                  _class = class;
-                  _prefix = prefix;
-                  config = addErrorContext "if you get an infinite recursion here, you probably reference `config` in `imports`. If you are trying to achieve a conditional import behavior dependent on `config`, consider importing unconditionally, and using `mkEnableOption` and `mkIf` to control its effect." config;
-                }
-                // specialArgs
-              );
-        in
-        mergeModules prefix (reverseList collected);
+      # This function takes an empty attrset as an argument.
+      # It could theoretically be replaced with its body,
+      # but such a binding is avoided to allow for earlier grabage collection.
+      doCollect =
+        { }:
+        collectModules class (specialArgs.modulesPath or "") (regularModules ++ [ internalModule ]) (
+          {
+            inherit
+              lib
+              options
+              specialArgs
+              ;
+            _class = class;
+            _prefix = prefix;
+            config = addErrorContext "if you get an infinite recursion here, you probably reference `config` in `imports`. If you are trying to achieve a conditional import behavior dependent on `config`, consider importing unconditionally, and using `mkEnableOption` and `mkIf` to control its effect." config;
+          }
+          // specialArgs
+        );
+
+      merged = mergeModules prefix (reverseList (doCollect { }).modules);
 
       options = merged.matchedOptions;
 
@@ -359,12 +360,13 @@ let
         options = checked options;
         config = checked (removeAttrs config [ "_module" ]);
         _module = checked (config._module);
+        inherit (doCollect { }) graph;
         inherit extendModules type class;
       };
     in
     result;
 
-  # collectModules :: (class: String) -> (modulesPath: String) -> (modules: [ Module ]) -> (args: Attrs) -> [ Module ]
+  # collectModules :: (class: String) -> (modulesPath: String) -> (modules: [ Module ]) -> (args: Attrs) -> ModulesTree
   #
   # Collects all modules recursively through `import` statements, filtering out
   # all modules in disabledModules.
@@ -529,9 +531,25 @@ let
           operator = attrs: keyFilter attrs.modules;
         });
 
+      toGraph =
+        modulesPath:
+        { disabled, modules }:
+        let
+          isDisabledModule = isDisabled modulesPath disabled;
+
+          toModuleGraph = structuredModule: {
+            disabled = isDisabledModule structuredModule;
+            inherit (structuredModule) key;
+            file = structuredModule.module._file;
+            imports = map toModuleGraph structuredModule.modules;
+          };
+        in
+        map toModuleGraph (filter (x: x.key != "lib/modules.nix") modules);
     in
-    modulesPath: initialModules: args:
-    filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args);
+    modulesPath: initialModules: args: {
+      modules = filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args);
+      graph = toGraph modulesPath (collectStructuredModules unknownModule "" initialModules args);
+    };
 
   /**
     Wrap a module with a default location for reporting errors.
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index a4aa5201715c..301808ae6651 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -20,6 +20,10 @@ cd "$DIR"/modules
 pass=0
 fail=0
 
+local-nix-instantiate() {
+    nix-instantiate --timeout 1 --eval-only --show-trace --read-write-mode --json "$@"
+}
+
 # loc
 #   prints the location of the call of to the function that calls it
 # loc n
@@ -55,7 +59,7 @@ evalConfig() {
     local attr=$1
     shift
     local script="import ./default.nix { modules = [ $* ];}"
-    nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only --show-trace --read-write-mode --json
+    local-nix-instantiate -E "$script" -A "$attr"
 }
 
 reportFailure() {
@@ -106,6 +110,20 @@ globalErrorLogCheck() {
       }
 }
 
+checkExpression() {
+  local path=$1
+  local output
+  {
+      output="$(local-nix-instantiate --strict "$path" 2>&1)" && ((++pass))
+  } || {
+      logStartFailure
+      echo "$output"
+      ((++fail))
+      logFailure
+      logEndFailure
+  }
+}
+
 checkConfigError() {
     local errorContains=$1
     local err=""
@@ -337,6 +355,9 @@ checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix
 checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
 checkConfigError 'toInt: Could not convert .* to int' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
 
+# Check `graph` attribute
+checkExpression './graph/test.nix'
+
 # Check mkAliasOptionModule.
 checkConfigOutput '^true$' config.enable ./alias-with-priority.nix
 checkConfigOutput '^true$' config.enableAlias ./alias-with-priority.nix
diff --git a/lib/tests/modules/graph/a.nix b/lib/tests/modules/graph/a.nix
new file mode 100644
index 000000000000..e3c72afbe672
--- /dev/null
+++ b/lib/tests/modules/graph/a.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    {
+      imports = [ { } ];
+    }
+  ];
+  disabledModules = [ ./b.nix ];
+}
diff --git a/lib/tests/modules/graph/b.nix b/lib/tests/modules/graph/b.nix
new file mode 100644
index 000000000000..a890d3138a18
--- /dev/null
+++ b/lib/tests/modules/graph/b.nix
@@ -0,0 +1,3 @@
+args: {
+  imports = [ { key = "explicit-key"; } ];
+}
diff --git a/lib/tests/modules/graph/test.nix b/lib/tests/modules/graph/test.nix
new file mode 100644
index 000000000000..748fb8db5f4d
--- /dev/null
+++ b/lib/tests/modules/graph/test.nix
@@ -0,0 +1,64 @@
+let
+  lib = import ../../..;
+
+  evaluation = lib.evalModules {
+    modules = [
+      { }
+      (args: { })
+      ./a.nix
+      ./b.nix
+    ];
+  };
+
+  actual = evaluation.graph;
+
+  expected = [
+    {
+      key = ":anon-1";
+      file = "<unknown-file>";
+      imports = [ ];
+      disabled = false;
+    }
+    {
+      key = ":anon-2";
+      file = "<unknown-file>";
+      imports = [ ];
+      disabled = false;
+    }
+    {
+      key = toString ./a.nix;
+      file = toString ./a.nix;
+      imports = [
+        {
+          key = "${toString ./a.nix}:anon-1";
+          file = toString ./a.nix;
+          imports = [
+            {
+              key = "${toString ./a.nix}:anon-1:anon-1";
+              file = toString ./a.nix;
+              imports = [ ];
+              disabled = false;
+            }
+          ];
+          disabled = false;
+        }
+      ];
+      disabled = false;
+    }
+    {
+      key = toString ./b.nix;
+      file = toString ./b.nix;
+      imports = [
+        {
+          key = "explicit-key";
+          file = toString ./b.nix;
+          imports = [ ];
+          disabled = false;
+        }
+      ];
+      disabled = true;
+    }
+  ];
+in
+assert actual == expected;
+null

From 0ba9e80fd5e9904a5f13810320fb2feafcb315da Mon Sep 17 00:00:00 2001
From: "\"Arne\"" <"arne@zillhardt.com">
Date: Thu, 7 Aug 2025 05:55:50 +0200
Subject: [PATCH 144/230] vimPlugins.tiny-glimmer-nvim: init at 2025-07-01

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index fe343e2881de..0b6b2c1101e0 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -14689,6 +14689,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  tiny-glimmer-nvim = buildVimPlugin {
+    pname = "tiny-glimmer.nvim";
+    version = "2025-07-01";
+    src = fetchFromGitHub {
+      owner = "rachartier";
+      repo = "tiny-glimmer.nvim";
+      rev = "60a632536e0741c9cecb892f89fbe65a270dc7c7";
+      sha256 = "0xa3ma6ps1q5766ib2iksc7bw8rpqn96llynb75njwj2kpadfcis";
+    };
+    meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
     version = "2025-05-12";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 1b622615869f..bcd7e1fb0895 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1127,6 +1127,7 @@ https://github.com/vim-scripts/timestamp.vim/,,
 https://github.com/levouh/tint.nvim/,HEAD,
 https://github.com/tinted-theming/tinted-vim/,HEAD,
 https://github.com/rachartier/tiny-devicons-auto-colors.nvim/,HEAD,
+https://github.com/rachartier/tiny-glimmer.nvim/,HEAD,
 https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD,
 https://github.com/tomtom/tinykeymap_vim/,,tinykeymap
 https://github.com/tomtom/tlib_vim/,,

From 065d66597d72f130b76764ad7dc8aaba5a16f240 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 05:13:38 +0000
Subject: [PATCH 145/230] monkeysAudio: 11.22 -> 11.30

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

diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix
index aa441fec1e73..20c1ea19c5c7 100644
--- a/pkgs/by-name/mo/monkeysAudio/package.nix
+++ b/pkgs/by-name/mo/monkeysAudio/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "11.22";
+  version = "11.30";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-O60fNcz3/CsinL7NbEprtMhEcFK0NNZIuIG3hfqOW3Y=";
+    hash = "sha256-GnC2w1hhQlvpxa254M15xOVsqKUuIjXfgUxwgA7zcxc=";
     stripRoot = false;
   };
 

From 4719d4daf5b1cd43947d7911d313f3b6ded9cc15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 05:20:59 +0000
Subject: [PATCH 146/230] python3Packages.asf-search: 9.0.7 -> 9.0.9

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

diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix
index 646e6fe16267..544ba040f042 100644
--- a/pkgs/development/python-modules/asf-search/default.nix
+++ b/pkgs/development/python-modules/asf-search/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "asf-search";
-  version = "9.0.7";
+  version = "9.0.9";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "asfadmin";
     repo = "Discovery-asf_search";
     tag = "v${version}";
-    hash = "sha256-qfP02OQ3RQx8EZsrbrSvlFkz16MZsTT7phemrKo8vEI=";
+    hash = "sha256-1ZJsVcbqvB0DpcVyCWaEdYEnDXDDIupiprcIZlRCWDo=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];

From 5cae463e64fed5cacee77857d92092d0bc875128 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 05:23:25 +0000
Subject: [PATCH 147/230] tombi: 0.4.37 -> 0.4.42

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

diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index a4b112529459..363303666a79 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -7,19 +7,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "0.4.37";
+  version = "0.4.42";
 
   src = fetchFromGitHub {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-K2JIP9dqeAbfc4NefN8zdvzvRqGnH7qTLUzD11vDnd0=";
+    hash = "sha256-EOUi8yIXRJag9U2RzXWgX8vmOO7OJ/hmCpx7BvKsml4=";
   };
 
   # Tests relies on the presence of network
   doCheck = false;
   cargoBuildFlags = [ "--package tombi-cli" ];
-  cargoHash = "sha256-Vkj0BXvY9hGS2pq8mz0ZKhZBQLakh+hIIZ8Py5cgtl8=";
+  cargoHash = "sha256-Hwa+P0Qt3W171EzhuEdzY85w3XuHv6s4MCFkH4Ejqa8=";
 
   postPatch = ''
     substituteInPlace Cargo.toml \

From 5db8ee9dbd4d2b394a408c74527968e7a09b0747 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 22:48:23 +0000
Subject: [PATCH 148/230] ananicy-rules-cachyos: 0-unstable-2025-07-06 ->
 0-unstable-2025-08-06

---
 pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 44632ea8ab7b..7108d39dfef7 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2025-07-06";
+  version = "0-unstable-2025-08-06";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "339bee6f2de3de8e866c23b210baf6cabf153549";
-    hash = "sha256-D/+/7NdfV8kHwYm5mJ6b7Vl3QCUdK2+NbZSefWTZt5k=";
+    rev = "80576999c92af3eb88ea2008d4a18d29393ed579";
+    hash = "sha256-SdxOgm7purRxIU16RFuSgUzKIgi+7gJ2hJuCDVCjd54=";
   };
 
   dontConfigure = true;

From a9cd681b8df39ca567cada7ff50d44f7b3fb225a Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 29 Jul 2025 16:54:53 +0200
Subject: [PATCH 149/230] nixos/ntpd-rs: hardening

---
 .../services/networking/ntp/ntpd-rs.nix       | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/nixos/modules/services/networking/ntp/ntpd-rs.nix b/nixos/modules/services/networking/ntp/ntpd-rs.nix
index f80ffa2d82cb..89735696616c 100644
--- a/nixos/modules/services/networking/ntp/ntpd-rs.nix
+++ b/nixos/modules/services/networking/ntp/ntpd-rs.nix
@@ -90,6 +90,49 @@ in
           ""
           "${lib.makeBinPath [ cfg.package ]}/ntp-daemon --config=${validateConfig configFile}"
         ];
+
+        CapabilityBoundingSet = [
+          "CAP_SYS_TIME"
+          "CAP_NET_BIND_SERVICE"
+        ];
+        AmbientCapabilities = [
+          "CAP_SYS_TIME"
+          "CAP_NET_BIND_SERVICE"
+        ];
+        LimitCORE = 0;
+        LimitNOFILE = 65535;
+        LockPersonality = true;
+        MemorySwapMax = 0;
+        MemoryZSwapMax = 0;
+        PrivateTmp = true;
+        ProcSubset = "pid";
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        Restart = "on-failure";
+        RestartSec = "10s";
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+          "AF_NETLINK"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "@resources"
+          "@network-io"
+          "@clock"
+        ];
+        NoNewPrivileges = true;
+        UMask = "0077";
       };
     };
 
@@ -103,6 +146,44 @@ in
           ""
           "${lib.makeBinPath [ cfg.package ]}/ntp-metrics-exporter --config=${validateConfig configFile}"
         ];
+
+        CapabilityBoundingSet = [ ];
+        LimitCORE = 0;
+        LimitNOFILE = 65535;
+        LockPersonality = true;
+        MemorySwapMax = 0;
+        MemoryZSwapMax = 0;
+        PrivateTmp = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        PrivateDevices = true;
+        RestrictSUIDSGID = true;
+        RemoveIPC = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "@network-io"
+          "~@privileged"
+          "~@resources"
+          "~@mount"
+        ];
+        NoNewPrivileges = true;
+        UMask = "0077";
       };
     };
   };

From 8cd3a087725e88d6ff1944148b9cd92f16f04fe0 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 7 Aug 2025 08:18:00 +0200
Subject: [PATCH 150/230] claude-code: 1.0.69 -> 1.0.70

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Optimized message rendering for better performance with large contexts
- Fixed native file search, ripgrep, and subagent functionality on Windows
- Added support for @-mentions in slash command arguments
---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 9c756ed22392..c37f45405743 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.69"
+        "@anthropic-ai/claude-code": "^1.0.70"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.69",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.69.tgz",
-      "integrity": "sha512-kF86lNI9o6rt14cEDw16G89rHz4pL0lv/sASztV8XenEeQ/6VUZ5Jk+icYg6XTQKe33BsdtNKFS3IL3iLyzQyw==",
+      "version": "1.0.70",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.70.tgz",
+      "integrity": "sha512-gJ/bdT/XQ/hp5EKM0QoOWj/eKmK3wvs1TotTLq1unqahiB6B+EAQeRy/uvxv2Ua9nI8p5Bogw8hXB1uUmAHb+A==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 0fcca8929992..3f3ab75669aa 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.69";
+  version = "1.0.70";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-uZbe7N3FSAVxNxL7npujJcBFH6ZjnwDz327bZWN2IEM=";
+    hash = "sha256-7nqhJNhO+QollwVtVlKDYHOlPDT6Erk6wI/voiAYXY4=";
   };
 
-  npmDepsHash = "sha256-a06NT96pVOiz06ZZ9r+1s+oF9U/I7SRJFFAw1e0NkMY=";
+  npmDepsHash = "sha256-nBLaWDwSPOfZx26UU2QQpp/r8HPHAO4EnPkb/gcTPrg=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 5ceb0d1210ca31e6197dd01c836ed7ad6c58a162 Mon Sep 17 00:00:00 2001
From: Steven Kou <skykinetic@stevenkou.xyz>
Date: Thu, 7 Aug 2025 14:33:36 +0800
Subject: [PATCH 151/230] uhd: add flag for X400 devices

---
 pkgs/by-name/uh/uhd/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/uh/uhd/package.nix b/pkgs/by-name/uh/uhd/package.nix
index 07e1e9bb5c73..5ae9f1caa877 100644
--- a/pkgs/by-name/uh/uhd/package.nix
+++ b/pkgs/by-name/uh/uhd/package.nix
@@ -27,6 +27,7 @@
   enableUsrp1 ? true,
   enableUsrp2 ? true,
   enableX300 ? true,
+  enableX400 ? true,
   enableN300 ? true,
   enableN320 ? true,
   enableE300 ? true,
@@ -138,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "ENABLE_USRP1" enableUsrp1)
     (cmakeBool "ENABLE_USRP2" enableUsrp2)
     (cmakeBool "ENABLE_X300" enableX300)
+    (cmakeBool "ENABLE_X400" enableX400)
     (cmakeBool "ENABLE_N300" enableN300)
     (cmakeBool "ENABLE_N320" enableN320)
     (cmakeBool "ENABLE_E300" enableE300)

From 170041f1f71720db0dbb40a52c9e42ee738cd4a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 06:47:07 +0000
Subject: [PATCH 152/230] python3Packages.whodap: 0.1.12 -> 0.1.13

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

diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix
index d4de5f0333f5..4287b66a5f06 100644
--- a/pkgs/development/python-modules/whodap/default.nix
+++ b/pkgs/development/python-modules/whodap/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "whodap";
-  version = "0.1.12";
+  version = "0.1.13";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pogzyb";
     repo = "whodap";
-    tag = "v${version}";
-    hash = "sha256-kw7bmkpDNb/PK/Q2tSbG+ju0G+6tdSy3RaNDaNOVYnE=";
+    tag = version;
+    hash = "sha256-VSFtHjdG9pJAryGUgwI0NxxaW0JiXEHU7aVvXYxymtc=";
   };
 
   propagatedBuildInputs = [ httpx ];
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python RDAP utility for querying and parsing information about domain names";
     homepage = "https://github.com/pogzyb/whodap";
-    changelog = "https://github.com/pogzyb/whodap/releases/tag/v${version}";
+    changelog = "https://github.com/pogzyb/whodap/releases/tag/${src.tag}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From 66ac644511bf9d0d277ec4f3f021c5d66e28e147 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Thu, 7 Aug 2025 09:10:13 +0200
Subject: [PATCH 153/230] iotas: 0.11.0 -> 0.11.2

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

diff --git a/pkgs/by-name/io/iotas/package.nix b/pkgs/by-name/io/iotas/package.nix
index 79ec2898aefd..eb3c7776c320 100644
--- a/pkgs/by-name/io/iotas/package.nix
+++ b/pkgs/by-name/io/iotas/package.nix
@@ -20,7 +20,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "iotas";
-  version = "0.11.0";
+  version = "0.11.2";
   pyproject = false;
 
   src = fetchFromGitLab {
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "World";
     repo = "iotas";
     tag = version;
-    hash = "sha256-9YYKVBjidHBWyUqFvxo3tNx5DQkpililCDLZofESYRw=";
+    hash = "sha256-nDmofssoaB3BKh6X3Lpi5xftyo9Zw3IUoD3wte0wPM4=";
   };
 
   nativeBuildInputs = [

From 76c1b5e7d961e3e0ead83bf310a6bd09945a5980 Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Tue, 5 Aug 2025 18:29:58 +0200
Subject: [PATCH 154/230] sqlitebrowser: move to pkgs/by-name

---
 .../sq}/sqlitebrowser/macos.patch                   |  0
 .../sq/sqlitebrowser/package.nix}                   | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 --
 3 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{development/tools/database => by-name/sq}/sqlitebrowser/macos.patch (100%)
 rename pkgs/{development/tools/database/sqlitebrowser/default.nix => by-name/sq/sqlitebrowser/package.nix} (87%)

diff --git a/pkgs/development/tools/database/sqlitebrowser/macos.patch b/pkgs/by-name/sq/sqlitebrowser/macos.patch
similarity index 100%
rename from pkgs/development/tools/database/sqlitebrowser/macos.patch
rename to pkgs/by-name/sq/sqlitebrowser/macos.patch
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/by-name/sq/sqlitebrowser/package.nix
similarity index 87%
rename from pkgs/development/tools/database/sqlitebrowser/default.nix
rename to pkgs/by-name/sq/sqlitebrowser/package.nix
index 5a39d5126526..de32f2e569dd 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/by-name/sq/sqlitebrowser/package.nix
@@ -3,11 +3,8 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  qttools,
+  qt5,
   sqlcipher,
-  wrapQtAppsHook,
-  qtmacextras,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,15 +25,15 @@ stdenv.mkDerivation (finalAttrs: {
   # -qt4 or -qt5 prefix while others do not.
   # We *really* should get that cleaned up.
   buildInputs = [
-    qtbase
+    qt5.qtbase
     sqlcipher
   ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
+  ++ lib.optional stdenv.hostPlatform.isDarwin qt5.qtmacextras;
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt5.qttools
+    qt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b6bb9777556..2187a7fa3929 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7486,8 +7486,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
-
   sqlite-utils = with python3Packages; toPythonApplication sqlite-utils;
 
   sqlmap = with python3Packages; toPythonApplication sqlmap;

From a1b79104ef3c0e076c370ae15c733241f8cf5004 Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Tue, 5 Aug 2025 18:33:20 +0200
Subject: [PATCH 155/230] sqlitebrowser: use qscintilla and qcustomplot from
 nixpkgs

---
 pkgs/by-name/sq/sqlitebrowser/package.nix | 48 +++++++++++++++--------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/sq/sqlitebrowser/package.nix b/pkgs/by-name/sq/sqlitebrowser/package.nix
index de32f2e569dd..4318bc279d81 100644
--- a/pkgs/by-name/sq/sqlitebrowser/package.nix
+++ b/pkgs/by-name/sq/sqlitebrowser/package.nix
@@ -3,10 +3,15 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qt5,
+  pkg-config,
+  libsForQt5,
   sqlcipher,
 }:
 
+let
+  qt' = libsForQt5; # upstream has adopted qt6, but no released version supports it
+
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlitebrowser";
   version = "3.13.1";
@@ -14,41 +19,52 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sqlitebrowser";
     repo = "sqlitebrowser";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-bpZnO8i8MDgOm0f93pBmpy1sZLJQ9R4o4ZLnGfT0JRg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bpZnO8i8MDgOm0f93pBmpy1sZLJQ9R4o4ZLnGfT0JRg=";
   };
 
   patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch;
 
-  # We should be using qscintilla from nixpkgs instead of the vendored version,
-  # but qscintilla is currently in a bit of a mess as some consumers expect a
-  # -qt4 or -qt5 prefix while others do not.
-  # We *really* should get that cleaned up.
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail '"Unknown"' '"${finalAttrs.src.rev}"'
+  '';
+
   buildInputs = [
-    qt5.qtbase
+    qt'.qtbase
+    qt'.qcustomplot
+    qt'.qscintilla
     sqlcipher
   ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin qt5.qtmacextras;
+  ++ lib.optional stdenv.hostPlatform.isDarwin qt'.qtmacextras;
 
   nativeBuildInputs = [
     cmake
-    qt5.qttools
-    qt5.wrapQtAppsHook
+    pkg-config
+    qt'.qttools
+    qt'.wrapQtAppsHook
   ];
 
   cmakeFlags = [
-    "-Dsqlcipher=1"
+    "-Wno-dev"
+    (lib.cmakeBool "sqlcipher" true)
     (lib.cmakeBool "ENABLE_TESTING" (finalAttrs.finalPackage.doCheck or false))
+    (lib.cmakeBool "FORCE_INTERNAL_QSCINTILLA" false)
+    (lib.cmakeBool "FORCE_INTERNAL_QCUSTOMPLOT" false)
+    (lib.cmakeBool "FORCE_INTERNAL_QHEXEDIT" true) # TODO: package qhexedit
+    (lib.cmakeFeature "QSCINTILLA_INCLUDE_DIR" "${lib.getDev qt'.qscintilla}/include")
   ];
 
+  env.LANG = "C.UTF-8";
+
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "DB Browser for SQLite";
     mainProgram = "sqlitebrowser";
     homepage = "https://sqlitebrowser.org/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.unix;
   };
 })

From f8717fb0d69656739332989a9eebdb3349287b65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 07:45:35 +0000
Subject: [PATCH 156/230] railway: 4.5.6 -> 4.6.1

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

diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index 8fdc51f28bcf..86d4e9278f86 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "4.5.6";
+  version = "4.6.1";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-xoBGYdcef1xBlPlUOPudhX0t59OBbNavcg5CeRJiQIY=";
+    hash = "sha256-+nweRMHwQbt/Nn/i0P3s7kziP7Z8RnEszqcVzjTthes=";
   };
 
-  cargoHash = "sha256-o/wbBp2gIl+Dyxnee7mChVzv5qmrVAcG95i9YMxd5AI=";
+  cargoHash = "sha256-u86v7DeWCdeODP+mHL0mYvas1lpCEWuI15ua1LUzDak=";
 
   nativeBuildInputs = [ pkg-config ];
 

From b64d0e34de1f97e3abd9921a23700498fb77c112 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 07:55:59 +0000
Subject: [PATCH 157/230] python3Packages.sabctools: 8.2.5 -> 8.2.6

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

diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix
index 4f07633db51f..821a6c29438b 100644
--- a/pkgs/development/python-modules/sabctools/default.nix
+++ b/pkgs/development/python-modules/sabctools/default.nix
@@ -7,12 +7,12 @@
 }:
 buildPythonPackage rec {
   pname = "sabctools";
-  version = "8.2.5";
+  version = "8.2.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZEC813/JpGPEFL+nXKFAXFfUrrhECCIqONe27LwS00g=";
+    hash = "sha256-olZSIjfP2E1tkCG8WzEZfrBJuDEp3PZyFFE5LJODEZE=";
   };
 
   nativeBuildInputs = [ setuptools ];

From a416b08195fdbce22b408629351f415d789a36f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 08:26:47 +0000
Subject: [PATCH 158/230] rusty-psn-gui: 0.5.8 -> 0.5.9

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

diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix
index cb9d21b9766c..3a3304f5f956 100644
--- a/pkgs/by-name/ru/rusty-psn/package.nix
+++ b/pkgs/by-name/ru/rusty-psn/package.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rusty-psn";
-  version = "0.5.8";
+  version = "0.5.9";
 
   src = fetchFromGitHub {
     owner = "RainbowCookie32";
     repo = "rusty-psn";
     tag = "v${version}";
-    hash = "sha256-n2h+sgqNZhFgUa4MFp501W4YPtlWN94GhP9Rlu5plBA=";
+    hash = "sha256-Al0cT4WaOX7gxOkD5ciRntbGLCCDFSjj83E4n8nXp6I=";
   };
 
-  cargoHash = "sha256-ffqTzu8/ra6SwvqDne/g9EgISGlEBSleEGn6gQ/DWAY=";
+  cargoHash = "sha256-FaKUQk/Q2hE0lZ11QSKA2P2BLlBNih47zzuwpMsblhw=";
 
   # Tests require network access
   doCheck = false;

From d18fdcd52b86ce7ac29df68d6ab3d60984cf161a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 10:48:59 +0200
Subject: [PATCH 159/230] python313Packages.inkbird-ble: 1.0.0 -> 1.1.0

Diff: https://github.com/Bluetooth-Devices/inkbird-ble/compare/refs/tags/v1.0.0...refs/tags/v1.1.0

Changelog: https://github.com/Bluetooth-Devices/inkbird-ble/blob/v1.1.0/CHANGELOG.md
---
 pkgs/development/python-modules/inkbird-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix
index f7ff5abfac28..b2a31ed4c13c 100644
--- a/pkgs/development/python-modules/inkbird-ble/default.nix
+++ b/pkgs/development/python-modules/inkbird-ble/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "inkbird-ble";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "inkbird-ble";
     tag = "v${version}";
-    hash = "sha256-J3BT4KZ5Kzoc8vwbsXbhZJ+qkeggYomGE0JedxNTPaQ=";
+    hash = "sha256-Dwp65FKtqJbgux+T3Ql09sDy6m8CCeK26aDKM3I3eJo=";
   };
 
   build-system = [ poetry-core ];

From fa17e3d05b5e095256d6e7bafe08387609dd7078 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 10:50:42 +0200
Subject: [PATCH 160/230] python313Packages.soco: 0.30.10 -> 0.30.11

Diff: https://github.com/SoCo/SoCo/compare/refs/tags/v0.30.10...refs/tags/v0.30.11

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

diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index bc547c7101ce..7c87025dc2b3 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "soco";
-  version = "0.30.10";
+  version = "0.30.11";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "SoCo";
     repo = "SoCo";
     tag = "v${version}";
-    hash = "sha256-BTDKn6JVqXfLiry6jES/OnsO3SGniEMWW2osf9veukU=";
+    hash = "sha256-x5WKG2KFBr0FQu28160qHB2ckKdpx0cKhgYTH6sLnuw=";
   };
 
   build-system = [ setuptools ];

From 7ca4ea1bf30beccf980e0cdfeded91dd9e36b8d9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 10:51:05 +0200
Subject: [PATCH 161/230] python313Packages.reolink-aio: 0.14.5 -> 0.14.6

Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.14.5...refs/tags/0.14.6

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.14.6
---
 pkgs/development/python-modules/reolink-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 1e1adb006e79..0680cd1e6b16 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.14.5";
+  version = "0.14.6";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     tag = version;
-    hash = "sha256-i1/1Z8JngoGQ/VwjMAHJ7RJhS3dfpXApE1DdfTfIz8E=";
+    hash = "sha256-7RCE1E1pWUdb7hW9N7nX9+e5dXX49nn+rTnkoS+ghJE=";
   };
 
   build-system = [ setuptools ];

From 91d7d5e52c2927347b7508d6cc16e04a7856c968 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 08:54:04 +0000
Subject: [PATCH 162/230] terraform-providers.akamai: 8.0.0 -> 8.1.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9890a4b2662b..8a6ee650765a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -45,13 +45,13 @@
     "vendorHash": "sha256-jZ950/nPFt3+t3CHsNEkYo7POabRCHVvcfu04Iq3cJc="
   },
   "akamai": {
-    "hash": "sha256-JALEVzmBVmHtCG4B1jNeNdSWb+SGZWDSZgUQ5voMQPg=",
+    "hash": "sha256-pXBQikG5yjCPj/Nv6+qJBv3+BpRx04CbDQo9Q9nU0o4=",
     "homepage": "https://registry.terraform.io/providers/akamai/akamai",
     "owner": "akamai",
     "repo": "terraform-provider-akamai",
-    "rev": "v8.0.0",
+    "rev": "v8.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-sf6gCPsKnBVjMsCw7ZA4BKt9GAGtAcgU7vRZN8xzN9Q="
+    "vendorHash": "sha256-WT4sjem80445Qwlr3i/OuQMujrxEKqhws1GLpvbqKaU="
   },
   "alicloud": {
     "hash": "sha256-ITu569Um+3Y7FPCBNALvePAjCCIf/3+Hu0831o7rZCU=",

From 8b6da630a254d55cb9a5dad9c162c3753d06b516 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 7 Aug 2025 10:51:55 +0200
Subject: [PATCH 163/230] python3Packages.torch-bin: 2.7.1 -> 2.8.0

Diff: https://github.com/pytorch/pytorch/compare/v2.7.1...v2.8.0

Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.8.0
---
 .../torch/bin/binary-hashes.nix               | 92 +++++++++----------
 .../python-modules/torch/bin/default.nix      |  2 +-
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
index 3a7d0926ba26..8001f6822c03 100644
--- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.7.1" = {
+  "2.8.0" = {
     x86_64-linux-39 = {
-      name = "torch-2.7.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-c4rJs6155iohJW49JQzuhY3pVfk/ifqxFNqNGRk0fQY=";
+      name = "torch-2.8.0-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
+      hash = "sha256-uTV6h1laPXsqVlumArlzkqN8VvC4VpjwzPCixY++9ew=";
     };
     x86_64-linux-310 = {
-      name = "torch-2.7.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-1sPLoZjck/k0IqhUX0imaXiQNm5LlwH1Q1H8J+IwS9M=";
+      name = "torch-2.8.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-DJaZnRXPHxPdfJE+CyGpo1VTjmz8EIYaFxWDICkvWVQ=";
     };
     x86_64-linux-311 = {
-      name = "torch-2.7.1-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-wwHcKARYr9lUUK95SSTJj+B1It0Uj/OEc5uBDj4xefI=";
+      name = "torch-2.8.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-A5udzda9uqEKilzWviLEyz41iaNB5fkEy7Vxyij1W+0=";
     };
     x86_64-linux-312 = {
-      name = "torch-2.7.1-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-C2T30KbypzntBSupWfe2fGdwKMlWbOUZl/n5D+Vz3ao=";
+      name = "torch-2.8.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-Q1T8Bbt5sgjWmVoEyhzu9qlUexxDNENVdDU9OBxVCHw=";
     };
     x86_64-linux-313 = {
-      name = "torch-2.7.1-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-lWBCX56hrxeRUH6Mpw1bns9i/tfKImqV/NWNDrLMp48=";
+      name = "torch-2.8.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-OoUjaaON7DQ9RezQvDZg95uIoj4Mh40YcH98E79JU48=";
     };
     aarch64-darwin-39 = {
-      name = "torch-2.7.1-cp39-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp39-none-macosx_11_0_arm64.whl";
-      hash = "sha256-NRvpBdG6aT8xe+YDRB5O2VgO2ajX7hez2uYPov9Jv/c=";
+      name = "torch-2.8.0-cp39-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp39-none-macosx_11_0_arm64.whl";
+      hash = "sha256-a+wfJAlodJ4ju7fqj2YXoI/D2xtMdmtczq34ootBl9k=";
     };
     aarch64-darwin-310 = {
-      name = "torch-2.7.1-cp310-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp310-none-macosx_11_0_arm64.whl";
-      hash = "sha256-+MO+4mGwyOCQ9jR0kNxu4q6/1mHrDz9q6uBtmS2O1W8=";
+      name = "torch-2.8.0-cp310-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp310-none-macosx_11_0_arm64.whl";
+      hash = "sha256-pGe0n+iTpqbM6J467lVu39xkpyLXGV/f3XXOyd6hN3k=";
     };
     aarch64-darwin-311 = {
-      name = "torch-2.7.1-cp311-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp311-none-macosx_11_0_arm64.whl";
-      hash = "sha256-aKNSx/Q1q7XLR+LAMtzRASdyriustvyLg7DBsRh0qzo=";
+      name = "torch-2.8.0-cp311-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp311-none-macosx_11_0_arm64.whl";
+      hash = "sha256-PQUBfRm8mXQSiORYiIKDpEsO6IHVPwX3L4sc/qiZgSI=";
     };
     aarch64-darwin-312 = {
-      name = "torch-2.7.1-cp312-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp312-none-macosx_11_0_arm64.whl";
-      hash = "sha256-e0+LK4O9CPfTmQJamnsyO9u1PSBWbx4NWEaJu5LYL5o=";
+      name = "torch-2.8.0-cp312-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp312-none-macosx_11_0_arm64.whl";
+      hash = "sha256-pHt5hr7j9hrSF9ioziRgWAmrQluvNJ+X3nWIFe3S71Q=";
     };
     aarch64-darwin-313 = {
-      name = "torch-2.7.1-cp313-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp313-none-macosx_11_0_arm64.whl";
-      hash = "sha256-fs2GighkaOG890uR20JcHClRqc/NBZLExzN3t+Qkha4=";
+      name = "torch-2.8.0-cp313-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp313-none-macosx_11_0_arm64.whl";
+      hash = "sha256-BX79MKZ3jS7l4jdM1jpj9jMRqm8zMh5ifGVd9gq905A=";
     };
     aarch64-linux-39 = {
-      name = "torch-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-pFUcuXuD31+T/A11ODMlNYKFgeHbLxea/ChwJ6+91ug=";
+      name = "torch-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl";
+      hash = "sha256-6si371x8oQba7F6CnfqMpWykdgHbE7QC0mCIYa06uSY=";
     };
     aarch64-linux-310 = {
-      name = "torch-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-wN8Xzul2U9CaToRIijPSEhf5skIIWDxVzyjwBFqrB2Y=";
+      name = "torch-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-shSYWLg0Cu6x8wVuC/9bgrluQ7WW/kmp26MYRSImEhM=";
     };
     aarch64-linux-311 = {
-      name = "torch-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-X+YEW49Ca/LQQm5P4AnxZnqVTsKuuC8b0L9gxteoVEU=";
+      name = "torch-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-aAEp797uw9tdo/iO5dKMGx4QO3dK70D51jjizOj42Ng=";
     };
     aarch64-linux-312 = {
-      name = "torch-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-O/LbWt93tDOETwgIh63gScRwXd+f4aMgI/+E/3Napa0=";
+      name = "torch-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-YQ9gDBAjhuWBMn1e/BjA1u3suYILQUDSYWM1SpnNgA0=";
     };
     aarch64-linux-313 = {
-      name = "torch-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-6xdkZ5KsQ3T/yH5CNp9F0h7/F8eQholjuQSD7wtttO8=";
+      name = "torch-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-pQZLXiN3LI0WQGjMfBLgGnX697lI7NlaDUAH10h+XyU=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix
index 315094905b60..eb03276cf909 100644
--- a/pkgs/development/python-modules/torch/bin/default.nix
+++ b/pkgs/development/python-modules/torch/bin/default.nix
@@ -34,7 +34,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "2.7.1";
+  version = "2.8.0";
 in
 buildPythonPackage {
   inherit version;

From 05fa45835cd93e16a9bd2b628969112a315d2189 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 7 Aug 2025 10:54:50 +0200
Subject: [PATCH 164/230] python3Packages.torchaudio-bin: 2.7.1 -> 2.8.0

Diff: https://github.com/pytorch/audio/compare/v2.7.1...v2.8.0

Changelog: https://github.com/pytorch/audio/releases/tag/v2.8.0
---
 .../python-modules/torchaudio/bin.nix         |  2 +-
 .../torchaudio/binary-hashes.nix              | 92 +++++++++----------
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index 67ca7358dfbb..5334f94ffd81 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.7.1";
+  version = "2.8.0";
   format = "wheel";
 
   src =
diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index da82062146cb..f0bb5feaa82b 100644
--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.7.1" = {
+  "2.8.0" = {
     x86_64-linux-39 = {
-      name = "torchaudio-2.7.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-DBRNX/tO7IbHn/ETar2RvT+DfzBCcTeV4QdYrtxC3Og=";
+      name = "torchaudio-2.8.0-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
+      hash = "sha256-2QZsae7B8pPC/wqAW/UEc3OQzL9rd8jmfa+DTbhv2kU=";
     };
     x86_64-linux-310 = {
-      name = "torchaudio-2.7.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-K6CBbu5lnjQ4UanF3GDI4euBmjlpspJo+rJ9MUMnPXg=";
+      name = "torchaudio-2.8.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-oBYelShaC3Ft4hD+4DkhUdYB59o8yGWVAI2Car/0iow=";
     };
     x86_64-linux-311 = {
-      name = "torchaudio-2.7.1-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-hOxyfx/a/fhd0cAYptO/q+tWZbEOC18nOmdetzD1nOU=";
+      name = "torchaudio-2.8.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-9ECd9WfQcjp6OonTLHVSoX4P9vE36iag0mjGZSWbKZU=";
     };
     x86_64-linux-312 = {
-      name = "torchaudio-2.7.1-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-DB1Af5NNRPh5NbE5mR2IcvgfiPimvpt70lkYv3ROK+Y=";
+      name = "torchaudio-2.8.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-FFuKDCHPyqFwXGcXPF1DkIfg4SDV2pvDRHRvk3kB0kM=";
     };
     x86_64-linux-313 = {
-      name = "torchaudio-2.7.1-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-fpfqil1eVhCNHAcUFmE7xhoONTHC5rpqm2RiMtbkEIg=";
+      name = "torchaudio-2.8.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-QQu46kYiXv5ljl0no4AsGBoiVZEwA2IaXSWlGsqAGNk=";
     };
     aarch64-darwin-39 = {
-      name = "torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-oHEA/iz3r0+mnYywRqK3QEZhJiGhpUivpa8caeAur4E=";
+      name = "torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl";
+      hash = "sha256-UiKJ4s1X55QB/VzK6bG8D/LkfzUpCSrfWs9XQn6gxqk=";
     };
     aarch64-darwin-310 = {
-      name = "torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-RzmvV9DrlDR9HGobVmi+eKc4Ov6Cbd4YoEiDufnyY7E=";
+      name = "torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-wvRM8nn2c8/N2PV2w0nu6L7fjKqzUaXdeLMpcMw0ohI=";
     };
     aarch64-darwin-311 = {
-      name = "torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-1aYviMYpA1kT9QbfA/cQxI/Iu5Y3GRkz8nxnCI1coTY=";
+      name = "torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-ySdoV9JBxt4levdlwPUfwBGvOMtyVAFJUSGygJEwB88=";
     };
     aarch64-darwin-312 = {
-      name = "torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-kwbc/EWGzr12R6k/6aRI55HE+Dk02mFrlDO3VZeh+Xg=";
+      name = "torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-3e+UvxgeZEfLsF84vqyo9sW7jSud3O0ao0UgJbn8cNM=";
     };
     aarch64-darwin-313 = {
-      name = "torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl";
-      hash = "sha256-5fBZmlB/RoNUaHjtlmfhsy18o8ipV+TBXGswI3jvTe4=";
+      name = "torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl";
+      hash = "sha256-+FHTLpTKBeRw8MYOJXJuweDrccsspaAga3/QMnLMw8g=";
     };
     aarch64-linux-39 = {
-      name = "torchaudio-2.7.1-cp39-cp39-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-6LLaEaf3eCsAuCPJnoEusA7os0Va1HT4/UKg2gvE9Go=";
+      name = "torchaudio-2.8.0-cp39-cp39-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl";
+      hash = "sha256-739/+oKLjYul06VpuCX8BGlojh6JYr9ld9U4vYrxOH0=";
     };
     aarch64-linux-310 = {
-      name = "torchaudio-2.7.1-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-wInb/BTF9HCRt78/a/K7rJO4ZhkpnQTZwQL0rVN1iZA=";
+      name = "torchaudio-2.8.0-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-08G4WyagmDLROfbW2mtmyutR0uFuCPhYdmXESp4aqPk=";
     };
     aarch64-linux-311 = {
-      name = "torchaudio-2.7.1-cp311-cp311-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-U7xLoS50aL40p8ou6DfuXIvVdVslwS9mWvkznK434mU=";
+      name = "torchaudio-2.8.0-cp311-cp311-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-RXPGBClQwgJ442CKmjgFC6C8cuAEnhu/0knK+FmoAps=";
     };
     aarch64-linux-312 = {
-      name = "torchaudio-2.7.1-cp312-cp312-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-1mvXayJv3UE1yXZQ4bfrY/t2WbTtDjp3iJjkHbuiG2E=";
+      name = "torchaudio-2.8.0-cp312-cp312-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-hi4uQL8J2GXl3wgKhMGjm7zvQOQxQPSxc36zo4nTs48=";
     };
     aarch64-linux-313 = {
-      name = "torchaudio-2.7.1-cp313-cp313-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-Jx9xeETlx/ngXIMo3oF7+Q9G2DKBx5HpT1TU7eovWBc=";
+      name = "torchaudio-2.8.0-cp313-cp313-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-CVNam3J8B5PNB8Gs6Z8/NTYmKBvMPjDC8jFOPrydP5Y=";
     };
   };
 }

From 363721e3042481a398c5ec816f4ab3751547c50a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 7 Aug 2025 10:57:45 +0200
Subject: [PATCH 165/230] python3Packages.torchvision-bin: 0.22.1 -> 0.23.0

Diff: https://github.com/pytorch/vision/compare/v0.22.1...v0.23.0

Changelog: https://github.com/pytorch/vision/releases/tag/v0.23.0
---
 .../python-modules/torchvision/bin.nix        |  2 +-
 .../torchvision/binary-hashes.nix             | 92 +++++++++----------
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index 1e2d08b4b36c..8626ead3ac02 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -23,7 +23,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "0.22.1";
+  version = "0.23.0";
 in
 buildPythonPackage {
   inherit version;
diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix
index 6457b1621cd8..545ff5bac535 100644
--- a/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "0.22.1" = {
+  "0.23.0" = {
     x86_64-linux-39 = {
-      name = "torchvision-0.22.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-UfJbwdKLA32YoUFckXRBcmJE2KAJcZB+bfsA7MwxNl8=";
+      name = "torchvision-0.23.0-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
+      hash = "sha256-eE/JDLlw5aKbJLZEHkYfW/YWhGMFuXk/o4cKnyltTA4=";
     };
     x86_64-linux-310 = {
-      name = "torchvision-0.22.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-U49NtmcobZObTu4KZtMe0htRGGZoAGsOD/4gM47MfgA=";
+      name = "torchvision-0.23.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-RgvI1w9jvbQzpzUd7MLBrhkD9/N45KdhT8joyXpcNqo=";
     };
     x86_64-linux-311 = {
-      name = "torchvision-0.22.1-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-klaKxGsTqMiLYViYALG5xGKb4JHqfOCA/G/GIuEeCRU=";
+      name = "torchvision-0.23.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-k/G19WsgzWhpvKQJQ95P08qczFbhtX9HxnHeHNqznNs=";
     };
     x86_64-linux-312 = {
-      name = "torchvision-0.22.1-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-9k75u5HXGrNdg4SRKhn3QZ41koaFvGdUTVj0UUgzQ3M=";
+      name = "torchvision-0.23.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-nLPBOZevy0QFfKENlDxsTLowaK/eDzcJZavOnIn8/6k=";
     };
     x86_64-linux-313 = {
-      name = "torchvision-0.22.1-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-vE/vGTkXtR22tAms0//eyShth3uqwK7l3Pu3JZLQC/w=";
+      name = "torchvision-0.23.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-xjmC8Zc7pnezfmZj3w4Hy1OBRZtvBXLCypXuvY3+t0I=";
     };
     aarch64-darwin-39 = {
-      name = "torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-i+lBtNNcCrqBm+cP27vtjOtgQBzmmWuM+quhMAzmImM=";
+      name = "torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl";
+      hash = "sha256-sZDbIF+QIGwjD8L5HL39VzMzS6vA4NGb3bkKQLjPJsI=";
     };
     aarch64-darwin-310 = {
-      name = "torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-O0fYNp7laMBneVwNoLQHjzmp3+pvO8HzrIdTDf2h3VY=";
+      name = "torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-cmaHHaygCtRtHAc+VdlyF50SpY+lya3smj25u+1xKEo=";
     };
     aarch64-darwin-311 = {
-      name = "torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-St32JuK1f8Iv1tMpzxNG1HRJdnLmr4ODt7W2NvupSlM=";
+      name = "torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-Saog4h8MK9RYxx17RJd2y9XxZpPdWAcZWoIGEriiKbc=";
     };
     aarch64-darwin-312 = {
-      name = "torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-FT8XkOUFvW2hI+Ie7m6D4uFV3wXA/n1WNHMDBn2FQ8U=";
+      name = "torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-4OLASpFAPo3Tr5dWxqAkodnA7ZwNWSqDFN7Y9P4w1EA=";
     };
     aarch64-darwin-313 = {
-      name = "torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl";
-      hash = "sha256-nDrjMZYkxDzIEnAg9GwUqoeEBngfCJm7YoOuR0r+r78=";
+      name = "torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl";
+      hash = "sha256-HDfjJeCaGEtzDD71FCTzg+xXRTeNwOyiRFIKyilyJgA=";
     };
     aarch64-linux-39 = {
-      name = "torchvision-0.22.1-cp39-cp39-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-FUor3DehYSLCAk8vd+ZfWYYCC0DAE1FcaUtdNX+smaE=";
+      name = "torchvision-0.23.0-cp39-cp39-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-manylinux_2_28_aarch64.whl";
+      hash = "sha256-bHTLwcvuJt1PNfmJzYDczEBBHyWN7kdrKYcd7ktIOvA=";
     };
     aarch64-linux-310 = {
-      name = "torchvision-0.22.1-cp310-cp310-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-mQ3k1lekHtcWgM2L4umOvKtVNx8wmT3JvS5nZEH3GA4=";
+      name = "torchvision-0.23.0-cp310-cp310-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-McWDuidCajoE7KjAVFBSQQXBVk20G+ZjL3U270BabeI=";
     };
     aarch64-linux-311 = {
-      name = "torchvision-0.22.1-cp311-cp311-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-i0pTpgZ9Y626DFLyuN0ikNtknWQgIWdO5DwMki8Mamk=";
+      name = "torchvision-0.23.0-cp311-cp311-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-Adwz7iTHkUiu582880roo8naFnSlkeeBV3txbSM7H6Y=";
     };
     aarch64-linux-312 = {
-      name = "torchvision-0.22.1-cp312-cp312-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-lkQU7vGUWdVaEOiG4vylBndVDiQ1htFnj2Xj9va6xHo=";
+      name = "torchvision-0.23.0-cp312-cp312-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-bdfE0ymg4DFXgDAxvIViIMYVXvCMJtT1u6yTis7PCUg=";
     };
     aarch64-linux-313 = {
-      name = "torchvision-0.22.1-cp313-cp313-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-SmFKakCNLtdCCNDqbCii+7aCkOmn3yBsX+8/C2hl0wc=";
+      name = "torchvision-0.23.0-cp313-cp313-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-L3/WwV82l+gGJ7d5NPd3BfO8Dpgni5ibJlXeAfaQPh0=";
     };
   };
 }

From 39058a48fbf38fd7a0b8bc6ccc90ce7c104fd76c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 10:58:08 +0200
Subject: [PATCH 166/230] python313Packages.deebot-client: 13.5.0 -> 13.6.0

Diff: https://github.com/DeebotUniverse/client.py/compare/refs/tags/13.5.0...refs/tags/13.6.0

Changelog: https://github.com/DeebotUniverse/client.py/releases/tag/13.6.0
---
 pkgs/development/python-modules/deebot-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix
index 43668b02ce9f..6d2a10f875a1 100644
--- a/pkgs/development/python-modules/deebot-client/default.nix
+++ b/pkgs/development/python-modules/deebot-client/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "deebot-client";
-  version = "13.5.0";
+  version = "13.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -29,12 +29,12 @@ buildPythonPackage rec {
     owner = "DeebotUniverse";
     repo = "client.py";
     tag = version;
-    hash = "sha256-sQCUxctFTa3olNxXdSbFh/xo5ISOAivQ6XvvOmLysB4=";
+    hash = "sha256-/8IBXPqDHgAa7v5+c1co9cABXXaZJZhZy5N2TzVKG7Q=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Uk9JIrN1w+bwFSG04I3EQGbBV5SArb7G7jcKpVA+ME4=";
+    hash = "sha256-pJSbNgDLq+c3KLVXXZGr7jc7crrbZLcyO//sXJK/bA4=";
   };
 
   pythonRelaxDeps = [

From 006979186438203f6a2c79307bc3c172d6a8d04c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 09:06:00 +0000
Subject: [PATCH 167/230] libretro.fmsx: 0-unstable-2024-10-21 ->
 0-unstable-2025-07-31

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

diff --git a/pkgs/applications/emulators/libretro/cores/fmsx.nix b/pkgs/applications/emulators/libretro/cores/fmsx.nix
index 09152627e8bc..dc072c5108a3 100644
--- a/pkgs/applications/emulators/libretro/cores/fmsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/fmsx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fmsx";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2025-07-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fmsx-libretro";
-    rev = "9eb5f25df5397212a3e3088ca1a64db0740bbe5f";
-    hash = "sha256-Pac1tQvPxYETU+fYU17moBHGfjNtzZiOsOms1uFQAmE=";
+    rev = "fbe4dfc4c3e3f7eb27089def3d663a905b181845";
+    hash = "sha256-1hZQO16SDB8n1wdTP67Kpns3izg/nPGl5M7wjFDBjGc=";
   };
 
   makefile = "Makefile";

From cf37081293268d81e92f0db3589fbb4e7954e0fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 09:13:35 +0000
Subject: [PATCH 168/230] libretro.dosbox-pure: 0-unstable-2025-07-28 ->
 0-unstable-2025-08-03

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

diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index e3b12570912f..e66f399e6dd4 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2025-07-28";
+  version = "0-unstable-2025-08-03";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "4b5f6c964aa56357e19632bf73d1875c2496fdd1";
-    hash = "sha256-J1NSt2Q4+lWUVqROv5yAM/rXI5COl0FRux3xqFLw20g=";
+    rev = "935b33b892b55ab5e12a093795a6563af9eacb78";
+    hash = "sha256-19ehYyVOnYg3b1cvuznYn3zB9rhp2xULKhdFN/FKE4U=";
   };
 
   hardeningDisable = [ "format" ];

From d63981ee565142ea4e5b0f4f67a5a7556b277e46 Mon Sep 17 00:00:00 2001
From: Alexis Praga <alexis@praga.dev>
Date: Tue, 5 Aug 2025 15:03:55 +0200
Subject: [PATCH 169/230] python3Packages.cnvkit: fix tests and build error.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add patch for pytorch.
Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 .../python-modules/cnvkit/default.nix         | 86 +++++++++++++++----
 1 file changed, 68 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix
index 4911f8b004cd..eb6375367297 100644
--- a/pkgs/development/python-modules/cnvkit/default.nix
+++ b/pkgs/development/python-modules/cnvkit/default.nix
@@ -3,9 +3,9 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
-
+  python,
+  makeWrapper,
   # dependencies
-  R,
   biopython,
   matplotlib,
   numpy,
@@ -13,15 +13,15 @@
   pomegranate,
   pyfaidx,
   pysam,
-  rPackages,
   reportlab,
+  rPackages,
   scikit-learn,
   scipy,
-
+  R,
   # tests
   pytestCheckHook,
-}:
 
+}:
 buildPythonPackage rec {
   pname = "cnvkit";
   version = "0.9.12";
@@ -47,11 +47,38 @@ buildPythonPackage rec {
     "pomegranate"
   ];
 
-  # Numpy 2 compatibility
-  postPatch = ''
-    substituteInPlace skgenome/intersect.py \
-      --replace-fail "np.string_" "np.bytes_"
-  '';
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  buildInputs = [
+    R
+  ];
+
+  postPatch =
+    let
+      rscript = lib.getExe' R "Rscript";
+    in
+    # Numpy 2 compatibility
+    ''
+      substituteInPlace skgenome/intersect.py \
+        --replace-fail "np.string_" "np.bytes_"
+    ''
+    # Patch shebang lines in R scripts
+    + ''
+      substituteInPlace cnvlib/segmentation/flasso.py \
+        --replace-fail "#!/usr/bin/env Rscript" "#!${rscript}"
+
+      substituteInPlace cnvlib/segmentation/cbs.py \
+        --replace-fail "#!/usr/bin/env Rscript" "#!${rscript}"
+
+      substituteInPlace cnvlib/segmentation/__init__.py \
+        --replace-fail 'rscript_path="Rscript"' 'rscript_path="${rscript}"'
+
+      substituteInPlace cnvlib/commands.py \
+        --replace-fail 'default="Rscript"' 'default="${rscript}"'
+
+    '';
 
   dependencies = [
     biopython
@@ -61,12 +88,42 @@ buildPythonPackage rec {
     pomegranate
     pyfaidx
     pysam
-    rPackages.DNAcopy
     reportlab
+    rPackages.DNAcopy
     scikit-learn
     scipy
   ];
 
+  # Make sure R can find the DNAcopy package
+  postInstall = ''
+    wrapProgram $out/bin/cnvkit.py \
+      --set R_LIBS_SITE "${rPackages.DNAcopy}/library" \
+       --set MPLCONFIGDIR "/tmp/matplotlib-config"
+  '';
+
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    ${python.executable} -m pytest --deselect=test/test_commands.py::CommandTests::test_batch \
+      --deselect=test/test_commands.py::CommandTests::test_segment_hmm
+
+      cd test
+      # Set matplotlib config directory for the tests
+      export MPLCONFIGDIR="/tmp/matplotlib-config"
+      export HOME="/tmp"
+      mkdir -p "$MPLCONFIGDIR"
+
+      # Use the installed binary - it's already wrapped with R_LIBS_SITE
+      make cnvkit="$out/bin/cnvkit.py" || {
+        echo "Make tests failed"
+        exit 1
+      }
+
+    runHook postInstallCheck
+  '';
+
+  doInstallCheck = true;
+
   pythonImportsCheck = [ "cnvlib" ];
 
   nativeCheckInputs = [
@@ -74,13 +131,6 @@ buildPythonPackage rec {
     R
   ];
 
-  disabledTests = [
-    # AttributeError: module 'pomegranate' has no attribute 'NormalDistribution'
-    # https://github.com/etal/cnvkit/issues/815
-    "test_batch"
-    "test_segment_hmm"
-  ];
-
   meta = {
     homepage = "https://cnvkit.readthedocs.io";
     description = "Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data";

From 244248f8a126cbd66cbe3597fbada09b4b146d87 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 11:35:10 +0200
Subject: [PATCH 170/230] python313Packages.readabilipy: disable failing tests

---
 .../python-modules/readabilipy/default.nix     | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix
index e220f5caff29..65bca92865c5 100644
--- a/pkgs/development/python-modules/readabilipy/default.nix
+++ b/pkgs/development/python-modules/readabilipy/default.nix
@@ -44,9 +44,9 @@ buildPythonPackage rec {
     dontNpmBuild = true;
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     beautifulsoup4
     html5lib
     lxml
@@ -75,6 +75,18 @@ buildPythonPackage rec {
     "tests/test_benchmarking.py"
   ];
 
+  disabledTests = [
+    # IndexError: list index out of range
+    "test_html_blacklist"
+    "test_prune_div_with_one_empty_span"
+    "test_prune_div_with_one_whitespace_paragraph"
+    "test_empty_page"
+    "test_contentless_page"
+    "test_extract_title"
+    "test_iframe_containing_tags"
+    "test_iframe_with_source"
+  ];
+
   passthru = {
     tests.version = testers.testVersion {
       package = readabilipy;
@@ -85,10 +97,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "HTML content extractor";
-    mainProgram = "readabilipy";
     homepage = "https://github.com/alan-turing-institute/ReadabiliPy";
     changelog = "https://github.com/alan-turing-institute/ReadabiliPy/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "readabilipy";
   };
 }

From 6fe959f8cef40b3213d8fd412b9c0476c5b42377 Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Thu, 7 Aug 2025 11:59:39 +0200
Subject: [PATCH 171/230] nixos test driver: drop wrong assertion

---
 nixos/lib/test-driver/src/test_driver/machine/ocr.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/lib/test-driver/src/test_driver/machine/ocr.py b/nixos/lib/test-driver/src/test_driver/machine/ocr.py
index 5f74b2ccfbc1..9f56f9c901e4 100644
--- a/nixos/lib/test-driver/src/test_driver/machine/ocr.py
+++ b/nixos/lib/test-driver/src/test_driver/machine/ocr.py
@@ -12,10 +12,7 @@ def perform_ocr_on_screenshot(screenshot_path: Path) -> str:
     Perform OCR on a screenshot that contains text.
     Returns a string with all words that could be found.
     """
-    variants = perform_ocr_variants_on_screenshot(screenshot_path, False)[0]
-    if len(variants) != 1:
-        raise MachineError(f"Received wrong number of OCR results: {len(variants)}")
-    return variants[0]
+    return perform_ocr_variants_on_screenshot(screenshot_path, False)[0]
 
 
 def perform_ocr_variants_on_screenshot(

From 476c08beffd553fee8d6dac5e04423804d9c8f51 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 12:00:35 +0200
Subject: [PATCH 172/230] python313Packages.logutils: disable redis tests for
 all platforms

---
 .../python-modules/logutils/default.nix       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix
index e3480e9fe5d3..71ba14b499a1 100644
--- a/pkgs/development/python-modules/logutils/default.nix
+++ b/pkgs/development/python-modules/logutils/default.nix
@@ -42,14 +42,17 @@ buildPythonPackage rec {
     "test_hashandlers"
   ];
 
-  disabledTestPaths =
-    lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # Exception: unable to connect to Redis server
-      "tests/test_redis.py"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      "tests/test_dictconfig.py"
-    ];
+  disabledTestPaths = [
+    # Disable redis tests on all systems for now
+    "tests/test_redis.py"
+  ]
+  # lib.optionals (stdenv.hostPlatform.isDarwin) [
+  #   # Exception: unable to connect to Redis server
+  #   "tests/test_redis.py"
+  # ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    "tests/test_dictconfig.py"
+  ];
 
   pythonImportsCheck = [ "logutils" ];
 

From 150643a84fba155d38a1998e96f42f3bb31424ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 10:23:10 +0000
Subject: [PATCH 173/230] enzyme: 0.0.187 -> 0.0.188

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

diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 1749c5c7d787..a4a325303032 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.187";
+  version = "0.0.188";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-vdLt7LtVkgcgoUzzl5jb7ERIyQMpY+iSwJpdQpWxoJw=";
+    hash = "sha256-CoImpu1Hwn11s+6GeYPIyaIHz7kdjrBMpbxAUzaJWZU=";
   };
 
   postPatch = ''

From bbc726b2fc6567c130ceb1f45d65593293706c16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 10:36:03 +0000
Subject: [PATCH 174/230] terraform-providers.harbor: 3.10.21 -> 3.10.23

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9890a4b2662b..8c0c61acdb1c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -570,13 +570,13 @@
     "vendorHash": null
   },
   "harbor": {
-    "hash": "sha256-KYCyqNKqW/I4q1JHVK4rD9H8/D60IL7H9cCgz6wLg5Q=",
+    "hash": "sha256-RZkXUB4Msmsm+1mQij+577d7KUrDpk50oPc2rcFevi4=",
     "homepage": "https://registry.terraform.io/providers/goharbor/harbor",
     "owner": "goharbor",
     "repo": "terraform-provider-harbor",
-    "rev": "v3.10.21",
+    "rev": "v3.10.23",
     "spdx": "MIT",
-    "vendorHash": "sha256-C1MT4mA7ubh1mN4+HO0bwMpjVHjDIG6UXZI6gvXHFZE="
+    "vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
   },
   "hcloud": {
     "hash": "sha256-O6GaMSL5E9t5v9nsRh7aGIXy/w04sCy7AYG4AvGsbLc=",

From c61812a5df18e5df810fa5252e4ea3cd2b896aab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 13:08:56 +0200
Subject: [PATCH 175/230] python312Packages.ciscoconfparse2: 0.8.17 -> 0.8.29

Diff: https://github.com/mpenning/ciscoconfparse2/compare/refs/tags/0.8.17...refs/tags/0.8.29

Changelog: https://github.com/mpenning/ciscoconfparse2/blob/0.8.29/CHANGES.md
---
 pkgs/development/python-modules/ciscoconfparse2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix
index 166eaba86ea4..3134599b8b40 100644
--- a/pkgs/development/python-modules/ciscoconfparse2/default.nix
+++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "ciscoconfparse2";
-  version = "0.8.17";
+  version = "0.8.29";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mpenning";
     repo = "ciscoconfparse2";
     tag = version;
-    hash = "sha256-G6FR2v/FJE0ySpNXJ9603O16UjSqOkRB2+7xNoLBJAM=";
+    hash = "sha256-Dvryv3VPdyRuvIPksEnSlKnCJU70j2xd2aWpwXUGbUY=";
   };
 
   pythonRelaxDeps = [

From 8c34ca893accb7a77529616e5f8228c50411cacb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 13:11:16 +0200
Subject: [PATCH 176/230] python313Packages.ciscoconfparse2: mark as broken

Missing support for hier_config > 3
https://github.com/mpenning/ciscoconfparse2/issues/19
---
 pkgs/development/python-modules/ciscoconfparse2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix
index 3134599b8b40..731c78292b68 100644
--- a/pkgs/development/python-modules/ciscoconfparse2/default.nix
+++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix
@@ -84,5 +84,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/mpenning/ciscoconfparse2/blob/${src.tag}/CHANGES.md";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
+    # https://github.com/mpenning/ciscoconfparse2/issues/19
+    broken = lib.versionAtLeast hier-config.version "3";
   };
 }

From d214d34b9c8b7b2a53399f502a70da4820351dea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 13:12:49 +0200
Subject: [PATCH 177/230] python313Packages.scrypt: 0.8.29 -> 0.9.4

Diff: https://github.com/holgern/py-scrypt/compare/refs/tags/v0.8.29...refs/tags/v0.9.4

Changelog: https://github.com/holgern/py-scrypt/releases/tag/v0.9.4
---
 pkgs/development/python-modules/scrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scrypt/default.nix b/pkgs/development/python-modules/scrypt/default.nix
index 431d1e0da634..d85aaa43cb71 100644
--- a/pkgs/development/python-modules/scrypt/default.nix
+++ b/pkgs/development/python-modules/scrypt/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "scrypt";
-  version = "0.8.29";
+  version = "0.9.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "holgern";
     repo = "py-scrypt";
     tag = "v${version}";
-    hash = "sha256-vO7TLLF+TMp8sr55sLaUWA9erwaHj5YipqchmIX6EOE=";
+    hash = "sha256-4jVXaPD57RMe4ef1PVgZwPGAhEHL3RGlu2DSC6lGuR4=";
   };
 
   build-system = [ setuptools ];

From 8bd00446aea504e12ac8e9a0c54e3d25079006c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 13:15:55 +0200
Subject: [PATCH 178/230] electrum-ltc: rename py-scrypt to scrypt

---
 pkgs/applications/misc/electrum/ltc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 268952e4747d..338b5fc316e8 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -70,17 +70,17 @@ python3.pkgs.buildPythonApplication {
       aiorpcx
       attrs
       bitstring
+      certifi
       cryptography
       dnspython
       jsonrpclib-pelix
       matplotlib
       pbkdf2
       protobuf
-      py-scrypt
       pysocks
       qrcode
       requests
-      certifi
+      scrypt
       # plugins
       btchip-python
       ckcc-protocol

From 3629b64b8c5728320d0111dd0ef9737276805580 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 13:18:49 +0200
Subject: [PATCH 179/230] python313Packages.py-scrypt: remove

Duplicate package
---
 .../python-modules/py-scrypt/default.nix      | 28 -------------------
 pkgs/top-level/python-aliases.nix             |  2 +-
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/development/python-modules/py-scrypt/default.nix

diff --git a/pkgs/development/python-modules/py-scrypt/default.nix b/pkgs/development/python-modules/py-scrypt/default.nix
deleted file mode 100644
index bf2bf239145a..000000000000
--- a/pkgs/development/python-modules/py-scrypt/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  openssl,
-}:
-
-buildPythonPackage rec {
-  pname = "py-scrypt";
-  version = "0.8.27";
-  format = "setuptools";
-
-  src = fetchPypi {
-    pname = "scrypt";
-    inherit version;
-    hash = "sha256-p7Y3hI7VGMHqKzGp7Kqj9JYWWY2EQt6HBs8fAfur8Kc=";
-  };
-
-  buildInputs = [ openssl ];
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Bindings for scrypt key derivation function library";
-    homepage = "https://pypi.python.org/pypi/scrypt";
-    maintainers = [ ];
-    license = licenses.bsd2;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 307b307774ff..4faa55fe87a1 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -615,7 +615,7 @@ mapAliases ({
   Pyro5 = pyro5; # added 2023-02-19
   PyRSS2Gen = pyrss2gen; # added 2023-02-19
   pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07
-  py_scrypt = py-scrypt; # added 2024-01-07
+  py-scrypt = scrypt; # added 2025-08-07
   pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20
   pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16
   pysmart-smartx = pysmart; # added 2021-10-22
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1e5e4e2af05d..b50faa2a12b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12256,8 +12256,6 @@ self: super: with self; {
 
   py-schluter = callPackage ../development/python-modules/py-schluter { };
 
-  py-scrypt = callPackage ../development/python-modules/py-scrypt { };
-
   py-serializable = callPackage ../development/python-modules/py-serializable { };
 
   py-slvs = callPackage ../development/python-modules/py-slvs { };

From 19f5098f8bdc3d75f3e1764557ac2eefe3d56b7f Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Thu, 7 Aug 2025 11:57:46 +0200
Subject: [PATCH 180/230] linkchecker: 10.2.1 -> 10.6.0

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

diff --git a/pkgs/by-name/li/linkchecker/package.nix b/pkgs/by-name/li/linkchecker/package.nix
index 12f5b5d6fef3..1395dfba23ba 100644
--- a/pkgs/by-name/li/linkchecker/package.nix
+++ b/pkgs/by-name/li/linkchecker/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "linkchecker";
-  version = "10.2.1";
+  version = "10.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "linkchecker";
     repo = "linkchecker";
     tag = "v${version}";
-    hash = "sha256-z7Qp74cai8GfsxB4n9dSCWQepp0/4PimFiRJQBaVSoo=";
+    hash = "sha256-CzDShtqcGO2TP5qNVf2zkI3Yyh80I+pSVIFzmi3AaGQ=";
   };
 
   nativeBuildInputs = [ gettext ];
@@ -46,11 +46,6 @@ python3.pkgs.buildPythonApplication rec {
     "test_itms_services" # uses sys.version_info for conditional testing
   ];
 
-  disabledTestPaths = [
-    "tests/checker/telnetserver.py"
-    "tests/checker/test_telnet.py"
-  ];
-
   __darwinAllowLocalNetworking = true;
 
   meta = {

From c02976ad5fbd7c2ba6ddb251fcb45543247bb90c Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Thu, 7 Aug 2025 11:58:42 +0200
Subject: [PATCH 181/230] linkchecker: modernize, add PDF support

---
 pkgs/by-name/li/linkchecker/package.nix | 34 +++++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/li/linkchecker/package.nix b/pkgs/by-name/li/linkchecker/package.nix
index 1395dfba23ba..e94747d4eaa3 100644
--- a/pkgs/by-name/li/linkchecker/package.nix
+++ b/pkgs/by-name/li/linkchecker/package.nix
@@ -1,11 +1,12 @@
 {
+  python3Packages,
   lib,
   fetchFromGitHub,
-  python3,
   gettext,
+  pdfSupport ? true,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "linkchecker";
   version = "10.6.0";
   pyproject = true;
@@ -19,31 +20,36 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeBuildInputs = [ gettext ];
 
-  build-system = with python3.pkgs; [
+  build-system = with python3Packages; [
     hatchling
     hatch-vcs
     polib # translations
   ];
 
-  dependencies = with python3.pkgs; [
-    argcomplete
-    beautifulsoup4
-    dnspython
-    requests
-  ];
+  dependencies =
+    with python3Packages;
+    [
+      argcomplete
+      beautifulsoup4
+      dnspython
+      requests
+    ]
+    ++ lib.optional pdfSupport pdfminer-six;
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     pyopenssl
     parameterized
     pytestCheckHook
+    pyftpdlib
   ];
 
+  # Needed for tests to be able to create a ~/.local/share/linkchecker/plugins directory
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
   disabledTests = [
-    "TestLoginUrl"
     "test_timeit2" # flakey, and depends sleep being precise to the milisecond
-    "test_internet" # uses network, fails on Darwin (not sure why it doesn't fail on linux)
-    "test_markdown" # uses sys.version_info for conditional testing
-    "test_itms_services" # uses sys.version_info for conditional testing
   ];
 
   __darwinAllowLocalNetworking = true;

From 55d96a12c9675d244d3dd7837635d866c04e8200 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 11:28:53 +0000
Subject: [PATCH 182/230] vial: 0.7.4 -> 0.7.5

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

diff --git a/pkgs/by-name/vi/vial/package.nix b/pkgs/by-name/vi/vial/package.nix
index 4586ca25d039..a1e6c450d136 100644
--- a/pkgs/by-name/vi/vial/package.nix
+++ b/pkgs/by-name/vi/vial/package.nix
@@ -4,12 +4,12 @@
   appimageTools,
 }:
 let
-  version = "0.7.4";
+  version = "0.7.5";
   pname = "Vial";
 
   src = fetchurl {
     url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
-    hash = "sha256-SxZC+ihJsmIQAZ31G6wS42qTxdt1/8lx80bHox3sy28=";
+    hash = "sha256-sN8i/MOPhaLZ4iJNKz/MdpRIGTZVV/G5qD7o+ID8dAM=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 6682e3e582e87558cf8c38617c2254e6e46363f7 Mon Sep 17 00:00:00 2001
From: datafoo <34766150+datafoo@users.noreply.github.com>
Date: Thu, 7 Aug 2025 08:38:34 +0200
Subject: [PATCH 183/230] vscode-extensions.elixir-lsp.vscode-elixir-ls: 0.28.0
 -> 0.29.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index bccdce35177f..89eee2f6a96b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1614,8 +1614,8 @@ let
         mktplcRef = {
           name = "elixir-ls";
           publisher = "JakeBecker";
-          version = "0.28.0";
-          hash = "sha256-pHLAA7i2HJC523lPotUy5Zwa3BTSTurC2BA+eevdH38=";
+          version = "0.29.2";
+          hash = "sha256-+MkKUhyma/mc5MZa0+RFty5i7rox0EARPTm/uggQj6M=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";

From 1d4489dc3265771fd11f8b3d0422036d39b44b0f Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Mon, 4 Aug 2025 17:00:57 +0200
Subject: [PATCH 184/230] stdenv: Replace "// optionalAttrs" with nullable attr
 name

As in https://github.com/NixOS/nixpkgs/pull/430132, it saves a lot of
set allocations and merge operations, but makes code harder to read.

I've tried introducing a function like this to make code cleaner, but it
increases number of envs and space taken by them significantly:

  optionalAttr = cond: name: if cond then name else null;

I've also tried applying this logic to the section with isDarwin, but
it makes things measurably worse for x86_64-linux eval.
---
 pkgs/stdenv/generic/make-derivation.nix | 85 +++++++++++++------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index f453e61510c3..aed866aa454b 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -202,17 +202,15 @@ let
     # to be built eventually, we would still like to get the error early and without
     # having to wait while nix builds a derivation that might not be used.
     # See also https://github.com/NixOS/nix/issues/4629
-    optionalAttrs (attrs ? disallowedReferences) {
-      disallowedReferences = map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences;
-    }
-    // optionalAttrs (attrs ? disallowedRequisites) {
-      disallowedRequisites = map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites;
-    }
-    // optionalAttrs (attrs ? allowedReferences) {
-      allowedReferences = mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences;
-    }
-    // optionalAttrs (attrs ? allowedRequisites) {
-      allowedRequisites = mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites;
+    {
+      ${if (attrs ? disallowedReferences) then "disallowedReferences" else null} =
+        map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences;
+      ${if (attrs ? disallowedRequisites) then "disallowedRequisites" else null} =
+        map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites;
+      ${if (attrs ? allowedReferences) then "allowedReferences" else null} =
+        mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences;
+      ${if (attrs ? allowedRequisites) then "allowedRequisites" else null} =
+        mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites;
     };
 
   makeDerivationArgument =
@@ -478,8 +476,8 @@ let
 
         derivationArg =
           removeAttrs attrs removedOrReplacedAttrNames
-          // (optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
-            name =
+          // {
+            ${if (attrs ? name || (attrs ? pname && attrs ? version)) then "name" else null} =
               let
                 # Indicate the host platform of the derivation if cross compiling.
                 # Fixed-output derivations like source tarballs shouldn't get a host
@@ -507,8 +505,7 @@ let
                   ) "The `version` attribute cannot be null.";
                   "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
               );
-          })
-          // {
+
             builder = attrs.realBuilder or stdenv.shell;
             args =
               attrs.args or [
@@ -556,28 +553,33 @@ let
             inherit doCheck doInstallCheck;
 
             inherit outputs;
-          }
-          // optionalAttrs (__contentAddressed) {
-            inherit __contentAddressed;
-            # Provide default values for outputHashMode and outputHashAlgo because
-            # most people won't care about these anyways
-            outputHashAlgo = attrs.outputHashAlgo or "sha256";
-            outputHashMode = attrs.outputHashMode or "recursive";
-          }
-          // optionalAttrs (enableParallelBuilding) {
-            inherit enableParallelBuilding;
-            enableParallelChecking = attrs.enableParallelChecking or true;
-            enableParallelInstalling = attrs.enableParallelInstalling or true;
-          }
-          // optionalAttrs (hardeningDisable != [ ] || hardeningEnable != [ ] || stdenv.hostPlatform.isMusl) {
-            NIX_HARDENING_ENABLE = builtins.concatStringsSep " " enabledHardeningOptions;
-          }
-          //
+
+            # When the derivations is content addressed provide default values
+            # for outputHashMode and outputHashAlgo because most people won't
+            # care about these anyways
+            ${if __contentAddressed then "__contentAddressed" else null} = __contentAddressed;
+            ${if __contentAddressed then "outputHashAlgo" else null} = attrs.outputHashAlgo or "sha256";
+            ${if __contentAddressed then "outputHashMode" else null} = attrs.outputHashMode or "recursive";
+
+            ${if enableParallelBuilding then "enableParallelBuilding" else null} = enableParallelBuilding;
+            ${if enableParallelBuilding then "enableParallelChecking" else null} =
+              attrs.enableParallelChecking or true;
+            ${if enableParallelBuilding then "enableParallelInstalling" else null} =
+              attrs.enableParallelInstalling or true;
+
+            ${
+              if (hardeningDisable != [ ] || hardeningEnable != [ ] || stdenv.hostPlatform.isMusl) then
+                "NIX_HARDENING_ENABLE"
+              else
+                null
+            } =
+              builtins.concatStringsSep " " enabledHardeningOptions;
+
             # TODO: remove platform condition
             # Enabling this check could be a breaking change as it requires to edit nix.conf
             # NixOS module already sets gccarch, unsure of nix installers and other distributions
-            optionalAttrs
-              (
+            ${
+              if
                 stdenv.buildPlatform ? gcc.arch
                 && !(
                   stdenv.buildPlatform.isAarch64
@@ -589,12 +591,15 @@ let
                       stdenv.buildPlatform.gcc.arch == "armv8-a"
                   )
                 )
-              )
-              {
-                requiredSystemFeatures = attrs.requiredSystemFeatures or [ ] ++ [
-                  "gccarch-${stdenv.buildPlatform.gcc.arch}"
-                ];
-              }
+              then
+                "requiredSystemFeatures"
+              else
+                null
+            } =
+              attrs.requiredSystemFeatures or [ ] ++ [
+                "gccarch-${stdenv.buildPlatform.gcc.arch}"
+              ];
+          }
           // optionalAttrs (stdenv.buildPlatform.isDarwin) (
             let
               allDependencies = concatLists (concatLists dependencies);

From b924fc659db3dae7ea67d4a7e4752d176fb1fffa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 11:46:53 +0000
Subject: [PATCH 185/230] task-keeper: 0.29.3 -> 0.30.1

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

diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix
index 45fbb404ec6b..75dd0646e308 100644
--- a/pkgs/by-name/ta/task-keeper/package.nix
+++ b/pkgs/by-name/ta/task-keeper/package.nix
@@ -8,19 +8,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "task-keeper";
-  version = "0.29.3";
+  version = "0.30.1";
 
   src = fetchFromGitHub {
     owner = "linux-china";
     repo = "task-keeper";
     tag = "v${version}";
-    hash = "sha256-89KR1u4aTd32tGPiW4qUUk9eC7d9pGSBuZ8C8QVgMQ4=";
+    hash = "sha256-/ZmwCvoYdX733c5QkUE0KuUdHeibJkXD5wNHR7Cr7aU=";
   };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
 
-  cargoHash = "sha256-eLdGLKem/Sh9cQ7TRbKymUIldpctBKk1JBjWiSwLloo=";
+  cargoHash = "sha256-Z56p2jeHvNAT4Pwl8kt1l9RopYCKk5Tt/XWZ7AqIFYw=";
 
   # tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅
   doCheck = false;

From 6bf4c20403a4d9665f36d86420d409477baf707d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 11:58:10 +0000
Subject: [PATCH 186/230] artichoke: 0-unstable-2025-07-28 ->
 0-unstable-2025-08-03

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

diff --git a/pkgs/by-name/ar/artichoke/package.nix b/pkgs/by-name/ar/artichoke/package.nix
index 7282ca4388be..25bfac1bca1b 100644
--- a/pkgs/by-name/ar/artichoke/package.nix
+++ b/pkgs/by-name/ar/artichoke/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "artichoke";
-  version = "0-unstable-2025-07-28";
+  version = "0-unstable-2025-08-03";
 
   src = fetchFromGitHub {
     owner = "artichoke";
     repo = "artichoke";
-    rev = "148d3bf4bc361fa3214c02219e50e22e4cf2a3cf";
-    hash = "sha256-CKCRFSg8ROMhKwiIDU9iAYY/HfGtYlW1zrtn7thxIzY=";
+    rev = "ff0b17820a5f64ea9e8b744cef4a9111df3ed252";
+    hash = "sha256-0SUU/1gp7A0gjluc8ZyF9C4ZxAgNsM6jwuT3E8GxFQY=";
   };
 
-  cargoHash = "sha256-a43awTdhOlu+KO3B6XQ7Vdv4NbZ3iffq4rpmBBgUcZ8=";
+  cargoHash = "sha256-JD+qt0pu5wxIuLa3Bd9eadQFE7dyKzqxsAKPebG7+Zg=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From c7d7fc5bd08ad7a60d907851fc5548289825b882 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 12:18:19 +0000
Subject: [PATCH 187/230] xenia-canary: 0-unstable-2025-07-27 ->
 0-unstable-2025-08-06

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

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index 540db1ad546b..d66bc9521c37 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-07-27";
+  version = "0-unstable-2025-08-06";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "4e8e789876329e03697d1542718fbc21b5053aa5";
-    hash = "sha256-sfNkMeOEvmBbFv2mDnKs3UGPxFRvts9wcgcA23endUI=";
+    rev = "e9b24642541f0203d369fedd74900cbbaddeac1e";
+    hash = "sha256-q3NJvt19mi6Ve5rMHAtzP3P/ryiypCAuiEsVVCDKn8M=";
   };
 
   dontConfigure = true;

From fb94e68811b8ff7e0807631ff3626026791114c5 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Wed, 6 Aug 2025 14:48:25 +0200
Subject: [PATCH 188/230] chroma: 2.19.0 -> 2.20.0

https://github.com/alecthomas/chroma/releases/tag/v2.20.0
---
 pkgs/by-name/ch/chroma/package.nix |  4 ++--
 pkgs/by-name/ch/chroma/src.json    | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix
index 929dbbb88b85..d795feef29fe 100644
--- a/pkgs/by-name/ch/chroma/package.nix
+++ b/pkgs/by-name/ch/chroma/package.nix
@@ -10,7 +10,7 @@ in
 
 buildGoModule rec {
   pname = "chroma";
-  version = "2.19.0";
+  version = "2.20.0";
 
   # To update:
   # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
@@ -21,7 +21,7 @@ buildGoModule rec {
     inherit (srcInfo) sha256;
   };
 
-  vendorHash = "sha256-Gqldcp68Rn4wkfQptbmKUjkwLSb+qaFboJNfmWVkrPU=";
+  vendorHash = "sha256-GiaVgqhhrexSnBWVtQ+/cwdykHVDxR95BFMkrH1s+8Q=";
 
   modRoot = "./cmd/chroma";
 
diff --git a/pkgs/by-name/ch/chroma/src.json b/pkgs/by-name/ch/chroma/src.json
index 1a5fd3cf2246..c705d660c1cb 100644
--- a/pkgs/by-name/ch/chroma/src.json
+++ b/pkgs/by-name/ch/chroma/src.json
@@ -1,12 +1,13 @@
 {
   "url": "https://github.com/alecthomas/chroma.git",
-  "rev": "adeac8f5dbfb6806a51bcf07eefd89fc8a0aee6a",
-  "date": "2025-07-01T09:59:45+10:00",
-  "path": "/nix/store/063ldbczafhxq02g5n28bxr1xnl6fwgd-chroma",
-  "sha256": "1r50gqbizi7l1l07syx9wgfyx1k8gzspmsbpk42jnwgw3h9dcw42",
-  "hash": "sha256-gnDWEhz8cSsFmXfpevV/aIbu3eOpe30ADfTEHxd+oOQ=",
+  "rev": "303b65df3f2d2151cee24bcf9f9b625db474ef51",
+  "date": "2025-08-04T13:55:06+10:00",
+  "path": "/nix/store/1f8p33h1srs9knj6sn6mc5rf0wcybf4g-chroma",
+  "sha256": "05w4hnfcxqdlsz7mkc0m3jbp1aj67wzyhq5jh8ldfgnyjnlafia3",
+  "hash": "sha256-Q0WnqJXePtcogrJg6D8/RqpwlxwVsFnP17ThzpyFhBc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
+  "fetchTags": false,
   "leaveDotGit": false
 }

From 190f6932af0a62fc7d61bc2a643625bc0da10626 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 7 Aug 2025 13:01:35 +0000
Subject: [PATCH 189/230] meerk40t: migrate to by-name

meerk40t: refactor package definitions and meta
---
 .../me/meerk40t-camera/package.nix}               | 15 ++++++---------
 .../me/meerk40t/package.nix}                      | 12 ++++++------
 pkgs/top-level/all-packages.nix                   |  4 ----
 3 files changed, 12 insertions(+), 19 deletions(-)
 rename pkgs/{applications/misc/meerk40t/camera.nix => by-name/me/meerk40t-camera/package.nix} (67%)
 rename pkgs/{applications/misc/meerk40t/default.nix => by-name/me/meerk40t/package.nix} (90%)

diff --git a/pkgs/applications/misc/meerk40t/camera.nix b/pkgs/by-name/me/meerk40t-camera/package.nix
similarity index 67%
rename from pkgs/applications/misc/meerk40t/camera.nix
rename to pkgs/by-name/me/meerk40t-camera/package.nix
index 6e33c8077c66..befee442bf31 100644
--- a/pkgs/applications/misc/meerk40t/camera.nix
+++ b/pkgs/by-name/me/meerk40t-camera/package.nix
@@ -1,13 +1,10 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchPypi,
 }:
 
-let
-  inherit (python3.pkgs) buildPythonPackage;
-in
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "meerk40t-camera";
   version = "0.1.9";
   format = "setuptools";
@@ -21,7 +18,7 @@ buildPythonPackage rec {
     sed -i '/meerk40t/d' setup.py
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3Packages; [
     opencv4
   ];
 
@@ -31,10 +28,10 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "MeerK40t camera plugin";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/meerk40t/meerk40t-camera";
-    maintainers = with maintainers; [ hexa ];
+    maintainers = with lib.maintainers; [ hexa ];
   };
 }
diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/by-name/me/meerk40t/package.nix
similarity index 90%
rename from pkgs/applications/misc/meerk40t/default.nix
rename to pkgs/by-name/me/meerk40t/package.nix
index a7c9c9aa4b9f..810655eb1d47 100644
--- a/pkgs/applications/misc/meerk40t/default.nix
+++ b/pkgs/by-name/me/meerk40t/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "meerk40t";
-    repo = pname;
+    repo = "MeerK40t";
     tag = version;
     hash = "sha256-7igY6qEHDUAyyKK+T0WFNfGPYy8VnMLYaWHyBE8EMSs=";
   };
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
   dontWrapGApps = true;
 
   # https://github.com/meerk40t/meerk40t/blob/main/setup.py
-  propagatedBuildInputs =
+  dependencies =
     with python3Packages;
     [
       meerk40t-camera
@@ -75,12 +75,12 @@ python3Packages.buildPythonApplication rec {
     export HOME=$TMPDIR
   '';
 
-  meta = with lib; {
-    changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${src.tag}";
+  meta = {
+    changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${version}";
     description = "MeerK40t LaserCutter Software";
     mainProgram = "meerk40t";
     homepage = "https://github.com/meerk40t/meerk40t";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2187a7fa3929..240e00fda5e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12306,10 +12306,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  meerk40t = callPackage ../applications/misc/meerk40t { };
-
-  meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { };
-
   libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { };
 
   mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };

From c0b0005ab051eb275ccdf59912d24969217eaf28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 13:12:52 +0000
Subject: [PATCH 190/230] protoc-gen-go: 1.36.6 -> 1.36.7

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

diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix
index a119d4ee6fcc..5e2615bb1309 100644
--- a/pkgs/by-name/pr/protoc-gen-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "protoc-gen-go";
-  version = "1.36.6";
+  version = "1.36.7";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-go";
     rev = "v${version}";
-    hash = "sha256-6Wx1XoHZS1RM0hpgVE85U7huVS4IK+AroTE2zpZR4VI=";
+    hash = "sha256-8ePIQ62ewJ1Bp+rG+R7o8Vx++zp8VK0MeEb8ASGZQ7E=";
   };
 
   vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E=";

From a3ed12cbe232ad99b1c579c028ea1c7811ba9324 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 7 Aug 2025 21:30:01 +0800
Subject: [PATCH 191/230] .github/labeler.yml: label cinnamon itself

See 2c551ea2d35051b0e4f166b8a7fa659b01205c6c.
---
 .github/labeler.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 95190ab16bf6..031fead8f534 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -28,6 +28,7 @@
               - nixos/modules/services/x11/desktop-managers/cinnamon.nix
               - nixos/tests/cinnamon.nix
               - nixos/tests/cinnamon-wayland.nix
+              - pkgs/by-name/ci/cinnamon/**/*
               - pkgs/by-name/ci/cinnamon-*/**/*
               - pkgs/by-name/cj/cjs/**/*
               - pkgs/by-name/mu/muffin/**/*

From ed6f6a1ca1ac5707695a56cb1312cc32247b9c75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 13:43:39 +0000
Subject: [PATCH 192/230] limine: 9.5.1 -> 9.5.4

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

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 609616167dc1..c7171ec7f1d7 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "9.5.1";
+  version = "9.5.4";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-UgY8S+XGlSnO1k98JWBfSN0/IY3LANVFgJwI1kdPAcU=";
+    hash = "sha256-X0dStbsBJyFDUG25G4PUZInp+yVG3+p3bfhwQL280ig=";
   };
 
   enableParallelBuilding = true;

From 285da4d2a8bf716d988728e4d68831f2e65cdfdb Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 7 Aug 2025 14:48:13 +0100
Subject: [PATCH 193/230] moonlight: 1.3.25 -> 1.3.26

Diff: https://github.com/moonlight-mod/moonlight/compare/v1.3.25...v1.3.26

Changelog: https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v1.3.26/CHANGELOG.md
---
 pkgs/by-name/mo/moonlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index b22688a1d1de..f21fcd84b5c9 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.25";
+  version = "1.3.26";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-raqn8TVqD/VFgPw6kiv69JoBmUUVp9Ltj9n2EeEg85U=";
+    hash = "sha256-NcwRidwb/ask65LE86os4RkhyoPQo5sLu0sJs/NboK4=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildInputs = [ nodejs_22 ];
 
     fetcherVersion = 2;
-    hash = "sha256-KZOAbU6IBytkZzwB8jbSwmlkM69uhjNUEKmIu5/DySI=";
+    hash = "sha256-LUUpcC2eS8VvzguicIn9xsKql9w3533xxUJ+l7e7Anc=";
   };
 
   env = {

From fad04064f2b9821d88f5903c909db737549c7956 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 7 Aug 2025 16:14:28 +0200
Subject: [PATCH 194/230] signal-desktop-bin: 7.59.0 -> 7.64.0 (#422163)

* signal-desktop-bin: 7.59.0 -> 7.64.0

* signal-desktop-bin(aarch64-linux): 7.59.0 -> 7.64.0

* signal-desktop-bin(darwin): 7.59.0 -> 7.64.0
---
 .../si/signal-desktop-bin/signal-desktop-aarch64.nix        | 6 +++---
 .../by-name/si/signal-desktop-bin/signal-desktop-darwin.nix | 4 ++--
 pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
index ff66f0d21c8e..f13a40c87f29 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
@@ -1,7 +1,7 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } {
   pname = "signal-desktop-bin";
-  version = "7.59.0";
+  version = "7.64.0";
 
   libdir = "usr/lib64/signal-desktop";
   bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
     bsdtar -xf $downloadedFile -C "$out"
   '';
 
-  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09213968-signal-desktop/signal-desktop-7.59.0-1.fc42.aarch64.rpm";
-  hash = "sha256-nGpSWlTJ1M6UL7V3o57KByfh55LL/p3I9h+XmoJhuec=";
+  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09358233-signal-desktop/signal-desktop-7.64.0-1.fc42.aarch64.rpm";
+  hash = "sha256-VWDw1eSYze23obCU/R4chesJvZZo1JbDGvR82Jg99og=";
 }
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
index d4344a3a30e3..0f6235e4eae9 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop-bin";
-  version = "7.59.0";
+  version = "7.64.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-maBZqSklxa1Vg3U6xbQxYx+McPTWa4WdBCKh4tq6W4g=";
+    hash = "sha256-Ir0p2M3P8bUNi16i4aGO8RmUD20mYKbVD+4twHEOMJc=";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
index 32f8f782b044..e6a4bd11bb3d 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
@@ -1,12 +1,12 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } rec {
   pname = "signal-desktop-bin";
-  version = "7.59.0";
+  version = "7.64.0";
 
   libdir = "opt/Signal";
   bindir = libdir;
   extractPkg = "dpkg-deb -x $downloadedFile $out";
 
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-SgTbV7KrGVdN87hgfjxamKikBxVHPIiaXAV2K3kljsU=";
+  hash = "sha256-3mibhZJpY/yo4RzZ6LQbI5xUlGgK6zGtB48Q8yDgflc=";
 }

From 6e9cbd1691a840acab39715b8b674703325c6880 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 14:37:29 +0000
Subject: [PATCH 195/230] bngblaster: 0.9.22 -> 0.9.23

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

diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index 349ef5c28691..0c69a0030677 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bngblaster";
-  version = "0.9.22";
+  version = "0.9.23";
 
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
     rev = finalAttrs.version;
-    hash = "sha256-vLvPiHwrFLqNV9ReeFAr0YBn8HUt6SazanpwZ1q09oU=";
+    hash = "sha256-qo48OW02IMAAxMYTYguv5jKvy/GPq1WKgcluSrMIt2E=";
   };
 
   nativeBuildInputs = [ cmake ];

From ddbe450f4017084e1eb367a62a2788cc8b6500e8 Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <pop.atry@gmail.com>
Date: Thu, 7 Aug 2025 07:48:25 -0700
Subject: [PATCH 196/230] ld-audit-search-mod: init at 0-unstable-2025-06-19
 (#418244)

---
 maintainers/maintainer-list.nix               |  6 +++
 .../ld/ld-audit-search-mod/package.nix        | 44 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/ld/ld-audit-search-mod/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 221d6fc58e82..5275410c66ad 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5966,6 +5966,12 @@
     githubId = 58050402;
     name = "Jost Alemann";
   };
+  DDoSolitary = {
+    email = "DDoSolitary@gmail.com";
+    github = "DDoSolitary";
+    githubId = 25856103;
+    name = "DDoSolitary";
+  };
   dduan = {
     email = "daniel@duan.ca";
     github = "dduan";
diff --git a/pkgs/by-name/ld/ld-audit-search-mod/package.nix b/pkgs/by-name/ld/ld-audit-search-mod/package.nix
new file mode 100644
index 000000000000..6ad048662edb
--- /dev/null
+++ b/pkgs/by-name/ld/ld-audit-search-mod/package.nix
@@ -0,0 +1,44 @@
+{
+  cmake,
+  fetchFromGitHub,
+  lib,
+  stdenv,
+  storeDir ? builtins.storeDir,
+  spdlog,
+  yaml-cpp,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ld-audit-search-mod";
+  version = "0-unstable-2025-06-19";
+
+  src = fetchFromGitHub {
+    repo = "ld-audit-search-mod";
+    owner = "DDoSolitary";
+    rev = "261f475f154d0f1f0766d6756af9c714eeeb14ea";
+    hash = "sha256-c6ub+m4ihIE3gh6yHtLfJIVqm12C46wThrBCqp8SOLE=";
+    sparseCheckout = [ "src" ];
+  };
+  sourceRoot = "${finalAttrs.src.name}/src";
+
+  buildInputs = [
+    spdlog
+    yaml-cpp
+  ];
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "NIX_RTLD_NAME" (builtins.baseNameOf stdenv.cc.bintools.dynamicLinker))
+    (lib.cmakeFeature "NIX_STORE_DIR" storeDir)
+  ];
+
+  meta = {
+    inherit (finalAttrs.src.meta) homepage;
+    description = "Audit module that modifies ld.so library search behavior";
+    license = lib.licenses.mit;
+    maintainers = [
+      lib.maintainers.atry
+      lib.maintainers.DDoSolitary
+    ];
+    platforms = lib.platforms.linux;
+  };
+})

From 77c5a1d6db8497751341a8b5caea59a6f8532c25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 15:01:03 +0000
Subject: [PATCH 197/230] dotenv-cli: 9.0.0 -> 10.0.0

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

diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix
index 4204344e9e68..169c9ea0b3fe 100644
--- a/pkgs/by-name/do/dotenv-cli/package.nix
+++ b/pkgs/by-name/do/dotenv-cli/package.nix
@@ -10,18 +10,18 @@
 }:
 stdenv.mkDerivation rec {
   pname = "dotenv-cli";
-  version = "9.0.0";
+  version = "10.0.0";
 
   src = fetchFromGitHub {
     owner = "entropitor";
     repo = "dotenv-cli";
     rev = "v${version}";
-    hash = "sha256-mpVObsilwVCq1V2Z11uqK1T7VgwpfTYng2vqrTqJZE4=";
+    hash = "sha256-prSGIEHf6wRqOFVsn3Ws25yG7Ga2YEbiU/IMP3QeLXU=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-ak6QD9Z0tE0XgFVt3QkjZxk2kelUFPX9bEF855RiY2w=";
+    hash = "sha256-rbG1oM1mEZSB/eYp87YMi6v9ves5YR7u7rkQRlziz7I=";
   };
 
   nativeBuildInputs = [

From 1df12ed991b480e862798918feb04c41bec5800c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 17:08:19 +0200
Subject: [PATCH 198/230] python313Packages.soco: refactor

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

diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index 7c87025dc2b3..83b0d6422235 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -7,9 +7,7 @@
   ifaddr,
   lxml,
   mock,
-  nix-update-script,
   pytestCheckHook,
-  pythonOlder,
   requests,
   requests-mock,
   setuptools,
@@ -21,8 +19,6 @@ buildPythonPackage rec {
   version = "0.30.11";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
   src = fetchFromGitHub {
     owner = "SoCo";
     repo = "SoCo";
@@ -49,12 +45,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "soco" ];
 
-  passthru.updateScript = nix-update-script { };
-
   meta = with lib; {
     description = "CLI and library to control Sonos speakers";
     homepage = "http://python-soco.com/";
-    changelog = "https://github.com/SoCo/SoCo/releases/tag/v${version}";
+    changelog = "https://github.com/SoCo/SoCo/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ lovesegfault ];
   };

From 8e7c9b8276f789c93c6df3f461119960dff937a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 15:12:24 +0000
Subject: [PATCH 199/230] ghostfolio: 2.185.0 -> 2.189.0

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

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 6ff1e7aef05a..204a7075b6e9 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.185.0";
+  version = "2.189.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-jnC2u9ZZcOSux6UUzW9Ot02aFWeGYhrdCC9d4xM0efA=";
+    hash = "sha256-rHqg7ziUdir6jWL4Xo/n9I2lNCmpBWFI34LQAS5mPsM=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-FCH0v9jRviH33mfIVX8967X1u494qToHraYVn5pbSPw=";
+  npmDepsHash = "sha256-hRDBNt2JIdjWYJLmW5BkW5wJ8yzcqQRwS2jRJKFrZL0=";
 
   nativeBuildInputs = [
     prisma

From b053278a36133562363fa711e25e1417d11bcfd0 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Wed, 6 Aug 2025 23:06:37 -0700
Subject: [PATCH 200/230] python313Packages.triggercmd: init at 0.0.27

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

diff --git a/pkgs/development/python-modules/triggercmd/default.nix b/pkgs/development/python-modules/triggercmd/default.nix
new file mode 100644
index 000000000000..760a72323be1
--- /dev/null
+++ b/pkgs/development/python-modules/triggercmd/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  requests,
+  websocket-client,
+  pyjwt,
+}:
+
+buildPythonPackage rec {
+  pname = "triggercmd";
+  version = "0.0.27";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-4MTRtDo4kD/1Bifw8wx++TZ3K2M4TMVRyvwqGL5cHC8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    requests
+    websocket-client
+    pyjwt
+  ];
+
+  # Tests require network access and authentication tokens
+  doCheck = false;
+
+  pythonImportsCheck = [ "triggercmd" ];
+
+  meta = {
+    description = "Python agent for TRIGGERcmd cloud service";
+    homepage = "https://github.com/rvmey/triggercmd-python-agent";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5566867bdfd2..516b7463d279 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18348,6 +18348,8 @@ self: super: with self; {
 
   trie = callPackage ../development/python-modules/trie { };
 
+  triggercmd = callPackage ../development/python-modules/triggercmd { };
+
   trimesh = callPackage ../development/python-modules/trimesh { };
 
   trino-python-client = callPackage ../development/python-modules/trino-python-client { };

From 08e64775eb4a087829cf8aedd10fc2a8c2f2f60d Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Wed, 6 Aug 2025 23:06:52 -0700
Subject: [PATCH 201/230] home-assistant: update component packages

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

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c7da58267d92..f587ffd9164a 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -6159,7 +6159,8 @@
       ];
     "triggercmd" =
       ps: with ps; [
-      ]; # missing inputs: triggercmd
+        triggercmd
+      ];
     "tts" =
       ps: with ps; [
         ha-ffmpeg
@@ -7681,6 +7682,7 @@
     "transmission"
     "transport_nsw"
     "trend"
+    "triggercmd"
     "tts"
     "tuya"
     "twentemilieu"

From 19f0381dbc99a1f395011b782c1bd4511db1144a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 6 Aug 2025 11:57:56 -0700
Subject: [PATCH 202/230] python3Packages.langgraph-cli: enable 'inmem'
 optional dependancy

---
 .../python-modules/langgraph-cli/default.nix  | 22 ++++++++++---------
 .../langgraph-runtime-inmem/default.nix       | 14 +++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index faaab1ce7e80..f395d6b61d2c 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -8,7 +8,10 @@
 
   # dependencies
   click,
+  langgraph,
+  langgraph-runtime-inmem,
   langgraph-sdk,
+  python-dotenv,
 
   # testing
   pytest-asyncio,
@@ -40,21 +43,20 @@ buildPythonPackage rec {
     langgraph-sdk
   ];
 
-  # Not yet. Depemnds on `langgraph-runtime-inmem` which isn't in github yet
-  # https://github.com/langchain-ai/langgraph/issues/5802
-  # optional-dependencies = {
-  #   "inmem" = [
-  #     langgraph-api
-  #     langgraph-runtime-inmem
-  #     python-dotenv
-  #   ]
-  # }
+  optional-dependencies = {
+    "inmem" = [
+      langgraph
+      langgraph-runtime-inmem
+      python-dotenv
+    ];
+  };
 
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
     docker-compose
-  ];
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   enabledTestPaths = [ "tests/unit_tests" ];
 
diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
index 3dd52a5f6c7b..87d660138956 100644
--- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
+++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
@@ -23,14 +23,6 @@ buildPythonPackage rec {
     hash = "sha256-chPmwJ+tUJoRK5xX9+r6mbYf95ZbX4Z3mP6Ra19nBxM=";
   };
 
-  # 1.5.24 (now 1.5.25) only affects non-cpython builds
-  # upgrade: https://github.com/NixOS/nixpkgs/pull/431547
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "blockbuster>=1.5.24,<2.0.0" \
-     "blockbuster>=1.5.23,<2.0.0"
-  '';
-
   build-system = [
     hatchling
   ];
@@ -44,6 +36,12 @@ buildPythonPackage rec {
     structlog
   ];
 
+  # Can remove after blockbuster version bump
+  # https://github.com/NixOS/nixpkgs/pull/431547
+  pythonRelaxDeps = [
+    "blockbuster"
+  ];
+
   pythonImportsCheck = [
     "langgraph_runtime_inmem"
   ];

From 0036ae90321dc2bf28a07feaf6d42eb8bbeaeae6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 15:32:29 +0000
Subject: [PATCH 203/230] phpunit: 12.2.7 -> 12.3.0

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

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index 9c54b6b68acd..a19db2e1c133 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -10,16 +10,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "12.2.7";
+  version = "12.3.0";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     tag = finalAttrs.version;
-    hash = "sha256-pSmxvDGsD2NFKwP0tA8LTBxfZEXDJFwLACdmK//6Ks8=";
+    hash = "sha256-t1BABpCkWqnjIE25HNzh/oWE5uYRUtm824t3dPtWq8w=";
   };
 
-  vendorHash = "sha256-py1mJRNb8Wcsw9sq0sGZc7lHzi52Ui4HmTUeAvTaXwY=";
+  vendorHash = "sha256-nXVaLzbUDqrmWW+uvuHkUBBC0Spp8UxX40ifTbUq8MA=";
 
   passthru = {
     updateScript = nix-update-script { };

From b681066644920d7cbec4b14cd3b4c3c9fd50efe0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 17:45:22 +0200
Subject: [PATCH 204/230] python312Packages.mypy-boto3-appstream: 1.40.0 ->
 1.40.4

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b92b558c588c..b903d3033864 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -130,8 +130,8 @@ rec {
       "sha256-xrpy1Eq+Kleg0oYEQY/UDXvUUdZp9B6rz4OrXo/A9bA=";
 
   mypy-boto3-appstream =
-    buildMypyBoto3Package "appstream" "1.40.0"
-      "sha256-TuIQx9qeu+JL1+Y3Gp83J4am1IYua7Ps40mqN8YLln8=";
+    buildMypyBoto3Package "appstream" "1.40.4"
+      "sha256-AgYaQp4AQUly5DO83NgCojU7cKOP5LdStYr1X3lMAE0=";
 
   mypy-boto3-appsync =
     buildMypyBoto3Package "appsync" "1.40.0"

From 5b99181687d3042c01c79618fa9e23d9c6ef21a6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 17:45:26 +0200
Subject: [PATCH 205/230] python312Packages.mypy-boto3-budgets: 1.40.0 ->
 1.40.4

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b903d3033864..d2b79906a314 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -178,8 +178,8 @@ rec {
       "sha256-YZKJblhTzoW0I/ozKw+RzELF9nJ0+3Z/zjZhb/lEd80=";
 
   mypy-boto3-budgets =
-    buildMypyBoto3Package "budgets" "1.40.0"
-      "sha256-nY9RvXgjyeNsiuVtM+2pWsc0kGuAggZNpkF7SXkHVwk=";
+    buildMypyBoto3Package "budgets" "1.40.4"
+      "sha256-6kCRDur13G+GTZK8R7gknc1J3L/E3YA4/xi+9qQhVp0=";
 
   mypy-boto3-ce =
     buildMypyBoto3Package "ce" "1.40.0"

From 4ae23f50976d3824f3c7f7d7d5b4eff20938af4a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 17:45:46 +0200
Subject: [PATCH 206/230] python312Packages.mypy-boto3-ec2: 1.40.0 -> 1.40.4

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d2b79906a314..3ecaa3f92d19 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ rec {
       "sha256-p+NFAi4x4J6S4v0f2u0awDG+lb2V7r3XwgYwl5CvhHo=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.40.0"
-      "sha256-iyPAkVpfnqz2RX12klUOTH2NaFO/tAfiWFXLF+FHGe0=";
+    buildMypyBoto3Package "ec2" "1.40.4"
+      "sha256-fotmSGj+r85lJZPKq4UOc3OvCdnX0pO+qSQVQozxGJw=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.40.0"

From 98050990167cfc0ca98609dd0b588e8a386221a4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 17:46:26 +0200
Subject: [PATCH 207/230] python312Packages.mypy-boto3-opensearchserverless:
 1.40.0 -> 1.40.4

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3ecaa3f92d19..1ef0824e39b0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -974,8 +974,8 @@ rec {
       "sha256-DduRVsWhYZPX+mQAj1j1kA00rilUHKA4SnmehgS4hYU=";
 
   mypy-boto3-opensearchserverless =
-    buildMypyBoto3Package "opensearchserverless" "1.40.0"
-      "sha256-IKxLTdH0V590cXVZ1JNdp3Hg4sFEs2ZAiAir4eicpZ4=";
+    buildMypyBoto3Package "opensearchserverless" "1.40.4"
+      "sha256-nkt68bkNRfKMeO9TJV/P5PGzy8ps4CZpYcF2LmDUs2c=";
 
   mypy-boto3-opsworks =
     buildMypyBoto3Package "opsworks" "1.40.0"

From a9dae6adafeac417b4040356fd3f5a121053132e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 15:47:04 +0000
Subject: [PATCH 208/230] rattler-build: 0.44.0 -> 0.45.0

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

diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix
index c82bac90aa1a..97c5f1233196 100644
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rattler-build";
-  version = "0.44.0";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "rattler-build";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VgthpzZNFBIV4SwikmHJkRsuEP0j16hVt+CxOBuOy6s=";
+    hash = "sha256-nk4orzkmgKQ6UfRpA9suh7FxiPh4P+F4NagY22if5Iw=";
   };
 
-  cargoHash = "sha256-HO4DXuCs/Jtz7kzp3jn/X/75Zdh9gS0ZO3eS9GFCbXA=";
+  cargoHash = "sha256-LvdFKguUMplNbJLh6CTy6enfg1PGqjawku/tBjwf30o=";
 
   doCheck = false; # test requires network access
 

From d5476ff3d42a9a3267a18996e9f17b4a5a5bd3d1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 7 Aug 2025 17:47:05 +0200
Subject: [PATCH 209/230] python313Packages.boto3-stubs: 1.40.3 -> 1.40.4

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 35dea3a7130e..6fb1c4692905 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.3";
+  version = "1.40.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-0IyFSdOam+ft9PRs6j2IdzPWI9CexUHwocbiOgZXLuE=";
+    hash = "sha256-17alwgsvFrR7RChEr8po4K7t9t3aZnvFbLUGsEtUXdA=";
   };
 
   build-system = [ setuptools ];

From 5bae0333a7f539f2b030bd32539989e4f4ed4f44 Mon Sep 17 00:00:00 2001
From: Vaios K <jjacke@proton.me>
Date: Thu, 7 Aug 2025 19:41:27 +0300
Subject: [PATCH 210/230] maintainers: add jjacke13

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5275410c66ad..a3bf23bdca15 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11959,6 +11959,12 @@
     githubId = 51518420;
     name = "jitwit";
   };
+  jjacke13 = {
+    email = "vaios.k@pm.me";
+    github = "jjacke13";
+    githubId = 156372486;
+    name = "Vaios Karastathis";
+  };
   jjjollyjim = {
     email = "jamie@kwiius.com";
     github = "JJJollyjim";

From a1d661ccb5914e4fa77cad458de9784b3de8b325 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 16:49:17 +0000
Subject: [PATCH 211/230] libretro.play: 0-unstable-2025-07-23 ->
 0-unstable-2025-08-04

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

diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index cfac4250e3f1..db3b85fe376a 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2025-07-23";
+  version = "0-unstable-2025-08-04";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "78c184bca1063d5482cbfad924af72dd23ebbff1";
-    hash = "sha256-0n6PQqepc7xKVMf8slN9aOodzBbt7J2c68z7200q07M=";
+    rev = "c7e327b5b86bfeaf13e89440a319ee5b0c039a3d";
+    hash = "sha256-J7rCOl7vHX/2Jy/fPh8yDAf8xQc41wmkMcC9SSRqxF0=";
     fetchSubmodules = true;
   };
 

From 27d63abaeb4028205e6f19597a4a3033907d1f11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 17:24:29 +0000
Subject: [PATCH 212/230] art: 1.25.7 -> 1.25.8

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

diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 9c3ceaa37a76..5b0b3c0ce928 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation rec {
   pname = "art";
-  version = "1.25.7";
+  version = "1.25.8";
 
   src = fetchFromGitHub {
     owner = "artpixls";
     repo = "ART";
     tag = version;
-    hash = "sha256-VrIayD7Gj0j5Rfs6sl2tZTqPFTvQcJHgUnGQ6IGiUmU=";
+    hash = "sha256-FsaTXGlQ390XgFrV4InF+xFr+Y9JgZefsR/AyHOuSsA=";
   };
 
   nativeBuildInputs = [

From 9746a806156421be341fa02165cbd7d0784f1792 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 7 Aug 2025 10:24:35 -0700
Subject: [PATCH 213/230] python3Packages.hko: init at 0.3.2

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

diff --git a/pkgs/development/python-modules/hko/default.nix b/pkgs/development/python-modules/hko/default.nix
new file mode 100644
index 000000000000..8c683da8edb2
--- /dev/null
+++ b/pkgs/development/python-modules/hko/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  poetry-core,
+  aiohttp,
+}:
+
+buildPythonPackage rec {
+  pname = "hko";
+  version = "0.3.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-6FzdaSaw7sX52wM8HbHFGtKdR2JBg3B2cMZnP7RfQzs=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [ aiohttp ];
+
+  # Tests require network access
+  doCheck = false;
+
+  pythonImportsCheck = [ "hko" ];
+
+  meta = {
+    description = "Unofficial Python wrapper for the Hong Kong Observatory public API";
+    homepage = "https://github.com/MisterCommand/python-hko";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 516b7463d279..eb1c2e1057ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6584,6 +6584,8 @@ self: super: with self; {
 
   hkavr = callPackage ../development/python-modules/hkavr { };
 
+  hko = callPackage ../development/python-modules/hko { };
+
   hledger-utils = callPackage ../development/python-modules/hledger-utils { };
 
   hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { };

From aa1b71c54f98820ad75d6b435da7b51da870f025 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 7 Aug 2025 10:25:33 -0700
Subject: [PATCH 214/230] home-assistant: update component packages

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

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index f587ffd9164a..e262729f73f5 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2292,7 +2292,8 @@
       ];
     "hko" =
       ps: with ps; [
-      ]; # missing inputs: hko
+        hko
+      ];
     "hlk_sw16" =
       ps: with ps; [
         hlk-sw16
@@ -7143,6 +7144,7 @@
     "history"
     "history_stats"
     "hive"
+    "hko"
     "hlk_sw16"
     "holiday"
     "home_connect"

From 78ff4534b4fea31956c23e6188c7f6be9df6e463 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 17:31:18 +0000
Subject: [PATCH 215/230] python3Packages.qdrant-client: 1.14.3 -> 1.15.1

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

diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix
index eb702067ae81..1adb4250c10f 100644
--- a/pkgs/development/python-modules/qdrant-client/default.nix
+++ b/pkgs/development/python-modules/qdrant-client/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "qdrant-client";
-  version = "1.14.3";
+  version = "1.15.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "qdrant";
     repo = "qdrant-client";
     tag = "v${version}";
-    hash = "sha256-OcSR8iYwX1az5BFVNp6xHpVE//Nyk4Nk97SaxAMJQRI=";
+    hash = "sha256-tZu6NeoStPwZ1f+AlVws8iS3UwpKikxE6Es7WKlFQfw=";
   };
 
   build-system = [ poetry-core ];

From 5b51168e8242dcb2b9f4b257f25548ccef0732ec Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 7 Aug 2025 10:54:48 -0700
Subject: [PATCH 216/230] python3Packages.speak2mary: init at 1.5.0

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

diff --git a/pkgs/development/python-modules/speak2mary/default.nix b/pkgs/development/python-modules/speak2mary/default.nix
new file mode 100644
index 000000000000..cb5bd25a4ffc
--- /dev/null
+++ b/pkgs/development/python-modules/speak2mary/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "speak2mary";
+  version = "1.5.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-5W2E/leT/IiXFVXD+LSPE99zGlz+yKm5XCv830rt8O0=";
+  };
+
+  build-system = [ setuptools ];
+
+  # Tests require a running MaryTTS server
+  doCheck = false;
+
+  pythonImportsCheck = [ "speak2mary" ];
+
+  meta = {
+    description = "Python wrapper for a running MaryTTS server";
+    homepage = "https://github.com/Poeschl/speak2mary";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb1c2e1057ee..fc147660992c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16865,6 +16865,8 @@ self: super: with self; {
 
   spdx-tools = callPackage ../development/python-modules/spdx-tools { };
 
+  speak2mary = callPackage ../development/python-modules/speak2mary { };
+
   speaklater = callPackage ../development/python-modules/speaklater { };
 
   speaklater3 = callPackage ../development/python-modules/speaklater3 { };

From a993a21b498794e9a94c8318f4061cec1303d1d3 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 7 Aug 2025 10:54:57 -0700
Subject: [PATCH 217/230] home-assistant: update component packages

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

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index e262729f73f5..860bcd7a25c2 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3406,7 +3406,8 @@
       ];
     "marytts" =
       ps: with ps; [
-      ]; # missing inputs: speak2mary
+        speak2mary
+      ];
     "mastodon" =
       ps: with ps; [
         mastodon-py
@@ -7290,6 +7291,7 @@
     "mailgun"
     "manual"
     "manual_mqtt"
+    "marytts"
     "mastodon"
     "matrix"
     "matter"

From 24c61df596346477e2bd1ef3b2f36eb04941131b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 18:47:14 +0000
Subject: [PATCH 218/230] python3Packages.py-ocsf-models: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix
index 326906f3ab5e..51b9e629b86f 100644
--- a/pkgs/development/python-modules/py-ocsf-models/default.nix
+++ b/pkgs/development/python-modules/py-ocsf-models/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "py-ocsf-models";
-  version = "0.7.0";
+  version = "0.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "prowler-cloud";
     repo = "py-ocsf-models";
     tag = version;
-    hash = "sha256-9aKZtSolUARl70QdavQ6mkW7jk3OlOAIoy/8I6o1+0M=";
+    hash = "sha256-6mVu508FyLUUqKTKSFHXnsna/KDMh3RXVQ051sqozQs=";
   };
 
   pythonRelaxDeps = true;

From 192fa0f21161262c069a5b8f31882b13655a35cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 19:03:36 +0000
Subject: [PATCH 219/230] python3Packages.fastapi-mcp: 0.3.7 -> 0.4.0

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

diff --git a/pkgs/development/python-modules/fastapi-mcp/default.nix b/pkgs/development/python-modules/fastapi-mcp/default.nix
index 0767727a927b..844ba0f6de2d 100644
--- a/pkgs/development/python-modules/fastapi-mcp/default.nix
+++ b/pkgs/development/python-modules/fastapi-mcp/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "fastapi-mcp";
-  version = "0.3.7";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tadata-org";
     repo = "fastapi_mcp";
     tag = "v${version}";
-    hash = "sha256-WQ+Y/TM5fz0lHjCKvEuYGY6hzxo2ePcgRnq7piNC+KQ=";
+    hash = "sha256-TCmM5n6BF3CWEuGVSZnUL2rTYitKtn4vSCkiQvKFLKw=";
   };
 
   build-system = [
@@ -74,7 +74,7 @@ buildPythonPackage rec {
   meta = {
     description = "Expose your FastAPI endpoints as Model Context Protocol (MCP) tools, with Auth";
     homepage = "https://github.com/tadata-org/fastapi_mcp";
-    changelog = "https://github.com/tadata-org/fastapi_mcp/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/tadata-org/fastapi_mcp/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From b9b371c2e1f61edb926a22ee44a5f3021e7b6e5f Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Wed, 9 Jul 2025 09:00:02 +0900
Subject: [PATCH 220/230] television: 0.11.9 -> 0.13.2

https://github.com/alexpasmantier/television/releases/tag/0.12.0
https://github.com/alexpasmantier/television/releases/tag/0.12.1
https://github.com/alexpasmantier/television/releases/tag/0.12.2
https://github.com/alexpasmantier/television/releases/tag/0.12.3
https://github.com/alexpasmantier/television/releases/tag/0.12.4
https://github.com/alexpasmantier/television/releases/tag/0.12.5
https://github.com/alexpasmantier/television/releases/tag/0.13.0
https://github.com/alexpasmantier/television/releases/tag/0.13.1
https://github.com/alexpasmantier/television/releases/tag/0.13.2

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

diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index a9b3ba9fb0d1..99ed16059053 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -2,22 +2,35 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  makeWrapper,
   testers,
   television,
   nix-update-script,
+  extraPackages ? [ ],
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "television";
-  version = "0.11.9";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "alexpasmantier";
     repo = "television";
     tag = finalAttrs.version;
-    hash = "sha256-9ug3MFBAvdOpA7Cw5eqCjS2gWK0InqlfUAOItE0o40s=";
+    hash = "sha256-Ur6UTd3XsI2ZyVboQA9r3WDkl7hd1wQ0NCgTlYFF/C0=";
   };
 
-  cargoHash = "sha256-n417hrDLpBD7LhtHfqHPgr9N+gkdC9nw+iDnNRcTqQQ=";
+  cargoHash = "sha256-LfaYRrJ4ZXoNVDsI650t+A7mWB9+2+znATp+mqDwTiE=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = lib.optionalString (extraPackages != [ ]) ''
+    wrapProgram $out/bin/tv \
+      --prefix PATH : ${lib.makeBinPath extraPackages}
+  '';
+
+  # TODO(@getchoo): Investigate selectively disabling some tests, or fixing them
+  # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941
+  doCheck = false;
 
   passthru = {
     tests.version = testers.testVersion {

From f5d139155e81012dcf76509aeddab99f8ceb8d1b Mon Sep 17 00:00:00 2001
From: Brenton Simpson <appsforartists@users.noreply.github.com>
Date: Thu, 7 Aug 2025 15:22:35 -0400
Subject: [PATCH 221/230] handheld-daemon: remove appsforartists as maintainer

I'm no longer using NixOS.
---
 pkgs/by-name/ha/handheld-daemon/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 50f3b15b0b8a..ef1c8738dd2d 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -100,7 +100,6 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/hhd-dev/hhd/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
-      appsforartists
       toast
     ];
     mainProgram = "hhd";

From 9be39ea676dca543cb7fa7df8e2665225007b993 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 7 Aug 2025 22:50:27 +0200
Subject: [PATCH 222/230] python3Packages.orbax-checkpoint: 0.11.20 -> 0.11.21

Diff: https://github.com/google/orbax/compare/refs/tags/v0.11.20...refs/tags/v0.11.21

Changelog: https://github.com/google/orbax/blob/v0.11.21/checkpoint/CHANGELOG.md
---
 pkgs/development/python-modules/orbax-checkpoint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index 41723897cc1c..53590690dbec 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.11.20";
+  version = "0.11.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     tag = "v${version}";
-    hash = "sha256-ZZTmWW0PZHk8Evhk6JnbAyl7RQOAxN4GwXUv5M6GfIQ=";
+    hash = "sha256-hb7Y/usg4JFRKsahKNV8rvjMGAN4xYEaaWsedGKcK+Y=";
   };
 
   sourceRoot = "${src.name}/checkpoint";

From e55d6f838dcdee7dd373973dc3539a33b3c38d36 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 7 Aug 2025 22:50:45 +0200
Subject: [PATCH 223/230] python3Packages.torchmetrics: 1.8.0 -> 1.8.1

Diff: https://github.com/Lightning-AI/torchmetrics/compare/refs/tags/v1.8.0...refs/tags/v1.8.1

Changelog: https://github.com/Lightning-AI/torchmetrics/releases/tag/v1.8.1
---
 pkgs/development/python-modules/torchmetrics/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix
index ddc59e0bc060..08c8964a51f8 100644
--- a/pkgs/development/python-modules/torchmetrics/default.nix
+++ b/pkgs/development/python-modules/torchmetrics/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "torchmetrics";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lightning-AI";
     repo = "torchmetrics";
     tag = "v${version}";
-    hash = "sha256-zoKULi12vIKMzPRE6I4Rtq4dVQL/GfNFjHR+BId1ADg=";
+    hash = "sha256-Qisp5RTfcKr6W9K6FDFUHMqICSpVshsrZWwpDEgTTQM=";
   };
 
   dependencies = [

From f11608be952d3859beddb4efd69e65557ae82db2 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 7 Aug 2025 23:07:37 +0300
Subject: [PATCH 224/230] warp-terminal: 0.2025.07.30.08.12.stable_02 ->
 0.2025.08.06.08.12.stable_01

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index a0cfd095817c..cbc548582c4d 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-3j6Kqlo/nsc+gjSrW5Afuamnh0qb9TnG+sFN4E5pnxc=",
-    "version": "0.2025.07.30.08.12.stable_02"
+    "hash": "sha256-s4SHM2pU1CZPJZFiWE5VDeSEprLsSYChFazNGOpz+oo=",
+    "version": "0.2025.08.06.08.12.stable_01"
   },
   "linux_x86_64": {
-    "hash": "sha256-GbkTghYchdUdYdvPNAqPv+PD7UJ2sgVc7+AAA+5bHGI=",
-    "version": "0.2025.07.30.08.12.stable_02"
+    "hash": "sha256-u0TH9u1o+g3GngEMg6r78fSZH778kGcKe5tB/lpExZE=",
+    "version": "0.2025.08.06.08.12.stable_01"
   },
   "linux_aarch64": {
-    "hash": "sha256-xIf12oEOHQE1+Sz3L/nrqli2tlP0+wWFA9dA+HHNrr0=",
-    "version": "0.2025.07.30.08.12.stable_02"
+    "hash": "sha256-smg2QiXRlADGBKxl9Wlq2yWsCCi3JwjxhwR13yG70mA=",
+    "version": "0.2025.08.06.08.12.stable_01"
   }
 }

From 6c2219d6a112b6d330f0c252493d5322ee7d219f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 21:17:51 +0000
Subject: [PATCH 225/230] roddhjav-apparmor-rules: 0-unstable-2025-07-29 ->
 0-unstable-2025-08-04

---
 pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 65a8b8b72d03..65e12de00778 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-07-29";
+  version = "0-unstable-2025-08-04";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "fc421183a024cb3abb4c3343ed7a1954f53e4511";
-    hash = "sha256-V4sjCCie5LKXQTrso8ysFDCQJ60BUx/+OHuB9ntFLUs=";
+    rev = "d57b86769653ae2651533dbc2a1ffe25b119b801";
+    hash = "sha256-+bcjZVwsuHnKtKkM+4vd5fY6xLidpOKXMxMQuBLwbKo=";
   };
 
   dontConfigure = true;

From f4384b38da4794861342c0058eb732ca0cfbc785 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 8 Aug 2025 00:08:13 +0200
Subject: [PATCH 226/230] python313Packages.mcp: 1.12.2 -> 1.12.4

Diff: https://github.com/modelcontextprotocol/python-sdk/compare/refs/tags/v1.12.2...refs/tags/v1.12.4

Changelog: https://github.com/modelcontextprotocol/python-sdk/releases/tag/v1.12.4
---
 pkgs/development/python-modules/mcp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index 82e3584482c8..97ab3ceefe0c 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "mcp";
-  version = "1.12.2";
+  version = "1.12.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-K3S+2Z4yuo8eAOo8gDhrI8OOfV6ADH4dAb1h8PqYntc=";
+    hash = "sha256-FHVhufv4O7vM/9fNHyDU4L15dNLFMmoVaYd98Iw6l2o=";
   };
 
   postPatch = ''

From 95c433aee910ee626770f2d5fb1f042d12b2d136 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 8 Aug 2025 00:08:55 +0200
Subject: [PATCH 227/230] python313Packages.mcpadapt: 0.1.10 -> 0.1.12

Diff: https://github.com/grll/mcpadapt/compare/refs/tags/v0.1.10...refs/tags/v0.1.12

Changelog: https://github.com/grll/mcpadapt/releases/tag/v0.1.12
---
 pkgs/development/python-modules/mcpadapt/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix
index 83fc4979cd11..08c8832a6c76 100644
--- a/pkgs/development/python-modules/mcpadapt/default.nix
+++ b/pkgs/development/python-modules/mcpadapt/default.nix
@@ -12,18 +12,20 @@
   pytestCheckHook,
   python-dotenv,
   smolagents,
+  soundfile,
+  torchaudio,
 }:
 
 buildPythonPackage rec {
   pname = "mcpadapt";
-  version = "0.1.10";
+  version = "0.1.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "grll";
     repo = "mcpadapt";
     tag = "v${version}";
-    hash = "sha256-605e28p1rlJ5teCLxL/Lh8p5zV7cPuSzZWwfkE1gM5I=";
+    hash = "sha256-mU/zcNEHmPfSMEMgjj4u0iwmXBH2cJzGEANPxyiR1l0=";
   };
 
   build-system = [ hatchling ];
@@ -35,12 +37,18 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
+    audio = [
+      torchaudio
+      soundfile
+    ];
+    # crewai = [ crewai ];
     langchain = [
       langchain
       # langchain-anthropic
       langgraph
     ];
     llamaindex = [ llama-index ];
+    smolagents = [ smolagents ];
   };
 
   pythonImportsCheck = [ "mcpadapt" ];

From 22772f8d697b19de42bd9b5ebe71bf2e3476bac6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 8 Aug 2025 00:21:03 +0200
Subject: [PATCH 228/230] python313Packages.smpclient: 4.5.0 -> 5.0.0

Changelog: https://github.com/intercreate/smpclient/releases/tag/5.0.0
---
 .../python-modules/smpclient/default.nix      | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/smpclient/default.nix b/pkgs/development/python-modules/smpclient/default.nix
index a9a7210b8b7c..2e339d7e3f33 100644
--- a/pkgs/development/python-modules/smpclient/default.nix
+++ b/pkgs/development/python-modules/smpclient/default.nix
@@ -1,31 +1,35 @@
 {
   lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  poetry-core,
   async-timeout,
   bleak,
+  buildPythonPackage,
+  fetchFromGitHub,
   intelhex,
+  poetry-core,
+  poetry-dynamic-versioning,
   pyserial,
-  smp,
   pytest-asyncio,
   pytestCheckHook,
+  smp,
 }:
 
 buildPythonPackage rec {
   pname = "smpclient";
-  version = "4.5.0";
+  version = "5.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "intercreate";
     repo = "smpclient";
     tag = version;
-    hash = "sha256-Z0glcCy3JsL45iT8Q82Vtxozi3hv6xaRJvJ3BkHX4PQ=";
+    hash = "sha256-NQRVEvi/B+KdhPIzw8pm22uXpYPkoaatkCNFnEcibzo=";
   };
 
+  pythonRelaxDeps = [ "smp" ];
+
   build-system = [
     poetry-core
+    poetry-dynamic-versioning
   ];
 
   dependencies = [
@@ -41,13 +45,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonRelaxDeps = [
-    "smp"
-  ];
-
-  pythonImportsCheck = [
-    "smpclient"
-  ];
+  pythonImportsCheck = [ "smpclient" ];
 
   meta = {
     description = "Simple Management Protocol (SMP) Client for remotely managing MCU firmware";

From 5ec35586d9d592b353ced399665021f220c45e9a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 7 Aug 2025 17:29:56 -0500
Subject: [PATCH 229/230] claude-code: 1.0.70 -> 1.0.71

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index c37f45405743..89a9bbd637d2 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.70"
+        "@anthropic-ai/claude-code": "^1.0.71"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.70",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.70.tgz",
-      "integrity": "sha512-gJ/bdT/XQ/hp5EKM0QoOWj/eKmK3wvs1TotTLq1unqahiB6B+EAQeRy/uvxv2Ua9nI8p5Bogw8hXB1uUmAHb+A==",
+      "version": "1.0.71",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.71.tgz",
+      "integrity": "sha512-2Z1HU8TiOSRZSZdHCPs+ih942cteUQ9Yx1EHHW5fO9y+gwxPYDR8Xbh/rAJMl/G58cJIn2jRiZmkWcGMN+Iqqg==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 3f3ab75669aa..e4dab3449ef5 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.70";
+  version = "1.0.71";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-7nqhJNhO+QollwVtVlKDYHOlPDT6Erk6wI/voiAYXY4=";
+    hash = "sha256-ZJUvscbEaWHILL77R5/sPdNcxCLc2BL9P6tR+S7QnHg=";
   };
 
-  npmDepsHash = "sha256-nBLaWDwSPOfZx26UU2QQpp/r8HPHAO4EnPkb/gcTPrg=";
+  npmDepsHash = "sha256-wQ/DRPefziSRv6aFZXRpmz2vC6mQRqgc7r3++cDpYSg=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 8b9482ff531e6675fd906dc600e3f19fe63cb84d Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Fri, 8 Aug 2025 02:00:26 +0200
Subject: [PATCH 230/230] .git-blame-ignore-revs: add missing systemd commit

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index d7c6649e1125..64f3109dba20 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -285,3 +285,6 @@ b4532efe93882ae2e3fc579929a42a5a56544146
 # nixfmt 1.0.0
 62fe01651911043bd3db0add920af3d2935d9869 # !autorebase nix-shell --run treefmt
 5a0711127cd8b916c3d3128f473388c8c79df0da # !autorebase nix-shell --run treefmt
+
+# systemd: nixfmt
+b1c5cd3e794cdf89daa5e4f0086274a416a1cded