From e2d1a15821708917aab469c04661de5a7667fbcb Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Tue, 29 Jul 2025 12:55:36 +0200
Subject: [PATCH 01/36] oniux: 0.5.0 -> 0.6.0

We now also need perl to build.

cargo:warning=configuring OpenSSL build: Command 'perl' not found. Is perl installed?
cargo:warning=openssl-src: failed to build OpenSSL from source
---
 pkgs/by-name/on/oniux/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/on/oniux/package.nix b/pkgs/by-name/on/oniux/package.nix
index 1ea07b4360a8..e5a831835093 100644
--- a/pkgs/by-name/on/oniux/package.nix
+++ b/pkgs/by-name/on/oniux/package.nix
@@ -2,21 +2,26 @@
   lib,
   rustPlatform,
   fetchFromGitLab,
+  perl,
   nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oniux";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
     owner = "tpo/core";
     repo = "oniux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rtQUHTDPQXL4gT8/Nl0hV/F06ybPIfemibCzH3mFHaY=";
+    hash = "sha256-KLtII1pO1G9dsmu7Fq+CwvgYfrWCaSRiCs1+VhlU3Ck=";
   };
 
-  cargoHash = "sha256-79KNytAXxuYi9VBmkkOJg2ugjjoKJ/BPBqWa7Z72HGI=";
+  cargoHash = "sha256-tYHGuBEuwrB/gSCWbSKEavlADIYiNpWjOpVQxYgEC+U=";
+
+  nativeBuildInputs = [
+    perl
+  ];
 
   passthru.updateScript = nix-update-script { };
 

From 9a6df14a146dc12c3963f4ea0ed8737b8e50061e Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 3 Aug 2025 22:17:16 -0600
Subject: [PATCH 02/36] picocrypt: 1.48 -> 1.49

https://github.com/Picocrypt/Picocrypt/releases/tag/1.49
Diff: https://github.com/Picocrypt/Picocrypt/compare/1.48...1.49
---
 pkgs/by-name/pi/picocrypt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix
index 3700983f5760..b9085ca4be4b 100644
--- a/pkgs/by-name/pi/picocrypt/package.nix
+++ b/pkgs/by-name/pi/picocrypt/package.nix
@@ -15,18 +15,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "picocrypt";
-  version = "1.48";
+  version = "1.49";
 
   src = fetchFromGitHub {
     owner = "Picocrypt";
     repo = "Picocrypt";
     tag = finalAttrs.version;
-    hash = "sha256-Gvh6t/jFRBCX+I9CYkXV265PiRSSvH6qAgkU0fA/v4A=";
+    hash = "sha256-B10PP/V8xvYbA6rQHWdav/KtQKecNUmwvj9qMYqml8E=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
-  vendorHash = "sha256-HvtQFoAK4+DX2Mwzf5f39tTnxJcH7Dox/otlvPVczeA=";
+  vendorHash = "sha256-0fEy/YuZa7dENfL3y+NN4SLWYwOLmXqHHJEiU37AkX4=";
 
   ldflags = [
     "-s"

From a8f8a8fc30392af8e011b906e0ebf56ed4439314 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 6 Aug 2025 08:42:05 +0200
Subject: [PATCH 03/36] busybox: apply Alpine's patch for tar TOCTOU

Link: https://lists.busybox.net/pipermail/busybox/2025-August/091665.html
---
 pkgs/os-specific/linux/busybox/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index ef7b545ed548..ed1f723d5ee2 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -106,6 +106,10 @@ stdenv.mkDerivation rec {
       url = "https://git.alpinelinux.org/aports/plain/main/busybox/CVE-2023-42364-CVE-2023-42365.patch?id=8a4bf5971168bf48201c05afda7bee0fbb188e13";
       hash = "sha256-nQPgT9eA1asCo38Z9X7LR9My0+Vz5YBPba3ARV3fWcc=";
     })
+    (fetchurl {
+      url = "https://git.alpinelinux.org/aports/plain/main/busybox/0001-tar-fix-TOCTOU-symlink-race-condition.patch?id=9e42dea5fba84a8afad1f1910b7d3884128a567e";
+      hash = "sha256-GmXQhwB1/IPVjXXpGi5RjRvuGJgIMIb7lQKB63m306g=";
+    })
   ]
   ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
 

From 0a5944572275dd042453303c964130e9e6aaa0a3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 7 Aug 2025 16:59:45 +0200
Subject: [PATCH 04/36] ci/eval: fix min-free-swap report

This was checking the wrong condition, likely from a copy&pasto.
---
 ci/eval/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 21285757a277..9de67643e709 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -167,7 +167,7 @@ let
             if [[ ! -f "$out/${evalSystem}/min-avail-memory" ]] || (( availMemory < $(<$out/${evalSystem}/min-avail-memory) )); then
               echo "$availMemory" > $out/${evalSystem}/min-avail-memory
             fi
-            if [[ ! -f $out/${evalSystem}/min-free-swap ]] || (( availMemory < $(<$out/${evalSystem}/min-free-swap) )); then
+            if [[ ! -f $out/${evalSystem}/min-free-swap ]] || (( freeSwap < $(<$out/${evalSystem}/min-free-swap) )); then
               echo "$freeSwap" > $out/${evalSystem}/min-free-swap
             fi
             sleep 4

From cb527a04e03a1393d54d761ce95e06c47d724b5b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 7 Aug 2025 17:13:51 +0200
Subject: [PATCH 05/36] ci/eval: return min memory in megabyte

No need to return bytes in these files. Also busybox has problems to
render `free -b` with sizes > 100 GB properly in the next commit,
leading to extraction errors with awk.
---
 ci/eval/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 9de67643e709..018a5b092526 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -160,9 +160,9 @@ let
         # Record and print stats on free memory and swap in the background
         (
           while true; do
-            availMemory=$(free -b | grep Mem | awk '{print $7}')
-            freeSwap=$(free -b | grep Swap | awk '{print $4}')
-            echo "Available memory: $(( availMemory / 1024 / 1024 )) MiB, free swap: $(( freeSwap / 1024 / 1024 )) MiB"
+            availMemory=$(free -m | grep Mem | awk '{print $7}')
+            freeSwap=$(free -m | grep Swap | awk '{print $4}')
+            echo "Available memory: $(( availMemory )) MiB, free swap: $(( freeSwap )) MiB"
 
             if [[ ! -f "$out/${evalSystem}/min-avail-memory" ]] || (( availMemory < $(<$out/${evalSystem}/min-avail-memory) )); then
               echo "$availMemory" > $out/${evalSystem}/min-avail-memory

From 32737b1e2ad0d99ae0a5837dcabd65df954c34b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 16:07:51 +0000
Subject: [PATCH 06/36] python3Packages.canopen: 2.3.0 -> 2.4.1

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

diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix
index 320dfd776b2d..0ff10b22532b 100644
--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/pkgs/development/python-modules/canopen/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "canopen";
-  version = "2.3.0";
+  version = "2.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eSCEqTwTjVsqQG3dLU61ziCPA72P2mD4GtK7jVbGuCc=";
+    hash = "sha256-IKhLxJizTa3XnOzkZ9O74ZWRwcAqjzkzG8xgZcTYsus=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 794d422363312f6c6d5b09cef76a98d7e6bfee81 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Thu, 7 Aug 2025 21:35:23 +0100
Subject: [PATCH 07/36] postgresqlPackages.pg_hll: fix build on pg18

PostgreSQL 18 adds the -Wmissing-variable-declarations flag by default,
which makes this build fail. Ignoring this warning allows the build to
succeed.
---
 pkgs/servers/sql/postgresql/ext/pg_hll.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index e63191a4a85f..bd3bd7bcdb09 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -16,6 +16,9 @@ postgresqlBuildExtension (finalAttrs: {
     hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c=";
   };
 
+  # https://github.com/citusdata/postgresql-hll/issues/166#issuecomment-3165489050
+  NIX_CFLAGS_COMPILE = "-Wno-error=missing-variable-declarations";
+
   meta = {
     description = "HyperLogLog for PostgreSQL";
     homepage = "https://github.com/citusdata/postgresql-hll";

From 6835dce85b747597d25568ecdfe9fff67cf044b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 11:35:01 +0000
Subject: [PATCH 08/36] opencommit: 3.2.9 -> 3.2.10

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

diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix
index 450f4750a8ee..db9d8a2bb113 100644
--- a/pkgs/by-name/op/opencommit/package.nix
+++ b/pkgs/by-name/op/opencommit/package.nix
@@ -8,13 +8,13 @@
 
 buildNpmPackage rec {
   pname = "opencommit";
-  version = "3.2.9";
+  version = "3.2.10";
 
   src = fetchFromGitHub {
     owner = "di-sukharev";
     repo = "opencommit";
     rev = "v${version}";
-    hash = "sha256-nn+Whjs3qLXhydrELXzogr66H6btY/TPbmWT/MH6w+M=";
+    hash = "sha256-FsPtTuvBvbDIldwxLbuXOxNfOIQ8THboRB6ghTSzTbI=";
     postFetch = ''
       cd $out
       # Fix lockfile issues with bundled dependencies
@@ -22,7 +22,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-1lUMtQFGlM1Z2oQ4nktsePyce/EwAu75BbkBiqBrdnQ=";
+  npmDepsHash = "sha256-Ilf9lfFegraQRkYU5v7Zv6MubpN5m6bck3j5UkTXk+4=";
 
   passthru.updateScript = nix-update-script { };
 

From b580ef27396c6e515777ea2e7e9826ce892b7b9c Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 8 Aug 2025 13:39:04 +0200
Subject: [PATCH 09/36] mesen: don't use absolute path for Exec in generated
 .desktop files

---
 .../me/mesen/desktop-make-non-absolute-exec.patch   | 13 +++++++++++++
 pkgs/by-name/me/mesen/package.nix                   |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/by-name/me/mesen/desktop-make-non-absolute-exec.patch

diff --git a/pkgs/by-name/me/mesen/desktop-make-non-absolute-exec.patch b/pkgs/by-name/me/mesen/desktop-make-non-absolute-exec.patch
new file mode 100644
index 000000000000..e8c78d46e994
--- /dev/null
+++ b/pkgs/by-name/me/mesen/desktop-make-non-absolute-exec.patch
@@ -0,0 +1,13 @@
+diff --git a/UI/Config/FileAssociationHelper.cs b/UI/Config/FileAssociationHelper.cs
+index bcd40ce..4965c7a 100644
+--- a/UI/Config/FileAssociationHelper.cs
++++ b/UI/Config/FileAssociationHelper.cs
+@@ -152,7 +152,7 @@ namespace Mesen.Config
+ 				"Comment=Emulator" + Environment.NewLine +
+ 				"Keywords=game;emulator;emu" + Environment.NewLine +
+ 				"Categories=GNOME;GTK;Game;Emulator;" + Environment.NewLine +
+-				"Exec=" + mainModule.FileName + " %f" + Environment.NewLine +
++				"Exec=" + "Mesen" + " %f" + Environment.NewLine +
+ 				"NoDisplay=false" + Environment.NewLine +
+ 				"StartupNotify=true" + Environment.NewLine +
+ 				"Icon=MesenIcon" + Environment.NewLine;
diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix
index cb7bca0d47c1..0fc87dc8ce19 100644
--- a/pkgs/by-name/me/mesen/package.nix
+++ b/pkgs/by-name/me/mesen/package.nix
@@ -26,6 +26,8 @@ buildDotnetModule rec {
     ./dont-use-nightly-avalonia.patch
     # upstream has a weird library loading mechanism, which we override with a more sane alternative
     ./dont-zip-libraries.patch
+    # without this the generated .desktop file uses an absolute (and incorrect) path for the binary
+    ./desktop-make-non-absolute-exec.patch
   ];
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;

From 180bf2a7d8519da1b4c194028a6198c0e8a9aea2 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 8 Aug 2025 11:56:11 +0000
Subject: [PATCH 10/36] firefox-beta-unwrapped: 142.0b3 -> 142.0b8

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index 9b2c1ee89478..85ef3908b0fd 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = pname;
-  version = "142.0b3";
+  version = "142.0b8";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "707781fcc59798c0ecbf11532eac41f4f134f24b1d670234cf674e433525ca83fe4fff75874d1a16d2be2039959731e71a5aa56e727d2b46e5bc40f63277b188";
+    sha512 = "048325c583dc3c6716be3fcb9d793448ab6e2b18b7b5f7d6aafa76cbc9e790489f7cd59644ded4b7e7929e19021e04b21e5d11c298057bb60fe018a791494ce8";
   };
 
   meta = {

From 101d5a1ddce7e0ed468fd741581d87f429da8122 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 8 Aug 2025 11:57:04 +0000
Subject: [PATCH 11/36] firefox-devedition-unwrapped: 142.0b3 -> 142.0b8

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index e93b0cfff180..50d327a69b93 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = pname;
-  version = "142.0b3";
+  version = "142.0b8";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "5752c77307e59ad188385bb7bbb440e01a256f437088e051d1bc74e0ccdbde4ddf68c97fdcf0401c03636293753c5e8f7132352aed5f5e9e537c96eaf8784f21";
+    sha512 = "a5a89cdbfe3e05e6d329011476d571625094546e0eb2bea4f4ce426fd8d6ce23ce51ce19fd0a4d44ea7cb134d3f6c1510dcc1403d6aab5981862845a250c9dae";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From ddd670ff1b992125646ea8fcbb2c22d81571b899 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 13:08:44 +0000
Subject: [PATCH 12/36] sentry-native: 0.9.1 -> 0.10.0

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

diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index 8ae15d686976..40ee50c38261 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentry-native";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     tag = version;
-    hash = "sha256-jB744MO5GaZMQWIToyv1g4WzVu99qt/Cx0shvK7SW/c=";
+    hash = "sha256-65Eylc0l3R0bQeKyb7JgULbZCldaR7TZmMvYB9wz/1M=";
   };
 
   nativeBuildInputs = [

From 6b04cd7b6cdc89dd8e88c6deabe4d14887fb5474 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 17:11:31 +0000
Subject: [PATCH 13/36] cargo-edit: 0.13.6 -> 0.13.7

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

diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix
index ed49120217b9..00cb3e0e06aa 100644
--- a/pkgs/by-name/ca/cargo-edit/package.nix
+++ b/pkgs/by-name/ca/cargo-edit/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-edit";
-  version = "0.13.6";
+  version = "0.13.7";
 
   src = fetchFromGitHub {
     owner = "killercup";
     repo = "cargo-edit";
     rev = "v${version}";
-    hash = "sha256-z+LTgCeTUr3D0LEbw0yHlk1di2W95XewbYlgusD2TLg=";
+    hash = "sha256-doNQzXB+tW+5UI3PCuZo8aZErsXeafL6lldi/yXyBhs=";
   };
 
-  cargoHash = "sha256-/+DDA64kemZKzKdaKnXK+R4e8FV59qT5HCGcwyOz7R8=";
+  cargoHash = "sha256-N3Q3rK9GsVf9mI9SFqF7lnU8CWxmueDCgBjP6n9dUoY=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 791ee7f0731909a8f9398ae4e77c216ca158b9df Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 9 Aug 2025 08:54:26 +1200
Subject: [PATCH 14/36] heroic: disable privateTmp

Disable privateTmp in the Steam runtime env wrapper so that Heroic does
not run multiple instances.

Closes #432037
---
 pkgs/by-name/he/heroic/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/he/heroic/package.nix b/pkgs/by-name/he/heroic/package.nix
index 77dc9a494db8..d68acae65911 100644
--- a/pkgs/by-name/he/heroic/package.nix
+++ b/pkgs/by-name/he/heroic/package.nix
@@ -5,7 +5,7 @@
   extraLibraries ? pkgs: [ ],
 }:
 
-steam.buildRuntimeEnv {
+(steam.override { privateTmp = false; }).buildRuntimeEnv {
   pname = "heroic";
   inherit (heroic-unwrapped) version meta;
 

From 71263d016a93915a8ab3b1a1f7c20af9ece8630d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 9 Aug 2025 00:16:24 +0200
Subject: [PATCH 15/36] python313Packages.canopen: refactor

---
 .../python-modules/canopen/default.nix        | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix
index 0ff10b22532b..0a2ec5b2093d 100644
--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/pkgs/development/python-modules/canopen/default.nix
@@ -1,32 +1,30 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  setuptools-scm,
-  python-can,
   canmatrix,
+  fetchPypi,
   pytestCheckHook,
-  pythonOlder,
+  python-can,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "canopen";
   version = "2.4.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-IKhLxJizTa3XnOzkZ9O74ZWRwcAqjzkzG8xgZcTYsus=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
-    python-can
-    canmatrix
-  ];
+  dependencies = [ python-can ];
+
+  optional-dependencies = {
+    db_export = [ canmatrix ];
+  };
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 108733a2a258788434c06e883c4e68dceb0dba3c Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Tue, 29 Jul 2025 15:26:38 +0100
Subject: [PATCH 16/36] postgresql18Packages: mark remaining extensions as
 broken

Those extensions don't support building with PostgreSQL 18, yet.

To make sure the broken status is updated on the next upgrade, they all
have version checks in the form of an evaluation warning, so that there
has be explicit action regarding its PG18 compatibility.
---
 pkgs/servers/sql/postgresql/ext/citus.nix              |  9 ++++++++-
 pkgs/servers/sql/postgresql/ext/lantern.nix            |  5 +++++
 pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix   |  5 +++++
 pkgs/servers/sql/postgresql/ext/pg_bigm.nix            |  5 +++++
 pkgs/servers/sql/postgresql/ext/pg_cron.nix            |  6 ++++++
 pkgs/servers/sql/postgresql/ext/pg_ivm.nix             | 10 +++++++++-
 pkgs/servers/sql/postgresql/ext/pg_tle.nix             |  5 +++++
 pkgs/servers/sql/postgresql/ext/pgroonga.nix           |  5 +++++
 pkgs/servers/sql/postgresql/ext/pgvector.nix           |  6 ++++++
 .../sql/postgresql/ext/pgvectorscale/package.nix       |  5 +++++
 pkgs/servers/sql/postgresql/ext/pgx_ulid.nix           | 10 +++++++++-
 pkgs/servers/sql/postgresql/ext/rum.nix                |  5 +++++
 pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix         |  6 ++++++
 pkgs/servers/sql/postgresql/ext/tds_fdw.nix            |  5 +++++
 pkgs/servers/sql/postgresql/ext/timescaledb.nix        |  9 ++++++++-
 .../servers/sql/postgresql/ext/vectorchord/package.nix |  6 ++++++
 16 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix
index 2b197e70719f..7dd9874a2821 100644
--- a/pkgs/servers/sql/postgresql/ext/citus.nix
+++ b/pkgs/servers/sql/postgresql/ext/citus.nix
@@ -66,7 +66,14 @@ postgresqlBuildExtension (finalAttrs: {
     # "Our soft policy for Postgres version compatibility is to support Citus'
     # latest release with Postgres' 3 latest releases."
     # https://www.citusdata.com/updates/v12-0/#deprecated_features
-    broken = lib.versionOlder postgresql.version "15";
+    broken =
+      lib.versionOlder postgresql.version "15"
+      ||
+        # PostgreSQL 18 support issue upstream: https://github.com/citusdata/citus/issues/7978
+        # Check after next package update.
+        lib.warnIf (finalAttrs.version != "13.0.3") "Is postgresql18Packages.citus still broken?" (
+          lib.versionAtLeast postgresql.version "18"
+        );
     description = "Distributed PostgreSQL as an extension";
     homepage = "https://www.citusdata.com/";
     changelog = "https://github.com/citusdata/citus/blob/${finalAttrs.src.rev}/CHANGELOG.md";
diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix
index 8cd89a145bde..449be22a31ec 100644
--- a/pkgs/servers/sql/postgresql/ext/lantern.nix
+++ b/pkgs/servers/sql/postgresql/ext/lantern.nix
@@ -51,6 +51,11 @@ postgresqlBuildExtension (finalAttrs: {
   };
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/lanterndata/lantern/issues/375
+    # Check after next package update.
+    broken = lib.warnIf (
+      finalAttrs.version != "0.5.0"
+    ) "Is postgresql18Packages.lantern still broken?" (lib.versionAtLeast postgresql.version "18");
     description = "PostgreSQL vector database extension for building AI applications";
     homepage = "https://lantern.dev/";
     changelog = "https://github.com/lanterndata/lantern/blob/${finalAttrs.src.rev}/CHANGELOG.md";
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 3bf237c88b45..4cc2eb58e73d 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -19,6 +19,11 @@ postgresqlBuildExtension (finalAttrs: {
   buildInputs = postgresql.buildInputs;
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/hapostgres/pg_auto_failover/issues/1083
+    # Check after next package update.
+    broken =
+      lib.warnIf (finalAttrs.version != "2.2") "Is postgresql18Packages.pg_auto_failover still broken?"
+        (lib.versionAtLeast postgresql.version "18");
     description = "PostgreSQL extension and service for automated failover and high-availability";
     mainProgram = "pg_autoctl";
     homepage = "https://github.com/citusdata/pg_auto_failover";
diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
index 9db198216bb6..f4ed12e2f902 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
@@ -19,6 +19,11 @@ postgresqlBuildExtension (finalAttrs: {
   makeFlags = [ "USE_PGXS=1" ];
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/pgbigm/pg_bigm/issues/28
+    # Check after next package update.
+    broken = lib.warnIf (
+      finalAttrs.version != "1.2-20240606"
+    ) "Is postgresql18Packages.pg_bigm still broken?" (lib.versionAtLeast postgresql.version "18");
     description = "Text similarity measurement and index searching based on bigrams";
     homepage = "https://pgbigm.osdn.jp/";
     maintainers = [ ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index 1345dc4b1051..ef019030ddb1 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -17,6 +17,12 @@ postgresqlBuildExtension (finalAttrs: {
   };
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/citusdata/pg_cron/issues/396
+    # Note: already fixed on `main` branch.
+    # Check after next package update.
+    broken = lib.warnIf (
+      finalAttrs.version != "1.6.5"
+    ) "Is postgresql18Packages.pg_cron still broken?" (lib.versionAtLeast postgresql.version "18");
     description = "Run Cron jobs through PostgreSQL";
     homepage = "https://github.com/citusdata/pg_cron";
     changelog = "https://github.com/citusdata/pg_cron/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
index 4e2e3c3d3776..1c57b2502482 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
@@ -23,6 +23,14 @@ postgresqlBuildExtension (finalAttrs: {
     maintainers = with lib.maintainers; [ ivan ];
     platforms = postgresql.meta.platforms;
     license = lib.licenses.postgresql;
-    broken = lib.versionOlder postgresql.version "13";
+    broken =
+      lib.versionOlder postgresql.version "13"
+      ||
+        # PostgreSQL 18 support issue upstream: https://github.com/sraoss/pg_ivm/issues/133
+        # Note: already fixed on `main` branch.
+        # Check after next package update.
+        lib.warnIf (finalAttrs.version != "1.11") "Is postgresql18Packages.pg_ivm still broken?" (
+          lib.versionAtLeast postgresql.version "18"
+        );
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/pg_tle.nix b/pkgs/servers/sql/postgresql/ext/pg_tle.nix
index 20355bc0bda0..ea1fbcbcfe4c 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_tle.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_tle.nix
@@ -19,6 +19,11 @@ postgresqlBuildExtension rec {
   buildInputs = postgresql.buildInputs;
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/aws/pg_tle/issues/302
+    # Check after next package update.
+    broken = lib.warnIf (version != "1.5.1") "Is postgresql18Packages.pg_tle still broken?" (
+      lib.versionAtLeast postgresql.version "18"
+    );
     description = "Framework for building trusted language extensions for PostgreSQL";
     homepage = "https://github.com/aws/pg_tle";
     changelog = "https://github.com/aws/pg_tle/releases/tag/v${version}";
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index c365aea52bae..82611345c418 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -34,6 +34,11 @@ postgresqlBuildExtension (finalAttrs: {
   ];
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/pgroonga/pgroonga/issues/708
+    # Check after next package update.
+    broken = lib.warnIf (
+      finalAttrs.version != "4.0.1"
+    ) "Is postgresql18Packages.pgroonga still broken?" (lib.versionAtLeast postgresql.version "18");
     description = "PostgreSQL extension to use Groonga as the index";
     longDescription = ''
       PGroonga is a PostgreSQL extension to use Groonga as the index.
diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix
index 36789689bae0..3b440e537ffc 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvector.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix
@@ -17,6 +17,12 @@ postgresqlBuildExtension (finalAttrs: {
   };
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/pgvector/pgvector/issues/869
+    # Note: already fixed on `master` branch.
+    # Check after next package update.
+    broken = lib.warnIf (
+      finalAttrs.version != "0.8.0"
+    ) "Is postgresql18Packages.pgvector still broken?" (lib.versionAtLeast postgresql.version "18");
     description = "Open-source vector similarity search for PostgreSQL";
     homepage = "https://github.com/pgvector/pgvector";
     changelog = "https://github.com/pgvector/pgvector/raw/v${finalAttrs.version}/CHANGELOG.md";
diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
index ffc2f2682d52..8da7420f3bea 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
@@ -65,6 +65,11 @@ buildPgrxExtension (finalAttrs: {
   };
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/timescale/pgvectorscale/issues/249
+    # Check after next package update.
+    broken =
+      lib.warnIf (finalAttrs.version != "0.7.0") "Is postgresql18Packages.pgvectorscale still broken?"
+        (lib.versionAtLeast postgresql.version "18");
     homepage = "https://github.com/timescale/pgvectorscale";
     teams = [ lib.teams.flyingcircus ];
     description = "Complement to pgvector for high performance, cost efficient vector search on large workloads";
diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
index d1a7ed141f96..456d7bca4efa 100644
--- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
@@ -40,7 +40,15 @@ buildPgrxExtension (finalAttrs: {
 
   meta = {
     # Support for PostgreSQL 13 was removed in 0.2.0: https://github.com/pksunkara/pgx_ulid/blob/084778c3e2af08d16ec5ec3ef4e8f345ba0daa33/CHANGELOG.md?plain=1#L6
-    broken = lib.versionOlder postgresql.version "14";
+    broken =
+      lib.versionOlder postgresql.version "14"
+      ||
+        # PostgreSQL 18 support issue upstream: https://github.com/pksunkara/pgx_ulid/issues/65
+        # Note: already fixed on `master` branch.
+        # Check after next package update.
+        lib.warnIf (finalAttrs.version != "0.2.0") "Is postgresql18Packages.pgx_ulid still broken?" (
+          lib.versionAtLeast postgresql.version "18"
+        );
     description = "ULID Postgres extension written in Rust";
     homepage = "https://github.com/pksunkara/pgx_ulid";
     changelog = "https://github.com/pksunkara/pgx_ulid/blob/v${finalAttrs.version}/CHANGELOG.md";
diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix
index bc93ff3b76a6..99f0d336d525 100644
--- a/pkgs/servers/sql/postgresql/ext/rum.nix
+++ b/pkgs/servers/sql/postgresql/ext/rum.nix
@@ -29,6 +29,11 @@ postgresqlBuildExtension (finalAttrs: {
   };
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/postgrespro/rum/issues/156
+    # Check after next package update.
+    broken = lib.warnIf (finalAttrs.version != "1.3.14") "Is postgresql18Packages.rum still broken?" (
+      lib.versionAtLeast postgresql.version "18"
+    );
     description = "Full text search index method for PostgreSQL";
     homepage = "https://github.com/postgrespro/rum";
     license = lib.licenses.postgresql;
diff --git a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix
index 1ade4b6e90fa..dd5da727beee 100644
--- a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix
@@ -22,6 +22,12 @@ postgresqlBuildExtension (finalAttrs: {
   makeFlags = [ "USE_PGXS=1" ];
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/pgspider/sqlite_fdw/issues/117
+    # Note: already fixed on `master` branch.
+    # Check after next package update.
+    broken = lib.warnIf (
+      finalAttrs.version != "2.5.0"
+    ) "Is postgresql18Packages.sqlite_fdw still broken?" (lib.versionAtLeast postgresql.version "18");
     description = "SQLite Foreign Data Wrapper for PostgreSQL";
     homepage = "https://github.com/pgspider/sqlite_fdw";
     changelog = "https://github.com/pgspider/sqlite_fdw/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
index e89acc14811e..f6a4ba6f9607 100644
--- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
@@ -20,6 +20,11 @@ postgresqlBuildExtension (finalAttrs: {
   };
 
   meta = {
+    # PostgreSQL 18 support issue upstream: https://github.com/tds-fdw/tds_fdw/issues/384
+    # Check after next package update.
+    broken = lib.warnIf (
+      finalAttrs.version != "2.0.4"
+    ) "Is postgresql18Packages.tds_fdw still broken?" (lib.versionAtLeast postgresql.version "18");
     description = "PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)";
     homepage = "https://github.com/tds-fdw/tds_fdw";
     changelog = "https://github.com/tds-fdw/tds_fdw/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 2fe5cf171589..ea60aa516889 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -101,6 +101,13 @@ postgresqlBuildExtension (finalAttrs: {
     maintainers = with lib.maintainers; [ kirillrdy ];
     platforms = postgresql.meta.platforms;
     license = with lib.licenses; if enableUnfree then tsl else asl20;
-    broken = lib.versionOlder postgresql.version "15";
+    broken =
+      lib.versionOlder postgresql.version "15"
+      ||
+        # PostgreSQL 18 support issue upstream: https://github.com/timescale/timescaledb/issues/8233
+        # Check after next package update.
+        lib.warnIf (finalAttrs.version != "2.21.1") "Is postgresql18Packages.timescaledb still broken?" (
+          lib.versionAtLeast postgresql.version "18"
+        );
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
index 2217c9b0d275..eeb3bcef1e3e 100644
--- a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
@@ -123,6 +123,12 @@ buildPgrxExtension (finalAttrs: {
   };
 
   meta = {
+    # PostgreSQL 18 is not yet supported
+    # Will be supported in the next release (likely 0.5.0), as it's already supported in the main branch
+    # Check after next package update.
+    broken = lib.warnIf (
+      finalAttrs.version != "0.4.2"
+    ) "Is postgresql18Packages.vectorchord still broken?" (lib.versionAtLeast postgresql.version "18");
     changelog = "https://github.com/tensorchord/VectorChord/releases/tag/${finalAttrs.version}";
     description = "Scalable, fast, and disk-friendly vector search in Postgres, the successor of pgvecto.rs";
     homepage = "https://github.com/tensorchord/VectorChord";

From d14020e6d30d6314ad6906970af32f77cd3ae27e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 01:42:52 +0000
Subject: [PATCH 17/36] nuclei-templates: 10.2.6 -> 10.2.7

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

diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 13c6cdd72f8f..1c125f038fff 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.2.6";
+  version = "10.2.7";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${version}";
-    hash = "sha256-76PtEYXvZxKEBky0fqdWmjWxrKHfYLBWe+3nqqXUNOw=";
+    hash = "sha256-lawVAx/YmvRgeIWX5rQbqeX0+YAORG84aE/6Qw6okhg=";
   };
 
   installPhase = ''

From b51705d7066ee7ac3332728674b08a197681b80b Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Sat, 9 Aug 2025 01:45:59 +0000
Subject: [PATCH 18/36] zed-editor: 0.198.3 -> 0.198.5

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.198.5
---
 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 579341272f36..c0e220cb0099 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.198.3";
+  version = "0.198.5";
 
   outputs = [
     "out"
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-icLiruC219iuT5vO1Cc77mz01z/Afx9Xt23uxXhbPPo=";
+    hash = "sha256-jDwHw5kbm0qfV2WJ5tbFl9z/1S1ICp8bCZbhUD5o0VI=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
     '';
 
-  cargoHash = "sha256-z8xlU25L+LZxLOfSQowpVEnKM0BU+dgNqlFG3mh1HAQ=";
+  cargoHash = "sha256-MHwMsMdv7TjnWi2Kmr7vA+TUK+VyHMm4faYOssJ5Z1o=";
 
   nativeBuildInputs = [
     cmake

From 074465065221dc33b3fa97b263e42c3e2222ae26 Mon Sep 17 00:00:00 2001
From: yorenapu <yorenapu@users.noreply.github.com>
Date: Sat, 9 Aug 2025 09:47:17 +0800
Subject: [PATCH 19/36] errbot: fix build

---
 pkgs/by-name/er/errbot/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/er/errbot/package.nix b/pkgs/by-name/er/errbot/package.nix
index d164c7be9c78..5c3b421698b3 100644
--- a/pkgs/by-name/er/errbot/package.nix
+++ b/pkgs/by-name/er/errbot/package.nix
@@ -50,9 +50,6 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
-  # errbot-backend-slackv3 has not been packaged
-  disabledTestPaths = [ "tests/backend_tests/slack_test.py" ];
-
   disabledTests = [
     # require networking
     "test_backup"

From aab638f1745ae732e56155cef3a7dfa91c8c8a54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 01:55:44 +0000
Subject: [PATCH 20/36] python3Packages.yamlloader: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 388e88284bc7..0add590d5bfb 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "yamlloader";
-  version = "1.5.1";
+  version = "1.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jezhmwUKyxxqjKFKoweTOI+b4VT3NLgmVB+aGCjUHOw=";
+    hash = "sha256-wQrBMhpiaxyosJ0/Ov6YVbgYORxZmSp2tl5KLZXqxBs=";
   };
 
   build-system = [

From 35e0bd89298c820c51979af75e2a495a8738ca29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 05:57:43 +0000
Subject: [PATCH 21/36] mount-zip: 1.8 -> 1.10

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

diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix
index 26cbce771521..037bc80413c0 100644
--- a/pkgs/by-name/mo/mount-zip/package.nix
+++ b/pkgs/by-name/mo/mount-zip/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mount-zip";
-  version = "1.8";
+  version = "1.10";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "mount-zip";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HxHXQfyX3jdTJ5s/QwC9tkjU+JbPDEm7FUGss7tB0EM=";
+    hash = "sha256-d6cjqsqIYFPuAWKxjlLXCWNKT33xbMW8gLriZWj0SSc=";
   };
 
   strictDeps = true;

From 73eb63ffc5bb9ac78f979e36b267981db65eb03b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 06:01:14 +0000
Subject: [PATCH 22/36] python3Packages.ping3: 4.0.8 -> 5.1.3

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

diff --git a/pkgs/development/python-modules/ping3/default.nix b/pkgs/development/python-modules/ping3/default.nix
index 548e38c388d5..3598ec21f729 100644
--- a/pkgs/development/python-modules/ping3/default.nix
+++ b/pkgs/development/python-modules/ping3/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "ping3";
-  version = "4.0.8";
+  version = "5.1.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mrRg61fwBrcfl3ppPRVyFaq9a7y8bNZCi2lR6q4MKHU=";
+    hash = "sha256-UTD12FxxRnTlRMGo5TwIo+fsM3Ka1zEMWYjM4BAH0t8=";
   };
 
   build-system = [ setuptools ];

From cb55cd0848f11424ef6042551efa482fe5038873 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 9 Aug 2025 08:52:10 +0300
Subject: [PATCH 23/36] steam.buildRuntimeEnv: plumb privateTmp

---
 pkgs/by-name/he/heroic/package.nix | 4 +++-
 pkgs/by-name/st/steam/package.nix  | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/he/heroic/package.nix b/pkgs/by-name/he/heroic/package.nix
index d68acae65911..4884a733ecd1 100644
--- a/pkgs/by-name/he/heroic/package.nix
+++ b/pkgs/by-name/he/heroic/package.nix
@@ -5,7 +5,7 @@
   extraLibraries ? pkgs: [ ],
 }:
 
-(steam.override { privateTmp = false; }).buildRuntimeEnv {
+steam.buildRuntimeEnv {
   pname = "heroic";
   inherit (heroic-unwrapped) version meta;
 
@@ -19,4 +19,6 @@
     ln -s ${heroic-unwrapped}/share/applications $out/share
     ln -s ${heroic-unwrapped}/share/icons $out/share
   '';
+
+  privateTmp = false;
 }
diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix
index 06c08f7490ef..99b28d32bb68 100644
--- a/pkgs/by-name/st/steam/package.nix
+++ b/pkgs/by-name/st/steam/package.nix
@@ -21,6 +21,7 @@ let
       extraPreBwrapCmds ? "",
       extraBwrapArgs ? [ ],
       extraEnv ? { },
+      privateTmp ? true,
       ...
     }@args:
     buildFHSEnv (
@@ -150,6 +151,7 @@ buildRuntimeEnv {
     extraPreBwrapCmds
     extraBwrapArgs
     extraEnv
+    privateTmp
     ;
 
   runScript = writeShellScript "steam-wrapped" ''
@@ -175,6 +177,7 @@ buildRuntimeEnv {
             extraPreBwrapCmds
             extraBwrapArgs
             extraEnv
+            privateTmp
             ;
 
           runScript = writeShellScript "steam-run" ''

From 1df97d723e3f7ec573a5b479a9efa1d7cee79110 Mon Sep 17 00:00:00 2001
From: pancho horrillo <pancho@pancho.name>
Date: Sat, 9 Aug 2025 07:27:40 +0200
Subject: [PATCH 24/36] tessen: update meta.homepage

Co-authored-by: Acid Bong <acidbong@tilde.club>
---
 pkgs/by-name/te/tessen/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/tessen/package.nix b/pkgs/by-name/te/tessen/package.nix
index f60ee3a7aa68..e660bfa23e3d 100644
--- a/pkgs/by-name/te/tessen/package.nix
+++ b/pkgs/by-name/te/tessen/package.nix
@@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://sr.ht/~ayushnix/tessen";
+    homepage = "https://git.sr.ht/~ayushnix/tessen";
     description = "Interactive menu to autotype and copy Pass and GoPass data";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;

From 02e6758557c7ea24e56c5c55d76ca9696e9bf1f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 06:39:12 +0000
Subject: [PATCH 25/36] comrak: 0.40.0 -> 0.41.0

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

diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index 7aaa2254f70b..a58afa43e28e 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comrak";
-  version = "0.40.0";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = "comrak";
     rev = "v${version}";
-    sha256 = "sha256-lPO0i6oQtJqcmXDsqhTQV+7a6V04cMcvm2Jn3eWEceg=";
+    sha256 = "sha256-GYUMSn276XrGPIYRQf6+w3eIvKB5lMayBgSFyGb0DVw=";
   };
 
-  cargoHash = "sha256-TA8tC/8LfXzoxYJZlVELZirg9Xzr677VugzFwm5NHM4=";
+  cargoHash = "sha256-GxWhSYsCxOxcRbEtHj7V+4Wu2uoZjTpG04NFidS8sSQ=";
 
   meta = {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";

From 465f689e638576140b94aaa87b7a7abc0fbb03b3 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 9 Aug 2025 08:41:25 +0200
Subject: [PATCH 26/36] treewide: Remove myself as a maintainer from most
 things

---
 nixos/modules/services/security/hockeypuck.nix | 2 +-
 nixos/tests/hockeypuck.nix                     | 2 +-
 nixos/tests/jackett.nix                        | 2 +-
 nixos/tests/lidarr.nix                         | 2 +-
 nixos/tests/radarr.nix                         | 2 +-
 nixos/tests/sonarr.nix                         | 2 +-
 pkgs/by-name/li/lidarr/package.nix             | 2 +-
 pkgs/by-name/st/stupidterm/package.nix         | 2 +-
 pkgs/by-name/te/testssl/package.nix            | 2 +-
 pkgs/servers/hockeypuck/server.nix             | 2 +-
 pkgs/servers/hockeypuck/web.nix                | 2 +-
 pkgs/servers/web-apps/freshrss/default.nix     | 1 -
 12 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/security/hockeypuck.nix b/nixos/modules/services/security/hockeypuck.nix
index 4352241a1ae9..5bfe2a5c1328 100644
--- a/nixos/modules/services/security/hockeypuck.nix
+++ b/nixos/modules/services/security/hockeypuck.nix
@@ -10,7 +10,7 @@ let
   settingsFormat = pkgs.formats.toml { };
 in
 {
-  meta.maintainers = with lib.maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   options.services.hockeypuck = {
     enable = lib.mkEnableOption "Hockeypuck OpenPGP Key Server";
diff --git a/nixos/tests/hockeypuck.nix b/nixos/tests/hockeypuck.nix
index d1b5037fbe26..f1609087ac66 100644
--- a/nixos/tests/hockeypuck.nix
+++ b/nixos/tests/hockeypuck.nix
@@ -25,7 +25,7 @@ let
 in
 {
   name = "hockeypuck";
-  meta.maintainers = with lib.maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   nodes.machine =
     { ... }:
diff --git a/nixos/tests/jackett.nix b/nixos/tests/jackett.nix
index 9ce8209f49dd..77f05a6bad76 100644
--- a/nixos/tests/jackett.nix
+++ b/nixos/tests/jackett.nix
@@ -5,7 +5,7 @@ let
 in
 {
   name = "jackett";
-  meta.maintainers = with lib.maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   nodes.machine =
     { pkgs, ... }:
diff --git a/nixos/tests/lidarr.nix b/nixos/tests/lidarr.nix
index 8f32ce14673f..ee6dd83f38aa 100644
--- a/nixos/tests/lidarr.nix
+++ b/nixos/tests/lidarr.nix
@@ -2,7 +2,7 @@
 
 {
   name = "lidarr";
-  meta.maintainers = with lib.maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   nodes.machine =
     { pkgs, ... }:
diff --git a/nixos/tests/radarr.nix b/nixos/tests/radarr.nix
index 00949dcc7695..dfdf23582354 100644
--- a/nixos/tests/radarr.nix
+++ b/nixos/tests/radarr.nix
@@ -2,7 +2,7 @@
 
 {
   name = "radarr";
-  meta.maintainers = with lib.maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   nodes.machine =
     { pkgs, ... }:
diff --git a/nixos/tests/sonarr.nix b/nixos/tests/sonarr.nix
index 44dcaf3c893a..7205a5f640ef 100644
--- a/nixos/tests/sonarr.nix
+++ b/nixos/tests/sonarr.nix
@@ -2,7 +2,7 @@
 
 {
   name = "sonarr";
-  meta.maintainers = with lib.maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   nodes.machine =
     { pkgs, ... }:
diff --git a/pkgs/by-name/li/lidarr/package.nix b/pkgs/by-name/li/lidarr/package.nix
index 0a21e62a45dd..8c6e13698666 100644
--- a/pkgs/by-name/li/lidarr/package.nix
+++ b/pkgs/by-name/li/lidarr/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     description = "Usenet/BitTorrent music downloader";
     homepage = "https://lidarr.audio/";
     license = licenses.gpl3;
-    maintainers = [ maintainers.etu ];
+    maintainers = [ ];
     mainProgram = "Lidarr";
     platforms = [
       "x86_64-linux"
diff --git a/pkgs/by-name/st/stupidterm/package.nix b/pkgs/by-name/st/stupidterm/package.nix
index 7d82681b92df..c39e182127ab 100644
--- a/pkgs/by-name/st/stupidterm/package.nix
+++ b/pkgs/by-name/st/stupidterm/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
     description = "Simple wrapper around the VTE terminal emulator widget for GTK";
     homepage = "https://github.com/esmil/stupidterm";
     license = licenses.lgpl3Plus;
-    maintainers = [ maintainers.etu ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "stupidterm";
   };
diff --git a/pkgs/by-name/te/testssl/package.nix b/pkgs/by-name/te/testssl/package.nix
index 929940124146..994ed20c04f0 100644
--- a/pkgs/by-name/te/testssl/package.nix
+++ b/pkgs/by-name/te/testssl/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://testssl.sh/";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
     mainProgram = "testssl.sh";
   };
 }
diff --git a/pkgs/servers/hockeypuck/server.nix b/pkgs/servers/hockeypuck/server.nix
index deb5a52ee200..ab031dd2c96f 100644
--- a/pkgs/servers/hockeypuck/server.nix
+++ b/pkgs/servers/hockeypuck/server.nix
@@ -21,6 +21,6 @@ buildGoModule {
     description = "OpenPGP Key Server";
     homepage = "https://github.com/hockeypuck/hockeypuck";
     license = licenses.agpl3Plus;
-    maintainers = [ maintainers.etu ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/hockeypuck/web.nix b/pkgs/servers/hockeypuck/web.nix
index 2d6a75975ad4..a2f35a4d0cdb 100644
--- a/pkgs/servers/hockeypuck/web.nix
+++ b/pkgs/servers/hockeypuck/web.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
     description = "OpenPGP Key Server web resources";
     homepage = "https://github.com/hockeypuck/hockeypuck";
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.etu ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
index 7b4f54db4dd0..24ce7ec4bda7 100644
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -53,7 +53,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://www.freshrss.org/";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [
-      etu
       stunkymonkey
     ];
   };

From 903ad7eeeedfd727106ce8871d9c2ebcd0af20ac Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 8 Aug 2025 23:48:50 -0700
Subject: [PATCH 27/36] python3Packages.synology-srm: init at 0.2.3

---
 .../python-modules/synology-srm/default.nix   | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/synology-srm/default.nix

diff --git a/pkgs/development/python-modules/synology-srm/default.nix b/pkgs/development/python-modules/synology-srm/default.nix
new file mode 100644
index 000000000000..193ed83d258f
--- /dev/null
+++ b/pkgs/development/python-modules/synology-srm/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  requests,
+  poetry-core,
+  pythonRelaxDepsHook,
+  pytestCheckHook,
+  requests-mock,
+}:
+
+buildPythonPackage rec {
+  pname = "synology-srm";
+  version = "0.2.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "aerialls";
+    repo = "synology-srm";
+    tag = "v${version}";
+    hash = "sha256-qQxctw1UUs3jYve//irBni8rNKeld5u/bVtOwD2ofEQ=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [
+    "requests"
+  ];
+
+  dependencies = [
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    requests-mock
+  ];
+
+  pythonImportsCheck = [
+    "synology_srm"
+  ];
+
+  meta = {
+    description = "Python 3 library for Synology SRM (Router Manager)";
+    homepage = "https://github.com/aerialls/synology-srm";
+    changelog = "https://github.com/aerialls/synology-srm/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 323b48f55023..4870605e1404 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17595,6 +17595,8 @@ self: super: with self; {
 
   synergy = callPackage ../development/python-modules/synergy { };
 
+  synology-srm = callPackage ../development/python-modules/synology-srm { };
+
   syrupy = callPackage ../development/python-modules/syrupy { };
 
   syslog-rfc5424-formatter = callPackage ../development/python-modules/syslog-rfc5424-formatter { };

From d2c587c5899b0afc2eb7b0dad38a8200f8e94af5 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 8 Aug 2025 23:49:04 -0700
Subject: [PATCH 28/36] home-assistant: update component packages

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

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c5414b241c54..09a98b9fa0d3 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -5774,7 +5774,8 @@
       ];
     "synology_srm" =
       ps: with ps; [
-      ]; # missing inputs: synology-srm
+        synology-srm
+      ];
     "syslog" =
       ps: with ps; [
       ];

From 58cb2d74c3d94e4ea71ed3aa9906b92474c5bcf6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 07:42:20 +0000
Subject: [PATCH 29/36] kdePackages.ktextaddons: 1.7.0 -> 1.7.1

---
 pkgs/kde/misc/ktextaddons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix
index c845e53b9109..d5976aa08f9e 100644
--- a/pkgs/kde/misc/ktextaddons/default.nix
+++ b/pkgs/kde/misc/ktextaddons/default.nix
@@ -9,11 +9,11 @@
 }:
 mkKdeDerivation rec {
   pname = "ktextaddons";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
-    hash = "sha256-7JtimpC0shZgaGfoA08UszRDQgwreybz/UFNjB+jyuQ=";
+    hash = "sha256-kM8l4pjglcQLMoanFT0E+WHvTmWYMhvesA8r5+mYrn4=";
   };
 
   extraBuildInputs = [

From 0ab6e5e548498cb2cc796231a59603e8fe2ef623 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 9 Aug 2025 09:48:23 +0200
Subject: [PATCH 30/36] models-dev: 0-unstable-2025-08-07 -> 0-unstable-08-08

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

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index a3ef5f272334..6d3dfa0eab3f 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -17,12 +17,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-08-07";
+  version = "0-unstable-2025-08-08";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "f7d8b3932adea23b2cb4d0be615e7dff7870b8bc";
-    hash = "sha256-4bzXnZhILxtVMKtj54gXXtuTvh6KY9bLNCLnB1INy/E=";
+    rev = "429b76581cd3b63ba5e51be8fd543d4a0ca98f6a";
+    hash = "sha256-0A+BGq6+NR78bbCtPDqeG227phLm7/tuompUkdt2+6U=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 9501f2ac980575d8e7714d37d79556c84eb7af20 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 9 Aug 2025 11:11:04 +0200
Subject: [PATCH 31/36] claude-code: 1.0.71 -> 1.0.72

---
 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 89a9bbd637d2..cb8e32a0263f 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.71"
+        "@anthropic-ai/claude-code": "^1.0.72"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "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==",
+      "version": "1.0.72",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.72.tgz",
+      "integrity": "sha512-nA/l/xKX4sgOE0Y6P3o6czNGQqlyqJPjs9CHFxantsmyKvOot9VlRW4AiEAn42hQrZReCXeSnt8LOMx9ev7Erg==",
       "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 e4dab3449ef5..b7685095154a 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.71";
+  version = "1.0.72";
 
   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-ZJUvscbEaWHILL77R5/sPdNcxCLc2BL9P6tR+S7QnHg=";
+    hash = "sha256-1vIElqZ5sk62o1amdfOqhmSG4B5wzKWDLcCgvQO4a5o=";
   };
 
-  npmDepsHash = "sha256-wQ/DRPefziSRv6aFZXRpmz2vC6mQRqgc7r3++cDpYSg=";
+  npmDepsHash = "sha256-LkQf2lW6TM1zRr10H7JgtnE+dy0CE7WCxF4GhTd4GT4=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 5c697b8aea5b292be5f6abc1285cd975bbd8dd68 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 7 Aug 2025 16:38:14 +0200
Subject: [PATCH 32/36] ci/eval: reduce closure size

`procps` pulls in 180 MB of systemd, but busybox also provides `kill`.
`busybox` also ships `time`, so no need for that extra dependency.

Using `nativeBuildInputs` pulls in all the -dev outputs of the listed
packages - which we don't need. We only need to run these tools, thus
map to their bin outputs.

Brings down the closure size from 500+ MB to 193 MB for the Eval job.
This probably saves ~10 seconds for the job.
---
 ci/eval/compare/default.nix |  3 ++-
 ci/eval/default.nix         | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 5807f8ef52f7..81eebcc9adb1 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -122,7 +122,8 @@ let
 in
 runCommand "compare"
   {
-    nativeBuildInputs = [
+    # Don't depend on -dev outputs to reduce closure size for CI.
+    nativeBuildInputs = map lib.getBin [
       jq
       (python3.withPackages (
         ps: with ps; [
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 018a5b092526..9887afd5e107 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -14,10 +14,9 @@
   runCommand,
   writeShellScript,
   symlinkJoin,
-  time,
-  procps,
-  nix,
+  busybox,
   jq,
+  nix,
 }:
 
 let
@@ -48,9 +47,10 @@ let
     runCommand "attrpaths-superset.json"
       {
         src = nixpkgs;
-        nativeBuildInputs = [
+        # Don't depend on -dev outputs to reduce closure size for CI.
+        nativeBuildInputs = map lib.getBin [
+          busybox
           nix
-          time
         ];
       }
       ''
@@ -131,11 +131,11 @@ let
     in
     runCommand "nixpkgs-eval-${evalSystem}"
       {
-        nativeBuildInputs = [
-          nix
-          time
-          procps
+        # Don't depend on -dev outputs to reduce closure size for CI.
+        nativeBuildInputs = map lib.getBin [
+          busybox
           jq
+          nix
         ];
         env = {
           inherit evalSystem chunkSize;
@@ -206,7 +206,8 @@ let
     }:
     runCommand "combined-eval"
       {
-        nativeBuildInputs = [
+        # Don't depend on -dev outputs to reduce closure size for CI.
+        nativeBuildInputs = map lib.getBin [
           jq
         ];
       }

From 75f40a150c9d1aa9869cd5de817e25129a92f78b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 7 Aug 2025 16:39:04 +0200
Subject: [PATCH 33/36] ci/eval: use sane defaults

Using these defaults makes it possible to just run `nix-build ci -A
eval.singleSystem` without passing additional arguments and get a sane
result back. Especially helpful when testing or debugging.

A `chunkSize` of 5000 is conservative to be able to run on systems with
less memory as well. Run-time is not impacted by that, as recent
benchmarks show.
---
 ci/eval/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 9887afd5e107..2b7f59ae6b43 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -72,11 +72,11 @@ let
       # The system to evaluate.
       # Note that this is intentionally not called `system`,
       # because `--argstr system` would only be passed to the ci/default.nix file!
-      evalSystem,
+      evalSystem ? builtins.currentSystem,
       # The path to the `paths.json` file from `attrpathsSuperset`
       attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
       # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize,
+      chunkSize ? 5000,
       checkMeta ? true,
 
       # Don't try to eval packages marked as broken.

From 0528a382fe9c88d346346909d1c36868f77e6823 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 10:04:41 +0000
Subject: [PATCH 34/36] peazip: 10.5.0 -> 10.6.0

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

diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix
index edfbb7c30c42..07982d807d5f 100644
--- a/pkgs/by-name/pe/peazip/package.nix
+++ b/pkgs/by-name/pe/peazip/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "peazip";
-  version = "10.5.0";
+  version = "10.6.0";
 
   src = fetchFromGitHub {
     owner = "peazip";
     repo = "peazip";
     rev = version;
-    hash = "sha256-tEx0ZSvv+byn8OPSFprFJwMFxuEQzyrkvk4FbvGtH2A=";
+    hash = "sha256-oRgsT2j5P6jbaBAgLMGArJ+pCVSgC/CJcHM45mRw6Bs=";
   };
   sourceRoot = "${src.name}/peazip-sources";
 

From c17d64d64625cd11bc76ae79d242b49ba1e6580b Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <me-and@users.noreply.github.com>
Date: Sat, 9 Aug 2025 11:30:01 +0100
Subject: [PATCH 35/36] .gitattributes: manage CRLF handling (#424336)

In certain circumstances, Git will munge line endings when it checks out
and commits files.  This can result in difficult-to-debug errors when
files are changed when they're checked out.  To avoid that problem, set
.gitattributes such that Git will always use LF line endings for files
it detects as text files.

*.diff and *.patch files are excluded, as committed patch files may need
to patch upstream source code that intentionally uses CRLF line endings.

Fixes #423762
---
 .gitattributes | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 32cd96ef9e2c..6f006049e92d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,3 +18,28 @@ nixos/modules/module-list.nix merge=union
 # pkgs/top-level/all-packages.nix merge=union
 
 ci/OWNERS linguist-language=CODEOWNERS
+
+# Avoid munging line endings when using Git for Windows, and instead keep files
+# using LF line endings.  This particularly affects scripts committed in the
+# nixpkgs repository.
+#
+# - `text` without `=auto` would mean "Git should always munge line endings on
+#   this file so there will never be a CRLF in the repository, and the line
+#   endings in the working directory should respect the local Git
+#   configuration."
+# - `text=auto` means "Git should try to work out if this file is a text file.
+#   If it is, it should do the line-ending munging as for `text`, and if it
+#   isn't, it should leave the file alone."
+# - `eol=lf` means "Ignore any local configuration about how line
+#   endings normally work on this platform. This file should always and only
+#   have LF line endings in the repo (so if there's a CR in the repo, it's
+#   meant to be there in addition to any end-of-line mark), and the selected
+#   attribute is how the file should appear in the working directory."
+#
+# See https://github.com/NixOS/nixpkgs/issues/423762 for historical context.
+* text=auto eol=lf
+
+# Don't force LF line endings for diff/patch files, as they might be correctly
+# patching CRLF line endings from an upstream source package.
+*.diff !text !eol
+*.patch !text !eol

From a58f01c29f5593a55e0c1b7ecd4d9f34883fef0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 09:42:50 +0000
Subject: [PATCH 36/36] tomcat9: 9.0.107 -> 9.0.108

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

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 272297f584ce..020efc57e85b 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -60,8 +60,8 @@ let
 in
 {
   tomcat9 = common {
-    version = "9.0.107";
-    hash = "sha256-08qgrQpltJMafTrsok5VQc90O6X6nlGr2ls6MdC0hX0=";
+    version = "9.0.108";
+    hash = "sha256-qpEnzHOPUyqjTjR7MGqCFX+1tJm/wCi0/69521lW0o0=";
   };
 
   tomcat10 = common {