From db6901988d282ba3e309e8bb9260ed90f0261185 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Tue, 14 Jul 2026 09:24:58 -0400
Subject: [PATCH 001/310] darwin.libffi: check that the trampoline dylib is
 built correctly

---
 .../darwin/by-name/li/libffi/package.nix      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/pkgs/os-specific/darwin/by-name/li/libffi/package.nix b/pkgs/os-specific/darwin/by-name/li/libffi/package.nix
index 0411e61a1f9e..6a46e4cc0a5c 100644
--- a/pkgs/os-specific/darwin/by-name/li/libffi/package.nix
+++ b/pkgs/os-specific/darwin/by-name/li/libffi/package.nix
@@ -3,6 +3,9 @@
   autoreconfHook,
   dejagnu,
   mkAppleDerivation,
+  runCommand,
+  dyld,
+  python3,
   stdenv,
   testers,
   texinfo,
@@ -12,6 +15,10 @@
   doCheck ? !(stdenv.hostPlatform.isStatic),
 }:
 
+let
+  python3-with-macholib = python3.withPackages (pkgs: [ pkgs.macholib ]);
+in
+
 mkAppleDerivation (finalAttrs: {
   releaseName = "libffi";
 
@@ -94,6 +101,32 @@ mkAppleDerivation (finalAttrs: {
       pkg-config = testers.hasPkgConfigModules {
         package = finalAttrs.finalPackage;
       };
+      # Done as a passthru test to avoid pulling dyld into the Darwin bootstrap just for `dyld_info`.
+      # `dyld_info` is needed because `check-trampolines-dylib.py` does not check chained fixups.
+      check-trampolines-dylib =
+        runCommand "check-trampolines-dylib"
+          {
+            inherit (finalAttrs) src version;
+
+            nativeBuildInputs = [
+              dyld
+              python3-with-macholib
+            ];
+            buildInputs = [ finalAttrs.finalPackage ];
+
+            meta = {
+              description = "Test whether the libffi trampoline was built correctly and works on Darwin.";
+              inherit (finalAttrs.meta) license platforms;
+            };
+          }
+          ''
+            runPhase unpackPhase
+            trampolineDylib=${lib.escapeShellArg (lib.getLib finalAttrs.finalPackage)}/lib/libffi-trampolines.dylib
+            patchShebangs check-trampolines-dylib.py
+            ./check-trampolines-dylib.py "$trampolineDylib"
+            dyld_info -fixups "$trampolineDylib" | grep -v "chained fixups, seg_count exceeds number of segments"
+            touch "$out"
+          '';
     };
   };
 

From 31ac410db37503704af446f2cad40811fabe0b04 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Tue, 14 Jul 2026 09:24:58 -0400
Subject: [PATCH 002/310] darwin.libffi: disable linking with chained fixups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The dylib was apparently built with invalid chained fixups. This hasn’t
been a problem in the past, but dyld under macOS 27 is apparently
stricter now about which binaries it will load. Binaries using the
trampolines crash under macOS 27. Disabling them fixes those crashes.
---
 pkgs/os-specific/darwin/by-name/li/libffi/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/by-name/li/libffi/package.nix b/pkgs/os-specific/darwin/by-name/li/libffi/package.nix
index 6a46e4cc0a5c..1cfe8955c660 100644
--- a/pkgs/os-specific/darwin/by-name/li/libffi/package.nix
+++ b/pkgs/os-specific/darwin/by-name/li/libffi/package.nix
@@ -68,7 +68,7 @@ mkAppleDerivation (finalAttrs: {
   '';
 
   postBuild = ''
-    $CC -Os -Wl,-allowable_client,! -Wl,-not_for_dyld_shared_cache -Wl,-no_compact_unwind \
+    $CC -Os -Wl,-allowable_client,! -Wl,-not_for_dyld_shared_cache -Wl,-no_compact_unwind  -Wl,-no_fixup_chains \
       src/aarch64/trampoline.S -dynamiclib -o libffi-trampolines.dylib \
       -Iinclude -Ibuild -Ibuild/include \
       -install_name "$out/lib/libffi-trampoline.dylib" -Wl,-compatibility_version,1 -Wl,-current_version,1

From e122fee9393cc9c71da38209f078f1a5300403d1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 16:13:34 +0200
Subject: [PATCH 003/310] python3Packages.build: 1.5.0 -> 1.5.1

https://github.com/pypa/build/blob/1.5.1/CHANGELOG.rst
---
 pkgs/development/python-modules/build/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index 194e56dd34f9..a422cbfd6dd0 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "build";
-  version = "1.5.0";
+  version = "1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "build";
     tag = version;
-    hash = "sha256-Kxqqh9HfNC28CxFHzVkNVzqNM8MVkLgkaCU2jxpjceA=";
+    hash = "sha256-vm47wuSEKfU4CjonokylTyGe62jGS/5m2dhLKhY5TPc=";
   };
 
   build-system = [ flit-core ];

From 31b1ff3caa7f39e44d501a129652a8703ab0bb80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 16:43:18 +0200
Subject: [PATCH 004/310] python3Packages.setuptools: 82.0.1 -> 83.0.0

https://setuptools.pypa.io/en/stable/history.html#v83-0-0
---
 pkgs/development/python-modules/setuptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 7daa5062fbb8..f3cd903e9461 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "setuptools";
-  version = "82.0.1";
+  version = "83.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "setuptools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M4fB+R4UNla2VlcWNhfDLvExQMpjLkPkgVsU4vg6ImU=";
+    hash = "sha256-Gn2gH2LnsgeX1MvDRBbnFnI6WjkjBFItU4SelowkjBc=";
   };
 
   patches = [

From 1a3cfcf0d53b58424dd4eeffc08865d0c740de29 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 17:06:18 +0200
Subject: [PATCH 005/310] python3Packages.poetry-core: 2.4.0 -> 2.4.1

https://github.com/python-poetry/poetry-core/blob/2.4.1/CHANGELOG.md
---
 pkgs/development/python-modules/poetry-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index d158236eff78..2340a309ef38 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "poetry-core";
-  version = "2.4.0";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = "poetry-core";
     tag = version;
-    hash = "sha256-i9EucMsoX8Z0iyhNDVYaczv1CSY/KaZpMjn/FGzIJU4=";
+    hash = "sha256-Io2VpLxnJesO4QohsunD7ogr87NiNjGeTmEl9wFswkw=";
   };
 
   nativeCheckInputs = [

From 2ca3d7c2a44d780c288490c51fbffe75d2ddf57d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 17:06:35 +0200
Subject: [PATCH 006/310] python3Packages.hatchling: 1.30.1 -> 1.31.0

https://github.com/pypa/hatch/releases/tag/hatchling-v1.31.0
---
 pkgs/development/python-modules/hatchling/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix
index e9c0556a05a5..eff0884950cf 100644
--- a/pkgs/development/python-modules/hatchling/default.nix
+++ b/pkgs/development/python-modules/hatchling/default.nix
@@ -19,12 +19,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "hatchling";
-  version = "1.30.1";
+  version = "1.31.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-7uT9RTV/cuuz16QuXXLPteKe1CbXnog2KIkmxCWNXy4=";
+    hash = "sha256-a0itQGikgu1yObOoIVvFW0eq0zRdWN/JTlU8XS1GIRs=";
   };
 
   # listed in backend/pyproject.toml

From 5ef7f171a3deb4c770cf577456c11ab25740e397 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 18:11:46 +0200
Subject: [PATCH 007/310] python3Packages.cffi: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 8be0bfc0872d..39c0aed75292 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "cffi";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-cffi";
     repo = "cffi";
     tag = "v${version}";
-    hash = "sha256-7Mzz3KmmmE2xQru1GA4aY0DZqn6vxykWiExQvnA1bjM=";
+    hash = "sha256-17OgcPo1pYwsPV/2iHe7iXVusCp5zLTFGcHYUfX1g48=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 852f189b34c86c01a1ad2d291634b1aaad86c479 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 18:20:57 +0200
Subject: [PATCH 008/310] python3Packages.ast-serialize: 0.5.0 -> 0.6.0

https://github.com/mypyc/ast_serialize/compare/v0.5.0...v0.6.0
---
 pkgs/development/python-modules/ast-serialize/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ast-serialize/default.nix b/pkgs/development/python-modules/ast-serialize/default.nix
index 0ce8d6d2a3f4..3b47ae8a1508 100644
--- a/pkgs/development/python-modules/ast-serialize/default.nix
+++ b/pkgs/development/python-modules/ast-serialize/default.nix
@@ -7,19 +7,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ast-serialize";
-  version = "0.5.0";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mypyc";
     repo = "ast_serialize";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GmhbMraI16J6ePtn7lXAWaJ+9zDH1GdebKIAzm5w9ok=";
+    hash = "sha256-7MNtry/GDUpjuh/rMB+R4wAQpPAG/yLNGqH4tEyK7tw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-h+BklNeoQaRVWczsE9sFXgvFrnHW5vjWOVaOvLghv0U=";
+    hash = "sha256-iw1qkQoagmS+8e9znEEo4EZocu+ECL4c+egBY2TOrk0=";
   };
 
   build-system = [

From 59e6f2bdee0589aa705fa9584a5b81ad0c6cc864 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 22:39:29 +0200
Subject: [PATCH 009/310] python3Packages.charset-normalizer: 3.4.7 -> 3.4.9

https://github.com/jawah/charset_normalizer/blob/3.4.9/CHANGELOG.md
---
 .../python-modules/charset-normalizer/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix
index 7454c0643eb1..54cc26122485 100644
--- a/pkgs/development/python-modules/charset-normalizer/default.nix
+++ b/pkgs/development/python-modules/charset-normalizer/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "charset-normalizer";
-  version = "3.4.7";
+  version = "3.4.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "charset_normalizer";
     tag = version;
-    hash = "sha256-dOdJ4f98smCYdskp3BwtQG6aOyK+2a73+x580FKRWDk=";
+    hash = "sha256-YOskF90ach/qEwnMeYDEEO2H4DOoz/LZApXDRU9mvnM=";
   };
 
   postPatch = ''
     substituteInPlace _mypyc_hook/backend.py \
-      --replace-fail "mypy>=1.4.1,<=1.20" "mypy"
+      --replace-fail "mypy>=1.4.1,<2.2" "mypy"
   '';
 
   build-system = [

From e84a374a8fa5cf8dfdf2604d40c02df7a808956f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:13:41 +0200
Subject: [PATCH 010/310] python3Packages.aiohappyeyeballs: 2.7.0 -> 2.7.1

https://github.com/bdraco/aiohappyeyeballs/blob/v2.7.1/CHANGELOG.md
---
 pkgs/development/python-modules/aiohappyeyeballs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
index 61403273a997..789d9ae00e67 100644
--- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix
+++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "aiohappyeyeballs";
-  version = "2.7.0";
+  version = "2.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiohappyeyeballs";
     tag = "v${version}";
-    hash = "sha256-BqwKo1zZ7CqkUZ9H05fbbHVj/z3m0xaERh5dGBDKFYI=";
+    hash = "sha256-smpdmmut4wYekVew13KZXluI71lSUdZriPejUumkLNU=";
   };
 
   outputs = [

From d7069577cdff746df8d8cb2ffb82a79da0be62ff Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:23:07 +0200
Subject: [PATCH 011/310] python3Packages.httpcore2: 2.4.0 -> 2.5.0

https://github.com/pydantic/httpx2/blob/v2.5.0/src/httpcore2/CHANGELOG.md
---
 pkgs/development/python-modules/httpcore2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/httpcore2/default.nix b/pkgs/development/python-modules/httpcore2/default.nix
index eddeeb5178fd..fb4b68102f82 100644
--- a/pkgs/development/python-modules/httpcore2/default.nix
+++ b/pkgs/development/python-modules/httpcore2/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "httpcore2";
-  version = "2.4.0";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "httpx2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T5As4cdZRHkWszzaDZX8G8Z35TkaBsB/oy92FtOhuBY=";
+    hash = "sha256-vIWAUjHPyafbeeUc2OvGpkiOoTj1fTniRnQiKSdkm6s=";
   };
 
   postPatch = ''

From 6ee364839b1c406213037b41077c3e270e3d6217 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:26:51 +0200
Subject: [PATCH 012/310] python3Packages.httpx2: 2.4.0 -> 2.5.0

https://github.com/pydantic/httpx2/blob/v2.5.0/src/httpx2/CHANGELOG.md
---
 pkgs/development/python-modules/httpx2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/httpx2/default.nix b/pkgs/development/python-modules/httpx2/default.nix
index f27315046788..83f08830b4a2 100644
--- a/pkgs/development/python-modules/httpx2/default.nix
+++ b/pkgs/development/python-modules/httpx2/default.nix
@@ -39,14 +39,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "httpx2";
-  version = "2.4.0";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "httpx2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T5As4cdZRHkWszzaDZX8G8Z35TkaBsB/oy92FtOhuBY=";
+    hash = "sha256-vIWAUjHPyafbeeUc2OvGpkiOoTj1fTniRnQiKSdkm6s=";
   };
 
   postPatch = ''

From 7601ab68057b0eceacb234808e805e4da9f5355b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:29:54 +0200
Subject: [PATCH 013/310] python3Packages.sphinx-autodoc-typehints: 3.10.5 ->
 3.12.1

https://github.com/tox-dev/sphinx-autodoc-typehints/releases/tag/3.12.1
---
 .../python-modules/sphinx-autodoc-typehints/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
index a084e1a54962..4c3e107a318f 100644
--- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sphinx-autodoc-typehints";
-  version = "3.10.5";
+  version = "3.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "sphinx-autodoc-typehints";
     tag = finalAttrs.version;
-    hash = "sha256-ClRfCv3UvUdnSnm5XuyrWj8oFQMSAPb3ZCDokAWI4cE=";
+    hash = "sha256-RgRyYZcMJ2bgTxvf339ZEn2f1/BczlSSSv8tbDMn9fs=";
   };
 
   build-system = [

From 2d5bca4cdf06eec098102877362fad0d5cf6a846 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:34:00 +0200
Subject: [PATCH 014/310] python3Packages.pytest: 9.0.3 -> 9.1.1

https://github.com/pytest-dev/pytest/releases/tag/9.1.1
---
 pkgs/development/python-modules/pytest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index c86b2b419237..d093192551ff 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -26,12 +26,12 @@
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "9.0.3";
+  version = "9.1.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uGraUIr4HRnt6yE8aBsdSCRsGpHTBMbIGkJ2dMF+uRw=";
+    hash = "sha256-EIj73o8rSdlaVJoZVwevp6dqPOm8rcJrbXHw/9pf4xM=";
   };
 
   outputs = [

From 7cdd4e1ae465ade250feefc2e7e590970beab7ed Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:40:06 +0200
Subject: [PATCH 015/310] python3Packages.click: 8.3.3 -> 8.4.2

https://github.com/pallets/click/blob/8.4.2/CHANGES.rst
---
 pkgs/development/python-modules/click/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 13e65aa099c8..d79b1b5cede0 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -16,20 +16,24 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.3.3";
+  version = "8.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "click";
     tag = version;
-    hash = "sha256-LcnAI4hyiuaJ4qnFnbAR5Cft/yvW5tAIjY6qc6K/Nrw=";
+    hash = "sha256-66JFGGwPXeCU7Fbqsrsq3giv6qsea1ZKGmZYPu9rcog=";
   };
 
   build-system = [ flit-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   disabledTests = [
     # for some reason the tests fail to execute cat, even though they run with less just fine,
     # even adding coreutils to nativeCheckInputs explicitly does not change anything

From b64e13cf9715a2101411fa3303154026901f127e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:42:13 +0200
Subject: [PATCH 016/310] python3Packages.pytest-unordered: 0.7.0 -> 0.8.0

https://github.com/utapyngo/pytest-unordered/blob/v0.8.0/CHANGELOG.md
---
 pkgs/development/python-modules/pytest-unordered/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix
index 4d174bea06de..c96bad1e02bd 100644
--- a/pkgs/development/python-modules/pytest-unordered/default.nix
+++ b/pkgs/development/python-modules/pytest-unordered/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-unordered";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "utapyngo";
     repo = "pytest-unordered";
     tag = "v${version}";
-    hash = "sha256-JmP2zStxIt+u7sgfRKlnBwM5q5R0GfXtiE7ZgHKtg94=";
+    hash = "sha256-0Zh58qWKJIUL/7ELiZmyFNVKUyiJeckpYTQBnqKROo4=";
   };
 
   build-system = [ setuptools ];

From ff3f2270db9dddb7abe3e0bec78bf1d2656f8867 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:46:46 +0200
Subject: [PATCH 017/310] python3Packages.pytest-mock: fix tests with pytest
 9.1

---
 pkgs/development/python-modules/pytest-mock/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index 3c03379fceb4..f6a89f265a05 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pytest,
   pytest-asyncio,
   pytestCheckHook,
@@ -21,6 +22,14 @@ buildPythonPackage rec {
     hash = "sha256-9h5/cssWs4F0LKnFLjWDsEjB2AYczLvnSjiUdsaEcBQ=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "pytest-9.1-compat.patch";
+      url = "https://github.com/pytest-dev/pytest-mock/commit/1d42981a1577207db5919852f30ef08c97208496.patch";
+      hash = "sha256-9/vQi/VvZRrIUSq1e90MvLB0idkc+tT4R6q1Ut4HKnY=";
+    })
+  ];
+
   build-system = [
     setuptools
     setuptools-scm

From 9183b77c29f3903a10f315eb76ed1030a8d71a68 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:56:39 +0200
Subject: [PATCH 018/310] python3Packages.aspectlib: fix pluggy compat

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

diff --git a/pkgs/development/python-modules/aspectlib/default.nix b/pkgs/development/python-modules/aspectlib/default.nix
index 6cbbac920c55..ce4fabc3b2ef 100644
--- a/pkgs/development/python-modules/aspectlib/default.nix
+++ b/pkgs/development/python-modules/aspectlib/default.nix
@@ -28,6 +28,12 @@ buildPythonPackage rec {
       url = "https://github.com/ionelmc/python-aspectlib/commit/ef2c12304f08723dc8e79d1c59bc32c946d758dc.patch";
       hash = "sha256-gtPFtwDsGIMkHTyuoiLk+SAGgB2Wyx/Si9HIdoIsvI8=";
     })
+    (fetchpatch {
+      name = "pluggy-compat.patch";
+      url = "https://github.com/ionelmc/python-aspectlib/commit/b85abdb0565d1598ce56bd49d49dc709d4e16081.patch";
+      hash = "sha256-hW9xF50RjlrKXyABc69dkiV7YUeee95MnF0J/xQDWd4=";
+      includes = [ "tests/conftest.py" ];
+    })
   ];
 
   nativeBuildInputs = [ setuptools ];

From 32d47ec38b194b32d26dfef4a7cc84be53d60f16 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:57:59 +0200
Subject: [PATCH 019/310] python3Packages.roman-numerals: ignore pytest10
 deprecations

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

diff --git a/pkgs/development/python-modules/roman-numerals/default.nix b/pkgs/development/python-modules/roman-numerals/default.nix
index 0360ef4b7909..c16b1d37c17f 100644
--- a/pkgs/development/python-modules/roman-numerals/default.nix
+++ b/pkgs/development/python-modules/roman-numerals/default.nix
@@ -24,6 +24,10 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   pythonImportsCheck = [ "roman_numerals" ];
 
   meta = {

From b82555212853eedf9562d4c59bfd0f629e9d2a53 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 11 Jul 2026 23:58:29 +0200
Subject: [PATCH 020/310] python3Packages.infrared-protocols: relax setuptools
 constraint

---
 .../python-modules/infrared-protocols/default.nix            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/infrared-protocols/default.nix b/pkgs/development/python-modules/infrared-protocols/default.nix
index 839e13159529..5654af041975 100644
--- a/pkgs/development/python-modules/infrared-protocols/default.nix
+++ b/pkgs/development/python-modules/infrared-protocols/default.nix
@@ -18,6 +18,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-6kyb0a0cCwVSS4evDGg0Z7wLGhDUHnLeXUJ9PW+fhHk=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=78.1.1,<83.0" setuptools
+  '';
+
   build-system = [ setuptools ];
 
   pythonImportsCheck = [ "infrared_protocols" ];

From 7b607fe8650e336dec8cfa627edef17e04ed1e80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 00:38:00 +0200
Subject: [PATCH 021/310] python3Packages.paho-mqtt: disable failing tests

Upstream let key material used in tests exprie.
---
 pkgs/development/python-modules/paho-mqtt/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix
index b0ea0015bb42..93e3d3fc5b5e 100644
--- a/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
@@ -63,6 +62,15 @@ buildPythonPackage rec {
     "test_01_zero_length_clientid"
   ];
 
+  disabledTestPaths = [
+    # Expired key material
+    # https://github.com/eclipse-paho/paho.mqtt.python/pull/854
+    "tests/lib/test_08_ssl_connect_alpn.py"
+    "tests/lib/test_08_ssl_connect_cert_auth.py"
+    "tests/lib/test_08_ssl_connect_cert_auth_pw.py"
+    "tests/lib/test_08_ssl_connect_no_auth.py"
+  ];
+
   meta = {
     changelog = "https://github.com/eclipse/paho.mqtt.python/blob/${src.rev}/ChangeLog.txt";
     description = "MQTT version 5.0/3.1.1 client class";

From d75a3fa17d84cbee81646b9059241ca95294126a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 02:37:55 +0200
Subject: [PATCH 022/310] python3Packages.rf-protocols: relax setuptools
 constraint

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

diff --git a/pkgs/development/python-modules/rf-protocols/default.nix b/pkgs/development/python-modules/rf-protocols/default.nix
index 395b4c996f6c..49fc6ce5e5d6 100644
--- a/pkgs/development/python-modules/rf-protocols/default.nix
+++ b/pkgs/development/python-modules/rf-protocols/default.nix
@@ -21,6 +21,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-g2e+iQXBaoGO1Yv5v+xpiM+beecErI58Ua5/FODg8Bo=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=78.1.1,<83.0" setuptools
+  '';
+
   build-system = [ setuptools ];
 
   nativeBuildInputs = [

From 427f83bc1b438b0fc7b3ad244ca49fb5bc3eed3a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 02:53:51 +0200
Subject: [PATCH 023/310] python3Packages.watchfiles: 1.1.1 -> 1.2.0

https://github.com/samuelcolvin/watchfiles/releases/tag/v1.2.0
---
 pkgs/development/python-modules/watchfiles/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix
index d784a0c0ea86..b48753ee4de9 100644
--- a/pkgs/development/python-modules/watchfiles/default.nix
+++ b/pkgs/development/python-modules/watchfiles/default.nix
@@ -13,19 +13,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "watchfiles";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "samuelcolvin";
     repo = "watchfiles";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UlQnCYSNU9H4x31KenSfYExGun94ekrOCwajORemSco=";
+    hash = "sha256-gfH/8o3WsGL4Qki5kRrWpQLyk85HgTtR6iImInPYthg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname src version;
-    hash = "sha256-6sxtH7KrwAWukPjLSMAebguPmeAHbC7YHOn1QiRPigs=";
+    hash = "sha256-GFGhEXW0M23G0NB4Bu1FXV9Bmdt9weznHHSD/6rBSjI=";
   };
 
   nativeBuildInputs = [
@@ -52,6 +52,10 @@ buildPythonPackage (finalAttrs: {
     rm -rf watchfiles
   '';
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   disabledTests = [
     #  BaseExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
     "test_awatch_interrupt_raise"

From 46bfe83cc17bb0dbeb1b3224b0913c999a2132d1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 02:56:33 +0200
Subject: [PATCH 024/310] python3Packages.findpython: 0.7.1 -> 0.8.0

https://github.com/frostming/findpython/releases/tag/0.8.0
---
 pkgs/development/python-modules/findpython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix
index 59a7383da442..3f34cda59a54 100644
--- a/pkgs/development/python-modules/findpython/default.nix
+++ b/pkgs/development/python-modules/findpython/default.nix
@@ -16,7 +16,7 @@
 
 let
   pname = "findpython";
-  version = "0.7.1";
+  version = "0.8.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -24,7 +24,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nynmo9q9t18rOclJdywO0m6rFTCABmafNHjNqw2GfHg=";
+    hash = "sha256-U7MiZIdN+lmQvQnXF4GThtjbMUnYn+IPiP4QeN4oa64=";
   };
 
   build-system = [ pdm-backend ];

From ecd8f32bcd8010c9ad7f79111200befa81b45d7a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 02:57:37 +0200
Subject: [PATCH 025/310] python3Packages.flask: 3.1.2 -> 3.1.3

https://flask.palletsprojects.com/en/stable/changes/#version-3-1-3
---
 .../python-modules/flask/default.nix          |  9 ++-
 .../flask/pytest-9.1-compat.patch             | 71 +++++++++++++++++++
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/flask/pytest-9.1-compat.patch

diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index 7561d3fcb594..337c60ed0c06 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -29,14 +29,19 @@
 
 buildPythonPackage rec {
   pname = "flask";
-  version = "3.1.2";
+  version = "3.1.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-v2VsFcgBkO1iitCM39Oqo1vrCHhV4vSUkQqjd0zE/Yc=";
+    hash = "sha256-DvDlK4qc2TKFU3kZfdj5QEezWcoKeGlRRDBMtF+Hyes=";
   };
 
+  patches = [
+    # https://github.com/pallets/flask/issues/6071
+    ./pytest-9.1-compat.patch
+  ];
+
   build-system = [ flit-core ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/flask/pytest-9.1-compat.patch b/pkgs/development/python-modules/flask/pytest-9.1-compat.patch
new file mode 100644
index 000000000000..bd301adf5f87
--- /dev/null
+++ b/pkgs/development/python-modules/flask/pytest-9.1-compat.patch
@@ -0,0 +1,71 @@
+From 498f13135acdf045c40bad193ec44c94277f32fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <tomas.hrnciar@me.com>
+Date: Thu, 2 Jul 2026 09:03:11 +0200
+Subject: [PATCH] Fix pytest >= 9.1 compatibility
+
+pytest 9.1 removed the private `notset` sentinel from `_pytest.monkeypatch` (now `NOTSET` in `_pytest.compat`).
+Add compatibility shim in tests/test_cli.py
+
+Fixes: #6071
+
+Assisted-by: Claude Opus 4.6
+---
+ tests/conftest.py | 17 +++++++++++------
+ tests/test_cli.py |  5 ++++-
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 0414b9e22f..ee00e270b8 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -4,6 +4,11 @@
+ import pytest
+ from _pytest import monkeypatch
+ 
++try:
++    _notset = monkeypatch.notset
++except AttributeError:
++    from _pytest.compat import NOTSET as _notset
++
+ from flask import Flask
+ from flask.globals import app_ctx as _app_ctx
+ 
+@@ -16,15 +21,15 @@ def _standard_os_environ():
+     """
+     mp = monkeypatch.MonkeyPatch()
+     out = (
+-        (os.environ, "FLASK_ENV_FILE", monkeypatch.notset),
+-        (os.environ, "FLASK_APP", monkeypatch.notset),
+-        (os.environ, "FLASK_DEBUG", monkeypatch.notset),
+-        (os.environ, "FLASK_RUN_FROM_CLI", monkeypatch.notset),
+-        (os.environ, "WERKZEUG_RUN_MAIN", monkeypatch.notset),
++        (os.environ, "FLASK_ENV_FILE", _notset),
++        (os.environ, "FLASK_APP", _notset),
++        (os.environ, "FLASK_DEBUG", _notset),
++        (os.environ, "FLASK_RUN_FROM_CLI", _notset),
++        (os.environ, "WERKZEUG_RUN_MAIN", _notset),
+     )
+ 
+     for _, key, value in out:
+-        if value is monkeypatch.notset:
++        if value is _notset:
+             mp.delenv(key, False)
+         else:
+             mp.setenv(key, value)
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 2a34088bd5..35467265c1 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -11,7 +11,10 @@
+ 
+ import click
+ import pytest
+-from _pytest.monkeypatch import notset
++try:
++    from _pytest.monkeypatch import notset
++except ImportError:
++    from _pytest.compat import NOTSET as notset
+ from click.testing import CliRunner
+ 
+ from flask import Blueprint
+

From 00f4abe0876be63a420fb84bd2f4cdbfb749a683 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 02:59:18 +0200
Subject: [PATCH 026/310] python3Packages.setuptools-rust: 1.12.0 -> 1.13.0

https://github.com/PyO3/setuptools-rust/releases/tag/v1.13.0
---
 pkgs/development/python-modules/setuptools-rust/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index a13c0e7be526..71e2bda6fd30 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -17,13 +17,13 @@
 }:
 buildPythonPackage rec {
   pname = "setuptools-rust";
-  version = "1.12.0";
+  version = "1.13.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "setuptools_rust";
     inherit version;
-    hash = "sha256-2UqT8Ml3UcFwFFZfB73DJL7kXTls0buoPY56+SuUXww=";
+    hash = "sha256-8q/PS67uaJkQzknPqKrU4IzOcvQXRJvMMokbhmT9xyY=";
   };
 
   build-system = [

From f6db60842c915a75194fe7a42feddf4ba1fe0b6b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:11:11 +0200
Subject: [PATCH 027/310] python3Packages.granian: 2.7.8 -> 2.7.9

https://github.com/emmett-framework/granian/releases/tag/v2.7.9
---
 pkgs/development/python-modules/granian/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index b015bead770d..3fa255a99b4d 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "granian";
-  version = "2.7.8";
+  version = "2.7.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "emmett-framework";
     repo = "granian";
     tag = "v${version}";
-    hash = "sha256-89Kl/MrotK0fv0oAayUuZXyLLG9PPM1km57ER+dM1jw=";
+    hash = "sha256-SYbdLrE/LaPGpzsrW4FBWtKyTM1VTqJ6sWRVbLjvCM8=";
   };
 
   # Granian forces a custom allocator for all the things it runs,
@@ -40,7 +40,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-mnqtzZ2+xuxUezhsgw+gr6MmWbi4Z4j0bHndys6vHFw=";
+    hash = "sha256-DZZUWpTsKkJQ8ku1Hm5eKFNxhYVfxv7D2N9DLPS9+a4=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 059ed5a40ceebbeeef33e1b700b8caf837fd6d79 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:14:49 +0200
Subject: [PATCH 028/310] python3Packages.scikit-build-core: 0.12.2 -> 1.0.2

https://github.com/scikit-build/scikit-build-core/blob/v1.0.2/docs/about/changelog.md
---
 .../python-modules/scikit-build-core/default.nix    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
index 61cd4585d23c..6ee9471c8650 100644
--- a/pkgs/development/python-modules/scikit-build-core/default.nix
+++ b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   hatch-vcs,
@@ -28,24 +27,16 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "scikit-build-core";
-  version = "0.12.2";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-build";
     repo = "scikit-build-core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JE6z44u1FLfI+Gguhd2rVUvY8tyEoo/WviGJmPRT8kc=";
+    hash = "sha256-skqX3+jS+lT0zfc5E4ssrZfoZkUrel9WD6a70OX1shg=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "setuptools-scm-10-compat.patch";
-      url = "https://github.com/scikit-build/scikit-build-core/commit/1b870c538bf7ca679fc4a6e0cbba301c98d9ac35.patch";
-      hash = "sha256-JUxBvKiAHpDlIIFkvU+CflTNA6m/auxW5wd5cVYpvcM=";
-    })
-  ];
-
   build-system = [
     hatch-vcs
     hatchling

From 0dc1e39e1bd2531e03305f89c3bdac26063a20c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:16:42 +0200
Subject: [PATCH 029/310] python3Packages.scikit-build: 0.19.0 -> 0.19.1

https://github.com/scikit-build/scikit-build/blob/0.19.1/CHANGES.rst
---
 pkgs/development/python-modules/scikit-build/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index 8bf1fbdc5ba7..79285c935de3 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -22,13 +22,13 @@
 
 buildPythonPackage rec {
   pname = "scikit-build";
-  version = "0.19.0";
+  version = "0.19.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "scikit_build";
     inherit version;
-    hash = "sha256-RuGy1xND0U5MB9fmCQLmc8eN77miwoK3CtgPuFAq3i4=";
+    hash = "sha256-uajQf8otXRDZMiC8V6aFFh1yrx/HYoXVXFZN2qhi5YQ=";
   };
 
   # This line in the filterwarnings section of the pytest configuration leads to this error:

From e8a32a1aa0d13e39adee91a6378c088292c0f32c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:18:11 +0200
Subject: [PATCH 030/310] python3Packages.dulwich: 1.2.6 -> 1.2.10

https://github.com/jelmer/dulwich/blob/dulwich-dulwich-1.2.10/NEWS
---
 pkgs/development/python-modules/dulwich/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index e553dbb15dc7..cb403d4bf532 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -25,19 +25,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dulwich";
-  version = "1.2.6";
+  version = "1.2.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = "dulwich";
     tag = "dulwich-${finalAttrs.version}";
-    hash = "sha256-nj20g5OmlcqWDaKv3NoKWZS5/e4HOMCf7DHeS7xDzjQ=";
+    hash = "sha256-ogYR4xK4sYbh7zOozpiZ+bubA6/kDx1iFkbIAjYLkIs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-wifh/beg3VVQpAXg/P/tq6qiUwCqXxhWPoRvX2HcFOc=";
+    hash = "sha256-Shu80kj4rir3JvrgXmO82/Z6ZROaACl43zQBzjlDFYc=";
   };
 
   nativeBuildInputs = [

From 01dbc3ec9bac4bd460092b1c844b77522cd94659 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:18:39 +0200
Subject: [PATCH 031/310] python3Packages.uvicorn: 0.46.0 -> 0.51.0

https://github.com/Kludex/uvicorn/blob/0.51.0/docs/release-notes.md
---
 pkgs/development/python-modules/uvicorn/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index d9d4aba3e6e2..79d6596c40af 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "uvicorn";
-  version = "0.46.0";
+  version = "0.51.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = "uvicorn";
     tag = version;
-    hash = "sha256-+21fEPLnH2nrwPCXNlRw7U1VcXdaUnNCeThTfzepQoY=";
+    hash = "sha256-VX5X2BY8eZc93r3zfJFhtz1vuXHvaqWB5rTj7zddSzU=";
   };
 
   outputs = [
@@ -63,7 +63,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://www.uvicorn.org/";
-    changelog = "https://github.com/encode/uvicorn/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/Kludex/uvicorn/blob/${src.tag}/docs/release-notes.md";
     description = "Lightning-fast ASGI server";
     mainProgram = "uvicorn";
     license = lib.licenses.bsd3;

From eb937eca77f19521218174a31ee9e53cc7791c2b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:23:30 +0200
Subject: [PATCH 032/310] python3Packages.httpx: disable failing tests

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

diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index a5e66abfcd68..1fbeb83e6aa8 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -100,6 +100,9 @@ buildPythonPackage rec {
     "test_client_decode_text_using_autodetect"
     "test_client_decode_text_using_explicit_encoding"
     "test_response_decode_text_using_autodetect"
+    # uvicorn access logging mismatch
+    "test_logging_request"
+    "test_logging_redirect_chain"
   ];
 
   disabledTestPaths = [ "tests/test_main.py" ];

From 7b4a9f3904925a26be6c4898a23e321fe20ef4b5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:26:14 +0200
Subject: [PATCH 033/310] python3Packages.polars: 1.41.2 -> 1.42.1

https://github.com/pola-rs/polars/releases/tag/py-1.42.1
---
 pkgs/development/python-modules/polars/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix
index 3d1fdfb9c674..704524ce7bba 100644
--- a/pkgs/development/python-modules/polars/default.nix
+++ b/pkgs/development/python-modules/polars/default.nix
@@ -48,19 +48,19 @@ in
 
 buildPythonPackage (finalAttrs: {
   pname = "polars";
-  version = "1.41.2";
+  version = "1.42.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pola-rs";
     repo = "polars";
     tag = "py-${finalAttrs.version}";
-    hash = "sha256-Wys56Tj75+7sNNwi3U5a62Wwkddep/W1MjtAHOuDdwc=";
+    hash = "sha256-xHO+3mgwKvRRQZiAnThwkKFDvfe3ehkifBPINi101Ws=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-tmc8n0TVaXmc4C8XXTgPVsTRs0C/V+88f6T1vOamt00=";
+    hash = "sha256-EHtQ5BzG6EFJD7e8NMajqNEXlAU/QyyIFLil1irfaqo=";
   };
 
   requiredSystemFeatures = [ "big-parallel" ];

From 62ea94c20152c2adaead2cb1be6ea8061425020e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:33:38 +0200
Subject: [PATCH 034/310] python3Packages.pydantic: backport pytest 9.1 compat

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

diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index b84ef6f5aace..e513ceaa3218 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
-  python,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   hatchling,
@@ -39,6 +39,15 @@ buildPythonPackage rec {
     hash = "sha256-G4Xo6BF6tOn4g/qG3RNDP3/+lYnCOuw3AB1OrVOGcSA=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "pytest-9.1-compat.patch";
+      url = "https://github.com/pydantic/pydantic/commit/f257d0155c6643fbda9516af6b2c4ca082ed7651.patch";
+      excludes = [ "uv.lock" ];
+      hash = "sha256-azclSDYY/H8RcerNvI07njwLzr8fyIZ17nM18y/edVo=";
+    })
+  ];
+
   postPatch = ''
     sed -i "/--benchmark/d" pyproject.toml
   '';

From bec0bc967a87aa7797a2260b2f08894ac86c1a16 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:36:30 +0200
Subject: [PATCH 035/310] python3Packages.httpx2: disable failing tests

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

diff --git a/pkgs/development/python-modules/httpx2/default.nix b/pkgs/development/python-modules/httpx2/default.nix
index 83f08830b4a2..ab73647f11f2 100644
--- a/pkgs/development/python-modules/httpx2/default.nix
+++ b/pkgs/development/python-modules/httpx2/default.nix
@@ -102,6 +102,9 @@ buildPythonPackage (finalAttrs: {
     # network access
     "test_async_proxy_close"
     "test_sync_proxy_close"
+    # uvicorn access logging mismatch
+    "test_logging_request"
+    "test_logging_redirect_chain"
   ];
 
   passthru.tests = {

From 405945874a448aa77624078e63b1b07727c906e1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:37:48 +0200
Subject: [PATCH 036/310] python3Packages.responses: 0.25.8 -> 0.26.2

https://github.com/getsentry/responses/blob/0.26.2/CHANGES
---
 pkgs/development/python-modules/responses/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index badf42cfa893..0d094fd47134 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "responses";
-  version = "0.25.8";
+  version = "0.26.2";
   pyproject = true;
 
   __darwinAllowLocalNetworking = true;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "getsentry";
     repo = "responses";
     tag = version;
-    hash = "sha256-7vl8+7cpyJFhGDTzklQn7p5NyEFpzX9Yiz2g7fDCPGk=";
+    hash = "sha256-8+zc7UebB9pBLC5nc7QtuXQIoQ+k+NH1XvajQMGIXNg=";
   };
 
   nativeBuildInputs = [ setuptools ];

From d500778e43130109222c8095e4bb6553a9d2876a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:39:48 +0200
Subject: [PATCH 037/310] python3Packages.respx: 0.22.0 -> 0.23.1

https://github.com/lundberg/respx/blob/0.23.1/CHANGELOG.md
---
 pkgs/development/python-modules/respx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix
index 71580fce3be2..f0f260e5b7fb 100644
--- a/pkgs/development/python-modules/respx/default.nix
+++ b/pkgs/development/python-modules/respx/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "respx";
-  version = "0.22.0";
+  version = "0.23.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lundberg";
     repo = "respx";
     tag = version;
-    hash = "sha256-T3DLNXJykSF/HXjlmQdJ2CG4d+U1eTa+XWcgtT3dhl4=";
+    hash = "sha256-Fz3CS9rIm+H6axVIRErlFTTDgtAcTmGj4/wabLxDV2I=";
   };
 
   build-system = [ setuptools ];

From 37980b085325c927f541dd97d4c979b481b5d0d2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:50:32 +0200
Subject: [PATCH 038/310] python3Packages.markdown-it-py: 4.0.0 -> 4.2.0

https://github.com/executablebooks/markdown-it-py/blob/v4.2.0/CHANGELOG.md
---
 pkgs/development/python-modules/markdown-it-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix
index 4fbe2e0380ce..58f911fe0700 100644
--- a/pkgs/development/python-modules/markdown-it-py/default.nix
+++ b/pkgs/development/python-modules/markdown-it-py/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "markdown-it-py";
-  version = "4.0.0";
+  version = "4.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "markdown-it-py";
     tag = "v${version}";
-    hash = "sha256-92J9cMit2zwyjoE8G1YpwDxj+wiApQW2eUHxUOUt3as=";
+    hash = "sha256-S3xDPvnGqawsxAUcrMF/3a4jds6i+zfPLMpyvduaDpE=";
   };
 
   # fix downstrem usage of markdown-it-py[linkify]

From 0a85a6492c5a4ba80e2c0c858a7a192a83e1c795 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:50:47 +0200
Subject: [PATCH 039/310] python3Packages.pytest-regressions: 2.9.1 -> 2.11.0

https://github.com/ESSS/pytest-regressions/blob/v2.11.0/CHANGELOG.rst
---
 .../development/python-modules/pytest-regressions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix
index bc07443a8ccc..271374de1994 100644
--- a/pkgs/development/python-modules/pytest-regressions/default.nix
+++ b/pkgs/development/python-modules/pytest-regressions/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-regressions";
-  version = "2.9.1";
+  version = "2.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ESSS";
     repo = "pytest-regressions";
     tag = "v${version}";
-    hash = "sha256-pqlRfpi5Z9b6zrvU6M1sNRz5ltZLAFiJITFvex7YqcE=";
+    hash = "sha256-BojXizPr1b09YOa4wEeHQheyubKR2nBvtzLlcvt3380=";
   };
 
   build-system = [ setuptools-scm ];

From 8fc3e41843057297bd375ff32482375e6592bd37 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 03:54:59 +0200
Subject: [PATCH 040/310] python3Packages.syrupy: 5.2.0 -> 5.5.3

https://github.com/syrupy-project/syrupy/blob/v5.5.3/CHANGELOG.md
---
 pkgs/development/python-modules/syrupy/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix
index 84939fcf0ab4..08a2e69b4708 100644
--- a/pkgs/development/python-modules/syrupy/default.nix
+++ b/pkgs/development/python-modules/syrupy/default.nix
@@ -5,7 +5,6 @@
   hatchling,
   hypothesis,
   pydantic,
-  pyprojectVersionPatchHook,
   pytest,
   pytest-xdist,
   invoke,
@@ -13,23 +12,18 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "syrupy";
-  version = "5.2.0";
+  version = "5.5.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "syrupy-project";
     repo = "syrupy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tivRKADRYyyNmNOOd0w2qTseA3t7TMwkAkQ/Kr6wp6U=";
+    hash = "sha256-aFwYJsDviI7j7xeEdtDGy0t4JCLMr/z57Gjl9mQo0SE=";
   };
 
   build-system = [ hatchling ];
 
-  nativeBuildInputs = [
-    # the commit updating the version happens only after tagging
-    pyprojectVersionPatchHook
-  ];
-
   buildInputs = [ pytest ];
 
   nativeCheckInputs = [

From d5ca3483a195a69bae0f39b3a772ce503a11cdf7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 04:29:18 +0200
Subject: [PATCH 041/310] python3Packages.aioresponses: 0.7.8 -> 0.7.9

---
 .../python-modules/aioresponses/default.nix     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 395f7387aef7..ab510850ce94 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -12,17 +12,18 @@
 
   # tests
   ddt,
+  pytest-asyncio,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "aioresponses";
-  version = "0.7.8";
+  version = "0.7.9";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uGHN/l3FjzuK+sewppc9XXsstgjdD2JT0WuO6Or23xE=";
+    hash = "sha256-Hc+iiTj8AG8Eapg4OnwHrBgL56SSwe1Vf1zXsIBTV9M=";
   };
 
   patches = [
@@ -31,23 +32,18 @@ buildPythonPackage rec {
     ./aiohttp-3.14-compat.patch
   ];
 
-  postPatch = ''
-    # https://github.com/pnuckowski/aioresponses/pull/278
-    substituteInPlace aioresponses/core.py \
-      --replace-fail asyncio.iscoroutinefunction inspect.iscoroutinefunction
-  '';
-
-  nativeBuildInputs = [
+  build-system = [
     pbr
     setuptools
   ];
 
-  propagatedBuildInputs = [ aiohttp ];
+  dependencies = [ aiohttp ];
 
   pythonImportsCheck = [ "aioresponses" ];
 
   nativeCheckInputs = [
     ddt
+    pytest-asyncio
     pytestCheckHook
   ];
 
@@ -59,6 +55,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://github.com/pnuckowski/aioresponses/releases/tag/${version}";
     description = "Helper to mock/fake web requests in python aiohttp package";
     homepage = "https://github.com/pnuckowski/aioresponses";
     license = lib.licenses.mit;

From a9ad64d20d0f04938839a9fe3912e74c571cb5de Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 04:32:38 +0200
Subject: [PATCH 042/310] python3Packages.nanobind: 2.12.0 -> 2.13.0

https://github.com/wjakob/nanobind/blob/v2.13.0/docs/changelog.rst
---
 pkgs/development/python-modules/nanobind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix
index 1cb6bbfe82de..d584c34bd957 100644
--- a/pkgs/development/python-modules/nanobind/default.nix
+++ b/pkgs/development/python-modules/nanobind/default.nix
@@ -26,7 +26,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "nanobind";
-  version = "2.12.0";
+  version = "2.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
     repo = "nanobind";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-s9TshE3V50BtrnVv56j4BxZOloNsOVgi0PUT6xyF7yY=";
+    hash = "sha256-YAqjcVBkuNsXvrAaVmDRLQ1F38UBqdnIf8+OseNBzG4=";
   };
 
   build-system = [

From ae050500c11bc691ce3f2cb48559563a80dd1a36 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 04:34:56 +0200
Subject: [PATCH 043/310] python3Packages.pygal: 3.1.0 -> 3.1.3

https://github.com/Kozea/pygal/blob/3.1.3/docs/changelog.rst
---
 pkgs/development/python-modules/pygal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
index 9fa3b108c53f..d394c200ffd9 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "pygal";
-  version = "3.1.0";
+  version = "3.1.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+97nNRp0I+eQf7ipw7dzBfa1Z4yy5v0Ns2qIJeQpVew=";
+    hash = "sha256-3RGcFM3rVr64UoLj4mh+zjBWEiXUEKgi5rtoaZqm57E=";
   };
 
   postPatch = ''

From fd6525fe228cf959637fbb7ba8c7b27def41c34d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 04:48:59 +0200
Subject: [PATCH 044/310] python3Packages.aiohasupervisor: disable failing test

Broke with aioresponses 0.7.9, but upstream already migrated to
aiointercept instead.
---
 pkgs/development/python-modules/aiohasupervisor/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix
index 4486fd239130..c699d6128ffa 100644
--- a/pkgs/development/python-modules/aiohasupervisor/default.nix
+++ b/pkgs/development/python-modules/aiohasupervisor/default.nix
@@ -53,6 +53,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # mocked url differs with empty query param value vs dropped query param
+    "test_download_backup"
+  ];
+
   pythonImportsCheck = [ "aiohasupervisor" ];
 
   meta = {

From 7fdd7a0a4391345cb2bbc9e825101f826a38e2d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 04:55:20 +0200
Subject: [PATCH 045/310] python3Packages.fastcrc: 0.3.5 -> 0.3.6

https://github.com/overcat/fastcrc/compare/v0.3.5...v0.3.6
---
 pkgs/development/python-modules/fastcrc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix
index d259a442f5f4..25a92627b79d 100644
--- a/pkgs/development/python-modules/fastcrc/default.nix
+++ b/pkgs/development/python-modules/fastcrc/default.nix
@@ -9,13 +9,13 @@
 }:
 let
   pname = "fastcrc";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "overcat";
     repo = "fastcrc";
     tag = "v${version}";
-    hash = "sha256-Q1R0EgxrfCMn/DxblOAW4Z7YOxpaZPL5Sx8SL/dry98=";
+    hash = "sha256-13z56Ei+++UzlXs1Kmrm0qOWbr88oPMmX7mi9fK4Gbk=";
   };
 in
 buildPythonPackage {
@@ -29,7 +29,7 @@ buildPythonPackage {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-dWxQuWV3w1UM8yvLG/9SrJQxSSyWTXV0FWFDKjIHBf0=";
+    hash = "sha256-Z4pMDuW0gR/by3v4/dPsanhgl09tTGe6FMJr41p9/fk=";
   };
 
   pythonImportsCheck = [ "fastcrc" ];

From 3b388808ecbf9d3bc5c2ccfe1ce54261f6c43a20 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 05:04:44 +0200
Subject: [PATCH 046/310] python3Packages.typer: 0.25.1 -> 0.26.8

https://github.com/tiangolo/typer/releases/tag/0.26.8
---
 pkgs/development/python-modules/typer/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 65a0772135ad..80f3ac75dbbc 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -9,7 +9,6 @@
 
   # dependencies
   annotated-doc,
-  click,
 
   # optional-dependencies
   rich,
@@ -24,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "typer";
-  version = "0.25.1";
+  version = "0.26.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastapi";
     repo = "typer";
     tag = version;
-    hash = "sha256-HIvXseuR7zUXFuTWzntDfHhAp8BcFjxo35gn0i4+03w=";
+    hash = "sha256-VkqvlWLzmtbQPaplx/YRdSNN1xq/UMRl8EZVIEm97Lk=";
   };
 
   postPatch = ''
@@ -47,7 +46,6 @@ buildPythonPackage rec {
 
   dependencies = [
     annotated-doc
-    click
     rich
     shellingham
   ];
@@ -67,6 +65,10 @@ buildPythonPackage rec {
     # fails also on Linux
     "test_show_completion"
     "test_install_completion"
+    # error message mismatch
+    "test_file_error"
+    # test invokes test_types_file.py and fails to import .../tests
+    "test_binary_stderr"
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
     "test_install_completion"

From 94e8ddc11bf1e2004d79613190d0ef0baec7dd15 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 11:34:27 +0200
Subject: [PATCH 047/310] python3Packages.pyicu: 2.15.3 -> 2.16.2

https://gitlab.pyicu.org/main/pyicu/-/raw/v2.16.2/CHANGES
---
 pkgs/development/python-modules/pyicu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix
index 1057d5c7d988..458b7171b703 100644
--- a/pkgs/development/python-modules/pyicu/default.nix
+++ b/pkgs/development/python-modules/pyicu/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pyicu";
-  version = "2.15.3";
+  version = "2.16.2";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "main";
     repo = "pyicu";
     tag = "v${version}";
-    hash = "sha256-vbrl6n7X85sQIdgj+Z0Xr6x/L8roK5Z/mNj53zyWQGs=";
+    hash = "sha256-JCevXAL6+G+EXx4ikOANgFiI9YPhjY5fDFLFBmEs8Ro=";
   };
 
   postPatch = ''

From 3adee824b28a976c24723bc113278e8848df52b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 11:46:58 +0200
Subject: [PATCH 048/310] home-assistant: fix syrupy 5.5 compat

---
 pkgs/servers/home-assistant/default.nix       |  3 +++
 .../patches/syrupy-5.5-compat.patch           | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/patches/syrupy-5.5-compat.patch

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index cb5d580a01db..f38d8ee5d3e9 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -332,6 +332,9 @@ python3Packages.buildPythonApplication rec {
 
     # https://github.com/home-assistant/core/pull/172893
     ./patches/pyjwt-2.13-compat.patch
+
+    # remove is_xdist_controller usage
+    ./patches/syrupy-5.5-compat.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/servers/home-assistant/patches/syrupy-5.5-compat.patch b/pkgs/servers/home-assistant/patches/syrupy-5.5-compat.patch
new file mode 100644
index 000000000000..a57929bef17d
--- /dev/null
+++ b/pkgs/servers/home-assistant/patches/syrupy-5.5-compat.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/syrupy.py b/tests/syrupy.py
+index a8779963109..0b4c009d59c 100644
+--- a/tests/syrupy.py
++++ b/tests/syrupy.py
+@@ -18,7 +18,7 @@ from syrupy.location import PyTestLocation
+ from syrupy.report import SnapshotReport
+ from syrupy.session import ItemStatus, SnapshotSession
+ from syrupy.types import PropertyFilter, PropertyMatcher, PropertyPath, SerializableData
+-from syrupy.utils import is_xdist_controller, is_xdist_worker
++from syrupy.utils import is_xdist_worker
+ import voluptuous as vol
+ import voluptuous_serialize
+ 
+@@ -406,8 +406,6 @@ def override_syrupy_finish(self: SnapshotSession) -> int:
+                 indent=2,
+             )
+         return exitstatus
+-    if is_xdist_controller():
+-        return exitstatus
+ 
+     if needs_xdist_merge:
+         worker_count = None

From abbd981247a3dc5ba26a1dd2169b89f8adcce5fa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 12:00:51 +0200
Subject: [PATCH 049/310] python3Packages.vcrpy: 8.2.1 -> 8.3.0

https://github.com/kevin1024/vcrpy/releases/tag/v8.3.0
---
 pkgs/development/python-modules/vcrpy/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index 5556125736ee..9d80b8fc1620 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  pytest-asyncio,
   pytest-httpbin,
   pytestCheckHook,
   pyyaml,
@@ -14,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "vcrpy";
-  version = "8.2.1";
+  version = "8.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kevin1024";
     repo = "vcrpy";
     tag = "v${version}";
-    hash = "sha256-PlpbBzAj9a4bAfORGozAAsbrzngJt2Pnnp3bI96wYfI=";
+    hash = "sha256-WQLWUr1EgOibdAVVASxMzeFi1YikYAjjye/NtCEJ6Kk=";
   };
 
   build-system = [ setuptools ];
@@ -35,6 +36,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     pytest-httpbin
     pytestCheckHook
   ];

From 9e1be8d8a947327b10826530a3d02c03a5a5c60f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 12:25:46 +0200
Subject: [PATCH 050/310] python3Packages.pylama: fix pytest 9.1 compat

---
 .../python-modules/pylama/default.nix          |  1 +
 .../pylama/pytest-9.1-compat.patch             | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/python-modules/pylama/pytest-9.1-compat.patch

diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix
index 5349ee627470..907070c7419a 100644
--- a/pkgs/development/python-modules/pylama/default.nix
+++ b/pkgs/development/python-modules/pylama/default.nix
@@ -34,6 +34,7 @@ let
       (replaceVars ./paths.patch {
         git = "${lib.getBin git}/bin/git";
       })
+      ./pytest-9.1-compat.patch
     ];
 
     propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pylama/pytest-9.1-compat.patch b/pkgs/development/python-modules/pylama/pytest-9.1-compat.patch
new file mode 100644
index 000000000000..ecb87ea853c5
--- /dev/null
+++ b/pkgs/development/python-modules/pylama/pytest-9.1-compat.patch
@@ -0,0 +1,18 @@
+diff --git a/pylama/pytest.py b/pylama/pytest.py
+index 8009a51..3d1cb18 100644
+--- a/pylama/pytest.py
++++ b/pylama/pytest.py
+@@ -41,10 +41,10 @@ def pytest_sessionfinish(session):
+         config.cache.set(HISTKEY, config._pylamamtimes)
+ 
+ 
+-def pytest_collect_file(path, parent):
++def pytest_collect_file(file_path, parent):
+     config = parent.config
+-    if config.option.pylama and path.ext == ".py":
+-        return PylamaFile.from_parent(parent, path=pathlib.Path(path))
++    if config.option.pylama and file_path.ext == ".py":
++        return PylamaFile.from_parent(parent, path=pathlib.Path(file_path))
+     return None
+ 
+ 

From c02cec4fdb91d075818b88fd76b799c5ab4e79a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 12:50:25 +0200
Subject: [PATCH 051/310] python3Packages.pyecotrend-ista: ignore unused
 snapshot

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

diff --git a/pkgs/development/python-modules/pyecotrend-ista/default.nix b/pkgs/development/python-modules/pyecotrend-ista/default.nix
index c281eb080388..7f0f59e7ed0b 100644
--- a/pkgs/development/python-modules/pyecotrend-ista/default.nix
+++ b/pkgs/development/python-modules/pyecotrend-ista/default.nix
@@ -45,6 +45,10 @@ buildPythonPackage rec {
     syrupy
   ];
 
+  pytestFlags = [
+    "--snapshot-warn-unused"
+  ];
+
   pythonImportsCheck = [ "pyecotrend_ista" ];
 
   meta = {

From 279d557d56951d86357c504a0b6c7a65e63fca09 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 12:58:53 +0200
Subject: [PATCH 052/310] python3Packages.inline-snapshot: 0.32.5 -> 0.34.2

https://github.com/15r10nk/inline-snapshot/blob/0.34.2/CHANGELOG.md
---
 pkgs/development/python-modules/inline-snapshot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix
index 56968ab958bb..fd694d13f53d 100644
--- a/pkgs/development/python-modules/inline-snapshot/default.nix
+++ b/pkgs/development/python-modules/inline-snapshot/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "inline-snapshot";
-  version = "0.32.5";
+  version = "0.34.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "15r10nk";
     repo = "inline-snapshot";
     tag = version;
-    hash = "sha256-xnooMIm0UiNOWrZ4JZwbpFzliGsTF7b1DAXi1fxMb30=";
+    hash = "sha256-4Uvc925/6RxJRHjP3SZaB7T+gqky5KlL9agHy/14Jd0=";
   };
 
   build-system = [ hatchling ];

From 0e011384541a25f0b502074f13230841730fb67b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 14:16:01 +0200
Subject: [PATCH 053/310] valkey: disable dual-channel-replicaton test

Very reproducibly fails across all my x86_64-linux builders.
---
 pkgs/by-name/va/valkey/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 82e625efe933..4e0715702034 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -102,7 +102,8 @@ stdenv.mkDerivation (finalAttrs: {
       --skipunit unit/memefficiency \
       --skipunit unit/type/string \
       --skipunit integration/failover \
-      --skipunit integration/aof-multi-part
+      --skipunit integration/aof-multi-part \
+      --skipunit integration/dual-channel-replication
 
     runHook postCheck
   '';

From 5fde7450eaa322fe6919907e94b4a4a25f18ea6d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 14:34:30 +0200
Subject: [PATCH 054/310] python3Packages.typing-extensions: 4.15.0 -> 4.16.0

https://github.com/python/typing_extensions/blob/4.16.0/CHANGELOG.md
---
 pkgs/development/python-modules/typing-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix
index ca01caa898f8..954c977a3e5a 100644
--- a/pkgs/development/python-modules/typing-extensions/default.nix
+++ b/pkgs/development/python-modules/typing-extensions/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "typing-extensions";
-  version = "4.15.0";
+  version = "4.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python";
     repo = "typing_extensions";
     tag = version;
-    hash = "sha256-3oAlwvNSJ7NhPiHekh4SJI99cPFh29KCCR9314QzsvQ=";
+    hash = "sha256-L1BRIDYz0YqYE4geKTxIkbCbzTGz7AtrbpB5vR8T4dw=";
   };
 
   build-system = [ flit-core ];

From a07bb7f59dd11d1d49663423c6217d52d297847f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 14:36:50 +0200
Subject: [PATCH 055/310] python3Packages.certifi: 2026.04.22 -> 2026.06.17

https://github.com/certifi/python-certifi/compare/2026.04.22...2026.06.17
---
 pkgs/development/python-modules/certifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index 2f1d3be1e64d..ef37d8952751 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "certifi";
-  version = "2026.04.22";
+  version = "2026.06.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "certifi";
     repo = "python-certifi";
     tag = finalAttrs.version;
-    hash = "sha256-bGeOrYd7ZUG0VIbgRiYIBK3JDRC5wpST5IrFHyWO/cg=";
+    hash = "sha256-/Jg/tNYuZtL3YeCzPUwP0phLfkHiLxiWbPfby05XKw4=";
   };
 
   patches = [

From 8f5a762c165a46621f9e4d71b696f385641015a7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 14:39:07 +0200
Subject: [PATCH 056/310] python3Packages.filelock: 3.29.5 -> 3.29.7

https://github.com/tox-dev/filelock/releases/tag/3.29.7
---
 pkgs/development/python-modules/filelock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index 94ff66aa5620..c56a4991a173 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "filelock";
-  version = "3.29.5";
+  version = "3.29.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "filelock";
     tag = finalAttrs.version;
-    hash = "sha256-rpkRk3SwpUWNdjyLCk6FMwNvEhHMSOKWnn096thkhWE=";
+    hash = "sha256-sRJQa7vmMf9aWXT5QdYAZQHM0oIFFZM9P2tQ2x5T79Y=";
   };
 
   build-system = [

From bff1f2f8a4cd23985db0f6110c31c106db969489 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 14:39:49 +0200
Subject: [PATCH 057/310] python3Packages.tomli: 2.4.0 -> 2.4.1

https://github.com/hukkin/tomli/compare/2.4.0...2.4.1
---
 pkgs/development/python-modules/tomli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix
index a57cddde1f7e..be5af903241f 100644
--- a/pkgs/development/python-modules/tomli/default.nix
+++ b/pkgs/development/python-modules/tomli/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "tomli";
-  version = "2.4.0";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = "tomli";
     rev = version;
-    hash = "sha256-PVYwCUGQSuCe5WMeOBJpGXiJ4keVllzg9H3y+Il+Nr8=";
+    hash = "sha256-MBcmp0SeK/wum3c2c/eu8VEofXDguolHI30QwKahAGE=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 2bd3200bbc2209e200883ef21f531e6c9f7fb126 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 15:02:41 +0200
Subject: [PATCH 058/310] python3Packages.virtualenv: 21.2.4 -> 21.6.1

https://github.com/pypa/virtualenv/blob/21.6.1/docs/changelog.rst
---
 pkgs/development/python-modules/virtualenv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index dbdb04131e0d..ffdd174c3b66 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "21.2.4";
+  version = "21.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "virtualenv";
     tag = version;
-    hash = "sha256-3Ed2h5zzjpm+D1fQW2urWYcO/6sFGuZtueQxUnIu3MY=";
+    hash = "sha256-8LOmA1Mhfqbl3hsGZa8tQutjfjEVeDlpOKyVut5rDVI=";
   };
 
   build-system = [

From 953bc491e540c448bdafa83917be3e4f2c60bc7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 15:16:38 +0200
Subject: [PATCH 059/310] python3Packages.oschmod: fix tests with pytest 9.1

> ERROR: Unknown config option: mock_use_standalone_module
---
 pkgs/development/python-modules/oschmod/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/oschmod/default.nix b/pkgs/development/python-modules/oschmod/default.nix
index 8ce9b703c6b2..e724623d1d90 100644
--- a/pkgs/development/python-modules/oschmod/default.nix
+++ b/pkgs/development/python-modules/oschmod/default.nix
@@ -3,6 +3,8 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
+  mock,
+  pytest-mock,
   pytestCheckHook,
 }:
 
@@ -18,7 +20,11 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    mock
+    pytest-mock
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "oschmod" ];
 

From 5fc427e664ebea0af3a8c64ef9ea8114492cf2f2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 15:27:12 +0200
Subject: [PATCH 060/310] python3Packages.tlsh: fix version patch application

---
 .../python-modules/tlsh/default.nix            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix
index b71daa2736d9..05341909dbed 100644
--- a/pkgs/development/python-modules/tlsh/default.nix
+++ b/pkgs/development/python-modules/tlsh/default.nix
@@ -18,27 +18,27 @@ buildPythonPackage rec {
     hash = "sha256-cYvXZrd+8ZC5LfucguFFNlEX8FR+AkchmCFButYoiMg=";
   };
 
-  postPatch = ''
-    substituteInPlace py_ext/setup.py \
-      --replace-fail "version = '4.5.0'" "version = '${version}'"
-  '';
-
   patches = [
     # https://github.com/trendmicro/tlsh/pull/152
     ./cmake-4-compat.patch
   ];
 
+  postPatch = ''
+    substituteInPlace py_ext/setup.py \
+      --replace-fail "4.5.0" "${version}"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
+  postConfigure = ''
+    cd ../py_ext
+  '';
+
   build-system = [ setuptools ];
 
   # no test data
   doCheck = false;
 
-  postConfigure = ''
-    cd ../py_ext
-  '';
-
   pythonImportsCheck = [ "tlsh" ];
 
   meta = {

From 2ca11409ea0eaeab76f9edc18609f57cece1a832 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 17:09:09 +0200
Subject: [PATCH 061/310] python3Packages.sphinx-issues: 5.0.1 -> 6.0.0

https://github.com/sloria/sphinx-issues/compare/5.0.1...6.0.0
---
 pkgs/development/python-modules/sphinx-issues/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-issues/default.nix b/pkgs/development/python-modules/sphinx-issues/default.nix
index fb2b81409688..aa00a5cf5489 100644
--- a/pkgs/development/python-modules/sphinx-issues/default.nix
+++ b/pkgs/development/python-modules/sphinx-issues/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "sphinx-issues";
-  version = "5.0.1";
+  version = "6.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sloria";
     repo = "sphinx-issues";
     tag = version;
-    hash = "sha256-/nc5gtZbE1ziMPWIkZTkevMfVkNtJYL/b5QLDeMhzUs=";
+    hash = "sha256-havy1wP300yAKRi68fAVfQS7t5S9NueuGqE2RqdkVP0=";
   };
 
   postPatch = ''

From 287173ee8bc7de6861dbe4e36ef165a6c153aecb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 17:09:25 +0200
Subject: [PATCH 062/310] python3Packages.pip: 25.3 -> 26.1.2

https://pip.pypa.io/en/stable/news/#v26-1-2
---
 pkgs/development/python-modules/pip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 405f18f475ab..71e678afe0e1 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -34,14 +34,14 @@ let
 
   self = buildPythonPackage rec {
     pname = "pip";
-    version = "25.3";
+    version = "26.1.2";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "pypa";
       repo = "pip";
       tag = version;
-      hash = "sha256-aHV4j9OMLD6I6Fe6A04bE7xk6eS5CxeUEw4Psqj7xz0=";
+      hash = "sha256-E53TU7LzGz+gpW1TCQUkSRMUif8mq702EgXdAVxtrGw=";
     };
 
     postPatch = ''

From cad7f57ac36c7275efb2fd27af7ced7fca7a1840 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 17:31:46 +0200
Subject: [PATCH 063/310] python3Packages.invoke: 2.2.1 -> 3.0.3

https://www.pyinvoke.org/changelog.html#3.0.3
---
 pkgs/development/python-modules/invoke/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix
index 77f77a7e47ad..78e5f7156356 100644
--- a/pkgs/development/python-modules/invoke/default.nix
+++ b/pkgs/development/python-modules/invoke/default.nix
@@ -3,23 +3,28 @@
   bash,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "invoke";
-  version = "2.2.1";
-  format = "setuptools";
+  version = "3.0.3";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UVv0m0pIkyt5sCRZA0jaIvOcSULf+ZGtH7i4uuob5wc=";
+    hash = "sha256-Q3tqYiIjgkOAv7TmT2EnEaa2SMeV9WXvyGJa9m+1fww=";
   };
 
   postPatch = ''
     sed -e 's|/bin/bash|${bash}/bin/bash|g' -i invoke/config.py
   '';
 
+  build-system = [
+    setuptools
+  ];
+
   # errors with vendored libs
   doCheck = false;
 

From 69745b3092ebec9277809e675b8f87701ef60f3b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 17:33:29 +0200
Subject: [PATCH 064/310] python3Packages.pytest-rerunfailures: 16.3 -> 16.4

https://github.com/pytest-dev/pytest-rerunfailures/blob/16.4/CHANGES.rst
---
 .../python-modules/pytest-rerunfailures/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 7f681df0ce46..373a009ab113 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-rerunfailures";
-  version = "16.3";
+  version = "16.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-rerunfailures";
     tag = version;
-    hash = "sha256-T4l4AoUHvT6GjHyRK2TA3vPTxRicZ5pvgFgDtbkOGMw=";
+    hash = "sha256-wdUNGc50Yqrctc8OXBmgRwmHVjSeOq+ADRYcLtKSraM=";
   };
 
   build-system = [ setuptools ];

From 6900a124d9bc40ebe586c8995a9f975a9f448489 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 17:34:25 +0200
Subject: [PATCH 065/310] python3Packages.hpack: 4.1.0 -> 4.2.0

https://github.com/python-hyper/hpack/blob/v4.2.0/CHANGELOG.rst
---
 pkgs/development/python-modules/hpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix
index da16cd0896b8..f67dda839f1e 100644
--- a/pkgs/development/python-modules/hpack/default.nix
+++ b/pkgs/development/python-modules/hpack/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "hpack";
-  version = "4.1.0";
+  version = "4.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-hyper";
     repo = "hpack";
     rev = "v${version}";
-    hash = "sha256-vbxfDlRDwMXuzkPO0oceCpSz1ekLNxLSj4iocdHo680=";
+    hash = "sha256-gZe/ABRLXoBAeH/mp/yIgDj56jalyiYgs4EP2qK17Ig=";
   };
 
   build-system = [ setuptools ];

From b9124d07fa38a3262500f18f5824226da0756662 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 17:35:11 +0200
Subject: [PATCH 066/310] python3Packages.service-identity: 24.2.0 -> 26.1.0

https://github.com/pyca/service-identity/releases/tag/26.1.0
---
 pkgs/development/python-modules/service-identity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix
index eb64e0455d16..64309650ecdd 100644
--- a/pkgs/development/python-modules/service-identity/default.nix
+++ b/pkgs/development/python-modules/service-identity/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "service-identity";
-  version = "24.2.0";
+  version = "26.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyca";
     repo = "service-identity";
     tag = finalAttrs.version;
-    hash = "sha256-onxCUWqGVeenLqB5lpUpj3jjxTM61ogXCQOGnDnClT4=";
+    hash = "sha256-ujH0RdsdvbNbQVhlRfLnKSj3LbLE4RVwlaEsMNZmuLA=";
   };
 
   nativeBuildInputs = [

From 870f81ae6dc708091b422fe77a42978a0f74d5c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 17:39:53 +0200
Subject: [PATCH 067/310] python3Packages.gevent: 25.9.1 -> 26.5.0

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

diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index af22c81a7395..ed4e5257348f 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -24,12 +24,12 @@
 
 buildPythonPackage rec {
   pname = "gevent";
-  version = "25.9.1";
+  version = "26.5.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-rfnNVS3kSk5nVMUf8ueNkZO3+m6rEj25V4ohDmVyNd0=";
+    hash = "sha256-FlXrBMHiDXGyqko8dSgWLdWP9sxGoDevHwH1NMgP77o=";
   };
 
   build-system = [

From 81e0ccd69915ccb63606d95a14bc7c28db162ed9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 17:46:32 +0200
Subject: [PATCH 068/310] python3Packages.eventlet: 0.40.3 -> 0.41.0

https://github.com/eventlet/eventlet/blob/0.41.0/NEWS
---
 pkgs/development/python-modules/eventlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 4b84afbc6175..7d0a5b9e5b96 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "eventlet";
-  version = "0.40.3";
+  version = "0.41.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eventlet";
     repo = "eventlet";
     tag = version;
-    hash = "sha256-yieyNx91jvKoh02zDFIEFk70yf3I27DWiumqoOjtdzQ=";
+    hash = "sha256-g/AmHqCtWExp8XAdb9/knfATPne9Ma8MbIhYBHZxyOY=";
   };
 
   pythonRelaxDeps = lib.optionals isPyPy [ "greenlet" ];

From 7f9efc3f8da64b186ed2f7e07134e55d8d2e87a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 18:38:26 +0200
Subject: [PATCH 069/310] python3Packages.gunicorn: 23.0.0 -> 26.0.0

https://github.com/benoitc/gunicorn/blob/26.0.0/docs/content/2026-news.md#2600---2026-05-05
---
 .../python-modules/gunicorn/default.nix         | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index 13c403a59884..5d283ad955bc 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -15,20 +15,22 @@
   tornado,
   setproctitle,
 
+  # tests
+  pytest-asyncio,
   pytestCheckHook,
   pytest-cov-stub,
 }:
 
 buildPythonPackage rec {
   pname = "gunicorn";
-  version = "23.0.0";
+  version = "26.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "benoitc";
     repo = "gunicorn";
     tag = version;
-    hash = "sha256-Dq/mrQwo3II6DBvYfD1FHsKHaIlyHlJCZ+ZyrM4Efe0=";
+    hash = "sha256-duq5ghUuiuZL644jHgZ0qXHkcc8POHt7BX91m9F5BGE=";
   };
 
   build-system = [ setuptools ];
@@ -46,11 +48,22 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "gunicorn" ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     pytestCheckHook
     pytest-cov-stub
   ]
   ++ lib.concatAttrValues optional-dependencies;
 
+  disabledTests = [
+    # failure while starting a gunicorn instance
+    "TestSignalHandlingIntegration"
+  ];
+
+  disabledTestPaths = [
+    # tries to start gunicorn and fails on import
+    "tests/test_control_socket_integration.py"
+  ];
+
   meta = {
     description = "WSGI HTTP Server for UNIX, fast clients and sleepy applications";
     homepage = "https://github.com/benoitc/gunicorn";

From 9fdea88be8e0a7e6135b670ebcbb3b1a0984a750 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 18:47:48 +0200
Subject: [PATCH 070/310] python3Packages.pytest-dependency: 0.6.0 -> 0.6.1

https://github.com/RKrahl/pytest-dependency/blob/0.6.1/CHANGES.rst
---
 .../pytest-dependency/default.nix               | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix
index 11738b230adc..6e998302e0d1 100644
--- a/pkgs/development/python-modules/pytest-dependency/default.nix
+++ b/pkgs/development/python-modules/pytest-dependency/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytest,
   pytestCheckHook,
   setuptools,
@@ -9,14 +9,21 @@
 
 buildPythonPackage rec {
   pname = "pytest-dependency";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-k0sOajnZWZUGLBk/fq7tio/6Bv8bzvS2Kw3HSnCLrME=";
+  src = fetchFromGitHub {
+    owner = "RKrahl";
+    repo = "pytest-dependency";
+    tag = version;
+    hash = "sha256-1tAikpdCLJMmylIbd1zQ45Bq+95O5cDQxNGwe3XpZuw=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "UNKNOWN" "${version}"
+  '';
+
   nativeBuildInputs = [ setuptools ];
 
   buildInputs = [ pytest ];

From 9db553de2217b0730640ee77c2388f9b5a83a52a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 18:48:08 +0200
Subject: [PATCH 071/310] python3Packages.pytest-order: 1.3.0 -> 1.5.0

https://github.com/pytest-dev/pytest-order/compare/v1.3.0...v1.5.0
---
 pkgs/development/python-modules/pytest-order/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix
index cd2c9720b14c..7cb379eec7ca 100644
--- a/pkgs/development/python-modules/pytest-order/default.nix
+++ b/pkgs/development/python-modules/pytest-order/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-order";
-  version = "1.3.0";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-order";
     tag = "v${version}";
-    hash = "sha256-V1qJGkXn+HhuK5wiwkkJBEbfnv23R4x9Cv0J6ZTj5xE=";
+    hash = "sha256-LLQy5dO3OWmm7W9eI8yfrOFVp9MQOU+pjoAyWl03tZ0=";
   };
 
   build-system = [ setuptools ];

From c5fb3802aab460ac38ad0bf0f95adb90f8225ec0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 18:57:32 +0200
Subject: [PATCH 072/310] python3Packages.pyproject-metadata: 0.10.0 -> 0.12.1

https://github.com/pypa/pyproject-metadata/releases/tag/0.12.1
---
 .../development/python-modules/pyproject-metadata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix
index 81e67b50ce7d..17bfc2aae673 100644
--- a/pkgs/development/python-modules/pyproject-metadata/default.nix
+++ b/pkgs/development/python-modules/pyproject-metadata/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "pyproject-metadata";
-  version = "0.10.0";
+  version = "0.12.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyproject_metadata";
     inherit version;
-    hash = "sha256-f1vQ7zmLYBaVVssX6iYdcVyvf4VhI4FR9RsjBQhLqNQ=";
+    hash = "sha256-iAmk32/ggnmzmoiQZpUG7TFY4GF4Vaya/wmPy+dyrkw=";
   };
 
   build-system = [ flit-core ];

From d6260de3783c41498624e923be0d523d87ad6019 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 18:58:20 +0200
Subject: [PATCH 073/310] python3Packages.docutils: 0.22.4 -> 0.23

https://sourceforge.net/projects/docutils/files/docutils/0.23
---
 pkgs/development/python-modules/docutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix
index 9c798666f445..5a62f0e39d0a 100644
--- a/pkgs/development/python-modules/docutils/default.nix
+++ b/pkgs/development/python-modules/docutils/default.nix
@@ -13,12 +13,12 @@
 let
   self = buildPythonPackage rec {
     pname = "docutils";
-    version = "0.22.4";
+    version = "0.23";
     pyproject = true;
 
     src = fetchurl {
       url = "mirror://sourceforge/docutils/docutils-${version}.tar.gz";
-      hash = "sha256-TbU7H96avsu3TZEjDTKrYm2U9rrfxXXW25GUpJ3ymWg=";
+      hash = "sha256-dG9QYDIlESgKHlDrdoRu1r8jQphLKsBNxCyqGo14eZ4=";
     };
 
     build-system = [ flit-core ];

From 044a30626e5925b85edba64e294794ae4a721638 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 19:00:22 +0200
Subject: [PATCH 074/310] python3Packages.msgpack: 1.1.2 -> 1.2.1

https://github.com/msgpack/msgpack-python/blob/v1.2.1/ChangeLog.rst
---
 pkgs/development/python-modules/msgpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix
index a1c3b14b6303..3f519e329565 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/pkgs/development/python-modules/msgpack/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "msgpack";
-  version = "1.1.2";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "msgpack";
     repo = "msgpack-python";
     tag = "v${version}";
-    hash = "sha256-9iFTQPAM6AAogcRUoCw5/bECNiGUwmAarEiwMJ+rqbk=";
+    hash = "sha256-L8nU+n0M3NJvQzjRlWESXvzP6CxR5CTSu7UkeGfHHUs=";
   };
 
   build-system = [ setuptools ];

From 549010907ca4da2b444b0da1d4848383c1ac652c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 19:03:05 +0200
Subject: [PATCH 075/310] python3Packages.xxhash: 3.6.0 -> 3.8.1

https://github.com/ifduyue/python-xxhash/blob/v3.8.1/CHANGELOG.rst
---
 pkgs/development/python-modules/xxhash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix
index 3bbd4f7bb2c2..d9064c5d7ffc 100644
--- a/pkgs/development/python-modules/xxhash/default.nix
+++ b/pkgs/development/python-modules/xxhash/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "xxhash";
-  version = "3.6.0";
+  version = "3.8.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8BYqeLE6DXYXsoRbkMdjM50fHYK7BKSwf0q1NcxeBdY=";
+    hash = "sha256-sN5L86pmNjVS1SxqiQA8R5kR8SCYzUilPUSg96JffEY=";
   };
 
   nativeBuildInputs = [ setuptools ];

From a5f0b8e102b5123bb575d63e6763fb7c15225cc1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 19:03:22 +0200
Subject: [PATCH 076/310] python3Packages.tomlkit: 0.14.0 -> 0.15.0

https://github.com/sdispater/tomlkit/blob/0.15.0/CHANGELOG.md
---
 pkgs/development/python-modules/tomlkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index 5cf78e0fa30e..b7407cceaf68 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "tomlkit";
-  version = "0.14.0";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zwDvykFdvVdXW++x9mNMT0LS2H27o3YSittCwSG4cGQ=";
+    hash = "sha256-fRqey6MIZjghGxOBTqeckN1U3RGZNWQ3bzqpInH1x6M=";
   };
 
   build-system = [ poetry-core ];

From 595830ce19de139a6db680b24f4cf565c7efe5b4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 19:04:04 +0200
Subject: [PATCH 077/310] python3Packages.ujson: 5.11.0 -> 5.13.0

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

diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix
index 79049b56dc9d..7149f5af4ffa 100644
--- a/pkgs/development/python-modules/ujson/default.nix
+++ b/pkgs/development/python-modules/ujson/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "ujson";
-  version = "5.11.0";
+  version = "5.13.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4gSub5CfCZumtrlCExzuNZ3dorbk6jnBLri5kf4gEOA=";
+    hash = "sha256-1i49diU4TAgIKrrYGgd69Yf97ydhuxTDgi9CNLjQfXU=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 446ce057f75254b59e28af68572683d7a334b0e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 19:05:08 +0200
Subject: [PATCH 078/310] python3Packages.msgspec: 0.20.0 -> 0.21.1

https://github.com/jcrist/msgspec/releases/tag/0.21.1
---
 pkgs/development/python-modules/msgspec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix
index c22c2630b14d..d990fcf7d05e 100644
--- a/pkgs/development/python-modules/msgspec/default.nix
+++ b/pkgs/development/python-modules/msgspec/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "msgspec";
-  version = "0.20.0";
+  version = "0.21.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     # use `$Format:%d$` in msgspec/_version.py, and GitHub produces different
     # tarballs depending on whether tagged commit is the last commit, see
     # https://github.com/NixOS/nixpkgs/issues/84312
-    hash = "sha256-DWDmnSuo12oXl9NVfNhIOtWrQeJ9DMmHxOyHY33Datk=";
+    hash = "sha256-mjABnKhZeLLbSQPelZmi+UKZDEIiXi3c9shC8EG6tfE=";
   };
 
   build-system = [

From aafa42d435ede21e311e2cabec29b319575f61cc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 19:06:41 +0200
Subject: [PATCH 079/310] python3Packages.tzdata: 2026.2 -> 2026.3

https://github.com/python/tzdata/blob/2026.3/NEWS.md
---
 pkgs/development/python-modules/tzdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix
index b6db24779f12..2ecc577a60cb 100644
--- a/pkgs/development/python-modules/tzdata/default.nix
+++ b/pkgs/development/python-modules/tzdata/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "tzdata";
-  version = "2026.2";
+  version = "2026.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-kXP959gNkBjgKmYuFo5aLQT4fEHqF0sTn772Qu2mLRA=";
+    hash = "sha256-ShUYuJkwhqeYJSPgcWQ/PA5fIT51shMY54vKv/+dFBU=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 7a8213f821c24f8a0cbc683ed290c630e7ded2c6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 19:56:40 +0200
Subject: [PATCH 080/310] python3Packages.werkzeug: 3.1.6 -> 3.1.8

https://werkzeug.palletsprojects.com/en/stable/changes/#version-3-1-8
---
 pkgs/development/python-modules/werkzeug/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index c180763a8ecc..91f68d18880d 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -27,12 +27,12 @@
 
 buildPythonPackage rec {
   pname = "werkzeug";
-  version = "3.1.6";
+  version = "3.1.8";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IQxr7eWkIKkTlWtHkaf01oQ6Q7b87k36CKZekwB9DSU=";
+    hash = "sha256-m61hpCaNrBEvHFzUYwpW7eYBtu1CAwBneoaQg9cKTEQ=";
   };
 
   build-system = [ flit-core ];

From b535dcab38a8a19234109ef375ceb8200b201564 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 20:14:08 +0200
Subject: [PATCH 081/310] python3Packages.blockbuster: 1.5.25 -> 1.5.26

https://github.com/cbornet/blockbuster/compare/v1.5.25...v1.5.26
---
 pkgs/development/python-modules/blockbuster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/blockbuster/default.nix b/pkgs/development/python-modules/blockbuster/default.nix
index a0a488897912..f639ce3d1359 100644
--- a/pkgs/development/python-modules/blockbuster/default.nix
+++ b/pkgs/development/python-modules/blockbuster/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "blockbuster";
-  version = "1.5.25";
+  version = "1.5.26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cbornet";
     repo = "blockbuster";
     tag = "v${version}";
-    hash = "sha256-1+Q1IdJXqLAy7kIcVU38TC3dtMeWAn7YOLyGrjCkxD0=";
+    hash = "sha256-2p1xKThna33nhT3rkp1kfZPVkzsJd42OPs3cHenizJs=";
   };
 
   build-system = [ hatchling ];

From 352c949523d190e0329339bb0566899ef4e82148 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 20:42:29 +0200
Subject: [PATCH 082/310] python3Packages.pytest-codspeed: 4.2.0 -> 5.0.3

https://github.com/CodSpeedHQ/pytest-codspeed/releases/tag/v5.0.3
---
 pkgs/development/python-modules/pytest-codspeed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix
index 440edf8161d1..9b85caa34555 100644
--- a/pkgs/development/python-modules/pytest-codspeed/default.nix
+++ b/pkgs/development/python-modules/pytest-codspeed/default.nix
@@ -24,14 +24,14 @@ in
 
 buildPythonPackage rec {
   pname = "pytest-codspeed";
-  version = "4.2.0";
+  version = "5.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CodSpeedHQ";
     repo = "pytest-codspeed";
     tag = "v${version}";
-    hash = "sha256-MrdMUTNXRatGNsfw7Ghp/PIXPnocEgEMBjAwML/tMos=";
+    hash = "sha256-qlv7iCT1q/U8fWbXGYQyw2mcR7GS9w41FlRQvRxnHh8=";
   };
 
   postPatch = ''

From 6cfc5963a469446cf7d0a83c044d4b00ed83f689 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:01:42 +0200
Subject: [PATCH 083/310] python3Packages.cbor2: 5.8.0 -> 6.1.3

https://github.com/agronholm/cbor2/releases/tag/6.1.3
---
 .../python-modules/cbor2/default.nix          | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index 2d64160724b3..fe400c474984 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -1,28 +1,52 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  cargo,
+  fetchFromGitHub,
   hypothesis,
   pytest-cov-stub,
   pytestCheckHook,
-  setuptools-scm,
+  rustc,
+  rustPlatform,
   setuptools,
+  setuptools-rust,
+  setuptools-scm,
   withCExtensions ? true,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cbor2";
-  version = "5.8.0";
+  version = "6.1.3";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-sZw1/K6WiKwB73W61dsnMAwlN+tO4A7QfgXYRWoNSTE=";
+  src = fetchFromGitHub {
+    owner = "agronholm";
+    repo = "cbor2";
+    tag = finalAttrs.version;
+    hash = "sha256-DAhMoWZ820bfa7u+Mu+uqQ+ci+ibxQGwP70t4eOCHg8=";
   };
 
+  cargoRoot = "rust";
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      cargoRoot
+      ;
+    hash = "sha256-L9aYpPNGWf8h/NCjDwj5qper9sMSTCxPL91eIbb4hw0=";
+  };
+
+  nativeBuildInputs = [
+    cargo
+    rustc
+    rustPlatform.cargoSetupHook
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
+    setuptools-rust
   ];
 
   nativeCheckInputs = [
@@ -43,11 +67,11 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python CBOR (de)serializer with extensive tag support";
-    changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}";
+    changelog = "https://github.com/agronholm/cbor2/releases/tag/${finalAttrs.src.tag}";
     homepage = "https://github.com/agronholm/cbor2";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "cbor2";
 
   };
-}
+})

From 445c41eb98722f55f63070bba9efa43f75a98286 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:01:50 +0200
Subject: [PATCH 084/310] python3Packages.gruut: fix langpack version metadata

---
 pkgs/development/python-modules/gruut/language-pack.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/gruut/language-pack.nix b/pkgs/development/python-modules/gruut/language-pack.nix
index 37c3d909284c..7103f2ea598e 100644
--- a/pkgs/development/python-modules/gruut/language-pack.nix
+++ b/pkgs/development/python-modules/gruut/language-pack.nix
@@ -17,6 +17,10 @@ buildPythonPackage rec {
     cd "${pname}"
   '';
 
+  postPatch = ''
+    echo "${version}" > "gruut_lang_${lang}/VERSION"
+  '';
+
   pythonImportsCheck = [ "gruut_lang_${lang}" ];
 
   doCheck = false;

From d09007629124e57f8c045ec8dabd12a510802435 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:02:55 +0200
Subject: [PATCH 085/310] python3Packages.wrapt: 1.17.2 -> 2.2.2

---
 .../python-modules/wrapt/default.nix          |  6 +-
 .../python-modules/wrapt/pytest9-compat.patch | 59 -------------------
 2 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/development/python-modules/wrapt/pytest9-compat.patch

diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix
index 4f947d1c42d6..18a6607fbf5a 100644
--- a/pkgs/development/python-modules/wrapt/default.nix
+++ b/pkgs/development/python-modules/wrapt/default.nix
@@ -10,18 +10,16 @@
 
 buildPythonPackage rec {
   pname = "wrapt";
-  version = "1.17.2";
+  version = "2.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GrahamDumpleton";
     repo = "wrapt";
     tag = version;
-    hash = "sha256-QduT5bncXi4LeI034h5Pqtwybru0QcQIYI7cMchLy7c=";
+    hash = "sha256-m3vjzV2aM4P+PoH3w9f8swLnp4DBLz5vfCz4An/XoMQ=";
   };
 
-  patches = [ ./pytest9-compat.patch ];
-
   build-system = [ setuptools ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/wrapt/pytest9-compat.patch b/pkgs/development/python-modules/wrapt/pytest9-compat.patch
deleted file mode 100644
index 8ce0b26f5b84..000000000000
--- a/pkgs/development/python-modules/wrapt/pytest9-compat.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 318d226..0a79281 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -18,28 +18,29 @@ def construct_dummy(path, parent):
-     else:
-         return DummyCollector(path, parent=parent)
- 
--def pytest_pycollect_makemodule(path, parent):
--    if '_py33' in path.basename and version < (3, 3):
--        return construct_dummy(path, parent)
--    if '_py34' in path.basename and version < (3, 4):
--        return construct_dummy(path, parent)
--    if '_py35' in path.basename and version < (3, 5):
--        return construct_dummy(path, parent)
--    if '_py36' in path.basename and version < (3, 6):
--        return construct_dummy(path, parent)
--    if '_py37' in path.basename and version < (3, 7):
--        return construct_dummy(path, parent)
--    if '_py38' in path.basename and version < (3, 8):
--        return construct_dummy(path, parent)
--    if '_py39' in path.basename and version < (3, 9):
--        return construct_dummy(path, parent)
--    if '_py310' in path.basename and version < (3, 10):
--        return construct_dummy(path, parent)
--    if '_py311' in path.basename and version < (3, 11):
--        return construct_dummy(path, parent)
--    if '_py312' in path.basename and version < (3, 12):
--        return construct_dummy(path, parent)
--    if '_py3' in path.basename and version < (3, 0):
--        return construct_dummy(path, parent)
--    if '_py2' in path.basename and version >= (3, 0):
--        return construct_dummy(path, parent)
-+def pytest_pycollect_makemodule(module_path, parent):
-+    name = module_path.name
-+    if '_py33' in name and version < (3, 3):
-+        return construct_dummy(module_path, parent)
-+    if '_py34' in name and version < (3, 4):
-+        return construct_dummy(module_path, parent)
-+    if '_py35' in name and version < (3, 5):
-+        return construct_dummy(module_path, parent)
-+    if '_py36' in name and version < (3, 6):
-+        return construct_dummy(module_path, parent)
-+    if '_py37' in name and version < (3, 7):
-+        return construct_dummy(module_path, parent)
-+    if '_py38' in name and version < (3, 8):
-+        return construct_dummy(module_path, parent)
-+    if '_py39' in name and version < (3, 9):
-+        return construct_dummy(module_path, parent)
-+    if '_py310' in name and version < (3, 10):
-+        return construct_dummy(module_path, parent)
-+    if '_py311' in name and version < (3, 11):
-+        return construct_dummy(module_path, parent)
-+    if '_py312' in name and version < (3, 12):
-+        return construct_dummy(module_path, parent)
-+    if '_py3' in name and version < (3, 0):
-+        return construct_dummy(module_path, parent)
-+    if '_py2' in name and version >= (3, 0):
-+        return construct_dummy(module_path, parent)

From 2193364af5b3b57c3503a9a09e02e8576871791e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:03:58 +0200
Subject: [PATCH 086/310] python3Packages.trio: 0.32.0 -> 0.33.0

https://github.com/python-trio/trio/blob/v0.33.0/docs/source/history.rst
---
 pkgs/development/python-modules/trio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 7bfd2857a611..c1d1803a1924 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -35,14 +35,14 @@ let
 in
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.32.0";
+  version = "0.33.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-trio";
     repo = "trio";
     tag = "v${version}";
-    hash = "sha256-kZKP5TFg9M+NCx9V9B0qNbGiwZtBPtgVKgZYjX5w1ok=";
+    hash = "sha256-juqlTJPcXpLdzO5OBCcwVR7rckABza9TAhPs9ta5c8U=";
   };
 
   build-system = [ setuptools ];

From cff500b2e99829c74ebb6406fd4cf0591ea72b6a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:13:42 +0200
Subject: [PATCH 087/310] python3Packages.cattrs: 25.3.0 -> 26.1.0

https://github.com/python-attrs/cattrs/blob/v26.1.0/HISTORY.md
---
 .../python-modules/cattrs/default.nix         | 86 ++++++++++---------
 1 file changed, 47 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index 078a9fc50324..ae180c7cf45d 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -12,27 +12,34 @@
   msgpack,
   msgspec,
   orjson,
+  pymongo,
   pytest-xdist,
   pytestCheckHook,
-  pythonAtLeast,
   pyyaml,
+  tomli-w,
   tomlkit,
   typing-extensions,
   ujson,
+  writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cattrs";
-  version = "25.3.0";
+  version = "26.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-attrs";
     repo = "cattrs";
-    tag = "v${version}";
-    hash = "sha256-6oQblSanvSZOMD5ossCP7fNjyxF54SRbU1cQrW1I5Ps=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-i1C7TvtQhiEZPi4YELxPHkiz33nNw2rtgRTqs98PVlc=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5  --benchmark-group-by=fullname" ""
+  '';
+
   build-system = [
     hatchling
     hatch-vcs
@@ -43,57 +50,58 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
+  optional-dependencies = {
+    ujson = [
+      ujson
+    ];
+    orjson = [
+      orjson
+    ];
+    msgpack = [
+      msgpack
+    ];
+    pyyaml = [
+      pyyaml
+    ];
+    tomlkit = [
+      tomlkit
+    ];
+    cbor2 = [
+      cbor2
+    ];
+    bson = [
+      pymongo
+    ];
+    msgspec = [
+      msgspec
+    ];
+    tomllib = [
+      tomli-w
+    ];
+  };
+
   nativeCheckInputs = [
-    cbor2
     hypothesis
     immutables
     motor
-    msgpack
-    msgspec
-    orjson
     pytest-xdist
     pytestCheckHook
-    pyyaml
-    tomlkit
-    ujson
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5  --benchmark-group-by=fullname" ""
-    substituteInPlace tests/test_preconf.py \
-      --replace-fail "from orjson import dumps as orjson_dumps" "" \
-      --replace-fail "from orjson import loads as orjson_loads" ""
-  '';
-
-  preCheck = ''
-    export HOME=$(mktemp -d);
-  '';
+    writableTmpDirAsHomeHook
+  ]
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
   disabledTestPaths = [
     # Don't run benchmarking tests
     "bench"
   ];
 
-  disabledTests = [
-    # orjson is not available as it requires Rust nightly features to compile its requirements
-    "test_orjson"
-    # msgspec causes a segmentation fault for some reason
-    "test_simple_classes"
-    "test_msgspec_json_converter"
-  ]
-  ++ lib.optionals (pythonAtLeast "3.13") [
-    # https://github.com/python-attrs/cattrs/pull/543
-    "test_unstructure_deeply_nested_generics_list"
-  ];
-
   pythonImportsCheck = [ "cattr" ];
 
   meta = {
+    changelog = "https://github.com/python-attrs/cattrs/blob/${finalAttrs.src.tag}/HISTORY.md";
     description = "Python custom class converters for attrs";
     homepage = "https://github.com/python-attrs/cattrs";
-    changelog = "https://github.com/python-attrs/cattrs/blob/${src.tag}/HISTORY.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 5300c0dff9aa98500a53006f0c84d6fa1c0a101f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:22:34 +0200
Subject: [PATCH 088/310] python3Packages.sphinx: relax docutils constraint

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

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index b0733c1289e5..bd67cc2959d4 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -83,6 +83,8 @@ buildPythonPackage rec {
     sphinxcontrib-websupport
   ];
 
+  pythonRelaxDeps = [ "docutils" ];
+
   __darwinAllowLocalNetworking = true;
 
   nativeCheckInputs = [

From b80687fa42b0453b4063ddcc8e1017524addccdc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:26:01 +0200
Subject: [PATCH 089/310] python3Packages.tqdm: 4.67.3 -> 4.68.4

https://tqdm.github.io/releases/
---
 pkgs/development/python-modules/tqdm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 50b685ec17e6..3780728f37c1 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.67.3";
+  version = "4.68.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fYJfA/iSRO9z8dTOGTyxd0qBef2W8x1+Hc3mIJK5YLs=";
+    hash = "sha256-GYKclnNjjyoLhhfaTNy5J+gxzYi8/LbnjUKk0a8TFSA=";
   };
 
   nativeBuildInputs = [

From 5597b685edbd422bb691c8b0d0dccc69db170a53 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:26:27 +0200
Subject: [PATCH 090/310] python3Packages.mdit-py-plugins: 0.5.0 -> 0.6.1

https://github.com/executablebooks/mdit-py-plugins/blob/v0.6.1/CHANGELOG.md
---
 pkgs/development/python-modules/mdit-py-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix
index a8fecfd52e2e..e59aad6093a5 100644
--- a/pkgs/development/python-modules/mdit-py-plugins/default.nix
+++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mdit-py-plugins";
-  version = "0.5.0";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "mdit-py-plugins";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MQU6u49KsWGaKeWU5v066kZidcfCoubqClxAapAZb9A=";
+    hash = "sha256-rG9l45V+qsXZmBpRGkt1zuCRJVOsEC+Z2WrplQ1oGSo=";
   };
 
   build-system = [ flit-core ];

From d1b1476ff9b84a79a9b0db096cf4261329e863e1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:29:39 +0200
Subject: [PATCH 091/310] python3Packages.myst-parser: 5.0.0 ->
 5.1.0-unstable-2026-07-12

https://github.com/executablebooks/MyST-Parser/releases/tag/v5.1.0

Fast-Forward for docutils 0.23 compat
---
 pkgs/development/python-modules/myst-parser/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix
index bb91e8e228b1..63a2bd08cd43 100644
--- a/pkgs/development/python-modules/myst-parser/default.nix
+++ b/pkgs/development/python-modules/myst-parser/default.nix
@@ -26,7 +26,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "myst-parser";
-  version = "5.0.0";
+  version = "5.1.0-unstable-2026-07-12";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -34,8 +34,8 @@ buildPythonPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "myst-parser";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-0lGejdGVVvZar3sPBbvThXzJML7PcR5+shyDHTTtVEY=";
+    rev = "e843b5ff61d9834b4864a95bf6a668909c2de3a6";
+    hash = "sha256-lt2AECSVfakN63EcheYSdkHsQGl9pfcLhS9+lkMqQ7w=";
   };
 
   build-system = [ flit-core ];
@@ -73,7 +73,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Sphinx and Docutils extension to parse MyST";
     homepage = "https://myst-parser.readthedocs.io/";
-    changelog = "https://raw.githubusercontent.com/executablebooks/MyST-Parser/${finalAttrs.src.tag}/CHANGELOG.md";
+    # changelog = "https://raw.githubusercontent.com/executablebooks/MyST-Parser/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ loicreynier ];
   };

From a1cf8c2c2b2f9688f926b300575e798014e96a45 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:37:50 +0200
Subject: [PATCH 092/310] python3Packages.greenlet: 3.3.0 -> 3.5.3

https://github.com/python-greenlet/greenlet/blob/3.5.3/CHANGES.rst
---
 pkgs/development/python-modules/greenlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index fe6554328bc0..7219b87e4667 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -17,12 +17,12 @@
 let
   greenlet = buildPythonPackage rec {
     pname = "greenlet";
-    version = "3.3.0";
+    version = "3.5.3";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-qCuyJaTp5NZT3S+3uLLTbk+yW8AWVCKhHki4jp5vePs=";
+      hash = "sha256-ph78AY/T6zF+7KMaupDunn8m8iiEp5tsbscVv3G7YvE=";
     };
 
     build-system = [ setuptools ];

From 17749f1b0cf9da5283b183fa4fc32a3c35d1b437 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:38:06 +0200
Subject: [PATCH 093/310] python3Packages.fsspec: 2026.3.0 -> 2026.6.0

https://github.com/fsspec/filesystem_spec/raw/2026.6.0/docs/source/changelog.rst
---
 pkgs/development/python-modules/fsspec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix
index 827988124b82..fc9b10c91a92 100644
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/pkgs/development/python-modules/fsspec/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "fsspec";
-  version = "2026.3.0";
+  version = "2026.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "filesystem_spec";
     tag = version;
-    hash = "sha256-K/qHc9uBYq/HkA6xhKAujdCBqH+0kcFnfD3a506A9Ns=";
+    hash = "sha256-MQkrSqXILUkIwm1r1Ins4ZLSATBvFDbylgRLTWQyQOQ=";
   };
 
   build-system = [

From eb12f6fa9da95208566e624a8dcfeb4e0bafb922 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:38:27 +0200
Subject: [PATCH 094/310] python3Packages.platformdirs: 4.9.6 -> 4.10.0

https://github.com/tox-dev/platformdirs/releases/tag/4.10.0
---
 pkgs/development/python-modules/platformdirs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 3c81d609b50f..f224e733bd3e 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "platformdirs";
-  version = "4.9.6";
+  version = "4.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "platformdirs";
     tag = version;
-    hash = "sha256-/aoJquWRn1UQZa96uZba15tDO+IGEHN9/duu9JYXmd4=";
+    hash = "sha256-Sx5ln2mF2FkChP3UKu+GmOIIV8DNoJyYgsNiVDkVqQE=";
   };
 
   build-system = [

From 6f5550a62f41a27d88e4d0e4a67a240fa0c9d500 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:38:46 +0200
Subject: [PATCH 095/310] python3Packages.zipp: 4.0.0 -> 4.1.0

https://github.com/jaraco/zipp/compare/v4.0.0...v4.1.0
---
 pkgs/development/python-modules/zipp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix
index bd2c8c65ad88..b6f3f2cfcc10 100644
--- a/pkgs/development/python-modules/zipp/default.nix
+++ b/pkgs/development/python-modules/zipp/default.nix
@@ -11,14 +11,14 @@
 let
   zipp = buildPythonPackage rec {
     pname = "zipp";
-    version = "4.0.0";
+    version = "4.1.0";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "jaraco";
       repo = "zipp";
       tag = "v${version}";
-      hash = "sha256-JkU35S+BpDvWca1+BP61z3W5oyxf/RI21WXZ9fZ65SQ=";
+      hash = "sha256-qFsCud+fKDULbIF3LLGh6su/Sm1YjcvKe0+R9GH/Ies=";
     };
 
     postPatch = ''

From 3bc2fe7a827a6b5f348fdd06d0a677a152065085 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:39:18 +0200
Subject: [PATCH 096/310] python3Packages.wcwidth: 0.7.0 -> 0.8.2

https://github.com/jquast/wcwidth/releases/tag/0.8.2
---
 pkgs/development/python-modules/wcwidth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix
index d8c9b9cea8c5..df2870666854 100644
--- a/pkgs/development/python-modules/wcwidth/default.nix
+++ b/pkgs/development/python-modules/wcwidth/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "wcwidth";
-  version = "0.7.0";
+  version = "0.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jquast";
     repo = "wcwidth";
     tag = version;
-    hash = "sha256-XIOgDCoAP/shepasR41NbNW3cFlbemmdC0Xbd+9OOts=";
+    hash = "sha256-PMYGLqxbTYIE+2vn0wmaBB/y8lRs9AXX+rOPpYYXHSw=";
   };
 
   build-system = [ hatchling ];

From 257048432095a70100d1092164653f3ce13cd76e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:40:18 +0200
Subject: [PATCH 097/310] python3Packages.testtools: 2.7.2 -> 2.9.1

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

diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix
index e1c2cfc6e0bf..0ea71bcbe6af 100644
--- a/pkgs/development/python-modules/testtools/default.nix
+++ b/pkgs/development/python-modules/testtools/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "testtools";
-  version = "2.7.2";
+  version = "2.9.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-W+W7wfD6D4tgrKbO7AeEXUHQxHXPRFv6200sRew5fqM=";
+    hash = "sha256-Oa2eueG5NdaDj0s67k1ucttl31YC9v7amY27T+jeCxk=";
   };
 
   nativeBuildInputs = [

From 888be46e0cc0507c8173a10a398b0be86d39742a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:43:36 +0200
Subject: [PATCH 098/310] python3Packages.regex: 2026.4.4 -> 2026.7.11

---
 .../development/python-modules/regex/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index b786afac484d..f9116d7a5ff4 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -4,23 +4,23 @@
   lib,
   python,
   setuptools,
+  pyprojectVersionPatchHook,
 }:
 
-let
-  version = "2026.4.4";
-in
-buildPythonPackage {
+buildPythonPackage (finalAttrs: {
   pname = "regex";
-  inherit version;
+  version = "2026.7.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mrabarnett";
     repo = "mrab-regex";
-    tag = version;
-    hash = "sha256-vLhukoQc50XOgv74hBQS36w+T+27y5GTTDetZ2JV8r4=";
+    tag = finalAttrs.version;
+    hash = "sha256-x9XjtIUjm1eV0GS0216ZimHx6DNxtxZV5pQ6dbkEfTc=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ setuptools ];
 
   preCheck = ''
@@ -46,4 +46,4 @@ buildPythonPackage {
     ];
     maintainers = [ lib.maintainers.dwoffinden ];
   };
-}
+})

From 800fcf581f766d1e4d91b1523e97232e2ce7cce8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 21:53:10 +0200
Subject: [PATCH 099/310] python3Packages.eventlet: disable failing test

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

diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 7d0a5b9e5b96..591510fd1791 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -73,6 +73,8 @@ buildPythonPackage rec {
     "test_ssl_close"
     # flaky test
     "test_send_timeout"
+    # greenlet 3.5.1 compat issue
+    "test_patcher_existing_logging_module_lock"
   ];
 
   pythonImportsCheck = [ "eventlet" ];

From 0fa0f446a0ea4d73685357af8cab5758bc8685ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 22:09:05 +0200
Subject: [PATCH 100/310] python3Packages.flask: disable failing test

Upstream says this is already fixed on main and has no production impact.
---
 pkgs/development/python-modules/flask/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index 337c60ed0c06..51460c3d3ff6 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -59,6 +59,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies;
 
+  disabledTests = [
+    # https://github.com/pallets/flask/issues/6092#issuecomment-4952497033
+    "test_bad_environ_raises_bad_request"
+  ];
+
   passthru.tests = {
     inherit
       flask-limiter

From f3b474941c3e252918118962c6ce26aa5d915452 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 22:33:00 +0200
Subject: [PATCH 101/310] python3Packages.more-itertools: 10.8.0 -> 11.1.0

https://more-itertools.readthedocs.io/en/stable/versions.html
---
 pkgs/development/python-modules/more-itertools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix
index ed87a53aac5e..cc2d701e3c5f 100644
--- a/pkgs/development/python-modules/more-itertools/default.nix
+++ b/pkgs/development/python-modules/more-itertools/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "more-itertools";
-  version = "10.8.0";
+  version = "11.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "more-itertools";
     repo = "more-itertools";
     tag = "v${version}";
-    hash = "sha256-ZKvucnPFCA6Q4EQn/nKC9LIevOdSYXHIJ3w3Frregic=";
+    hash = "sha256-fk2QRwOYgYfANtwRpEtGK5F+rRI2Gj25l0XaP9svJz8=";
   };
 
   build-system = [ flit-core ];

From e5b95b099e1281c40a81aaf288b799e0a275f0c5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 22:33:14 +0200
Subject: [PATCH 102/310] python3Packages.fixtures: 4.2.8 -> 4.3.2

https://github.com/testing-cabal/fixtures/blob/4.3.2/NEWS
---
 pkgs/development/python-modules/fixtures/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix
index 08d89a0c6896..d2a024adc4e8 100644
--- a/pkgs/development/python-modules/fixtures/default.nix
+++ b/pkgs/development/python-modules/fixtures/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "fixtures";
-  version = "4.2.8";
+  version = "4.3.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6hRlZKZmYQbEgffDX5ek1lSFyEsMyGpQdZcWS2zA2Ek=";
+    hash = "sha256-t9tkAUcyUT8j0SsMSa5Se6DAwfJmfsl9kTbWcVfrzl0=";
   };
 
   build-system = [

From 65c5a6dac2c3a7833272b5246598ba39a76a3383 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 22:33:48 +0200
Subject: [PATCH 103/310] python3Packages.gitpython: 3.1.50 -> 3.1.51

https://github.com/gitpython-developers/GitPython/blob/3.1.51/doc/source/changes.rst
---
 pkgs/development/python-modules/gitpython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix
index 10486c955e8f..d612c47d5830 100644
--- a/pkgs/development/python-modules/gitpython/default.nix
+++ b/pkgs/development/python-modules/gitpython/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gitpython";
-  version = "3.1.50";
+  version = "3.1.51";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gitpython-developers";
     repo = "GitPython";
     tag = finalAttrs.version;
-    hash = "sha256-oHJrN/iYaAZUNPgOLS+8Ekr1eLES8APfXynmR4OySwk=";
+    hash = "sha256-c8tjBvWjVR7krR59Tfx5jKoJc/fcLWVt5D4xk15DvP4=";
   };
 
   postPatch = ''

From c5707a1404c889247c6b8156e124eb64e05b07a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:36:54 +0200
Subject: [PATCH 104/310] python3Packages.rpds-py: 0.30.0 -> 2026.6.3

https://github.com/crate-py/rpds/releases/tag/v2026.6.3
---
 pkgs/development/python-modules/rpds-py/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix
index 1407f4fa43c6..7557505707bc 100644
--- a/pkgs/development/python-modules/rpds-py/default.nix
+++ b/pkgs/development/python-modules/rpds-py/default.nix
@@ -12,18 +12,18 @@
 
 buildPythonPackage rec {
   pname = "rpds-py";
-  version = "0.30.0";
+  version = "2026.6.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "rpds_py";
     inherit version;
-    hash = "sha256-3Y/3z5ABSvDA94fuo0eU6/ZBUkLuHW+pHqunJcxEHoQ=";
+    hash = "sha256-HOvRM3wkLk7CKT5UH3ErLahJsp9I8MKTaEtxwGMmJdQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-2m2DW1rknZR+UztgUcRaQk4gY19eXmT089U2YlV16d8=";
+    hash = "sha256-7jtXfCBF9+WCZyekWYSMVYPOLYWd1VNwrhMShHre9Mg=";
   };
 
   nativeBuildInputs = [

From c7bf188dd11e87e92b30c016403f6b63f6c098d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:38:18 +0200
Subject: [PATCH 105/310] python3Packages.jsonpath-ng: 1.7.0 -> 1.8.0

https://github.com/h2non/jsonpath-ng/blob/v1.8.0/History.md
---
 .../development/python-modules/jsonpath-ng/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jsonpath-ng/default.nix b/pkgs/development/python-modules/jsonpath-ng/default.nix
index ecb4e0ba9df3..d826559764f4 100644
--- a/pkgs/development/python-modules/jsonpath-ng/default.nix
+++ b/pkgs/development/python-modules/jsonpath-ng/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hypothesis,
   ply,
   pytestCheckHook,
   setuptools,
@@ -9,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "jsonpath-ng";
-  version = "1.7.0";
+  version = "1.8.0";
   format = "setuptools";
   # TODO: typo; change to pyproject = true;
   pypropject = true;
@@ -18,14 +19,17 @@ buildPythonPackage rec {
     owner = "h2non";
     repo = "jsonpath-ng";
     tag = "v${version}";
-    hash = "sha256-sfIqEc5SsNQYxK+Ur00fFdVoC0ysOkHrx4Cq/3SpGHw=";
+    hash = "sha256-soCSMOHJpAM/tOaydvv8tGS/VewtSMBteDNipSPttI0=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [ ply ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "jsonpath_ng" ];
 

From 16d16ffaa4ef2fd65011f471ea6ba223c37b739a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:40:46 +0200
Subject: [PATCH 106/310] python3Packages.decorator: 5.2.1 -> 5.3.1

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

diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix
index b0d90c7a5cdc..1bddfbd4d13e 100644
--- a/pkgs/development/python-modules/decorator/default.nix
+++ b/pkgs/development/python-modules/decorator/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "decorator";
-  version = "5.2.1";
+  version = "5.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "micheles";
     repo = "decorator";
     tag = version;
-    hash = "sha256-UBjZ8LdgJ6iLBjNTlA3up0qAVBqTSZMJt7oEhUo3ZEo=";
+    hash = "sha256-whGT0XDVdo0mhc2KP5unjdUSP3AFWKql1fKM1qlK/Zc=";
   };
 
   build-system = [ setuptools ];

From f4d6b45e70eb6a2a063acad1c4bf5048193aa4a7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:40:58 +0200
Subject: [PATCH 107/310] python3Packages.soupsieve: 2.8.3 -> 2.8.4

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

diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix
index 9074261f5cfa..c0f30c8e2380 100644
--- a/pkgs/development/python-modules/soupsieve/default.nix
+++ b/pkgs/development/python-modules/soupsieve/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "soupsieve";
-  version = "2.8.3";
+  version = "2.8.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Mmfx7upCUftCcott+3Ru3JrK/8SkWyfhlFC2dlhug0k=";
+    hash = "sha256-4SH9Aul1xpXk6eh3Sl7jXXRxS1kweGjcxTGa0tnjMo4=";
   };
 
   nativeBuildInputs = [ hatchling ];

From d5622e4aefa4bc7021844a456891b9395eb4710e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:42:44 +0200
Subject: [PATCH 108/310] python3Packages.uv-build: 0.11.16 -> 0.11.28

https://github.com/astral-sh/uv/blob/0.11.28/CHANGELOG.md
---
 pkgs/development/python-modules/uv-build/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/uv-build/default.nix b/pkgs/development/python-modules/uv-build/default.nix
index 0750166192ce..fbe1af7a10e7 100644
--- a/pkgs/development/python-modules/uv-build/default.nix
+++ b/pkgs/development/python-modules/uv-build/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "uv-build";
-  version = "0.11.16";
+  version = "0.11.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-5LJspcHj/RjOMv7eRB7n+tofX4s51M3kqHCPymCg90A=";
+    hash = "sha256-/mTH2hojC+l0yxn+LEAIj8FTA/nWKIPZ7uLMVJxebw4=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-2lg86WxPGVbJ91zi61lKrSqnzFgmmSrBrl+SfV5SJWU=";
+    hash = "sha256-FvLl32JfIq5a1NnLtnFJyy5T+vkcOD+qfQLDy6NYhHg=";
   };
 
   buildAndTestSubdir = "crates/uv-build";

From f8b4066712a1460ac39d22d37fea1c4a6dfe14b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:43:06 +0200
Subject: [PATCH 109/310] python3Packages.sh: 2.2.2 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
index b21bbfa82957..4f473cfb0268 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -3,23 +3,23 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  hatchling,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "sh";
-  version = "2.2.2";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "amoffat";
     repo = "sh";
     tag = version;
-    hash = "sha256-5B+Bsxv2X1BHEMg8uv56ex//6EKEcLmte7ozcKzul/c=";
+    hash = "sha256-xtrT8fac7eJeGZ15yQqdYUqILcY1jUCVajX/j0ljl7Q=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -39,8 +39,6 @@ buildPythonPackage rec {
     # fails to import itself after modifying the environment
     "test_environment"
     # timing sensitive through usage of sleep(1) and signal handling
-    # https://github.com/amoffat/sh/issues/684
-    "test_general_signal"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Disable tests that fail on Darwin sandbox

From 5e77eb9e8cc40ec787076c424048d4f27a59bcf3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:45:08 +0200
Subject: [PATCH 110/310] python3Packages.editables: 0.5 -> 0.6

https://github.com/pfmoore/editables/blob/0.6/CHANGELOG.md
---
 pkgs/development/python-modules/editables/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix
index 32030cff7d46..65e52f8c46cc 100644
--- a/pkgs/development/python-modules/editables/default.nix
+++ b/pkgs/development/python-modules/editables/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "editables";
-  version = "0.5";
+  version = "0.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MJYn2bXErcDmaNjG+nusG6fIxdQVwtJ/YPCB+OgNHeI=";
+    hash = "sha256-EWODSQI4HEYTeHlRxZFIAP3xVa4IhIo3O46lAGeAl3w=";
   };
 
   build-system = [ flit-core ];

From b884e4d9e1dbbb6cdd73f0890610f43740ba3285 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:46:09 +0200
Subject: [PATCH 111/310] python3Packages.websockets: 16.0 -> 16.1

https://github.com/aaugustin/websockets/blob/16.1/docs/project/changelog.rst
---
 pkgs/development/python-modules/websockets/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 237f4d9fb994..f3b488e7302c 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   unittestCheckHook,
+  pyprojectVersionPatchHook,
   pythonAtLeast,
   setuptools,
   werkzeug,
@@ -11,16 +12,18 @@
 
 buildPythonPackage rec {
   pname = "websockets";
-  version = "16.0";
+  version = "16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aaugustin";
     repo = "websockets";
     tag = version;
-    hash = "sha256-75FkU45qbOb+xbJO4VKqfWBTep+Toh6OWch2WXnU4bg=";
+    hash = "sha256-YbiDoL4edb6QGDOBRBJliRhEOs5UvZUgWO9f+ooyBcc=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ setuptools ];
 
   disabledTests = [

From d7ff4a66cbe1ec0ea786d0c7b44f5fe78754afd7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:46:19 +0200
Subject: [PATCH 112/310] python3Packages.webob: 1.8.9 -> 1.8.10

https://github.com/Pylons/webob/compare/1.8.9...1.8.10
---
 pkgs/development/python-modules/webob/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix
index 9253813496b5..5a28aec1cd17 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/pkgs/development/python-modules/webob/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "webob";
-  version = "1.8.9";
+  version = "1.8.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Pylons";
     repo = "webob";
     tag = version;
-    hash = "sha256-axJQwlybuqBS6RgI2z9pbw58vHF9aC9AxCg13CIKCLs=";
+    hash = "sha256-r3fURb+Je/XevpeMGb/XEF2xjj1q172P4pTAbGkeloY=";
   };
 
   build-system = [ setuptools ];

From c63f8c3fbab5066402f83482dbaded08cfd0f677 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:46:29 +0200
Subject: [PATCH 113/310] python3Packages.kiwisolver: 1.4.9 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix
index a61ea5957552..11293cc11725 100644
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/pkgs/development/python-modules/kiwisolver/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "kiwisolver";
-  version = "1.4.9";
+  version = "1.5.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-w7IsJsb9aBGwroNjuVyozk6jwgLT0JdbKRQxDOsbzE0=";
+    hash = "sha256-1Bk/PZ3D9veartDlY39F2YhQ6/AffKIOaUV/PolGtmo=";
   };
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";

From 7bea3e0117066f575dc3e1ed545d17c299429c67 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:47:18 +0200
Subject: [PATCH 114/310] python3Packages.pyasn1: 0.6.3 -> 0.6.4

https://github.com/pyasn1/pyasn1/blob/v0.6.4/CHANGES.rst
---
 pkgs/development/python-modules/pyasn1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix
index dc4a86879a32..5f7f86c6317e 100644
--- a/pkgs/development/python-modules/pyasn1/default.nix
+++ b/pkgs/development/python-modules/pyasn1/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyasn1";
-  version = "0.6.3";
+  version = "0.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyasn1";
     repo = "pyasn1";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fHpAJ1WSoLwaWuSMcfHjZmnl8oNhADrdjHaYIEmqQiw=";
+    hash = "sha256-ZtsHANVUGk+LF17dEjePDm8ofX61P4f2/BTHqlscNd0=";
   };
 
   build-system = [ setuptools ];

From 26fbafc2e0b297506170ba0c8f96f185337cfa78 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:49:45 +0200
Subject: [PATCH 115/310] python3Packages.python-multipart: 0.0.30 -> 0.0.32

https://github.com/Kludex/python-multipart/blob/0.0.32/CHANGELOG.md
---
 pkgs/development/python-modules/python-multipart/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix
index 5403a419d768..6d6790dd3f41 100644
--- a/pkgs/development/python-modules/python-multipart/default.nix
+++ b/pkgs/development/python-modules/python-multipart/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-multipart";
-  version = "0.0.30";
+  version = "0.0.32";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kludex";
     repo = "python-multipart";
     tag = finalAttrs.version;
-    hash = "sha256-qW/OkOaM+7sN6+mxO5tm6tuDDJ/c703XDNqo6i6YnXo=";
+    hash = "sha256-zw6SHzbbjyRCGfUldxdki+wKwmTAgmd9ZAu/2zU+pFw=";
   };
 
   build-system = [ hatchling ];

From 1553d3f053e0fa0379f627597d434a8de0c29c07 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:58:47 +0200
Subject: [PATCH 116/310] python3Packages.traitlets: 5.14.3 -> 5.15.1

https://github.com/ipython/traitlets/blob/v5.15.1/CHANGELOG.md
---
 pkgs/development/python-modules/traitlets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix
index 7bc0d8c5bd9e..c069b8eec31c 100644
--- a/pkgs/development/python-modules/traitlets/default.nix
+++ b/pkgs/development/python-modules/traitlets/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "traitlets";
-  version = "5.14.3";
+  version = "5.15.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ipython";
     repo = "traitlets";
     tag = "v${version}";
-    hash = "sha256-lWtgzXW1ffzl1jkFaq99X0dU8agulUMHaghsYKX+8Dk=";
+    hash = "sha256-c4OZSC2MrX6Jx8x49lOzlkgwpwz+/2l+GGVCzpO/P+8=";
   };
 
   build-system = [ hatchling ];

From fbc0ee9a4a84bb1484fa2a45a88e23bff7255b0c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Jul 2026 23:59:50 +0200
Subject: [PATCH 117/310] python3Packages.librt: 0.11.0 -> 0.13.0

https://github.com/mypyc/librt/compare/v0.11.0...v0.13.0
---
 pkgs/development/python-modules/librt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/librt/default.nix b/pkgs/development/python-modules/librt/default.nix
index 628f0e68b0ab..201feef125e9 100644
--- a/pkgs/development/python-modules/librt/default.nix
+++ b/pkgs/development/python-modules/librt/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "librt";
-  version = "0.11.0";
+  version = "0.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mypyc";
     repo = "librt";
     tag = "v${version}";
-    hash = "sha256-y9z1EdrZRiDtT8cxz/Ex/f6B/RfjnAXdGf7tM+77HGg=";
+    hash = "sha256-DeeuUmMwm1Lg078qsdye1ZG08pZ36jBF2PdfV3f+fOs=";
   };
 
   # https://github.com/mypyc/librt/blob/v0.7.8/.github/workflows/buildwheels.yml#L90-L93

From 1a3743bb01224686cd4ccd17687fa7b76bcc70df Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 01:00:50 +0200
Subject: [PATCH 118/310] python3Packages.matplotlib-inline: 0.2.1 -> 0.2.2

https://github.com/ipython/matplotlib-inline/compare/0.2.1...0.2.2
---
 pkgs/development/python-modules/matplotlib-inline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix
index f1c2c27c7145..ff0cf0fdbd20 100644
--- a/pkgs/development/python-modules/matplotlib-inline/default.nix
+++ b/pkgs/development/python-modules/matplotlib-inline/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "matplotlib-inline";
-  version = "0.2.1";
+  version = "0.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ipython";
     repo = "matplotlib-inline";
     tag = version;
-    hash = "sha256-qExS0SsbnYgu0wFTew90z5QwPyJ+UWGVEgFURSMedSY=";
+    hash = "sha256-pLJGwykQ0+LK+cljGQmkSDuBSAdGq+SCPYGQ0ZF7nq0=";
   };
 
   build-system = [ flit-core ];

From 8e5758bfd8565f7c0449d8e326143779eac4e0fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 01:03:03 +0200
Subject: [PATCH 119/310] python3Packages.snowballstemmer: 3.0.1 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix
index 2f5c94b43399..2717cbeaa8b6 100644
--- a/pkgs/development/python-modules/snowballstemmer/default.nix
+++ b/pkgs/development/python-modules/snowballstemmer/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "snowballstemmer";
-  version = "3.0.1";
+  version = "3.1.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "sha256-bV7u7I6fhNTVa4R2krrPebwsjpDH+AykRE/4tvLlKJU=";
+    sha256 = "sha256-4Hu8VKDXmP5gEKEjmEIuYqi/u6lcOU/QlW71jLTT4mA=";
   };
 
   # No tests included

From 4ae3f9e414718d8b14f4227c9ee7e83a2e67cd93 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 01:03:29 +0200
Subject: [PATCH 120/310] python3Packages.imagesize: 1.4.1 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix
index 9a4f6515023a..77bfec9060d1 100644
--- a/pkgs/development/python-modules/imagesize/default.nix
+++ b/pkgs/development/python-modules/imagesize/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "imagesize";
-  version = "1.4.1";
+  version = "2.0.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aRUERK/7nLDVzFqSs2dvCy+3zZrjnpR6XhGja0SXzUo=";
+    hash = "sha256-joNYxKBcME8fzPf/lvA25yQ6GJ6eQukIUZk8VYz+nuM=";
   };
 
   meta = {

From 33a66960bf20eea13db9d4283e4c04ee37217942 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 01:03:58 +0200
Subject: [PATCH 121/310] python3Packages.simplejson: 3.20.2 -> 4.1.1

https://github.com/simplejson/simplejson/blob/v4.1.1/CHANGES.txt
---
 pkgs/development/python-modules/simplejson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 18e03236db18..f752aaf4f823 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "simplejson";
-  version = "3.20.2";
+  version = "4.1.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "simplejson";
     repo = "simplejson";
     tag = "v${version}";
-    hash = "sha256-err3NWljoC6MxJoFSYuqLHGKfDcst6ya7myP9XIRbFc=";
+    hash = "sha256-t7DU6NquHUy6WntmburFcYckUFXPcL15wh49zLc4eXo=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];

From ab91d20a3fda6d71d278ff78d495dd113c252258 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 01:58:37 +0200
Subject: [PATCH 122/310] python3Packages.jsonpointer: 3.0.0 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix
index b35689eb9b38..87858e87729e 100644
--- a/pkgs/development/python-modules/jsonpointer/default.nix
+++ b/pkgs/development/python-modules/jsonpointer/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "jsonpointer";
-  version = "3.0.0";
+  version = "3.1.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ky1ynyCRUi1hw7MfguEYcPYLaPQ/vHBct2v0uDKvWe8=";
+    hash = "sha256-C4AcfbM6kEAk9gBNUm3MU7u4pKD04yv9EL6t9grfGQA=";
   };
 
   meta = {

From 639ae4bbedfe43c01ddc7aa0452da23cce6ab4b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 01:58:52 +0200
Subject: [PATCH 123/310] python3Packages.tzlocal: 5.3.1 -> 5.4.4

https://github.com/regebro/tzlocal/blob/5.4.4/CHANGES.txt
---
 pkgs/development/python-modules/tzlocal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix
index c02cf030eccf..16408d0710c0 100644
--- a/pkgs/development/python-modules/tzlocal/default.nix
+++ b/pkgs/development/python-modules/tzlocal/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "tzlocal";
-  version = "5.3.1"; # version needs to be compatible with APScheduler
+  version = "5.4.4"; # version needs to be compatible with APScheduler
 
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zO/8ft7O/qH1lVQdvW6ZDLHqPRm/AbKAnzYqA915If0=";
+    hash = "sha256-jbuGYIOGiKe2uk/tMdGN7fhCr7TUfKBQ1tiRwsFfO+Q=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 5c3b5092c3855ed44f90e9e267e8350a7247de6d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 01:59:42 +0200
Subject: [PATCH 124/310] python3Packages.phonenumbers: 9.0.22 -> 9.0.34

https://github.com/daviddrysdale/python-phonenumbers/blob/v9.0.34/python/HISTORY.md
---
 pkgs/development/python-modules/phonenumbers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index d2b3cd0b33cc..906342f6e4f3 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "9.0.22";
+  version = "9.0.34";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7/mFxlV1dJ0dVOB8VsNRfVJD4D4I5KYZF2HfmqsiePI=";
+    hash = "sha256-AHUcddEWZIXKgM4C7BW2phomKOmzEzgVeTMLxwyTQHU=";
   };
 
   build-system = [ setuptools ];

From 70d3fbbf13d1d454ecc678676b32a88fc0bb7caf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:00:15 +0200
Subject: [PATCH 125/310] python3Packages.pymongo: 4.16.0 -> 4.17.0

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

diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index 5d9982586783..bf33ccfc58f1 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "4.16.0";
+  version = "4.17.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "pymongo";
-    hash = "sha256-i6hAUGX24lim+HL+YteXoo84OhIXjHFTwB7QToRcYAw=";
+    hash = "sha256-cP+gi6ZBRozAaM9GwGs08BqM40ifZBEwn8tc6r5rL8A=";
   };
 
   build-system = [

From e6b4355be9f49e7b863b073714ecaca85ef0c7d0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:02:34 +0200
Subject: [PATCH 126/310] python3Packages.pyfakefs: 6.0.0 -> 6.2.0

https://github.com/jmcgeheeiv/pyfakefs/blob/v6.2.0/CHANGES.md
---
 pkgs/development/python-modules/pyfakefs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index 6efb2f9d68af..7c6dbb4095de 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pyfakefs";
-  version = "6.0.0";
+  version = "6.2.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BZ/QshdL/u1JnssKWbzP9VfyZ8xtiFr8Dlt254ttUNo=";
+    hash = "sha256-5Zo220R79QnOnJerPRUQwIzFGJXFMRMlpWCl5bXcGUA=";
   };
 
   build-system = [ setuptools ];

From c180da6ef44a4ec54e269747d31603adf9399524 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:05:32 +0200
Subject: [PATCH 127/310] python3Packages.pytest-socket: 0.7.0 -> 0.8.0

https://github.com/miketheman/pytest-socket/blob/0.8.0/CHANGELOG.md
---
 pkgs/development/python-modules/pytest-socket/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix
index 9f8bfa0fce40..ca8a5314371e 100644
--- a/pkgs/development/python-modules/pytest-socket/default.nix
+++ b/pkgs/development/python-modules/pytest-socket/default.nix
@@ -2,23 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  uv-build,
   pytest,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-socket";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "miketheman";
     repo = "pytest-socket";
     tag = version;
-    hash = "sha256-19YF3q85maCVdVg2HOOPbN45RNjBf6kiFAhLut8B2tQ=";
+    hash = "sha256-UFUh0FhIEakAY1NZQD6hFY7wnnPs2NjjsfionIg0jRs=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  nativeBuildInputs = [ uv-build ];
 
   buildInputs = [ pytest ];
 

From 399698a71ddad805513612be856aed4edc960ddd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:10:10 +0200
Subject: [PATCH 128/310] python3Packages.mashumaro: 3.21 -> 3.22

https://github.com/Fatal1ty/mashumaro/releases/tag/v3.22
---
 pkgs/development/python-modules/mashumaro/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index 88e4f1ad479e..5c8c5ea9c2c7 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "mashumaro";
-  version = "3.21";
+  version = "3.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Fatal1ty";
     repo = "mashumaro";
     tag = "v${version}";
-    hash = "sha256-SWmZA/yoiElQ299+BkjwTdcPukKfgw/UgUwiesFRkqo=";
+    hash = "sha256-/aAyylHOEjSmcjb+OKDNY0OOlR2JXepvVpVsfGbKSyw=";
   };
 
   build-system = [ setuptools ];

From 49db97d68e17579e833df08fc45d19f0f9290594 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:11:07 +0200
Subject: [PATCH 129/310] python3Packages.typeguard: 4.5.1 -> 4.5.2

https://github.com/agronholm/typeguard/releases/tag/4.5.2
---
 pkgs/development/python-modules/typeguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index b1c969e2d398..cc0dc5cc565e 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "typeguard";
-  version = "4.5.1";
+  version = "4.5.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9vjsu8gZybx0mYPMZ8AjkeFqm0O4sn8V3HDtfEoAcnQ=";
+    hash = "sha256-WhbcrCNQIDkpnJfIlBZRvDPX6ozEsvfWu7G1KPbupCM=";
   };
 
   outputs = [

From 3b7959dde1a332533e443c5e3ea44f535c6f7a00 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:12:12 +0200
Subject: [PATCH 130/310] python3Packages.pymysql: 1.1.2 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix
index db536ce794a6..b93585d91c4b 100644
--- a/pkgs/development/python-modules/pymysql/default.nix
+++ b/pkgs/development/python-modules/pymysql/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "pymysql";
-  version = "1.1.2";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pymysql";
     inherit version;
-    hash = "sha256-SWHT4WVhSuZQFONhgRpyTiBErT6jc53pkDrnwh9TnwM=";
+    hash = "sha256-bHsXymhpiBBNdCbCeJW0Vc3uo+nTzrEnDww3BP6tjDM=";
   };
 
   build-system = [ setuptools ];

From d82a5ed8a6447cab36859872b5286abf77497e0f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:13:08 +0200
Subject: [PATCH 131/310] python3Packages.cachetools: 6.2.4 -> 7.1.4

https://github.com/tkem/cachetools/blob/v7.1.4/CHANGELOG.rst
---
 pkgs/development/python-modules/cachetools/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index cfb384d074e3..d4e0a5e56905 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -3,22 +3,26 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  setuptools-scm,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "cachetools";
-  version = "6.2.4";
+  version = "7.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tkem";
     repo = "cachetools";
     tag = "v${version}";
-    hash = "sha256-LlDyrjiRYCD9btDl5NA0Seb3jk3hlpNhwu0jAQp9YZE=";
+    hash = "sha256-zgIUNzDVQMBjaaEitD3ACVd8ZXCeXu3MBTEapzH5sSY=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From be8b0dcb21a7615b332f1c3676bd4c2254612320 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:14:05 +0200
Subject: [PATCH 132/310] python3Packages.marshmallow: 4.2.0 -> 4.3.0

https://github.com/marshmallow-code/marshmallow/blob/4.3.0/CHANGELOG.rst
---
 pkgs/development/python-modules/marshmallow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index a76693c0b793..52f5633415f6 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "marshmallow";
-  version = "4.2.0";
+  version = "4.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "marshmallow-code";
     repo = "marshmallow";
     tag = version;
-    hash = "sha256-UrkaKQUZ4fjemaAqd+T5nD5S1vuS1AS1CNZVDhJY9Y8=";
+    hash = "sha256-KNxR8AiEJ9S15G5l3rB48BvLdgB5s6q6L1I83V7iMv0=";
   };
 
   build-system = [ flit-core ];

From 1b85c31bee829498597cab40e76a416b942bccb3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:14:52 +0200
Subject: [PATCH 133/310] python3Packages.aiosqlite: 0.21.0 -> 0.22.1

https://github.com/omnilib/aiosqlite/blob/v0.22.1/CHANGELOG.md
---
 pkgs/development/python-modules/aiosqlite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix
index 4ca47d5e8a3a..87c1002e89e8 100644
--- a/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/pkgs/development/python-modules/aiosqlite/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "aiosqlite";
-  version = "0.21.0";
+  version = "0.22.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "aiosqlite";
     tag = "v${version}";
-    hash = "sha256-3l/uR97WuLlkAEdogL9iYoXp89bsAcpH6XEtMELsX9o=";
+    hash = "sha256-voOOFo1OwaRQ3JsDHlBrngP+8ajf0kTNKXJyOaJiTs4=";
   };
 
   build-system = [ flit-core ];

From 365e5afe0452f16d56fd8b5e5ea4b4b94ba78f48 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:15:23 +0200
Subject: [PATCH 134/310] python3Packages.httptools: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix
index 3be345cfb6f0..82a37c8283e6 100644
--- a/pkgs/development/python-modules/httptools/default.nix
+++ b/pkgs/development/python-modules/httptools/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "httptools";
-  version = "0.7.1";
+  version = "0.8.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-q9clVpdPjnx0olllWSSnF6I2WyNsiCw/b4pF/pRwOsk=";
+    hash = "sha256-ayoy8Y2X4W6Qgn16gZ/6jb2MwkX8Th+p0QlbVO9L2Zk=";
   };
 
   # Tests are not included in pypi tarball

From 87c268fc45618d82220fa6d71476c337f10be6d7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:15:35 +0200
Subject: [PATCH 135/310] python3Packages.h5py: 3.15.1 -> 3.16.0

https://github.com/h5py/h5py/blob/3.16.0/docs/whatsnew/3.16.rst
---
 pkgs/development/python-modules/h5py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 0adb77a037ef..256ddec3b5a6 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -20,13 +20,13 @@ let
   mpiSupport = hdf5.mpiSupport;
 in
 buildPythonPackage rec {
-  version = "3.15.1";
+  version = "3.16.0";
   pname = "h5py";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yG4+1FxEc1ZN5VqoO2/J5erYZXh3PfvZMEc4AELia2k=";
+    hash = "sha256-oNuq15aEDMqmekwUSg0MgIAHPDTHbVppQdaBhnjvJzg=";
   };
 
   pythonRelaxDeps = [ "mpi4py" ];

From 6e0998bb4ee2441b142f85a3753e188c7b8c714e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:16:53 +0200
Subject: [PATCH 136/310] python3Packages.usb-devices: 0.4.5 -> 0.5.1

https://github.com/Bluetooth-Devices/usb-devices/blob/v0.5.1/CHANGELOG.md
---
 pkgs/development/python-modules/usb-devices/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix
index e1136fc6bc2d..06714b6920b9 100644
--- a/pkgs/development/python-modules/usb-devices/default.nix
+++ b/pkgs/development/python-modules/usb-devices/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "usb-devices";
-  version = "0.4.5";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "usb-devices";
     tag = "v${version}";
-    hash = "sha256-Nfdl5oRIdOfAo5PFAJJpadRyu2zeEkmYzxDQxbvpt6c=";
+    hash = "sha256-W6RWm9x/emb1F8Oox927SnH3v8HWCXIFYivVJJh6ves=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From d0009d11b7cd7629cdd2d7b01f66dcc98d41c2e3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:22:02 +0200
Subject: [PATCH 137/310] python3Packages.mistune: 3.3.2 -> 3.3.3

https://github.com/lepture/mistune/blob/v3.3.3/docs/changes.rst
---
 pkgs/development/python-modules/mistune/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix
index 99f3922ee0fa..65ad746236d8 100644
--- a/pkgs/development/python-modules/mistune/default.nix
+++ b/pkgs/development/python-modules/mistune/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "mistune";
-  version = "3.3.2";
+  version = "3.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "mistune";
     tag = "v${version}";
-    hash = "sha256-uyOJFtDvVn0Y3VypphOXsSW3pX5XVCcfQ7dtFiL/5qY=";
+    hash = "sha256-AAOpQ3GMEifMVM1SaT5zVltIshAQt5SYqCtIvdjy20M=";
   };
 
   build-system = [ setuptools ];

From e8406537dfb0b206210e40e61aa6be42662dd969 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:24:09 +0200
Subject: [PATCH 138/310] python3Packages.beautifulsoup4: 4.14.3 -> 4.15.0

https://git.launchpad.net/beautifulsoup/tree/CHANGELOG?h=4.15.0
---
 .../python-modules/beautifulsoup4/default.nix       | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index b32ee083f165..ea5e40f84a96 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage rec {
   pname = "beautifulsoup4";
-  version = "4.14.3";
+  version = "4.15.0";
   pyproject = true;
 
   outputs = [
@@ -45,18 +45,9 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YpKxxRhtNWu6Zp759/BRdXCZVlrZraXdYwvZ3l+n+4Y=";
+    hash = "sha256-KI48p9VLBvKsGRlwvCdcGTnLRtRQslW/ZxiwSqN6tPc=";
   };
 
-  patches = [
-    # Fix tests with python 3.13.10 / 3.14.1
-    (fetchpatch {
-      url = "https://git.launchpad.net/beautifulsoup/patch/?id=55f655ffb7ef03bdd1df0f013743831fe54e3c7a";
-      excludes = [ "CHANGELOG" ];
-      hash = "sha256-DJl1pey0NdJH+SyBH9+y6gwUvQCmou0D9xcRAEV8OBw=";
-    })
-  ];
-
   build-system = [ hatchling ];
 
   nativeBuildInputs = [ sphinxHook ];

From 3584432b67ce297a8bd91de3c5ee582f90f37813 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:24:19 +0200
Subject: [PATCH 139/310] python3Packages.asttokens: 3.0.1 -> 3.0.2

https://github.com/gristlabs/asttokens/releases/tag/v3.0.2
---
 pkgs/development/python-modules/asttokens/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix
index e58acfa977d5..3116c1bfda04 100644
--- a/pkgs/development/python-modules/asttokens/default.nix
+++ b/pkgs/development/python-modules/asttokens/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "asttokens";
-  version = "3.0.1";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gristlabs";
     repo = "asttokens";
     tag = "v${version}";
-    hash = "sha256-1qkkNpjX89TmGD0z0KA2y+UbiHuEOaXzZ6hs9nw7EeM=";
+    hash = "sha256-qdjfhcU1Of07hEY9HZ8qUofPoYBixE4RnIohYMQWsqU=";
   };
 
   build-system = [ setuptools-scm ];

From eed26fc194fe342ec5659f84fdd0fa72a5a20d03 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:24:23 +0200
Subject: [PATCH 140/310] python3Packages.psycopg2: 2.9.11 -> 2.9.12

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

diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index b985f5120b23..d7e6138f7644 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "psycopg2";
-  version = "2.9.11";
+  version = "2.9.12";
   pyproject = true;
 
   # Extension modules don't work well with PyPy. Use psycopg2cffi instead.
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lk0xyvco4hfGl/936mnCughl+kHsILsA8Jd+Yv3MUuM=";
+    hash = "sha256-He2xx6HYVSxKYETGscQaUuao4tFEr4PsysdYB2sbfBU=";
   };
 
   postPatch = ''

From 45f05953c9551119c91dd0fb640cfa2dcd62db0b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:24:37 +0200
Subject: [PATCH 141/310] python3Packages.astroid: 4.0.3 -> 4.2.0

https://github.com/PyCQA/astroid/blob/v4.2.0/ChangeLog
---
 pkgs/development/python-modules/astroid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 0403878fb70e..23957f31892e 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "astroid";
-  version = "4.0.3"; # Check whether the version is compatible with pylint
+  version = "4.2.0"; # Check whether the version is compatible with pylint
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "astroid";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5p1xY6EWviSgmrLVOx3w7RcG/Vpx+sUtVndoxXrIFTQ=";
+    hash = "sha256-PwKGAk9tiQzxWydEREg0l0cF4J56SNRwhGRCVjmRoCo=";
   };
 
   build-system = [ setuptools ];

From 83d09388b76849fefbf78d8e677127c6230166bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:26:53 +0200
Subject: [PATCH 142/310] python3Packages.icecream: 2.1.10 -> 2.2.0

https://github.com/gruns/icecream/compare/v2.1.10...v2.2.0
---
 pkgs/development/python-modules/icecream/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix
index e232eedd65c3..6ef3825e89b4 100644
--- a/pkgs/development/python-modules/icecream/default.nix
+++ b/pkgs/development/python-modules/icecream/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "icecream";
-  version = "2.1.10";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gruns";
     repo = "icecream";
     tag = "v${version}";
-    hash = "sha256-5PFl+DIsWGbh2VR+xW/L9fYBF0VCo1B10b+mzsq85As=";
+    hash = "sha256-8y109lTvZS50sBNzsgxxyIDf5w3gAou7RK1NxiGIziQ=";
   };
 
   build-system = [ setuptools ];

From c25423f9232482cf2adcf23c83a32e491f5bd063 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:27:08 +0200
Subject: [PATCH 143/310] python3Packages.stevedore: 5.6.0 -> 5.9.0

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

diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index 639bffac6623..389fdf579ce7 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "stevedore";
-  version = "5.6.0";
+  version = "5.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8i0VxurUDFu/qcpUqn57SgfVmzauA+0SztGlTPC1GUU=";
+    hash = "sha256-q70K96OKi7sdat6i41sXYJzwBOqsMj6IqNiWNkDdKzw=";
   };
 
   build-system = [

From 9a0e9275e1aad962f120e42c571262c9fce26e97 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:28:19 +0200
Subject: [PATCH 144/310] python3Packages.docker: 7.1.0 -> 7.2.0

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

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index b766e50c16f7..01bee2c1be9e 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "docker";
-  version = "7.1.0";
+  version = "7.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker-py";
     tag = version;
-    hash = "sha256-sk6TZLek+fRkKq7kG9g6cR9lvfPC8v8qUXKb7Tq4pLU=";
+    hash = "sha256-4LmmWAmwoFroV4Ez0r1X72jCpBt69upQMrsA4eP5K6o=";
   };
 
   build-system = [

From f912b7dbae919aca764d955332123cf1359f46ef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:29:02 +0200
Subject: [PATCH 145/310] python3Packages.gssapi: 1.10.1 -> 1.11.1

https://github.com/pythongssapi/python-gssapi/releases/tag/v1.11.1
---
 pkgs/development/python-modules/gssapi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 156a7aee13af..55d9a934e29d 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -22,19 +22,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gssapi";
-  version = "1.10.1";
+  version = "1.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pythongssapi";
     repo = "python-gssapi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A1y3PD+zycKxlZT2vZ9b9p8SMr+aZA62CIAUpi4eOvo=";
+    hash = "sha256-E9rX5/7jTFR4nZ7ww2B083Tlz5vwl00yhakBQg75WZs=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "Cython == 3.1.3" Cython
+      --replace-fail "Cython == 3.2.4" Cython
     substituteInPlace setup.py \
       --replace-fail 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5-c}"'
   '';

From ff412bb903b6de505410d1854ee7e0137c65a37c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:29:14 +0200
Subject: [PATCH 146/310] python3Packages.anyio: 4.14.1 -> 4.14.2

https://github.com/agronholm/anyio/blob/4.14.2/docs/versionhistory.rst
---
 pkgs/development/python-modules/anyio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 2aa45bf41a62..278a5e4de9b4 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "4.14.1";
+  version = "4.14.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "agronholm";
     repo = "anyio";
     tag = version;
-    hash = "sha256-LPNRNb1RuSVQqsI6aAAiYWC2c2CZAhFS67XW9OfbIiE=";
+    hash = "sha256-MEU0c8/NI1vlyNtBsg/hGLv6DR619ZqoZzNY1eJLEWM=";
   };
 
   build-system = [ setuptools-scm ];

From 1ab5df5a17cfd587de6976d997cea74773c7a4f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:33:24 +0200
Subject: [PATCH 147/310] python3Packages.prettytable: 3.17.0 -> 3.18.0

https://github.com/jazzband/prettytable/releases/tag/3.18.0
---
 pkgs/development/python-modules/prettytable/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index 82b9bd67d84a..93c0ebd32c4c 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "prettytable";
-  version = "3.17.0";
+  version = "3.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "prettytable";
     tag = version;
-    hash = "sha256-MvKa6M2kfD3rUl+kxsD87ieBzmDtahoMQJUNWsofCBc=";
+    hash = "sha256-Wx3mt6b+tg3yz0f6r9NVFduLKWr8GBXXJI99RBc1VO4=";
   };
 
   build-system = [

From eb7bf502a48f76c32ac92b675e18cc2eb510c148 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:33:45 +0200
Subject: [PATCH 148/310] python3Packages.faker: 40.1.2 -> 40.28.1

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

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 7a5549113695..a1b4270087bd 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "faker";
-  version = "40.1.2";
+  version = "40.28.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-t2poFjql8XHSYPwkgnqDSbwdtnL2pmU1no0AlegTXTA=";
+    hash = "sha256-KmP7Uaurh5BjbUAwoJTPlCQEy8zJwojRytcOLj6ezVg=";
   };
 
   build-system = [ setuptools ];

From c39085348aec49e90784bcac419b093b2c8790c6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:40:40 +0200
Subject: [PATCH 149/310] python3Packages.marisa-trie: 1.3.1 -> 1.4.1

https://github.com/pytries/marisa-trie/blob/1.4.1/CHANGES.rst
---
 .../python-modules/marisa-trie/default.nix    |  4 ++--
 .../marisa-trie/unvendor-marisa.patch         | 22 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix
index 4cce1653ace1..8ced31257c98 100644
--- a/pkgs/development/python-modules/marisa-trie/default.nix
+++ b/pkgs/development/python-modules/marisa-trie/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "marisa-trie";
-  version = "1.3.1";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytries";
     repo = "marisa-trie";
     tag = version;
-    hash = "sha256-7T0V5levh9xjWmjJdFix0p8L3lZhfurikSWMI7Hotbs=";
+    hash = "sha256-U3gntlvJ0IaWoK+2V0OQ/XoDLfQsSbrrsSj95VR1m+4=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
index 69c0ee46678b..7c0b42b92c61 100644
--- a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
+++ b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
@@ -1,13 +1,20 @@
 diff --git a/setup.py b/setup.py
-index 133ba37..1026947 100755
+index 3b86748..543f5b8 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -26,19 +26,11 @@ extensions = [
-         "marisa_trie",
+@@ -7,7 +7,7 @@ from setuptools import setup, Extension
+ 
+ MARISA_ROOT_DIR = Path("marisa-trie")
+ MARISA_SOURCE_DIR = MARISA_ROOT_DIR / "lib"
+-MARISA_INCLUDE_DIR = MARISA_ROOT_DIR / "include"
++MARISA_INCLUDE_DIR = Path("@marisa@") / "include"
+ MARISA_FILES = [
+     "marisa/*.cc",
+     "marisa/grimoire.cc",
+@@ -27,19 +27,11 @@ extensions = [
          sources=["src/*.pyx"],
          language="c++",
--        include_dirs=[str(MARISA_INCLUDE_DIR)],
-+        include_dirs=["@marisa@/include"],
+         include_dirs=[str(MARISA_INCLUDE_DIR)],
 +        libraries=["marisa"],
      ),
  ]
@@ -22,5 +29,6 @@ index 133ba37..1026947 100755
 -            },
 -        )
 -    ],
-     ext_modules=cythonize(extensions, language_level="3"),
- )
+     ext_modules=cythonize(
+         extensions,
+         language_level="3",

From f4ef9ca361b4469ce2bc933201158d357ae3bfff Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:41:53 +0200
Subject: [PATCH 150/310] python3Packages.blobfile: 3.1.0 -> 3.2.0

https://github.com/christopher-hesse/blobfile/blob/v3.2.0/CHANGES.md
---
 pkgs/development/python-modules/blobfile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/blobfile/default.nix b/pkgs/development/python-modules/blobfile/default.nix
index 7f8d1f818cca..432df8f753ad 100644
--- a/pkgs/development/python-modules/blobfile/default.nix
+++ b/pkgs/development/python-modules/blobfile/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "blobfile";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: {
     owner = "christopher-hesse";
     repo = "blobfile";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aTHEJ1P+v9IWXPg9LN+KG1TlEVJh0qTl8J41iWpoPWk=";
+    hash = "sha256-6WECMS05upC+M81EtOlEs1K3NKD/z073PqutA/OCMiE=";
   };
 
   build-system = [ setuptools ];

From d5625ae386c04c77843a7324383246440dd25f77 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:43:43 +0200
Subject: [PATCH 151/310] python3Packages.bleach: 6.3.0 -> 6.4.0

https://github.com/mozilla/bleach/blob/v6.4.0/CHANGES
---
 pkgs/development/python-modules/bleach/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 69200ec70f9c..24afb3317fcb 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "bleach";
-  version = "6.3.0";
+  version = "6.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "bleach";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a85gLy0Ix4cWvXY0s3m+ZD+ga7en6bYu1iAA22OaSwk=";
+    hash = "sha256-2HcJIxmH78TIE4q481OZPL5ZempMqka6OChEv+BFctY=";
   };
 
   pythonRelaxDeps = [

From d4d92c3e4e5711f6e6118e97224ba132f3038b1d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:58:28 +0200
Subject: [PATCH 152/310] python3Packages.pint: 0.25.2 -> 0.25.3

https://github.com/hgrecco/pint/blob/0.25.3/CHANGES
---
 pkgs/development/python-modules/pint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index a2c95b8796fe..0b25f06325c7 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "pint";
-  version = "0.25.2";
+  version = "0.25.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hgrecco";
     repo = "pint";
     tag = version;
-    hash = "sha256-Ushg7e920TTW7AYXg5C076Bl/yWPLO+H8I3Ytlc7OKc=";
+    hash = "sha256-l2wbcS2mlamCBXr9KOWmq10WN5pNVH4Iu65UuZ0vQmU=";
   };
 
   build-system = [

From 7dea139c94d013d996031e9c0923015c3bf983b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 02:58:44 +0200
Subject: [PATCH 153/310] python3Packages.pylama: remove setuptools runtime
 requirement

---
 .../python-modules/pylama/default.nix         |  9 ++++----
 .../pylama/setuptools-82-compat.patch         | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/pylama/setuptools-82-compat.patch

diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix
index 907070c7419a..7fa4d11ca3ad 100644
--- a/pkgs/development/python-modules/pylama/default.nix
+++ b/pkgs/development/python-modules/pylama/default.nix
@@ -20,8 +20,7 @@ let
   pylama = buildPythonPackage rec {
     pname = "pylama";
     version = "8.4.1";
-
-    format = "setuptools";
+    pyproject = true;
 
     src = fetchFromGitHub {
       owner = "klen";
@@ -35,16 +34,18 @@ let
         git = "${lib.getBin git}/bin/git";
       })
       ./pytest-9.1-compat.patch
+      ./setuptools-82-compat.patch
     ];
 
-    propagatedBuildInputs = [
+    build-system = [ setuptools_80 ];
+
+    dependencies = [
       eradicate
       mccabe
       mypy
       pycodestyle
       pydocstyle
       pyflakes
-      setuptools_80
       vulture
     ];
 
diff --git a/pkgs/development/python-modules/pylama/setuptools-82-compat.patch b/pkgs/development/python-modules/pylama/setuptools-82-compat.patch
new file mode 100644
index 000000000000..bd007c3c9f31
--- /dev/null
+++ b/pkgs/development/python-modules/pylama/setuptools-82-compat.patch
@@ -0,0 +1,22 @@
+diff --git a/pylama/lint/__init__.py b/pylama/lint/__init__.py
+index c50dee3..c40d492 100644
+--- a/pylama/lint/__init__.py
++++ b/pylama/lint/__init__.py
+@@ -7,7 +7,7 @@ from pathlib import Path
+ from pkgutil import walk_packages
+ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Type
+ 
+-from pkg_resources import iter_entry_points
++from importlib.metadata import entry_points
+ 
+ LINTERS: Dict[str, Type[LinterV2]] = {}
+ 
+@@ -58,7 +58,7 @@ for _, pname, _ in walk_packages([str(Path(__file__).parent)]):  # type: ignore
+         pass
+ 
+ # Import installed linters
+-for entry in iter_entry_points("pylama.linter"):
++for entry in entry_points(group="pylama.linter"):
+     if entry.name not in LINTERS:
+         try:
+             LINTERS[entry.name] = entry.load()

From 3ac558ba01cf4ce0fb01361b9216e0d01c3a0f83 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 03:01:23 +0200
Subject: [PATCH 154/310] python3Packages.versioningit: ignore pytest10
 deprecations

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

diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 9c7ea7bfd6df..f73fcb023444 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -47,6 +47,10 @@ buildPythonPackage rec {
     mercurial
   ];
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   disabledTests = [
     # wants to write to the Nix store
     "test_editable_mode"

From 6dfafd45f14a237e55da72b2b3b3cda69ec0ce11 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 03:18:22 +0200
Subject: [PATCH 155/310] python3Packages.google-api-core: ignore pytest10
 deprecations

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

diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index bac60f66718c..ae883095f202 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -56,6 +56,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   # prevent google directory from shadowing google imports
   preCheck = ''
     rm -r google

From 4c8fd327c8e0259f5c3367c6f4a325f2cde74a72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 03:29:57 +0200
Subject: [PATCH 156/310] python3Packages.moto: 5.1.20 -> 5.2.2

https://github.com/getmoto/moto/blob/5.2.2/CHANGELOG.md
---
 pkgs/development/python-modules/moto/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 88429d2befe8..734f846a2c2f 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -21,6 +21,7 @@
   multipart,
   openapi-spec-validator,
   py-partiql-parser,
+  pyotp,
   pyparsing,
   pytest-order,
   pytest-xdist,
@@ -36,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "5.1.20";
+  version = "5.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getmoto";
     repo = "moto";
     tag = version;
-    hash = "sha256-YYRXGsdAsPk/0U8VTOBBTBs84xjskar1IczWOxoEFLQ=";
+    hash = "sha256-edMV/EDSVxbQfTjl81y4aM490qtt5NnHSFOvO5o015I=";
   };
 
   build-system = [
@@ -303,6 +304,7 @@ buildPythonPackage rec {
     joserfc
     openapi-spec-validator
     py-partiql-parser
+    pyotp
     pyparsing
     pytest-order
     pytest-xdist
@@ -395,6 +397,12 @@ buildPythonPackage rec {
 
     # Requires cfn-lint which is broken on Python 3.14
     "tests/test_cloudformation/test_validate.py"
+
+    #  Unknown parameter in input: "BucketNamespace", must be one of: ACL, Bucket, CreateBucketConfiguration, GrantFullControl, GrantRead, GrantReadACP, GrantWrite, GrantWriteACP, ObjectLockEnabledForBucket, ObjectOwnership
+    "tests/test_s3/test_s3.py::test_create_bucket_account_regional_namespace"
+    "tests/test_s3/test_s3.py::test_create_bucket_account_regional_namespace_other_region"
+    "tests/test_s3/test_s3.py::test_create_bucket_account_regional_namespace_invalid_name"
+    "tests/test_ec2/test_instance_types.py::test_describe_instance_types_gpu_instance_types"
   ];
 
   meta = {

From c3f499a147eb21b87a7539786443e95ed7f00479 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 03:42:32 +0200
Subject: [PATCH 157/310] python3Packages.llvmlite: 0.47.0 -> 0.48.0

https://github.com/numba/llvmlite/blob/v0.48.0/CHANGE_LOG
---
 pkgs/development/python-modules/llvmlite/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index cb855b02e33c..cf6f99de27c4 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -9,7 +9,7 @@
   cmake,
   ninja,
 
-  llvm_20,
+  llvm_22,
   libxml2,
 
   # tests
@@ -19,12 +19,12 @@
 }:
 
 let
-  llvm = llvm_20;
+  llvm = llvm_22;
 in
 
 buildPythonPackage rec {
   pname = "llvmlite";
-  version = "0.47.0";
+  version = "0.48.0";
   pyproject = true;
 
   disabled = isPyPy;
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "numba";
     repo = "llvmlite";
     tag = "v${version}";
-    hash = "sha256-YEIdIdbk19JHYtgL2gWjnAUYu13CH+7ikoyBUkOPpws=";
+    hash = "sha256-qFly3Thx0jkCHy6r8+VWuGROUj910oHBEQFMZlAX1aw=";
   };
 
   build-system = [ setuptools ];

From 78e52eaa11e7e492c35a42199126e85f6d1f39f5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 03:43:37 +0200
Subject: [PATCH 158/310] python3Packages.numba: 0.65.1 -> 0.66.0

https://numba.readthedocs.io/en/stable/release/0.66.0-notes.html
---
 pkgs/development/python-modules/numba/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 7c215cdb4aaf..dbf3255e8e66 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -42,7 +42,7 @@ let
   cudatoolkit = cudaPackages.cuda_nvcc;
 in
 buildPythonPackage (finalAttrs: {
-  version = "0.65.1";
+  version = "0.66.0";
   pname = "numba";
   pyproject = true;
 
@@ -58,7 +58,7 @@ buildPythonPackage (finalAttrs: {
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' $out/numba/_version.py
     '';
-    hash = "sha256-DMmUyTElDFyMK4BUQ4EhDNmG43lOWQHurKbnSyhAs5k=";
+    hash = "sha256-qkljZWvd+1mwPm4okQBW8w0qCTQnEigM6QkZHN2iwyk=";
   };
 
   patches = [

From 7a3a6fbe555fedae50cf3fea3551e3e1a4744bbe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 10:35:09 +0200
Subject: [PATCH 159/310] python3Packages.ibis-framework: disable failing tests

---
 pkgs/development/python-modules/ibis-framework/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index 61c2d9daedea..b71ed3dc476c 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -272,6 +272,13 @@ buildPythonPackage (finalAttrs: {
     "test_signature_from_callable_with_keyword_only_arguments"
   ];
 
+  disabledTestPaths = [
+    # TypeError: pytest.approx() does not support nan_ok for datetime/timedelta comparisons.
+    "ibis/backends/tests/tpc/h/test_queries.py::test_18"
+    "ibis/backends/tests/tpc/h/test_queries.py::test_03"
+    "ibis/backends/tests/tpc/ds/test_queries.py::test_51"
+  ];
+
   # patch out tests that check formatting with black
   postPatch = ''
     find ibis/tests -type f -name '*.py' -exec sed -i \

From a1a9610557bf8c45e47398e19649a0e4d950a71f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 10:50:45 +0200
Subject: [PATCH 160/310] python3Packages.xarray: 2026.04.0 -> 2026.07.0

https://github.com/pydata/xarray/blob/v2026.07.0/doc/whats-new.rst
---
 .../python-modules/xarray/default.nix         | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index d9f1f5464274..0c20185fabe1 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools,
@@ -40,7 +39,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "xarray";
-  version = "2026.04.0";
+  version = "2026.07.0";
   pyproject = true;
   # Needed mainly for pytestFlags with spaces
   __structuredAttrs = true;
@@ -49,25 +48,9 @@ buildPythonPackage (finalAttrs: {
     owner = "pydata";
     repo = "xarray";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BsgL+Xo9fTMLLdz5AfScnKGuBa76cE85LuUzB4ZNLiY=";
+    hash = "sha256-dj6V/HkHRm1kjHlAHUjN7pGCa1ioW11o1fdKUyxI8e0=";
   };
 
-  patches = [
-    # Performance fix
-    (fetchpatch {
-      url = "https://github.com/pydata/xarray/commit/b8bfeca3275045ca82adc3401c38444b1ed12c4a.patch";
-      hash = "sha256-KzN45MqOBPMNEmoG+rb3iwrk/7XFLlTNktQf5uYBWNo=";
-    })
-    # Fix tests with numpy >= 2.5.0
-    (fetchpatch {
-      url = "https://github.com/pydata/xarray/commit/c3a398e856f7fcff1c18bc72bfd1ab9c64d5a2e7.patch";
-      excludes = [
-        "doc/whats-new.rst"
-      ];
-      hash = "sha256-TakZ9RrJHeRksT3oBe7AKyfrjZeZ4oSmbE8axh7EmGg=";
-    })
-  ];
-
   postPatch = ''
     # don't depend on pytest-mypy-plugins
     sed -i "/--mypy-/d" pyproject.toml

From ff01b0ce8f71da3aa0c16e005bf00ef08fc992a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 11:39:28 +0200
Subject: [PATCH 161/310] python3Packages.falcon: 4.2.0 -> 4.3.1

https://falcon.readthedocs.io/en/stable/changes/4.3.1.html
---
 pkgs/development/python-modules/falcon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix
index c6c8ffa7fae0..0470435d9256 100644
--- a/pkgs/development/python-modules/falcon/default.nix
+++ b/pkgs/development/python-modules/falcon/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "falcon";
-  version = "4.2.0";
+  version = "4.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "falconry";
     repo = "falcon";
     tag = version;
-    hash = "sha256-Vi7J607PsjwxAKYNCiVGxSRYIbKHgrGvRX9Ent3+LQo=";
+    hash = "sha256-f+UoGYyrg8OZow4qONqzXuDVnrZalqUNDyavDoQ7QHE=";
   };
 
   build-system = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ];

From 59e265f07671e161bd8ceba7bf7b55b2087ff40b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 12:05:10 +0200
Subject: [PATCH 162/310] python3Packages.mocket: 3.14.2 -> 3.14.3

https://github.com/mindflayer/python-mocket/releases/tag/3.14.3
---
 pkgs/development/python-modules/mocket/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index 4d5373b9457e..a1a3bc5d507d 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -37,12 +37,12 @@
 
 buildPythonPackage rec {
   pname = "mocket";
-  version = "3.14.2";
+  version = "3.14.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-n8SQbK45B+mijEbnc/Otq+8NX0CIxuOQ72FEAhnOCac=";
+    hash = "sha256-lDDPfk8a1/HPxIzgCKv4eq+asnJkFsWBCUROnF6g+wg=";
   };
 
   build-system = [ hatchling ];

From bf61433489836f8146e5c36be985523dcc3c60ba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 13:09:43 +0200
Subject: [PATCH 163/310] python3Packages.pytest-cases: 3.9.1 -> 3.10.1

https://github.com/smarie/python-pytest-cases/releases/tag/3.10.1
---
 .../python-modules/pytest-cases/default.nix   | 10 ++-
 .../pytest-cases/pytest-9.1-compat.patch      | 74 +++++++++++++++++++
 2 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytest-cases/pytest-9.1-compat.patch

diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix
index e5680266e742..b1a0acb72067 100644
--- a/pkgs/development/python-modules/pytest-cases/default.nix
+++ b/pkgs/development/python-modules/pytest-cases/default.nix
@@ -12,15 +12,21 @@
 
 buildPythonPackage rec {
   pname = "pytest-cases";
-  version = "3.9.1";
+  version = "3.10.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pytest_cases";
     inherit version;
-    hash = "sha256-xOGB8bUlyTGjGNSBL6jeZWwsj7d/zPFXHs8Mxf6Of48=";
+    hash = "sha256-RR+ePs1dLYGkNiwQxEESb1s9GuOn769Z9gsfuTDfLWk=";
   };
 
+  patches = [
+    # https://github.com/smarie/python-pytest-cases/issues/385
+    # https://github.com/smarie/python-pytest-cases/pull/386
+    ./pytest-9.1-compat.patch
+  ];
+
   build-system = [
     setuptools_80
     setuptools-scm
diff --git a/pkgs/development/python-modules/pytest-cases/pytest-9.1-compat.patch b/pkgs/development/python-modules/pytest-cases/pytest-9.1-compat.patch
new file mode 100644
index 000000000000..dfc901cd2452
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-cases/pytest-9.1-compat.patch
@@ -0,0 +1,74 @@
+From 37c72c1350899d45bc80e92b4b4168b5f7a7af7c Mon Sep 17 00:00:00 2001
+From: "a.berod" <a.berod@sim-and-cure.com>
+Date: Thu, 9 Jul 2026 10:43:44 +0200
+Subject: [PATCH] Fix compatiblity with pytest 9.1+
+
+---
+ src/pytest_cases/common_pytest.py       | 17 ++++++++++++-----
+ src/pytest_cases/common_pytest_marks.py |  1 +
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/src/pytest_cases/common_pytest.py b/src/pytest_cases/common_pytest.py
+index afad9d39..4a2b6b71 100644
+--- a/src/pytest_cases/common_pytest.py
++++ b/src/pytest_cases/common_pytest.py
+@@ -31,7 +31,7 @@
+ from .common_pytest_marks import make_marked_parameter_value, get_param_argnames_as_list, \
+     get_pytest_parametrize_marks, get_pytest_usefixture_marks, PYTEST3_OR_GREATER, PYTEST6_OR_GREATER, \
+     PYTEST38_OR_GREATER, PYTEST34_OR_GREATER, PYTEST33_OR_GREATER, PYTEST32_OR_GREATER, PYTEST71_OR_GREATER, \
+-    PYTEST8_OR_GREATER, PYTEST84_OR_GREATER
++    PYTEST8_OR_GREATER, PYTEST84_OR_GREATER, PYTEST91_OR_GREATER
+ from .common_pytest_lazy_values import is_lazy_value, is_lazy
+ 
+ 
+@@ -641,7 +641,12 @@ def in_callspec_explicit_args(
+ if PYTEST71_OR_GREATER:
+     from _pytest.python import IdMaker  # noqa
+ 
+-    _idval = IdMaker([], [], None, None, None, None, None)._idval
++    args = [[], [], None, None, None, None, None]
++    if PYTEST91_OR_GREATER:
++        # func_name removed in https://github.com/pytest-dev/pytest/pull/13976
++        del args[-1]
++
++    _idval = IdMaker(*args)._idval
+     _idval_kwargs = dict()
+ else:
+     from _pytest.python import _idval  # noqa
+@@ -738,10 +743,12 @@ def getfuncargnames(function, cls=None):
+ 
+ 
+ class FakeSession(object):
+-    __slots__ = ('_fixturemanager',)
++    __slots__ = ("_fixturemanager", "config", "nodeid")
+ 
+-    def __init__(self):
++    def __init__(self, nodeid):
+         self._fixturemanager = None
++        self.config = None
++        self.nodeid = nodeid
+ 
+ 
+ class MiniFuncDef(object):
+@@ -750,7 +757,7 @@ class MiniFuncDef(object):
+     def __init__(self, nodeid):
+         self.nodeid = nodeid
+         if PYTEST8_OR_GREATER:
+-            self.session = FakeSession()
++            self.session = FakeSession(nodeid=nodeid)
+ 
+ 
+ class MiniMetafunc(Metafunc):
+diff --git a/src/pytest_cases/common_pytest_marks.py b/src/pytest_cases/common_pytest_marks.py
+index 6fa33b32..0c6030df 100644
+--- a/src/pytest_cases/common_pytest_marks.py
++++ b/src/pytest_cases/common_pytest_marks.py
+@@ -47,6 +47,7 @@
+ PYTEST81_OR_GREATER = PYTEST_VERSION >= Version('8.1.0')
+ PYTEST84_OR_GREATER = PYTEST_VERSION >= Version('8.4.0')
+ PYTEST9_OR_GREATER = PYTEST_VERSION >= Version('9.0.0')
++PYTEST91_OR_GREATER = PYTEST_VERSION >= Version('9.1.0')
+ 
+ 
+ def get_param_argnames_as_list(argnames):
+

From 4db081fc198958981943dba024b1541ff9bfe757 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 14:31:36 +0200
Subject: [PATCH 164/310] Revert "python3Packages.invoke: 2.2.1 -> 3.0.3"

This reverts commit 17c5975cd61257373860b24f0a13c7384d922908.

Breaks fabric, which requires invoke<3.
---
 pkgs/development/python-modules/invoke/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix
index 78e5f7156356..77f77a7e47ad 100644
--- a/pkgs/development/python-modules/invoke/default.nix
+++ b/pkgs/development/python-modules/invoke/default.nix
@@ -3,28 +3,23 @@
   bash,
   buildPythonPackage,
   fetchPypi,
-  setuptools,
   stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "invoke";
-  version = "3.0.3";
-  pyproject = true;
+  version = "2.2.1";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Q3tqYiIjgkOAv7TmT2EnEaa2SMeV9WXvyGJa9m+1fww=";
+    hash = "sha256-UVv0m0pIkyt5sCRZA0jaIvOcSULf+ZGtH7i4uuob5wc=";
   };
 
   postPatch = ''
     sed -e 's|/bin/bash|${bash}/bin/bash|g' -i invoke/config.py
   '';
 
-  build-system = [
-    setuptools
-  ];
-
   # errors with vendored libs
   doCheck = false;
 

From f255048fffccbcfa754e29490367bbdc7390adcb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 15:31:04 +0200
Subject: [PATCH 165/310] python3Packages.smp: relax cbor2 constraint

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

diff --git a/pkgs/development/python-modules/smp/default.nix b/pkgs/development/python-modules/smp/default.nix
index 548e087ab316..9f4e65e45917 100644
--- a/pkgs/development/python-modules/smp/default.nix
+++ b/pkgs/development/python-modules/smp/default.nix
@@ -7,6 +7,7 @@
   crcmod,
   eval-type-backport,
   pydantic,
+  pyprojectVersionPatchHook,
   pytestCheckHook,
 }:
 
@@ -22,10 +23,9 @@ buildPythonPackage rec {
     hash = "sha256-RjecTnMYNcJeD7wqq4FkwRvEgTn5V/RwMfOjf2dqQ+U=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail 'version = "0"' 'version = "${version}"'
-  '';
+  nativeBuildInputs = [
+    pyprojectVersionPatchHook
+  ];
 
   build-system = [
     poetry-core
@@ -38,6 +38,10 @@ buildPythonPackage rec {
     pydantic
   ];
 
+  pythonRelaxDeps = [
+    "cbor2"
+  ];
+
   nativeCheckInputs = [
     pytestCheckHook
   ];

From fd69fdf179df81543f2f0489f427bb964de3852b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 16:05:36 +0200
Subject: [PATCH 166/310] python3Packages.httpx2: ignore chardet encoding
 string mismatches

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

diff --git a/pkgs/development/python-modules/httpx2/default.nix b/pkgs/development/python-modules/httpx2/default.nix
index ab73647f11f2..33ae69aa41fc 100644
--- a/pkgs/development/python-modules/httpx2/default.nix
+++ b/pkgs/development/python-modules/httpx2/default.nix
@@ -105,6 +105,10 @@ buildPythonPackage (finalAttrs: {
     # uvicorn access logging mismatch
     "test_logging_request"
     "test_logging_redirect_chain"
+    # chardet shenanigans (Windows-1252 == WINDOWS-1252 cmp)
+    "test_client_decode_text_using_autodetect"
+    "test_client_decode_text_using_explicit_encoding"
+    "test_response_decode_text_using_autodetect"
   ];
 
   passthru.tests = {

From 27e116834fb8c141d0d1de7997b611e2ea32ae65 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 16:05:51 +0200
Subject: [PATCH 167/310] python3Packages.twine: ignore docutils 0.23 string
 changes

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

diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index 6082e3384240..777fd563ffc3 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -55,6 +55,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # docutils 0.23 string changes
+    "test_fails_rst_syntax_error"
+  ];
+
   pythonImportsCheck = [ "twine" ];
 
   meta = {

From fdff3b6d4d87a46d52d1a6c3c0eef5c12db7e1a6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 16:41:02 +0200
Subject: [PATCH 168/310] celery: ignore click 8.4 error message string changes

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

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index ad10bfb612cd..0f6863e1fd00 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -197,6 +197,9 @@ buildPythonPackage (finalAttrs: {
 
     # Flaky: Unclosed temporary file handle under heavy load (as in nixpkgs-review)
     "test_check_privileges_without_c_force_root_and_no_group_entry"
+
+    # click 8.4 error message flag quoting changes
+    "test_preload_options"
   ]
   ++ lib.optionals (lib.versionAtLeast django.version "6.0") [
     "test_is_pickled"

From f2c768861007e2b17839f6e89073b726b5297223 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 16:55:59 +0200
Subject: [PATCH 169/310] paperless-ngx: relax bleach & tqdm constraints

---
 pkgs/by-name/pa/paperless-ngx/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 93fb9c165ce2..c926b86282bf 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -109,6 +109,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
   ];
 
   pythonRelaxDeps = [
+    "bleach"
     "celery"
     "django-allauth"
     "django-auditlog"
@@ -119,6 +120,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
     "redis"
     "scikit-learn"
     "tika-client"
+    "tqdm"
     # requested by maintainer
     "imap-tools"
     "ocrmypdf"

From e1a93c635e02c2cb4573ba305564cb3b56e9798b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 20:01:29 +0200
Subject: [PATCH 170/310] python3Packages.paste: mark broken with
 setuptools>=82

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

diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
index 1759412e5cb6..98ccf15cbd62 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -45,6 +45,7 @@ buildPythonPackage rec {
   pythonNamespaces = [ "paste" ];
 
   meta = {
+    broken = lib.versionAtLeast setuptools.version "82"; # pkg_resources at runtime
     description = "Tools for using a Web Server Gateway Interface stack";
     homepage = "https://pythonpaste.readthedocs.io/";
     changelog = "https://github.com/pasteorg/paste/blob/${version}/docs/news.txt";

From 97ee6f39d2c65ed3169f36601ad94c7b340e6aa1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 20:05:27 +0200
Subject: [PATCH 171/310] python3Packages.lazr-delegate: broken with
 setuptools>=82

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

diff --git a/pkgs/development/python-modules/lazr-delegates/default.nix b/pkgs/development/python-modules/lazr-delegates/default.nix
index a2a922b8ddf2..f24362b36539 100644
--- a/pkgs/development/python-modules/lazr-delegates/default.nix
+++ b/pkgs/development/python-modules/lazr-delegates/default.nix
@@ -29,6 +29,7 @@ buildPythonPackage rec {
   pythonNamespaces = [ "lazr" ];
 
   meta = {
+    broken = lib.versionAtLeast setuptools.version "82"; # pkg_resources at runtime
     description = "Easily write objects that delegate behavior";
     homepage = "https://launchpad.net/lazr.delegates";
     changelog = "https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=${version}";

From 1aeafa7c2ac533fff65c1acc761cdc85920a3761 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:04:13 +0200
Subject: [PATCH 172/310] python3Packages.hf-xet: 1.4.3 -> 1.5.1

https://github.com/huggingface/xet-core/releases/tag/v1.5.1
---
 pkgs/development/python-modules/hf-xet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/hf-xet/default.nix b/pkgs/development/python-modules/hf-xet/default.nix
index 3f56fcdab488..4acf4f83d090 100644
--- a/pkgs/development/python-modules/hf-xet/default.nix
+++ b/pkgs/development/python-modules/hf-xet/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "hf-xet";
-  version = "1.4.3";
+  version = "1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "xet-core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zAliMR2d2j6ynHQmAljQ8XgDyjuPxNawI1bZks5aRgs=";
+    hash = "sha256-TqSErydAOaHzCN7qglO/aqMF8BWYXvEv09adhxTwny0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/hf_xet";
@@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-TOgBT0l7TvJamVdIAdAUFRWs8AMRRY+Ydoh6e+3dEp0=";
+    hash = "sha256-pwHUIkx+Dk8fGOVxRJKLswLjQB+sKzpyOOeqV6+Xyxo=";
   };
 
   nativeBuildInputs = [

From 18a55b8b13448feb8610adbb83157af673d4b686 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:04:39 +0200
Subject: [PATCH 173/310] python3Packages.huggingface-hub: 1.10.2 -> 1.23.0

https://github.com/huggingface/huggingface_hub/releases/tag/v1.23.0
---
 .../huggingface-hub/default.nix               | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 0d9992fe679c..57948a00daf2 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -7,6 +7,7 @@
   setuptools,
 
   # dependencies
+  click,
   filelock,
   fsspec,
   hf-xet,
@@ -14,7 +15,6 @@
   packaging,
   pyyaml,
   tqdm,
-  typer,
   typing-extensions,
 
   # optional-dependencies
@@ -28,6 +28,10 @@
   # gradio
   gradio,
   requests,
+  # oauth
+  authlib,
+  fastapi,
+  itsdangerous,
   # mcp
   mcp,
 
@@ -37,19 +41,20 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "huggingface-hub";
-  version = "1.10.2";
+  version = "1.23.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "huggingface_hub";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q9N0QnxV8oJcxUsJzv4wX8Z6FkNdEfUH5BEVoZolsRY=";
+    hash = "sha256-Xl9girALcJw7aeLjFd4d/xITS8bTz9xlmziEQwrOdQ0=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
+    click
     filelock
     fsspec
     hf-xet
@@ -57,7 +62,6 @@ buildPythonPackage (finalAttrs: {
     packaging
     pyyaml
     tqdm
-    typer
     typing-extensions
   ];
 
@@ -65,11 +69,6 @@ buildPythonPackage (finalAttrs: {
     all = [
 
     ];
-    torch = [
-      torch
-      safetensors
-    ]
-    ++ safetensors.optional-dependencies.torch;
     fastai = [
       toml
       fastai
@@ -85,6 +84,17 @@ buildPythonPackage (finalAttrs: {
     mcp = [
       mcp
     ];
+    oauth = [
+      authlib
+      fastapi
+      httpx
+      itsdangerous
+    ];
+    torch = [
+      torch
+      safetensors
+    ]
+    ++ safetensors.optional-dependencies.torch;
   };
 
   nativeCheckInputs = [

From 31280770c23ff95c1422ba3ebdd9514d9745fb18 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:33:17 +0200
Subject: [PATCH 174/310] python3Packages.hypothesis-jsonschema: init at 0.23.1

New dependency for datamodel-code-generator.
---
 .../hypothesis-jsonschema/default.nix         | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/hypothesis-jsonschema/default.nix

diff --git a/pkgs/development/python-modules/hypothesis-jsonschema/default.nix b/pkgs/development/python-modules/hypothesis-jsonschema/default.nix
new file mode 100644
index 000000000000..e57b566a2874
--- /dev/null
+++ b/pkgs/development/python-modules/hypothesis-jsonschema/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  hypothesis,
+  jsonschema,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "hypothesis-jsonschema";
+  version = "0.23.1";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  # no git tags
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-9KwDICQ0KkFJoQJTmE9aVza4Kz/ir7CIjzg0oxFT8hU=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    hypothesis
+    jsonschema
+  ];
+
+  doCheck = false; # sdist does not include everything to run the tests
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "hypothesis_jsonschema"
+  ];
+
+  meta = {
+    description = "Generate test data from JSON schemata with Hypothesis";
+    homepage = "https://github.com/Zac-HD/hypothesis-jsonschema";
+    license = lib.licenses.mpl20;
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6faae9d6334f..a52056a0ad0b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7800,6 +7800,8 @@ self: super: with self; {
 
   hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { };
 
+  hypothesis-jsonschema = callPackage ../development/python-modules/hypothesis-jsonschema { };
+
   hypothesis_6_136 = callPackage ../development/python-modules/hypothesis/hypothesis_6_136.nix { };
 
   hypothesmith = callPackage ../development/python-modules/hypothesmith { };

From e5ffb383ad62b16419e03087f472955737905964 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:17:44 +0200
Subject: [PATCH 175/310] python3Packages.datamodel-code-generator: 0.55.0 ->
 0.68.1

https://github.com/koxudaxi/datamodel-code-generator/releases/tag/0.68.1
---
 .../datamodel-code-generator/default.nix      | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/datamodel-code-generator/default.nix b/pkgs/development/python-modules/datamodel-code-generator/default.nix
index 03a7611f9453..f7d11b92ee19 100644
--- a/pkgs/development/python-modules/datamodel-code-generator/default.nix
+++ b/pkgs/development/python-modules/datamodel-code-generator/default.nix
@@ -3,15 +3,21 @@
   argcomplete,
   black,
   buildPythonPackage,
+  email-validator,
   fetchFromGitHub,
   genson,
   graphql-core,
+  grpcio-tools,
   hatch-vcs,
   hatchling,
   httpx,
+  hypothesis,
+  hypothesis-jsonschema,
   inflect,
   inline-snapshot,
   isort,
+  jsonschema,
+  msgspec,
   jinja2,
   openapi-spec-validator,
   packaging,
@@ -20,6 +26,8 @@
   pydantic,
   pysnooper,
   pytest-mock,
+  pytest-timeout,
+  pytest-xdist,
   pytestCheckHook,
   pyyaml,
   time-machine,
@@ -28,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "datamodel-code-generator";
-  version = "0.55.0";
+  version = "0.68.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "koxudaxi";
     repo = "datamodel-code-generator";
     tag = version;
-    hash = "sha256-zsLJv7gKhmnEIS/AUvnBzm+07QFQoMdiFo/PkfRyHek=";
+    hash = "sha256-fYnI7S4FJ927qZXyAsWQzxhLTrcpscYqJunmcSt/gkk=";
   };
 
   pythonRelaxDeps = [
@@ -65,6 +73,7 @@ buildPythonPackage rec {
     debug = [ pysnooper ];
     graphql = [ graphql-core ];
     http = [ httpx ];
+    protobuf = [ grpcio-tools ];
     ruff = [ ruff ];
     validation = [
       openapi-spec-validator
@@ -76,20 +85,31 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    email-validator
     inline-snapshot
+    hypothesis
+    hypothesis-jsonschema
+    jsonschema
+    msgspec
     pytest-mock
+    pytest-timeout
+    pytest-xdist
     pytestCheckHook
     time-machine
   ]
   ++ optional-dependencies.all;
 
-  pythonImportsCheck = [ "datamodel_code_generator" ];
+  pytestFlags = [
+    "--maxfail=2"
+  ];
 
   disabledTests = [
     # remote testing, name resolution failure.
     "test_openapi_parser_parse_remote_ref"
   ];
 
+  pythonImportsCheck = [ "datamodel_code_generator" ];
+
   meta = {
     description = "Pydantic model and dataclasses.dataclass generator for easy conversion of JSON, OpenAPI, JSON Schema, and YAML data sources";
     homepage = "https://github.com/koxudaxi/datamodel-code-generator";

From 05a5c121eb86fc4ae9451696de22d48d02bb7040 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:23:38 +0200
Subject: [PATCH 176/310] python3Packages.openapi-core: ignore starlette &
 pytest deprecations

---
 pkgs/development/python-modules/openapi-core/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix
index 81fb76e51861..81b42d959021 100644
--- a/pkgs/development/python-modules/openapi-core/default.nix
+++ b/pkgs/development/python-modules/openapi-core/default.nix
@@ -85,6 +85,12 @@ buildPythonPackage rec {
   ]
   ++ lib.concatAttrValues optional-dependencies;
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+    # Using `httpx` with `starlette.testclient` is deprecated; install `httpx2` instead.
+    "-Wignore::starlette.exceptions.StarletteDeprecationWarning"
+  ];
+
   disabledTestPaths = [
     # Requires secrets and additional configuration
     "tests/integration/contrib/django/"

From 8634347d566ab94ad9b233351b94cdd425fcd3ac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:33:01 +0200
Subject: [PATCH 177/310] python3Packages.quart: disable failing test

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

diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix
index f74a5c1f7d00..13c862261919 100644
--- a/pkgs/development/python-modules/quart/default.nix
+++ b/pkgs/development/python-modules/quart/default.nix
@@ -67,6 +67,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # click 8.4 compat
+    "test_cli_blueprints"
+  ];
+
   meta = {
     description = "Async Python micro framework for building web applications";
     mainProgram = "quart";

From 062e14e2f9b1f544a0d7355394553670c31cebfc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:48:29 +0200
Subject: [PATCH 178/310] python3Packages.cwsandbox: provide pytest-dotenv for
 tests

Pytest 9.1 fails hard when there are unhandled settings in its config.
---
 pkgs/development/python-modules/cwsandbox/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/cwsandbox/default.nix b/pkgs/development/python-modules/cwsandbox/default.nix
index 33f1ddd727c6..cfba92ff6376 100644
--- a/pkgs/development/python-modules/cwsandbox/default.nix
+++ b/pkgs/development/python-modules/cwsandbox/default.nix
@@ -16,6 +16,7 @@
 
   # tests
   pytest-asyncio,
+  pytest-dotenv,
   pytestCheckHook,
 }:
 
@@ -55,6 +56,7 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-dotenv
     pytestCheckHook
   ]
   ++ finalAttrs.passthru.optional-dependencies.cli;

From 129b1367f805d10dd2ea3412fbbbf83ab1b0e653 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:51:24 +0200
Subject: [PATCH 179/310] python3Packages.pip-tools: fix build with pip 26

---
 .../python-modules/pip-tools/default.nix           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 7f9c214dfaab..9c9a0f765e46 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -5,8 +5,10 @@
   build,
   click,
   fetchFromGitHub,
+  fetchpatch,
   pip,
   pyproject-hooks,
+  pytest-mock,
   pytest-xdist,
   pytestCheckHook,
   setuptools,
@@ -29,6 +31,17 @@ buildPythonPackage rec {
 
   patches = [
     ./fix-setup-py-bad-syntax-detection.patch
+
+    (fetchpatch {
+      name = "pip-26-compat.patch";
+      url = "https://github.com/jazzband/pip-tools/commit/cbe3c692f8977270e7ae6061c8159450a73c13fe.patch";
+      excludes = [
+        "changelog.d/2379.feature.md"
+        "pyproject.toml"
+        "tox.ini"
+      ];
+      hash = "sha256-wDma1FBnWnrRln0o7HaizMIkoQey6VdQzGh+q84cHxE=";
+    })
   ];
 
   build-system = [ setuptools-scm ];
@@ -45,6 +58,7 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   nativeCheckInputs = [
+    pytest-mock
     pytest-xdist
     pytestCheckHook
     tomli-w

From 3bae8e878b55fa2b26617a4afc57f0c78479f983 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:55:19 +0200
Subject: [PATCH 180/310] python3Packages.pytest-examples: ignore pytest 10
 deprecations

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

diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix
index 39e4fd28a34c..54ab8c681969 100644
--- a/pkgs/development/python-modules/pytest-examples/default.nix
+++ b/pkgs/development/python-modules/pytest-examples/default.nix
@@ -44,6 +44,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pytest_examples" ];
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   disabledTests = [
     # Fails with AssertionError because formatting is different than expected
     "test_black_error"

From f280d9d1cd90e588ede85eae5ea9be58f0fbb2d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:58:06 +0200
Subject: [PATCH 181/310] Revert "python3Packages.aiosqlite: 0.21.0 -> 0.22.1"

This reverts commit bdfeff3f48a9f295ec4db3cea2b537436dbb4043.

Breaking API changes that affect at least zigpy.
---
 pkgs/development/python-modules/aiosqlite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix
index 87c1002e89e8..4ca47d5e8a3a 100644
--- a/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/pkgs/development/python-modules/aiosqlite/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "aiosqlite";
-  version = "0.22.1";
+  version = "0.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "aiosqlite";
     tag = "v${version}";
-    hash = "sha256-voOOFo1OwaRQ3JsDHlBrngP+8ajf0kTNKXJyOaJiTs4=";
+    hash = "sha256-3l/uR97WuLlkAEdogL9iYoXp89bsAcpH6XEtMELsX9o=";
   };
 
   build-system = [ flit-core ];

From 1617865302943ef73c235e465b6f13501c1a07e6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Jul 2026 23:59:36 +0200
Subject: [PATCH 182/310] python3Packages.urllib3-future: 2.22.900 -> 2.22.901

https://github.com/jawah/urllib3.future/blob/2.22.901/CHANGES.rst
---
 pkgs/development/python-modules/urllib3-future/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix
index 5d2b1ff95696..7e4c88772925 100644
--- a/pkgs/development/python-modules/urllib3-future/default.nix
+++ b/pkgs/development/python-modules/urllib3-future/default.nix
@@ -77,6 +77,10 @@ buildPythonPackage rec {
   ]
   ++ lib.concatAttrValues optional-dependencies;
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   disabledTestPaths = [
     # test connects to the internet
     "test/contrib/test_resolver.py::test_url_resolver"

From f8046a76401eb145544647e25c3fc03ef36e69f5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:09:03 +0200
Subject: [PATCH 183/310] python3Packages.jupyter-server: 2.17.0 -> 2.20.0

https://github.com/jupyter-server/jupyter_server/blob/v2.20.0/CHANGELOG.md
---
 pkgs/development/python-modules/jupyter-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix
index f041ec23b306..df50cfdf82f9 100644
--- a/pkgs/development/python-modules/jupyter-server/default.nix
+++ b/pkgs/development/python-modules/jupyter-server/default.nix
@@ -34,13 +34,13 @@
 
 buildPythonPackage rec {
   pname = "jupyter-server";
-  version = "2.17.0";
+  version = "2.20.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "jupyter_server";
     inherit version;
-    hash = "sha256-w46omFZpZMiItHcq4e1Y7KhFkuiCUdLPxNFx+B9+mdU=";
+    hash = "sha256-tXeLozfYAVo9wrgIA+zdWsGNN5f932GlDqX7RytOvhQ=";
   };
 
   build-system = [

From b724b726edbd4c3f2f4d51aa8375ce7c8f9cd235 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:17:05 +0200
Subject: [PATCH 184/310] borgbackup: backport msgspec 1.2.1 support

---
 pkgs/by-name/bo/borgbackup/package.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index 9300650bace2..7cb332bdd5c8 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -4,6 +4,7 @@
   acl,
   e2fsprogs,
   fetchFromGitHub,
+  fetchpatch,
   libb2,
   lz4,
   openssh,
@@ -32,6 +33,26 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     hash = "sha256-pMZr9cVr84b948b5Iuevpy6AtMeYo/Ma8uFLuagAYy4=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "msgspec-1.2.0-compat.patch";
+      url = "https://github.com/borgbackup/borg/commit/364438f58c86aebd157b55bd2202afaf5945e008.patch";
+      excludes = [ "docs/changes.rst" ];
+      hash = "sha256-YhZDD6i2cn7p00Dgmpqi8uGJzFZzixMZmHPcZroB1sE=";
+    })
+    (fetchpatch {
+      name = "msgspec-1.2.1-compat.patch";
+      url = "https://github.com/borgbackup/borg/commit/8abdd3b8bf065dceecd52d2b22d92b3c407a7c1d.patch";
+      excludes = [ "docs/changes.rst" ];
+      hash = "sha256-bvSRxEzNvejG6PQFkeNDuQB7Zd4/EYPEZkrgjpgQ9Ss=";
+    })
+    (fetchpatch {
+      name = "msgspec-1.2.1-unpacker-compat.patch";
+      url = "https://github.com/borgbackup/borg/commit/b09bbed3de095d6ac9d69a42a486ec18523046dc.patch";
+      hash = "sha256-F8CIqOcQOLdYn7srsev2op0pgkgt8zdkc5DQUH1c6xg=";
+    })
+  ];
+
   postPatch = ''
     # sandbox does not support setuid/setgid/sticky bits
     substituteInPlace src/borg/testsuite/archiver.py \

From 414804f09cc668f9ff912058a32e33260221c25d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:19:27 +0200
Subject: [PATCH 185/310] python3Packages.stopit: broken with setuptools 82

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

diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix
index 23e27c951bb2..f019bd83caa6 100644
--- a/pkgs/development/python-modules/stopit/default.nix
+++ b/pkgs/development/python-modules/stopit/default.nix
@@ -26,6 +26,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "stopit" ];
 
   meta = {
+    broken = lib.versionAtLeast setuptools.version "82";
     description = "Raise asynchronous exceptions in other thread, control the timeout of blocks or callables with a context manager or a decorator";
     homepage = "https://github.com/glenfant/stopit";
     license = with lib.licenses; [ mit ];

From fea45e5e9d50cda5ea874706b0e961c5adb064e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:23:32 +0200
Subject: [PATCH 186/310] python3Packages.pontos: fix version metadata

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

diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 0f500c2091ab..2c944266c78e 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -8,6 +8,7 @@
   lxml,
   packaging,
   poetry-core,
+  pyprojectVersionPatchHook,
   pytestCheckHook,
   python-dateutil,
   semver,
@@ -28,6 +29,8 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-NKe5kM4YPxsGge1UG7DjE3SDXlfZIVazOVmF5RBCbSo=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ poetry-core ];
 
   dependencies = [

From 8be19173ac8bdeb36a8a0ed59b98f5a93e26822d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:27:25 +0200
Subject: [PATCH 187/310] python3Packages.pyemd: 1.0.0 -> 2.0.0

https://github.com/wmayner/pyemd/releases/tag/2.0.0
---
 pkgs/development/python-modules/pyemd/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index 4ac6e9155541..7958bc874723 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -6,6 +6,7 @@
   numpy,
   oldest-supported-numpy,
   packaging,
+  pot,
   pytestCheckHook,
   setuptools-scm,
   setuptools,
@@ -13,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pyemd";
-  version = "1.0.0";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4=";
+    hash = "sha256-FZaflENcK+mOajakkwfINm49/BpnASrMMG6SyQtQP+U=";
   };
 
   build-system = [
@@ -33,7 +34,10 @@ buildPythonPackage rec {
     packaging
   ];
 
-  dependencies = [ numpy ];
+  dependencies = [
+    numpy
+    pot
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 913358ad67d918e06420da8a4a02dfa56924bd5a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:31:56 +0200
Subject: [PATCH 188/310] python3Packages.pytest_9_0: init at 9.0.3

For packages lagging behind on updating pytest.
---
 .../development/python-modules/pytest/9_0.nix | 104 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   4 +
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest/9_0.nix

diff --git a/pkgs/development/python-modules/pytest/9_0.nix b/pkgs/development/python-modules/pytest/9_0.nix
new file mode 100644
index 000000000000..c86b2b419237
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/9_0.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  buildPythonPackage,
+  callPackage,
+  fetchPypi,
+  writeText,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
+  attrs,
+  iniconfig,
+  packaging,
+  pluggy,
+
+  # optional-dependencies
+  argcomplete,
+  hypothesis,
+  mock,
+  pygments,
+  requests,
+  xmlschema,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest";
+  version = "9.0.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-uGraUIr4HRnt6yE8aBsdSCRsGpHTBMbIGkJ2dMF+uRw=";
+  };
+
+  outputs = [
+    "out"
+    "testout"
+  ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    iniconfig
+    packaging
+    pluggy
+    pygments
+  ];
+
+  optional-dependencies = {
+    testing = [
+      argcomplete
+      attrs
+      hypothesis
+      mock
+      requests
+      setuptools
+      xmlschema
+    ];
+  };
+
+  postInstall = ''
+    mkdir $testout
+    cp -R testing $testout/testing
+  '';
+
+  doCheck = false;
+  passthru.tests.pytest = callPackage ./tests.nix { };
+
+  # Remove .pytest_cache when using py.test in a Nix build
+  setupHook = writeText "pytest-hook" ''
+    pytestcachePhase() {
+        find $out -name .pytest_cache -type d -exec rm -rf {} +
+    }
+    appendToVar preDistPhases pytestcachePhase
+
+    # pytest generates it's own bytecode files to improve assertion messages.
+    # These files similar to cpython's bytecode files but are never laoded
+    # by python interpreter directly. We remove them for a few reasons:
+    # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292
+    #   (file headers are generatedt by pytest directly and contain timestamps)
+    # - files are not needed after tests are finished
+    pytestRemoveBytecodePhase () {
+        # suffix is defined at:
+        #    https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53
+        find $out -name "*-pytest-*.py[co]" -delete
+    }
+    appendToVar preDistPhases pytestRemoveBytecodePhase
+  '';
+
+  pythonImportsCheck = [ "pytest" ];
+
+  meta = {
+    description = "Framework for writing tests";
+    homepage = "https://docs.pytest.org";
+    changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";
+    teams = [ lib.teams.python ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a52056a0ad0b..d27d3a058254 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16326,10 +16326,14 @@ self: super: with self; {
 
   pytest8_3CheckHook = pytestCheckHook.override { pytest = pytest_8_3; };
 
+  pytest9_0CheckHook = pytestCheckHook.override { pytest = pytest_9_0; };
+
   pytest_7 = callPackage ../development/python-modules/pytest/7.nix { };
 
   pytest_8_3 = callPackage ../development/python-modules/pytest/8_3.nix { };
 
+  pytest_9_0 = callPackage ../development/python-modules/pytest/9_0.nix { };
+
   pytestcache = callPackage ../development/python-modules/pytestcache { };
 
   pythinkingcleaner = callPackage ../development/python-modules/pythinkingcleaner { };

From 1d9a30906e93ace4ee0773ca76e089b93dec1f4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:37:17 +0200
Subject: [PATCH 189/310] borgbackup: pin to pytest 9.0.x

Something goes wrong in the output capturing which causes logging tests
to fail.
---
 pkgs/by-name/bo/borgbackup/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index 7cb332bdd5c8..53e46ade8c4b 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -124,7 +124,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     py
     pytest-benchmark
     pytest-xdist
-    pytestCheckHook
+    pytest9_0CheckHook
     versionCheckHook
   ];
 

From 9fb21b00b3007f731895c538efeaaa19ca5c0182 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:39:26 +0200
Subject: [PATCH 190/310] python3Packages.gcsfs: 2026.3.0 -> 2026.7.0

https://github.com/fsspec/gcsfs/raw/2026.7.0/docs/source/changelog.rst
---
 pkgs/development/python-modules/gcsfs/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix
index 1a81e2556ec7..f7ce82f07d13 100644
--- a/pkgs/development/python-modules/gcsfs/default.nix
+++ b/pkgs/development/python-modules/gcsfs/default.nix
@@ -4,7 +4,8 @@
   fetchFromGitHub,
 
   # build-system
-  setuptools,
+  hatchling,
+  hatch-vcs,
 
   # dependencies
   aiohttp,
@@ -23,7 +24,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gcsfs";
-  version = "2026.3.0";
+  version = "2026.7.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -31,11 +32,12 @@ buildPythonPackage (finalAttrs: {
     owner = "fsspec";
     repo = "gcsfs";
     tag = finalAttrs.version;
-    hash = "sha256-RLh3xFW/0qX5labJeUDsRRmQtnTdkvBS+gzJUJ1IP7k=";
+    hash = "sha256-Q+aqlFyNiGj0alOrnyjV9ILSSv6jRp+2DjDF/+f65po=";
   };
 
   build-system = [
-    setuptools
+    hatchling
+    hatch-vcs
   ];
 
   dependencies = [

From 087259bf03fb9e18cf13e08d9a73c7465784f0d7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:43:47 +0200
Subject: [PATCH 191/310] python3Packages.python-can: relax wrapt constraint

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

diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix
index 2d862212805b..210f66365d91 100644
--- a/pkgs/development/python-modules/python-can/default.nix
+++ b/pkgs/development/python-modules/python-can/default.nix
@@ -42,6 +42,8 @@ buildPythonPackage rec {
     wrapt
   ];
 
+  pythonRelaxDeps = [ "wrapt" ];
+
   optional-dependencies = {
     serial = [ pyserial ];
     seeedstudio = [ pyserial ];

From bdf0a1733efec52c63fbe6cbf460c2810d0533d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:49:13 +0200
Subject: [PATCH 192/310] python3Packages.matrix-nio: fix tests

---
 pkgs/development/python-modules/matrix-nio/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index 75385ef5f24f..7ca6a5b9fe3a 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -60,6 +60,13 @@ buildPythonPackage rec {
     ./allow-tests-without-olm.patch
   ];
 
+  postPatch = ''
+    # Fix yarl compat about url normalization
+    substituteInPlace tests/async_client_test.py \
+      --replace-fail "?&" "?"
+
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -115,6 +122,9 @@ buildPythonPackage rec {
     "test_connect_wrapper"
     # time dependent and flaky
     "test_transfer_monitor_callbacks"
+    # _plain_data_generator yields str but test expectes bytes
+    "test_upload_retry"
+    "test_upload_text_file_object"
   ]
   ++ lib.optionals (!withOlm) [
     "test_client_account_sharing"

From 29a84673106f847e3c4ea01aeecc9c242142cf12 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 00:51:35 +0200
Subject: [PATCH 193/310] python3Packages.astropy-healpix: ignore pytest 10
 deprecations

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

diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix
index 261309e70c68..82131eb28075 100644
--- a/pkgs/development/python-modules/astropy-healpix/default.nix
+++ b/pkgs/development/python-modules/astropy-healpix/default.nix
@@ -42,6 +42,10 @@ buildPythonPackage (finalAttrs: {
     hypothesis
   ];
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   disabledTests = lib.optional (!stdenv.hostPlatform.isDarwin) "test_interpolate_bilinear_skycoord";
 
   # tests must be run in the build directory

From a1004378f33a1d0b07ca285e0e01cc52580747d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 01:01:39 +0200
Subject: [PATCH 194/310] python3Packages.versionfinder: disable failing test

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

diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix
index 8d9a8d15036e..195489553504 100644
--- a/pkgs/development/python-modules/versionfinder/default.nix
+++ b/pkgs/development/python-modules/versionfinder/default.nix
@@ -43,6 +43,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Tests are out-dated
     "TestFindPipInfo"
+    # Looks for pkg_resources … good luck, bro
+    "test_find_pkg_info"
   ];
 
   pythonImportsCheck = [ "versionfinder" ];

From e3cc9a21bed67f78d80a6c444ab5b832a6d9d2c7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 01:19:31 +0200
Subject: [PATCH 195/310] python3Packages.pytest-cram: kill

No updates for 6 years and no support for recent pytest versions as a
pytest plugin.
---
 .../python-modules/pytest-cram/default.nix    | 51 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest-cram/default.nix

diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix
deleted file mode 100644
index 674566e2301e..000000000000
--- a/pkgs/development/python-modules/pytest-cram/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  pythonAtLeast,
-  setuptools,
-  pytest_7,
-  cram,
-  bash,
-}:
-
-buildPythonPackage rec {
-  pname = "pytest-cram";
-  version = "0.2.2";
-  pyproject = true;
-
-  # relies on the imp module
-  disabled = pythonAtLeast "3.12";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0405ymmrsv6ii2qhq35nxfjkb402sdb6d13xnk53jql3ybgmiqq0";
-    extension = "tar.gz";
-  };
-
-  postPatch = ''
-    substituteInPlace pytest_cram/tests/test_options.py \
-      --replace "/bin/bash" "${bash}/bin/bash"
-  '';
-
-  build-system = [ setuptools ];
-
-  dependencies = [ cram ];
-
-  # https://github.com/tbekolay/pytest-cram/issues/15
-  nativeCheckInputs = [ pytest_7 ];
-
-  # Remove __init__.py from tests folder, otherwise pytest raises an error that
-  # the imported and collected modules are different.
-  checkPhase = ''
-    rm pytest_cram/tests/__init__.py
-    pytest pytest_cram/ --ignore=pytest_cram/tests/test_examples.py
-  '';
-
-  meta = {
-    description = "Test command-line applications with pytest and cram";
-    homepage = "https://github.com/tbekolay/pytest-cram";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ jluttine ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 331272ada82b..64a5f7b50f98 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -516,6 +516,7 @@ mapAliases {
   pysuez = throw "'pysuez' has been renamed to/replaced by 'pysuezv2'"; # Converted to throw 2025-10-29
   pytado = throw "'pytado' has been renamed to/replaced by 'python-tado'"; # Converted to throw 2025-10-29
   pytedee-async = aiotedee; # added 2025-07-06
+  pytest-cram = throw "'pytest-cram' was removed becaused it was unmaintained"; # added 2026-07-14
   pytest-kafka = throw "'pytest-kafka' was removed because it is no longer used"; # added 2026-06-17
   pytest-pep8 = throw "'pytest-pep8' has been renamed to/replaced by 'pytestpep8'"; # Converted to throw 2025-10-29
   pytest-subtests = throw "'pytest-subtests' has been integrated into pytest 9."; # Added 2026-01-21
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d27d3a058254..ccd8dd0347f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16062,8 +16062,6 @@ self: super: with self; {
 
   pytest-cov-stub = callPackage ../development/python-modules/pytest-cov-stub { };
 
-  pytest-cram = callPackage ../development/python-modules/pytest-cram { };
-
   pytest-datadir = callPackage ../development/python-modules/pytest-datadir { };
 
   pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { };

From daa95195dd68c8f34a50ceb106b4bf3ad0c8fcd6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 01:39:57 +0200
Subject: [PATCH 196/310] python3Packages.weasel: provide click

Previously provided through typer, but they vendored click as _click.
---
 pkgs/development/python-modules/weasel/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix
index 196a3982cf64..af8cc175d8ee 100644
--- a/pkgs/development/python-modules/weasel/default.nix
+++ b/pkgs/development/python-modules/weasel/default.nix
@@ -7,6 +7,7 @@
   setuptools,
 
   # dependencies
+  click,
   cloudpathlib,
   confection,
   httpx,
@@ -38,6 +39,7 @@ buildPythonPackage (finalAttrs: {
   build-system = [ setuptools ];
 
   dependencies = [
+    click
     cloudpathlib
     confection
     httpx

From 2f27e7cf49b55a78412225ed845270d49b3393ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 01:41:01 +0200
Subject: [PATCH 197/310] python3Packages.mcp: ignore pytest 10 deprecations

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

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index 0ddad0e922cf..3b3d2d662f35 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -109,6 +109,10 @@ buildPythonPackage (finalAttrs: {
   ]
   ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   disabledTests = [
     # attempts to run the package manager uv
     "test_command_execution"

From c59b05508fd90f47d74f53edef1216226201c3bf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 01:41:12 +0200
Subject: [PATCH 198/310] python3Packages.cross-web: ignore starlette httpx2
 warning

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

diff --git a/pkgs/development/python-modules/cross-web/default.nix b/pkgs/development/python-modules/cross-web/default.nix
index 8d69ff5d6211..86e7981a9d8e 100644
--- a/pkgs/development/python-modules/cross-web/default.nix
+++ b/pkgs/development/python-modules/cross-web/default.nix
@@ -70,6 +70,11 @@ buildPythonPackage (finalAttrs: {
   ]
   ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
+  pytestFlags = [
+    # Using `httpx` with `starlette.testclient` is deprecated; install `httpx2` instead.
+    "-Wignore::starlette.exceptions.StarletteDeprecationWarning"
+  ];
+
   pythonImportsCheck = [ "cross_web" ];
 
   preCheck = ''

From 4a69532a6a99d934edbd3b014c8b49aca5de60f2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 01:45:31 +0200
Subject: [PATCH 199/310] 
 home-assistant.python3Packages.pytest-homeassistant-custom-component: fix
 syrupy compat

---
 .../pytest-homeassistant-custom-component.nix |  4 ++++
 .../home-assistant/syrupy-5.5-compat.patch    | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/syrupy-5.5-compat.patch

diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index 7cc26ca6ebbe..f12a44dae422 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -31,6 +31,10 @@ buildPythonPackage rec {
     hash = "sha256-GUUz6gbhmIgZCH9y3oEmf1Y+Gp2yUf8zvxM//uGvsNw=";
   };
 
+  patches = [
+    ./syrupy-5.5-compat.patch
+  ];
+
   build-system = [ setuptools ];
 
   pythonRemoveDeps = true;
diff --git a/pkgs/servers/home-assistant/syrupy-5.5-compat.patch b/pkgs/servers/home-assistant/syrupy-5.5-compat.patch
new file mode 100644
index 000000000000..6daa3478612b
--- /dev/null
+++ b/pkgs/servers/home-assistant/syrupy-5.5-compat.patch
@@ -0,0 +1,22 @@
+diff --git a/src/pytest_homeassistant_custom_component/syrupy.py b/src/pytest_homeassistant_custom_component/syrupy.py
+index 2eadcd3..2f90ab6 100644
+--- a/src/pytest_homeassistant_custom_component/syrupy.py
++++ b/src/pytest_homeassistant_custom_component/syrupy.py
+@@ -22,7 +22,7 @@ from syrupy.location import PyTestLocation
+ from syrupy.report import SnapshotReport
+ from syrupy.session import ItemStatus, SnapshotSession
+ from syrupy.types import PropertyFilter, PropertyMatcher, PropertyPath, SerializableData
+-from syrupy.utils import is_xdist_controller, is_xdist_worker
++from syrupy.utils import is_xdist_worker
+ import voluptuous as vol
+ import voluptuous_serialize
+ 
+@@ -410,8 +410,6 @@ def override_syrupy_finish(self: SnapshotSession) -> int:
+                 indent=2,
+             )
+         return exitstatus
+-    if is_xdist_controller():
+-        return exitstatus
+ 
+     if needs_xdist_merge:
+         worker_count = None

From 260901e23f85d91d563582773627ab01e474f6c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 01:47:06 +0200
Subject: [PATCH 200/310] python3Packages.asyncclick: ignore pytest 10
 deprecations

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

diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix
index 823c921260ab..81a172bcfaf1 100644
--- a/pkgs/development/python-modules/asyncclick/default.nix
+++ b/pkgs/development/python-modules/asyncclick/default.nix
@@ -31,6 +31,7 @@ buildPythonPackage rec {
 
   pytestFlags = [
     "-Wignore::trio.TrioDeprecationWarning"
+    "-Wignore::pytest.PytestRemovedIn10Warning"
   ];
 
   disabledTests = [

From 3099bd3f2268b30002649d7e423bdc7409906963 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 01:51:50 +0200
Subject: [PATCH 201/310] python3Packages.gwcs: add pytest-doctestplus to test
 deps

> ERROR: Unknown config option: doctest_plus
---
 pkgs/development/python-modules/gwcs/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix
index 7053149a64d5..d808f4bdd6bc 100644
--- a/pkgs/development/python-modules/gwcs/default.nix
+++ b/pkgs/development/python-modules/gwcs/default.nix
@@ -7,6 +7,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   numpy,
+  pytest-doctestplus,
   pytestCheckHook,
   scipy,
   setuptools-scm,
@@ -43,7 +44,10 @@ buildPythonPackage (finalAttrs: {
     scipy
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-doctestplus
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "gwcs" ];
 

From 032cfaf859126e03b4ed4f5a0a317f7d092eb110 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 01:55:24 +0200
Subject: [PATCH 202/310] python3Packges.fritzconnection: pin to pytest 9.0.x

> __________ ERROR collecting fritzconnection/tests/test_core_utils.py ___________
> Duplicate parametrization IDs detected, but strict_parametrization_ids is set.
>
> Test name:      fritzconnection/tests/test_core_utils.py::test_get_boolean_from_string
> Parameters:     value, expected_result
> Parameter sets: ['true', True], ['false', False], ['wahr', None], ['falsch', None], ['None', None], [42, None], ['', None], [None, None]
> IDs:            true-True, false-False, wahr-None, falsch-None, None-None, 42-None, -None, None-None
> Duplicates:     None-None
>
> You can fix this problem using `@pytest.mark.parametrize(..., ids=...)` or `pytest.param(..., id=...)`.
---
 pkgs/development/python-modules/fritzconnection/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix
index 1de0d06e5db5..6b57efacea8f 100644
--- a/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/pkgs/development/python-modules/fritzconnection/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
+  pytest9_0CheckHook,
   requests,
   segno,
   setuptools,
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
   };
 
   nativeCheckInputs = [
-    pytestCheckHook
+    pytest9_0CheckHook
     writableTmpDirAsHomeHook
   ];
 

From 183931a1cf10eabd1acc1fb604f9c7902496c60e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 02:05:46 +0200
Subject: [PATCH 203/310] python3Packages.alphaessopenapi: fix pname

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

diff --git a/pkgs/development/python-modules/alphaessopenapi/default.nix b/pkgs/development/python-modules/alphaessopenapi/default.nix
index 4cb1eef1aaf0..4eae01bd254f 100644
--- a/pkgs/development/python-modules/alphaessopenapi/default.nix
+++ b/pkgs/development/python-modules/alphaessopenapi/default.nix
@@ -7,7 +7,7 @@
   voluptuous,
 }:
 buildPythonPackage rec {
-  pname = "alphaess";
+  pname = "alphaessopenapi";
   version = "0.0.19";
   pyproject = true;
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     owner = "CharlesGillanders";
     repo = "alphaess-openAPI";
     tag = version;
-    sha256 = "sha256-wdwA1MIQrkZCT4zIf8WXyq0+F+peC/auVtjDJ8ZZyxE=";
+    hash = "sha256-wdwA1MIQrkZCT4zIf8WXyq0+F+peC/auVtjDJ8ZZyxE=";
   };
 
   build-system = [ setuptools ];

From f72db6bf6880383ad6238edf051672ea58acffda Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 02:07:13 +0200
Subject: [PATCH 204/310] python3Packages.frigidaire: fix version metadat

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

diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix
index 2df2d92984ed..e13f30f8f3d8 100644
--- a/pkgs/development/python-modules/frigidaire/default.nix
+++ b/pkgs/development/python-modules/frigidaire/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace-warn 'version = "SNAPSHOT"' 'version = "${finalAttrs.version}"'
+      --replace-fail 'version = "0.0.0-dev"' 'version = "${finalAttrs.version}"'
   '';
 
   nativeBuildInputs = [ setuptools ];

From 5c915e98e1e6fc1bfea50a647b9af13b2214924f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 02:09:26 +0200
Subject: [PATCH 205/310] python3Packages.airgradient: fix version metadata

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

diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix
index e54989874a6b..c671ac7aeedd 100644
--- a/pkgs/development/python-modules/airgradient/default.nix
+++ b/pkgs/development/python-modules/airgradient/default.nix
@@ -7,6 +7,7 @@
   mashumaro,
   orjson,
   poetry-core,
+  pyprojectVersionPatchHook,
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
@@ -26,6 +27,8 @@ buildPythonPackage rec {
     hash = "sha256-llhdLqVueATKCb4wyPYjnsdOpbbE2BnUU0PH0jwHPMU=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ poetry-core ];
 
   dependencies = [

From 6305d59f7c3451f32e477e41116b4df752f95670 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 02:11:07 +0200
Subject: [PATCH 206/310] python3Packages.freenub: relax cbor2 constraint

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

diff --git a/pkgs/development/python-modules/freenub/default.nix b/pkgs/development/python-modules/freenub/default.nix
index f138d0a7fade..ee075de2559b 100644
--- a/pkgs/development/python-modules/freenub/default.nix
+++ b/pkgs/development/python-modules/freenub/default.nix
@@ -35,6 +35,8 @@ buildPythonPackage rec {
     requests
   ];
 
+  pythonRelaxDeps = [ "cbor2" ];
+
   nativeCheckInputs = [
     busypie
     pytest-asyncio

From 0fef0ae6d52b66f5a109be1d58a2fb59539274ca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 02:13:07 +0200
Subject: [PATCH 207/310] python3Packages.aioazuredevops: fix failing test

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

diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix
index 0d3afa5d7746..9d04daf635c5 100644
--- a/pkgs/development/python-modules/aioazuredevops/default.nix
+++ b/pkgs/development/python-modules/aioazuredevops/default.nix
@@ -63,6 +63,8 @@ buildPythonPackage rec {
     "test_get_project"
     "test_get_builds"
     "test_get_build"
+    # something about aiohttp and url mocking, maybe yarl
+    "test_get_work_items"
   ];
 
   disabledTestPaths = [

From 3c9cf640351334a78feff96ac7acb4397091f11d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 02:14:47 +0200
Subject: [PATCH 208/310] Revert "python3Packages.azure-eventhub: 5.15.0 ->
 39.0.0"

This reverts commit fca4953a32752bc9997c48b2dc25ebaaa18a3590.

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

diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix
index 16b464e25073..0d3b8456d40b 100644
--- a/pkgs/development/python-modules/azure-eventhub/default.nix
+++ b/pkgs/development/python-modules/azure-eventhub/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "azure-eventhub";
-  version = "39.0.0";
+  version = "5.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-sdk-for-python";
-    tag = "azure-mgmt-containerservice_${version}";
-    hash = "sha256-zufXc8LR4STHi/jjV0bcLsifcHIif2m+3Q/KZlsSkRw=";
+    tag = "azure-eventhub_${version}";
+    hash = "sha256-zpj1DUeFCXgVw44LcBCYtuFcQtA9BnrDKAxKSYzu4ts=";
   };
 
   sourceRoot = "${src.name}/sdk/eventhub/azure-eventhub";

From f3758ad44b505c81e0265fe407dab92029e29d5d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 02:18:20 +0200
Subject: [PATCH 209/310] python3Packages.python-backoff: ignore pytest 10
 deprecations

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

diff --git a/pkgs/development/python-modules/python-backoff/default.nix b/pkgs/development/python-modules/python-backoff/default.nix
index 32b863d24f68..810c0e03fe3f 100644
--- a/pkgs/development/python-modules/python-backoff/default.nix
+++ b/pkgs/development/python-modules/python-backoff/default.nix
@@ -32,6 +32,10 @@ buildPythonPackage (finalAttrs: {
     responses
   ];
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   meta = {
     changelog = "https://github.com/python-backoff/backoff/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "Python library providing function decorators for configurable backoff and retry";

From 5e287811bcd7491bac89aa1e0245a9937289d0e1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 02:19:50 +0200
Subject: [PATCH 210/310] python3Packages.dio-chacon-wifi-api: fix version
 metadata

---
 .../development/python-modules/dio-chacon-wifi-api/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix b/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
index 37d8838ecb18..754e73f08d45 100644
--- a/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
+++ b/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pyprojectVersionPatchHook,
 
   # build-system
   poetry-core,
@@ -27,6 +28,8 @@ buildPythonPackage rec {
     hash = "sha256-c91xCrlNpCutZZYO6y0pOaqPCF4exbr7xVxfsf5LI0Q=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ poetry-core ];
 
   dependencies = [ aiohttp ];

From e355d4f5c8c8d27161d5d4fb7f3597bacfbfe136 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 02:21:01 +0200
Subject: [PATCH 211/310] python3Packages.pydeako: pin to pytest 9.0.x

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

diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix
index 8b8f632e0b7c..cde338ad4377 100644
--- a/pkgs/development/python-modules/pydeako/default.nix
+++ b/pkgs/development/python-modules/pydeako/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   mock,
   pytest-asyncio,
-  pytestCheckHook,
+  pytest9_0CheckHook,
   setuptools,
   zeroconf,
 }:
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytest-asyncio
-    pytestCheckHook
+    pytest9_0CheckHook
   ];
 
   pythonImportsCheck = [ "pydeako" ];

From e6891530cb0c06c3364f6f04878d67a829f6925f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 11:03:08 +0200
Subject: [PATCH 212/310] python3Packages.strawberry-graphql: fix version
 metadata

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

diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index 0b6a166da5bb..3bb60345bee4 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -23,6 +23,7 @@
   pydantic,
   pygments,
   pyinstrument,
+  pyprojectVersionPatchHook,
   pytest-aiohttp,
   pytest-asyncio,
   pytest-django,
@@ -62,6 +63,8 @@ buildPythonPackage (finalAttrs: {
       --replace-fail "--emoji" ""
   '';
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ uv-build ];
 
   dependencies = [

From 99577502f3f112766e12652082a3bf7eda6b0119 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 11:19:57 +0200
Subject: [PATCH 213/310] python3Packages.caldav: pin to pytest 9.0.x

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

diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix
index 057a14eb3a5f..72e464c69ee0 100644
--- a/pkgs/development/python-modules/caldav/default.nix
+++ b/pkgs/development/python-modules/caldav/default.nix
@@ -7,7 +7,7 @@
   icalendar-searcher,
   lxml,
   manuel,
-  pytestCheckHook,
+  pytest9_0CheckHook,
   python,
   radicale,
   recurring-ical-events,
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     proxy-py
     pyfakefs
     pytest-asyncio
-    pytestCheckHook
+    pytest9_0CheckHook
     (toPythonModule (radicale.override { python3 = python; }))
     tzlocal
     vobject

From d0df1312b705af7b9336ac986ddd83bcfbab61cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 11:28:12 +0200
Subject: [PATCH 214/310] python3Packages.pylint: 4.0.6 ->
 4.0.6-unstable-2026-07-14

Fast-forward for compat with newer astroid.
---
 pkgs/development/python-modules/pylint/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 94d97162dbb4..3b652e44ba07 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylint";
-  version = "4.0.6";
+  version = "4.0.6-unstable-2026-07-14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pylint-dev";
     repo = "pylint";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-vg33n+MHCQTYeiMYmKJ7wORLx7Z/wv4t8v3u7k1keh4=";
+    rev = "5f7e4013c004324f11eac6f310d932f505272e28";
+    hash = "sha256-fdOA/ofrEMfzlbVbN6f5LE9nGC7QlggBU/SKW70iaC8=";
   };
 
   build-system = [ setuptools ];
@@ -101,7 +101,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Bug and style checker for Python";
     homepage = "https://pylint.readthedocs.io/en/stable/";
-    changelog = "https://github.com/pylint-dev/pylint/releases/tag/${finalAttrs.src.tag}";
+    # changelog = "https://github.com/pylint-dev/pylint/releases/tag/${finalAttrs.src.tag}";
     longDescription = ''
       Pylint is a Python static code analysis tool which looks for programming errors,
       helps enforcing a coding standard, sniffs for code smells and offers simple

From 82fcdfd0ed14f2c7dba379876692bb5b59caccac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 12:32:36 +0200
Subject: [PATCH 215/310] python3Packages.strawberry-graphql-django: rename
 from strawberry-django

---
 pkgs/by-name/ne/netbox_4_4/package.nix                        | 2 +-
 pkgs/by-name/ne/netbox_4_5/package.nix                        | 2 +-
 .../default.nix                                               | 2 +-
 pkgs/development/rocm-modules/release-attrPaths.json          | 2 +-
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 4 ++--
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename pkgs/development/python-modules/{strawberry-django => strawberry-graphql-django}/default.nix (98%)

diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix
index d96ed7cb01d3..8ee3b56beb30 100644
--- a/pkgs/by-name/ne/netbox_4_4/package.nix
+++ b/pkgs/by-name/ne/netbox_4_4/package.nix
@@ -66,7 +66,7 @@ py.pkgs.buildPythonApplication rec {
         social-auth-app-django
         sorl-thumbnail
         strawberry-graphql
-        strawberry-django
+        strawberry-graphql-django
         svgwrite
         tablib
 
diff --git a/pkgs/by-name/ne/netbox_4_5/package.nix b/pkgs/by-name/ne/netbox_4_5/package.nix
index 879603c19e6a..a5d7a52cf350 100644
--- a/pkgs/by-name/ne/netbox_4_5/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/package.nix
@@ -73,7 +73,7 @@ py.pkgs.buildPythonApplication rec {
         social-auth-app-django
         sorl-thumbnail
         strawberry-graphql
-        strawberry-django
+        strawberry-graphql-django
         svgwrite
         tablib
 
diff --git a/pkgs/development/python-modules/strawberry-django/default.nix b/pkgs/development/python-modules/strawberry-graphql-django/default.nix
similarity index 98%
rename from pkgs/development/python-modules/strawberry-django/default.nix
rename to pkgs/development/python-modules/strawberry-graphql-django/default.nix
index 15fd5d2b9313..04a0776e3108 100644
--- a/pkgs/development/python-modules/strawberry-django/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql-django/default.nix
@@ -33,7 +33,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "strawberry-django";
+  pname = "strawberry-graphql-django";
   version = "0.86.0";
   pyproject = true;
 
diff --git a/pkgs/development/rocm-modules/release-attrPaths.json b/pkgs/development/rocm-modules/release-attrPaths.json
index e57aa6df25b8..f86ebf24603d 100644
--- a/pkgs/development/rocm-modules/release-attrPaths.json
+++ b/pkgs/development/rocm-modules/release-attrPaths.json
@@ -519,7 +519,7 @@
     "python3Packages.stable-baselines3",
     "python3Packages.stanza",
     "python3Packages.staticvectors",
-    "python3Packages.strawberry-django",
+    "python3Packages.strawberry-graphql-django",
     "python3Packages.strawberry-graphql",
     "python3Packages.stytra",
     "python3Packages.syne-tune",
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 64a5f7b50f98..b104bfdb571b 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -632,6 +632,7 @@ mapAliases {
   sqlalchemy-views = throw "'sqlalchemy-views' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-09
   sqlalchemy_migrate = throw "'sqlalchemy_migrate' has been renamed to/replaced by 'sqlalchemy-migrate'"; # Converted to throw 2025-10-29
   steamship = throw "'steamship' has been removed because it is broken and unmaintained upstream"; # Added 2026-05-06
+  strawberry-django = strawberry-graphql-django; # Added 2026-07-14
   subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   subunit = python-subunit; # added 2026-06-21
   supafunc = throw "'supafunc' has been replaced by 'supabase-functions'"; # Added 2026-03-08
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ccd8dd0347f2..8de0ece622aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19575,10 +19575,10 @@ self: super: with self; {
 
   stravaweblib = callPackage ../development/python-modules/stravaweblib { };
 
-  strawberry-django = callPackage ../development/python-modules/strawberry-django { };
-
   strawberry-graphql = callPackage ../development/python-modules/strawberry-graphql { };
 
+  strawberry-graphql-django = callPackage ../development/python-modules/strawberry-graphql-django { };
+
   strct = callPackage ../development/python-modules/strct { };
 
   streamcontroller-plugin-tools =

From b1e4cc5d5db90e80a578bab3aee3f3dcbe80588f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 12:36:14 +0200
Subject: [PATCH 216/310] python3Packages.strawberry-graphql-django: fix
 version metadata

---
 .../python-modules/strawberry-graphql-django/default.nix     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/strawberry-graphql-django/default.nix b/pkgs/development/python-modules/strawberry-graphql-django/default.nix
index 04a0776e3108..54a467314af6 100644
--- a/pkgs/development/python-modules/strawberry-graphql-django/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql-django/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pyprojectVersionPatchHook,
 
   # build-system
   hatchling,
@@ -49,6 +50,10 @@ buildPythonPackage rec {
     echo 'STATIC_URL = "static/"' >> tests/django_settings.py
   '';
 
+  nativeBuildInputs = [
+    pyprojectVersionPatchHook
+  ];
+
   build-system = [
     hatchling
   ];

From 96e85f3113638eeafc0c103af7122736641432e1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 12:55:51 +0200
Subject: [PATCH 217/310] dmarc-metrics-exporter: unpin python312

---
 .../dm/dmarc-metrics-exporter/package.nix        | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
index fa9419037b81..feda0b20daeb 100644
--- a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
+++ b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
@@ -1,16 +1,11 @@
 {
   lib,
   stdenv,
-  python312,
+  python3Packages,
   fetchFromGitHub,
 }:
 
-let
-  # more-itertools unsupported on 3.13
-  python3 = python312;
-in
-
-python3.pkgs.buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "dmarc-metrics-exporter";
   version = "1.3.1";
 
@@ -25,15 +20,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   pythonRelaxDeps = true;
 
-  build-system = with python3.pkgs; [
+  build-system = with python3Packages; [
     poetry-core
   ];
 
   dependencies =
-    with python3.pkgs;
+    with python3Packages;
     [
       bite-parser
-      dataclasses-serialization
       prometheus-client
       pydantic
       structlog
@@ -42,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     ]
     ++ uvicorn.optional-dependencies.standard;
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     aiohttp
     pytest-asyncio
     pytestCheckHook

From 0084934a15fcf90d0636694d37484e7d374c8595 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 12:58:03 +0200
Subject: [PATCH 218/310] python3Packages.dataclasses-serialization: drop

Unmaintained upstream and broken for Python 3.13 and higher.
---
 .../dataclasses-serialization/default.nix     | 64 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 pkgs/development/python-modules/dataclasses-serialization/default.nix

diff --git a/pkgs/development/python-modules/dataclasses-serialization/default.nix b/pkgs/development/python-modules/dataclasses-serialization/default.nix
deleted file mode 100644
index f9b05df532cd..000000000000
--- a/pkgs/development/python-modules/dataclasses-serialization/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  more-properties,
-  typing-inspect,
-  toolz,
-  toposort,
-  bson,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "dataclasses-serialization";
-  version = "1.3.1";
-
-  # upstream requires >= 3.6 but only 3.7 includes dataclasses
-
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "madman-bob";
-    repo = "python-dataclasses-serialization";
-    rev = version;
-    hash = "sha256-jLMR2D01KgzHHRP0zduMBJt8xgBmIquWLCjZYLo2/AA=";
-  };
-
-  postPatch = ''
-    mv pypi_upload/setup.py .
-    substituteInPlace setup.py \
-      --replace "project_root = Path(__file__).parents[1]" "project_root = Path(__file__).parents[0]"
-
-    # https://github.com/madman-bob/python-dataclasses-serialization/issues/16
-    sed -i '/(\(Dict\|List\)/d' tests/test_json.py tests/test_bson.py
-  '';
-
-  # dataclasses is included in Python 3.7
-  pythonRemoveDeps = [ "dataclasses" ];
-
-  propagatedBuildInputs = [
-    more-properties
-    typing-inspect
-    toolz
-    toposort
-  ];
-
-  nativeCheckInputs = [
-    bson
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [
-    "dataclasses_serialization.bson"
-    "dataclasses_serialization.json"
-    "dataclasses_serialization.serializer_base"
-  ];
-
-  meta = {
-    description = "Serialize/deserialize Python dataclasses to various other data formats";
-    homepage = "https://github.com/madman-bob/python-dataclasses-serialization";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b104bfdb571b..1f2b9e6118a0 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -161,6 +161,7 @@ mapAliases {
   cx_oracle = throw "'cx_oracle' has been renamed to/replaced by 'cx-oracle'"; # Converted to throw 2025-10-29
   dalle-mini = throw "'dalle-mini' has been removed due to lack of upstream maintenance"; # added 2026-02-26
   dask-yarn = throw "'dask-yarn' has been removed due to lack of upstream maintenance"; # added 2026-07-06
+  dataclasses-serialization = throw "'dataclasses-serialization' has been removed due to lack of upstream maintenance."; # added 2026-07-14
   datashape = throw "'datashape' has been removed as it was unmaintained upstream"; # Added 2026-03-22
   datatable = throw "'datatable' has been removed due to lack of upstream maintenance"; # added 2026-02-02
   dateutil = throw "'dateutil' has been renamed to/replaced by 'python-dateutil'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8de0ece622aa..a053ce0b73c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3993,8 +3993,6 @@ self: super: with self; {
 
   dataclasses-json = callPackage ../development/python-modules/dataclasses-json { };
 
-  dataclasses-serialization = callPackage ../development/python-modules/dataclasses-serialization { };
-
   dataconf = callPackage ../development/python-modules/dataconf { };
 
   datadiff = callPackage ../development/python-modules/datadiff { };

From ac60a9e360e1ef36610be446ae7b529666ca6ed9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 13:02:50 +0200
Subject: [PATCH 219/310] python3Packages.more-properties: drop

Unmaintained upstream and leaf in nixpkgs.
---
 .../more-properties/default.nix               | 51 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/development/python-modules/more-properties/default.nix

diff --git a/pkgs/development/python-modules/more-properties/default.nix b/pkgs/development/python-modules/more-properties/default.nix
deleted file mode 100644
index 0a62ed9c4ac2..000000000000
--- a/pkgs/development/python-modules/more-properties/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  pythonAtLeast,
-  fetchFromGitHub,
-  setuptools,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "more-properties";
-  version = "1.1.1";
-  pyproject = true;
-
-  # All tests are failing with:
-  # AssertionError: None != 'The type of the None singleton.'
-  disabled = pythonAtLeast "3.13";
-
-  src = fetchFromGitHub {
-    owner = "madman-bob";
-    repo = "python-more-properties";
-    tag = version;
-    hash = "sha256-dKG97rw5IG19m7u3ZDBM2yGScL5cFaKBvGZxPVJaUTE=";
-  };
-
-  postPatch = ''
-    mv pypi_upload/setup.py .
-    substituteInPlace setup.py \
-      --replace-fail "project_root = Path(__file__).parents[1]" "project_root = Path(__file__).parents[0]"
-  '';
-
-  build-system = [
-    setuptools
-  ];
-
-  pythonRemoveDeps = [
-    # dataclasses is included in Python since 3.7
-    "dataclasses"
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pythonImportsCheck = [ "more_properties" ];
-
-  meta = {
-    description = "Collection of property variants";
-    homepage = "https://github.com/madman-bob/python-more-properties";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 1f2b9e6118a0..b31b710d2c97 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -387,6 +387,7 @@ mapAliases {
   modeled = "'modeled' has been removed because it is unmaintained"; # Added 2026-01-19
   monarchmoney = throw "'monarchmoney' has been renamed to/replaced by 'monarchmoneycommunity'"; # Added 2026-03-05
   monkeytype = throw "'monkeytype' has been removed as it was unmaintained upstream"; # Added 2026-04-19
+  more-properties = "'more-properties' has been removed to due lack of upstream maintenance"; # Added 2026-07-14
   moretools = "'moretools' has been removed because it is unmaintained"; # Added 2026-01-19
   mpd2 = warnAlias "'mpd2' has been renamed to 'python-mpd2'"; # Added 2026-06-14
   mpire = throw "'mpire' has been removed because it is unused in Nixpkgs"; # Added 2026-06-22
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a053ce0b73c6..4b8eec12df33 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10794,8 +10794,6 @@ self: super: with self; {
 
   more-itertools = callPackage ../development/python-modules/more-itertools { };
 
-  more-properties = callPackage ../development/python-modules/more-properties { };
-
   morecantile = callPackage ../development/python-modules/morecantile { };
 
   moreorless = callPackage ../development/python-modules/moreorless { };

From 4fcd1ced689344ab207c0c3781b37b91f3aed850 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 13:30:06 +0200
Subject: [PATCH 220/310] diffoscope: fix version metadata for overridden tlsh

---
 pkgs/by-name/di/diffoscope/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index ae45896fed38..f2f8bfe99483 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -98,6 +98,11 @@ let
             tag = version;
             hash = "sha256-ZYEjT/yShfA4+zpbGOtaFOx1nSSOWPtMvskPhHv3c9U=";
           };
+
+          postPatch = ''
+            substituteInPlace py_ext/setup.py \
+              --replace-fail "0.2.0" "${version}"
+          '';
         }
       );
     };

From 8716c6e323a7972cd8a0867b4b3140038d204e72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 13:55:16 +0200
Subject: [PATCH 221/310] python3Packages.fava: relax simplejson constraint

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

diff --git a/pkgs/development/python-modules/fava/default.nix b/pkgs/development/python-modules/fava/default.nix
index ee8579128317..2d26a16dc772 100644
--- a/pkgs/development/python-modules/fava/default.nix
+++ b/pkgs/development/python-modules/fava/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   buildNpmPackage,
-  fetchpatch2,
   fetchFromGitHub,
   stdenv,
   babel,
@@ -84,6 +83,8 @@ buildPythonPackage {
     watchfiles
   ];
 
+  pythonRelaxDeps = [ "simplejson" ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "fava" ];

From c93170424643f6c955b888f9f0dcb23b7d611590 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 13:57:59 +0200
Subject: [PATCH 222/310] python3Packages.cloup: relax setuptools-scm
 constraint

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

diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix
index 3c932709ae66..da7da13f6665 100644
--- a/pkgs/development/python-modules/cloup/default.nix
+++ b/pkgs/development/python-modules/cloup/default.nix
@@ -17,6 +17,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-Y3weYo/pjz8gpeRNpZGnK0K/VNfUUnGQvzntX2SvdYU=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "setuptools_scm<10" setuptools_scm
+  '';
+
   build-system = [ setuptools-scm ];
 
   dependencies = [ click ];

From eb947795077579a1ccd1a1560d7826a90f145302 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 13:58:12 +0200
Subject: [PATCH 223/310] python3Packages.pydantic-monty: ignore pytes 10
 deprecations

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

diff --git a/pkgs/development/python-modules/pydantic-monty/default.nix b/pkgs/development/python-modules/pydantic-monty/default.nix
index e4fc0a102225..2a1278e72f22 100644
--- a/pkgs/development/python-modules/pydantic-monty/default.nix
+++ b/pkgs/development/python-modules/pydantic-monty/default.nix
@@ -47,6 +47,7 @@ buildPythonPackage (finalAttrs: {
   pytestFlags = [
     "--config-file"
     "crates/monty-python/pyproject.toml"
+    "-Wignore::pytest.PytestRemovedIn10Warning"
   ];
 
   disabledTests = [

From 945270e826dba842f7c9a1a302750eb9808787a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 14:09:07 +0200
Subject: [PATCH 224/310] python3Packages.rpy2-robjects: pin to pytest 9.0.x

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

diff --git a/pkgs/development/python-modules/rpy2-robjects/default.nix b/pkgs/development/python-modules/rpy2-robjects/default.nix
index 637a76b82a5e..b8800e813e97 100644
--- a/pkgs/development/python-modules/rpy2-robjects/default.nix
+++ b/pkgs/development/python-modules/rpy2-robjects/default.nix
@@ -12,7 +12,7 @@
   pandas,
   setuptools,
   tzlocal,
-  pytestCheckHook,
+  pytest9_0CheckHook,
 }:
 
 buildPythonPackage rec {
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     tzlocal
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytest9_0CheckHook ];
 
   pytestFlags = [
     # https://github.com/rpy2/rpy2/issues/1218

From 6ac2df8f6e5524c908759f85a1fe8ef7baf1157a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 14:17:02 +0200
Subject: [PATCH 225/310] remarshal_0_17: relax cbor2 constraint

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

diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix
index 1520b75fa0dc..a4109bad5238 100644
--- a/pkgs/by-name/re/remarshal_0_17/package.nix
+++ b/pkgs/by-name/re/remarshal_0_17/package.nix
@@ -59,6 +59,8 @@ pythonPackages.buildPythonApplication (finalAttrs: {
     u-msgpack-python
   ];
 
+  pythonRelaxDeps = [ "cbor2" ];
+
   nativeCheckInputs = [ pythonPackages.pytestCheckHook ];
 
   # nixpkgs-update: no auto update

From 5c10f4aa2718a1d4e81b566d17032c5a5abb6533 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 14:17:33 +0200
Subject: [PATCH 226/310] python3Packages.starlark: init at 0.5.0

New dependency for remarshal.
---
 .../python-modules/starlark/default.nix       | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/starlark/default.nix

diff --git a/pkgs/development/python-modules/starlark/default.nix b/pkgs/development/python-modules/starlark/default.nix
new file mode 100644
index 000000000000..3762afeb60a8
--- /dev/null
+++ b/pkgs/development/python-modules/starlark/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  hypothesis,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "starlark";
+  version = "0.5.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "dbohdan";
+    repo = "starlark-python";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-J3QgztBmoJBJ8VGl+w7Ybwyuehw8ZEEy6oHIn91tVAY=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "starlark"
+  ];
+
+  meta = {
+    description = "Starlark in pure Python";
+    homepage = "https://github.com/dbohdan/starlark-python";
+    changelog = "https://github.com/dbohdan/starlark-python/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b8eec12df33..4a4ad548c202 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19469,6 +19469,8 @@ self: super: with self; {
 
   starkbank-ecdsa = callPackage ../development/python-modules/starkbank-ecdsa { };
 
+  starlark = callPackage ../development/python-modules/starlark { };
+
   starlette = callPackage ../development/python-modules/starlette { };
 
   starlette-admin = callPackage ../development/python-modules/starlette-admin { };

From 638d68d5a555b57880196e8e9cf230d368214e7d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 14:17:54 +0200
Subject: [PATCH 227/310] python3Packages.remarshal: 1.3.0 -> 2.1.3

https://github.com/remarshal-project/remarshal/releases/tag/v2.1.3
---
 .../python-modules/remarshal/default.nix         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix
index 254be50c8641..7f1ab5ca1e09 100644
--- a/pkgs/development/python-modules/remarshal/default.nix
+++ b/pkgs/development/python-modules/remarshal/default.nix
@@ -9,10 +9,9 @@
   # propagates
   cbor2,
   colorama,
-  python-dateutil,
-  pyyaml,
-  rich-argparse,
   ruamel-yaml,
+  starlark,
+  termcolor,
   tomli,
   tomlkit,
   u-msgpack-python,
@@ -23,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "remarshal";
-  version = "1.3.0"; # test with `nix-build pkgs/pkgs-lib/format`
+  version = "2.1.3"; # test with `nix-build pkgs/pkgs-lib/tests -A formats`
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "remarshal-project";
     repo = "remarshal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/K8x6ij23pk5O1+XJdFHaGbZ47nFMbXzp+4UMO5dGp4=";
+    hash = "sha256-n+V2+xSzrBH58F10yKhDiCLvQmlPfDx6rP+ysEGpZg4=";
   };
 
   build-system = [ poetry-core ];
@@ -38,15 +37,16 @@ buildPythonPackage (finalAttrs: {
   dependencies = [
     cbor2
     colorama
-    python-dateutil
-    pyyaml
-    rich-argparse
     ruamel-yaml
+    starlark
+    termcolor
     tomli
     tomlkit
     u-msgpack-python
   ];
 
+  pythonRelaxDeps = [ "cbor2" ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {

From 6029273d3b625db1f1695b960eb5209cceaa503b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 14:27:19 +0200
Subject: [PATCH 228/310] python3Packages.notify-py: fix version metadata

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

diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix
index cfd1b5a9e9ee..6927b2754871 100644
--- a/pkgs/development/python-modules/notify-py/default.nix
+++ b/pkgs/development/python-modules/notify-py/default.nix
@@ -13,6 +13,7 @@
   pytest,
   dbus,
   coreutils,
+  pyprojectVersionPatchHook,
 }:
 
 buildPythonPackage rec {
@@ -43,6 +44,10 @@ buildPythonPackage rec {
     ];
 
   nativeBuildInputs = [
+    pyprojectVersionPatchHook
+  ];
+
+  build-system = [
     poetry-core
   ];
 

From 471df6a509f2f8ff5ed1b8dbdc456fb735146661 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 14:28:32 +0200
Subject: [PATCH 229/310] python3Packages.nocasedict: provide typing-extensions

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

diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix
index 7dc6d610832a..c9267ca3f646 100644
--- a/pkgs/development/python-modules/nocasedict/default.nix
+++ b/pkgs/development/python-modules/nocasedict/default.nix
@@ -5,6 +5,7 @@
   pytestCheckHook,
   setuptools,
   setuptools-scm,
+  typing-extensions,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -24,6 +25,8 @@ buildPythonPackage (finalAttrs: {
     setuptools-scm
   ];
 
+  dependencies = [ typing-extensions ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "nocasedict" ];

From b2aa5ba61566c8962a1280db911f42d87e20ed01 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 14:32:04 +0200
Subject: [PATCH 230/310] python3Packages.schema-salad: provide ast-serialize

This is now required in tandem with newer mypy versions.
---
 pkgs/development/python-modules/schema-salad/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index 214389029d5a..cecebf5fdc9e 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  ast-serialize,
   black,
   buildPythonPackage,
   cachecontrol,
@@ -44,6 +45,7 @@ buildPythonPackage rec {
   build-system = [ setuptools-scm ];
 
   dependencies = [
+    ast-serialize
     cachecontrol
     mistune
     mypy

From 30e115e64edfa7519def5fe855af54c94fe12ba2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 14:44:56 +0200
Subject: [PATCH 231/310] rocmPackages.tensile: don't check dist-info metadata

> The 'tensile' derivation has version '7.2.3' but .dist-info/METADATA specifies version '4.45.0'.
---
 pkgs/development/rocm-modules/tensile/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix
index 1f2ab4e9c49e..7bfa22f63db6 100644
--- a/pkgs/development/rocm-modules/tensile/default.nix
+++ b/pkgs/development/rocm-modules/tensile/default.nix
@@ -77,7 +77,10 @@ buildPythonPackage (finalAttrs: {
     clr
   ];
 
-  env.ROCM_PATH = "${clr}";
+  env = {
+    dontCheckPythonMetadata = true;
+    ROCM_PATH = "${clr}";
+  };
 
   pythonImportsCheck = [ "Tensile" ];
 

From 441a2bb60969b6978904e7a9559ddb3483405d94 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 15:00:20 +0200
Subject: [PATCH 232/310] python3Packages.rst-core: disable failing tests

It seems like docutils has reclassified the severity of this rule.
---
 pkgs/development/python-modules/rstcheck-core/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix
index b883214e1efe..991a4a9589b4 100644
--- a/pkgs/development/python-modules/rstcheck-core/default.nix
+++ b/pkgs/development/python-modules/rstcheck-core/default.nix
@@ -29,9 +29,7 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  env = {
-    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-strict-prototypes";
-  };
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-strict-prototypes";
 
   dependencies = [
     docutils
@@ -45,8 +43,8 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # https://github.com/rstcheck/rstcheck-core/issues/84
-    "test_check_yaml_returns_error_on_bad_code_block"
+    # severity was bumped from severe/4 to error/3
+    "test_include_directive_error_without_sphinx"
   ];
 
   pythonImportsCheck = [ "rstcheck_core" ];

From 9694d18e84d289d4a1eafe96a65948eb8796fcc1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 15:07:30 +0200
Subject: [PATCH 233/310] python3Packages.periodiq: 0.13.0 -> 0.14.0

https://gitlab.com/bersace/periodiq/-/compare/v0.13.0...v0.14.0
---
 .../python-modules/periodiq/default.nix       | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/periodiq/default.nix b/pkgs/development/python-modules/periodiq/default.nix
index 701bc88bc670..b50fb2c7b1b6 100644
--- a/pkgs/development/python-modules/periodiq/default.nix
+++ b/pkgs/development/python-modules/periodiq/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitLab,
-  poetry-core,
+  uv-build,
   dramatiq,
   pendulum,
   setuptools,
@@ -13,27 +13,19 @@
 
 buildPythonPackage rec {
   pname = "periodiq";
-  version = "0.13.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "bersace";
     repo = "periodiq";
     tag = "v${version}";
-    hash = "sha256-Pyh/T3/HGPYyaXjyM0wkQ1V7p5ibqxE1Q62QwCIJ8To=";
+    hash = "sha256-XYQ0cR0gdiX7GePqpMDG/Ml0CK+SBcNbsNB99FZ/D3I=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail 'poetry>=0.12' 'poetry-core' \
-      --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api'
-  '';
+  build-system = [ uv-build ];
 
-  pythonRelaxDeps = [ "dramatiq" ];
-
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     dramatiq
     pendulum
     setuptools
@@ -52,7 +44,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple Scheduler for Dramatiq Task Queue";
     mainProgram = "periodiq";
-    homepage = "https://pypi.org/project/periodiq/";
+    homepage = "https://gitlab.com/bersace/periodiq";
     license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ traxys ];
   };

From 7f225f2eed4f39ff1e992444a00342181edf7dc0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 15:13:29 +0200
Subject: [PATCH 234/310] python3Packages.go2rtc-client: disable failing tests

---
 pkgs/development/python-modules/go2rtc-client/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix
index 25cc4087f92f..a072657a4b44 100644
--- a/pkgs/development/python-modules/go2rtc-client/default.nix
+++ b/pkgs/development/python-modules/go2rtc-client/default.nix
@@ -55,6 +55,12 @@ buildPythonPackage rec {
     syrupy
   ];
 
+  disabledTests = [
+    # url encoding mismatch, probably yarl bump
+    "test_streams_add_list"
+    "test_streams_add_str"
+  ];
+
   pythonImportsCheck = [ "go2rtc_client" ];
 
   __darwinAllowLocalNetworking = true;

From a8d15378731a9ea54797cb755709135e12eeca39 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 15:34:52 +0200
Subject: [PATCH 235/310] python-matter-server: disable python metadata check

---
 .../python-modules/python-matter-server/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix
index b28b9ee66901..9c7dbb880a18 100644
--- a/pkgs/development/python-modules/python-matter-server/default.nix
+++ b/pkgs/development/python-modules/python-matter-server/default.nix
@@ -3,10 +3,8 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  stdenvNoCC,
   buildNpmPackage,
   python,
-  home-assistant-chip-wheels,
 
   # build
   setuptools,
@@ -154,6 +152,8 @@ buildPythonPackage rec {
     "tests/server/ota/test_dcl.py"
   ];
 
+  env.dontCheckPythonMetadata = true;
+
   meta = {
     changelog = "https://github.com/home-assistant-libs/python-matter-server/releases/tag/${src.tag}";
     description = "Python server to interact with Matter";

From 0cd71c54516f265cdf94d67a28f4b5761863470a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:00:44 +0200
Subject: [PATCH 236/310] python3Packages.pypck: fix version metadata

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

diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix
index f4de02e72223..9a45cb8defed 100644
--- a/pkgs/development/python-modules/pypck/default.nix
+++ b/pkgs/development/python-modules/pypck/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  pyprojectVersionPatchHook,
   pytest-asyncio,
   pytest-timeout,
   pytestCheckHook,
@@ -21,9 +22,7 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-b8uTY4UtyhKN7JDvu/wC1jXAN/oKs2cJ6sSRBC22vS0=";
   };
 
-  postPatch = ''
-    echo "${finalAttrs.version}" > VERSION
-  '';
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
 
   build-system = [ setuptools ];
 

From 5452ef2f30c721533b48b8014fcfc6ab1672a880 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:08:58 +0200
Subject: [PATCH 237/310] python3Packages.pyomie: provide click

Was part of typer until they vendored it as _click.
---
 pkgs/development/python-modules/pyomie/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/pyomie/default.nix b/pkgs/development/python-modules/pyomie/default.nix
index 5c4e69d73407..16c54bbf9915 100644
--- a/pkgs/development/python-modules/pyomie/default.nix
+++ b/pkgs/development/python-modules/pyomie/default.nix
@@ -3,6 +3,7 @@
   aiohttp,
   aioresponses,
   buildPythonPackage,
+  click,
   deepdiff,
   fetchFromGitHub,
   poetry-core,
@@ -34,6 +35,7 @@ buildPythonPackage (finalAttrs: {
 
   dependencies = [
     aiohttp
+    click
     rich
     typer
   ];

From f6730c976a144600d7109b0dd1c34e14b82b0559 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:25:02 +0200
Subject: [PATCH 238/310] python3Packages.python-robock: disable failing test

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

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index b6a949eb1c7f..30d110bffd14 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -73,6 +73,11 @@ buildPythonPackage (finalAttrs: {
   ]
   ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
+  disabledTests = [
+    # url mocking mismatch, probably due to yarl update
+    "test_url_cycling"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   pythonImportsCheck = [ "roborock" ];

From 6214bad005a3f1274fcf824ccd2fe995b97817d0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:26:45 +0200
Subject: [PATCH 239/310] python3Packages.pyprobeplus: fix version metadata

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

diff --git a/pkgs/development/python-modules/pyprobeplus/default.nix b/pkgs/development/python-modules/pyprobeplus/default.nix
index 2e95175f44a3..33e7774f7a35 100644
--- a/pkgs/development/python-modules/pyprobeplus/default.nix
+++ b/pkgs/development/python-modules/pyprobeplus/default.nix
@@ -19,6 +19,11 @@ buildPythonPackage rec {
     hash = "sha256-CJbQs0xZHdXNPX71G1KrrHHV58gXaQsUHGcX9P8E+iY=";
   };
 
+  postPatch = ''
+    substituteInPlace pyprobeplus/__init__.py \
+      --replace-fail "1.0.1" "${version}"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From 5f8a3d3cfa2e5abd1d2727ae2b9ed05871b652a6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:38:07 +0200
Subject: [PATCH 240/310] python3Packages.tilt-pi: fix version metadata

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

diff --git a/pkgs/development/python-modules/tilt-pi/default.nix b/pkgs/development/python-modules/tilt-pi/default.nix
index 03b700368773..5bac66b0a38d 100644
--- a/pkgs/development/python-modules/tilt-pi/default.nix
+++ b/pkgs/development/python-modules/tilt-pi/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   lib,
   poetry-core,
+  pyprojectVersionPatchHook,
   pytest-asyncio,
   pytestCheckHook,
 }:
@@ -20,6 +21,8 @@ buildPythonPackage rec {
     hash = "sha256-jGy7nwSblF486ldt4ShBEmmZtb0c4+7IuI10cN7Bw1A=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ poetry-core ];
 
   dependencies = [

From adbf39fe2a5021c6ad41786455b9b5d3a4993ea4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:39:19 +0200
Subject: [PATCH 241/310] Revert "python3Packages.aioresponses: 0.7.8 -> 0.7.9"

This reverts commit 02303b8a37c1168705120724f955060434a44972.

Too many subtle breakages right now, let's retry that later.
---
 .../python-modules/aioresponses/default.nix     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index ab510850ce94..395f7387aef7 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -12,18 +12,17 @@
 
   # tests
   ddt,
-  pytest-asyncio,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "aioresponses";
-  version = "0.7.9";
+  version = "0.7.8";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Hc+iiTj8AG8Eapg4OnwHrBgL56SSwe1Vf1zXsIBTV9M=";
+    hash = "sha256-uGHN/l3FjzuK+sewppc9XXsstgjdD2JT0WuO6Or23xE=";
   };
 
   patches = [
@@ -32,18 +31,23 @@ buildPythonPackage rec {
     ./aiohttp-3.14-compat.patch
   ];
 
-  build-system = [
+  postPatch = ''
+    # https://github.com/pnuckowski/aioresponses/pull/278
+    substituteInPlace aioresponses/core.py \
+      --replace-fail asyncio.iscoroutinefunction inspect.iscoroutinefunction
+  '';
+
+  nativeBuildInputs = [
     pbr
     setuptools
   ];
 
-  dependencies = [ aiohttp ];
+  propagatedBuildInputs = [ aiohttp ];
 
   pythonImportsCheck = [ "aioresponses" ];
 
   nativeCheckInputs = [
     ddt
-    pytest-asyncio
     pytestCheckHook
   ];
 
@@ -55,7 +59,6 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/pnuckowski/aioresponses/releases/tag/${version}";
     description = "Helper to mock/fake web requests in python aiohttp package";
     homepage = "https://github.com/pnuckowski/aioresponses";
     license = lib.licenses.mit;

From 934118b04a35f7777a5b2c05f8fc8dbedf504ecf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:51:11 +0200
Subject: [PATCH 242/310] python3Packages.pyrail: fix version metadata

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

diff --git a/pkgs/development/python-modules/pyrail/default.nix b/pkgs/development/python-modules/pyrail/default.nix
index 6069db6db723..ce1f523c733d 100644
--- a/pkgs/development/python-modules/pyrail/default.nix
+++ b/pkgs/development/python-modules/pyrail/default.nix
@@ -5,6 +5,7 @@
   lib,
   mashumaro,
   poetry-core,
+  pyprojectVersionPatchHook,
   pytest-asyncio,
   pytestCheckHook,
 }:
@@ -21,6 +22,8 @@ buildPythonPackage rec {
     hash = "sha256-MFsFtspL9cmhwu2oo8wx0Sjx2VpQe92JP9e0M7U8CL8=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ poetry-core ];
 
   dependencies = [

From b41d6b87232e3dddfd28044421789e08fc3d18af Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:51:23 +0200
Subject: [PATCH 243/310] python3Packages.pyreqwest: disable failing tests

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

diff --git a/pkgs/development/python-modules/pyreqwest/default.nix b/pkgs/development/python-modules/pyreqwest/default.nix
index 3d6fe0e9c825..bfabdc41d0b2 100644
--- a/pkgs/development/python-modules/pyreqwest/default.nix
+++ b/pkgs/development/python-modules/pyreqwest/default.nix
@@ -58,6 +58,12 @@ buildPythonPackage (finalAttrs: {
     yarl
   ];
 
+  disabledTests = [
+    # snapshot has different dict key ordering
+    "test_assert_called_exact_count_failure"
+    "test_assert_called_regex_matchers_display"
+  ];
+
   disabledTestPaths = [
     # requires a running Docker daemon
     "tests/test_examples.py"

From 3df278795e3a9cef12cbea0b4c3bee630aae4503 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:56:59 +0200
Subject: [PATCH 244/310] python3Packages.lg-rs232-tv: fix version metadata

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

diff --git a/pkgs/development/python-modules/lg-rs232-tv/default.nix b/pkgs/development/python-modules/lg-rs232-tv/default.nix
index 0b259670027d..ee78cae64c73 100644
--- a/pkgs/development/python-modules/lg-rs232-tv/default.nix
+++ b/pkgs/development/python-modules/lg-rs232-tv/default.nix
@@ -5,6 +5,7 @@
   uv-build,
   serialx,
   aiowebostv,
+  pyprojectVersionPatchHook,
   pytest-asyncio,
   pytest-timeout,
   pytestCheckHook,
@@ -27,6 +28,8 @@ buildPythonPackage (finalAttrs: {
       --replace-fail "uv_build>=0.8.4,<0.9.0" "uv_build"
   '';
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ uv-build ];
 
   dependencies = [ serialx ];

From 1e690d63d6a258dba419d7ea7a335c5451d7dbd6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 16:58:28 +0200
Subject: [PATCH 245/310] python3Packages.python-open-router: fix version
 metadata

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

diff --git a/pkgs/development/python-modules/python-open-router/default.nix b/pkgs/development/python-modules/python-open-router/default.nix
index 95c9c6583240..b63b290ef2ff 100644
--- a/pkgs/development/python-modules/python-open-router/default.nix
+++ b/pkgs/development/python-modules/python-open-router/default.nix
@@ -7,6 +7,7 @@
   yarl,
   mashumaro,
   orjson,
+  pyprojectVersionPatchHook,
   pytestCheckHook,
   pytest-asyncio,
   pytest-cov-stub,
@@ -26,6 +27,8 @@ buildPythonPackage rec {
     hash = "sha256-hf8Ay3/xXH262/1R07mN0iQpOlHFhHb6VUZoYQEq8YI=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ poetry-core ];
 
   dependencies = [

From 2ac7325c92917425eac292725e959a2836aff21c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:00:57 +0200
Subject: [PATCH 246/310] python3Packages.hdate: ignore unused snapshots

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

diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix
index 43620b0a92d2..4b6d6437a03a 100644
--- a/pkgs/development/python-modules/hdate/default.nix
+++ b/pkgs/development/python-modules/hdate/default.nix
@@ -48,6 +48,8 @@ buildPythonPackage rec {
     syrupy
   ];
 
+  pytestFlags = [ "--snapshot-warn-unused" ];
+
   enabledTestPaths = [ "tests" ];
 
   pythonImportsCheck = [ "hdate" ];

From 66aab15e2d345ba0ccd4727acbe46e4404960719 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:03:05 +0200
Subject: [PATCH 247/310] python3Packages.pyisy: build with setuptools 80.x

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

diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix
index bac4cd0868f9..005a834e53a6 100644
--- a/pkgs/development/python-modules/pyisy/default.nix
+++ b/pkgs/development/python-modules/pyisy/default.nix
@@ -6,6 +6,7 @@
   fetchFromGitHub,
   python-dateutil,
   requests,
+  setuptools_80,
   setuptools-scm,
 }:
 
@@ -26,7 +27,10 @@ buildPythonPackage rec {
       --replace 'version_format="{tag}"' 'version="${version}"'
   '';
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    setuptools_80
+    setuptools-scm
+  ];
 
   dependencies = [
     aiohttp

From a4cb2a936f3b0d3066fddede59b5e27fe1045bf5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:06:50 +0200
Subject: [PATCH 248/310] python3Packages.pyicloud: fix build

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

diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index 6b5464f6ee97..6be7d79f1194 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -15,7 +15,7 @@
   pythonAtLeast,
   requests,
   rich,
-  setuptools,
+  setuptools_80,
   setuptools-scm,
   srp,
   tinyhtml,
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
   };
 
   build-system = [
-    setuptools
+    setuptools_80
     setuptools-scm
   ];
 
@@ -54,6 +54,8 @@ buildPythonPackage (finalAttrs: {
     tzlocal
   ];
 
+  pythonRelaxDeps = [ "tzlocal" ];
+
   optional-dependencies = {
     cli = [
       rich

From 1719162d8237130b00a67cca1020fd11614f24a7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:09:05 +0200
Subject: [PATCH 249/310] Revert "python3Packages.typer: 0.25.1 -> 0.26.8"

This reverts commit 8a8a740ccdca82275a508df31b1bf5ddf5044676.

This release drops the click dependency and vendors it instead and the
ecosystem is not quite ready yet.
---
 pkgs/development/python-modules/typer/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 80f3ac75dbbc..65a0772135ad 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -9,6 +9,7 @@
 
   # dependencies
   annotated-doc,
+  click,
 
   # optional-dependencies
   rich,
@@ -23,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "typer";
-  version = "0.26.8";
+  version = "0.25.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastapi";
     repo = "typer";
     tag = version;
-    hash = "sha256-VkqvlWLzmtbQPaplx/YRdSNN1xq/UMRl8EZVIEm97Lk=";
+    hash = "sha256-HIvXseuR7zUXFuTWzntDfHhAp8BcFjxo35gn0i4+03w=";
   };
 
   postPatch = ''
@@ -46,6 +47,7 @@ buildPythonPackage rec {
 
   dependencies = [
     annotated-doc
+    click
     rich
     shellingham
   ];
@@ -65,10 +67,6 @@ buildPythonPackage rec {
     # fails also on Linux
     "test_show_completion"
     "test_install_completion"
-    # error message mismatch
-    "test_file_error"
-    # test invokes test_types_file.py and fails to import .../tests
-    "test_binary_stderr"
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
     "test_install_completion"

From e53ce32d8b7914de18da6b15ebeeb74b9866c4fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:10:20 +0200
Subject: [PATCH 250/310] python3Packages.pyfirefly: fix version metadata

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

diff --git a/pkgs/development/python-modules/pyfirefly/default.nix b/pkgs/development/python-modules/pyfirefly/default.nix
index 401c52be868c..faf096148a8f 100644
--- a/pkgs/development/python-modules/pyfirefly/default.nix
+++ b/pkgs/development/python-modules/pyfirefly/default.nix
@@ -7,6 +7,7 @@
   lib,
   mashumaro,
   orjson,
+  pyprojectVersionPatchHook,
   pytest-cov-stub,
   pytestCheckHook,
   syrupy,
@@ -25,6 +26,8 @@ buildPythonPackage rec {
     hash = "sha256-RrVjXhV42DBvmTcZMowmHXN5K4nZfKPT/CDbvf1tOAQ=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ hatchling ];
 
   dependencies = [

From 16ceb917c7cdb582cad343278fecb3558714e9da Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:12:20 +0200
Subject: [PATCH 251/310] Revert "python3Packages.click: 8.3.3 -> 8.4.2"

This reverts commit 466693502def0acfde2da53cef0b70d8aa3e56bb.

Many, many mismatching test strings downstream.
---
 pkgs/development/python-modules/click/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index d79b1b5cede0..13e65aa099c8 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -16,24 +16,20 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.4.2";
+  version = "8.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "click";
     tag = version;
-    hash = "sha256-66JFGGwPXeCU7Fbqsrsq3giv6qsea1ZKGmZYPu9rcog=";
+    hash = "sha256-LcnAI4hyiuaJ4qnFnbAR5Cft/yvW5tAIjY6qc6K/Nrw=";
   };
 
   build-system = [ flit-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  pytestFlags = [
-    "-Wignore::pytest.PytestRemovedIn10Warning"
-  ];
-
   disabledTests = [
     # for some reason the tests fail to execute cat, even though they run with less just fine,
     # even adding coreutils to nativeCheckInputs explicitly does not change anything

From b99ab211db7eda7660842b542389c93733b5d162 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:14:03 +0200
Subject: [PATCH 252/310] python3Packages.pandas: unpin cython

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index a0519d35c2ab..ddc10d53eb8f 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  cython_3_1,
+  cython,
   meson-python,
   meson,
   pkg-config,
@@ -93,7 +93,7 @@ let
     '';
 
     build-system = [
-      cython_3_1
+      cython
       meson-python
       meson
       numpy

From 3c1cb4721b3b970597038c3ca542a02cdf9f92bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:14:15 +0200
Subject: [PATCH 253/310] python3Packages.cython_3_1: kill

---
 pkgs/top-level/python-packages.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a4ad548c202..89d5536817eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3887,17 +3887,6 @@ self: super: with self; {
 
   cython_0 = callPackage ../development/python-modules/cython/0.nix { };
 
-  cython_3_1 = self.cython.overrideAttrs rec {
-    version = "3.1.8";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "cython";
-      repo = "cython";
-      tag = version;
-      hash = "sha256-U/vxKpLT4BvjpIfwvZTJ93oiZJT7fvh+doz51KPRGAs=";
-    };
-  };
-
   cytoolz = callPackage ../development/python-modules/cytoolz { };
 
   cyvest = callPackage ../development/python-modules/cyvest { };

From 8e2a675d8a00b1eaed2e2cec0e2f948e87725bba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:14:26 +0200
Subject: [PATCH 254/310] python3Packages.click: ignore pytest 10 deprecations

They're fixed in 8.4.x but we're not quite ready yet to update.
---
 pkgs/development/python-modules/click/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 13e65aa099c8..4f70e192501d 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -30,6 +30,10 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn10Warning"
+  ];
+
   disabledTests = [
     # for some reason the tests fail to execute cat, even though they run with less just fine,
     # even adding coreutils to nativeCheckInputs explicitly does not change anything

From 9b2962065884f56a4431d895df4b947d89a14c2f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 17:36:41 +0200
Subject: [PATCH 255/310] python3Packages.typer: pin to pytest 9.0.x

Test failures due to output capturing changes in pytest 9.1.x.
---
 pkgs/development/python-modules/typer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 65a0772135ad..7465b92890ea 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -17,7 +17,7 @@
 
   # tests
   pytest-xdist,
-  pytestCheckHook,
+  pytest9_0CheckHook,
   writableTmpDirAsHomeHook,
   procps,
 }:
@@ -54,7 +54,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-xdist
-    pytestCheckHook
+    pytest9_0CheckHook
     writableTmpDirAsHomeHook
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [

From f4a8de6d8fa8cbfb00218b5323b6b178ec70fdc7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 15 Jul 2026 01:10:52 +0200
Subject: [PATCH 256/310] python3Packages.json-home-client: broken with
 setuptools 82

---
 .../python-modules/json-home-client/default.nix           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/json-home-client/default.nix b/pkgs/development/python-modules/json-home-client/default.nix
index 828c18e1f5a0..849b2a0398b1 100644
--- a/pkgs/development/python-modules/json-home-client/default.nix
+++ b/pkgs/development/python-modules/json-home-client/default.nix
@@ -5,12 +5,13 @@
   # build inputs
   typing-extensions,
   uri-template,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "json-home-client";
   version = "1.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plinss";
@@ -23,7 +24,9 @@ buildPythonPackage rec {
     sed -i -e 's/0.0.0/${version}/' setup.py
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependenceis = [
     typing-extensions
     uri-template
   ];
@@ -31,6 +34,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "json_home_client" ];
 
   meta = {
+    broken = lib.versionAtLeast setuptools.version "82";
     description = "Client class for calling http+json APIs in Python";
     homepage = "https://github.com/plinss/json_home_client";
     license = lib.licenses.mit;

From e63b4d964ab7f06935a6eef1f5dc449d3f01e35d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 15 Jul 2026 01:12:34 +0200
Subject: [PATCH 257/310] python3Packages.nocaselist: provide typing-extensions

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

diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix
index 0b819851a617..fb8850c990e6 100644
--- a/pkgs/development/python-modules/nocaselist/default.nix
+++ b/pkgs/development/python-modules/nocaselist/default.nix
@@ -6,6 +6,7 @@
   setuptools,
   setuptools-scm,
   six,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -23,7 +24,10 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies = [ six ];
+  dependencies = [
+    six
+    typing-extensions
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 275f91ca1a15a53513e212329a205be6143484e7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 15 Jul 2026 01:51:02 +0200
Subject: [PATCH 258/310] python3Packages.eve: relax simplejson constraint

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

diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index 7375eb8feb56..8e64d5c461a9 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -22,7 +22,10 @@ buildPythonPackage rec {
     hash = "sha256-y0QfxLDoTKNZuAKcPqrLjwkZ0mRseBVq7OyflwUd+Lk=";
   };
 
-  pythonRelaxDeps = [ "events" ];
+  pythonRelaxDeps = [
+    "events"
+    "simplejson"
+  ];
 
   build-system = [ setuptools ];
 

From 97913a3458242e56c69535611839e52118ce43f5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 15 Jul 2026 01:54:18 +0200
Subject: [PATCH 259/310] python3Packages.flask-ldap3-login: fix version
 metadata

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

diff --git a/pkgs/development/python-modules/flask-ldap3-login/default.nix b/pkgs/development/python-modules/flask-ldap3-login/default.nix
index e321014da32a..ebbf0ed81167 100644
--- a/pkgs/development/python-modules/flask-ldap3-login/default.nix
+++ b/pkgs/development/python-modules/flask-ldap3-login/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  pyprojectVersionPatchHook,
   pytestCheckHook,
   flask,
   flask-wtf,
@@ -24,6 +25,8 @@ buildPythonPackage rec {
     hash = "sha256-bWu+hCVnNRSWvXgB2pAcCdhXJQEg3mZeAfZgxUqVOkY=";
   };
 
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
   build-system = [ setuptools ];
 
   dependencies = [

From 8d040b1444c7d72370c0642924f470857d85f894 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 15 Jul 2026 02:05:08 +0200
Subject: [PATCH 260/310] python3Packages.sparsediffpy: 0.5.1 -> 0.6.1

https://github.com/SparseDifferentiation/SparseDiffPy/blob/v0.6.1/RELEASES.md
---
 pkgs/development/python-modules/sparsediffpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sparsediffpy/default.nix b/pkgs/development/python-modules/sparsediffpy/default.nix
index 2a82b7b7d507..666042fe9794 100644
--- a/pkgs/development/python-modules/sparsediffpy/default.nix
+++ b/pkgs/development/python-modules/sparsediffpy/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sparsediffpy";
-  version = "0.5.1";
+  version = "0.6.1";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
     # SparseDiffEngine is built from source and their cmake does not support finding it on the
     # system. We fallback to using the git submodule approach for now.
     fetchSubmodules = true;
-    hash = "sha256-PqtD3FjOpYLuu5ddeTdJ1UcL4Wvcv6RoZFGchpVdBAI=";
+    hash = "sha256-W0S7VpPrthj5IuXkqPgb9YwuebcjF1e4rAKcStRowII=";
   };
 
   build-system = [

From 49233162d692e5c8d9002e37d1317f987a613c31 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 15 Jul 2026 02:07:07 +0200
Subject: [PATCH 261/310] python3Packages.calmjs-types: broken with setuptools
 82

---
 pkgs/development/python-modules/calmjs-types/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/calmjs-types/default.nix b/pkgs/development/python-modules/calmjs-types/default.nix
index 1f0d792b4c1d..23385164f450 100644
--- a/pkgs/development/python-modules/calmjs-types/default.nix
+++ b/pkgs/development/python-modules/calmjs-types/default.nix
@@ -3,12 +3,13 @@
   fetchPypi,
   buildPythonPackage,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "calmjs-types";
   version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "calmjs.types";
@@ -17,11 +18,14 @@ buildPythonPackage rec {
     extension = "zip";
   };
 
+  build-system = [ setuptools ];
+
   checkInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "calmjs.types" ];
 
   meta = {
+    broken = lib.versionAtLeast setuptools.version "82";
     description = "Types for the calmjs framework";
     homepage = "https://github.com/calmjs/calmjs.types";
     license = lib.licenses.mit;

From dd5346915923d7751e7e8b21226b3db90ade3eea Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 28 Jun 2026 17:34:20 +0100
Subject: [PATCH 262/310] ld64: disable hardening again

Turn out this happens on `aarch64-darwin` too.

Fixes: 23c05205023464c322a0df9ac0834c00f4da9fa8
---
 pkgs/by-name/ld/ld64/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix
index 184f635cffe3..ad2613836ff5 100644
--- a/pkgs/by-name/ld/ld64/package.nix
+++ b/pkgs/by-name/ld/ld64/package.nix
@@ -138,6 +138,9 @@ stdenv.mkDerivation (finalAttrs: {
     xar
   ];
 
+  # ld built with this fails to link glib's gio
+  hardeningDisable = [ "libcxxhardeningfast" ];
+
   dontUseCmakeConfigure = true; # CMake is only needed because it’s used by Meson to find LLVM.
 
   # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations,

From d12a044b56cdfcad9ba633da9b4673ee24f91610 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 28 Jun 2026 17:36:04 +0100
Subject: [PATCH 263/310] Revert "glib: use LLD on Darwin to work around ld64
 hardening issue"

The ld64 issue has been fixed.

This reverts commit 5f08853644352cc04d2b75f967583e621d22bff6.
---
 pkgs/by-name/gl/glib/package.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix
index bda3d4a4a09c..4aa4d639df9e 100644
--- a/pkgs/by-name/gl/glib/package.nix
+++ b/pkgs/by-name/gl/glib/package.nix
@@ -24,8 +24,6 @@
   gi-docgen,
   # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
   util-linuxMinimal ? null,
-  # TODO: Clean up on `staging`.
-  llvmPackages,
   buildPackages,
 
   # this is just for tests (not in the closure of any regular package)
@@ -209,10 +207,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals withDtrace [
     systemtap' # for dtrace
-  ]
-  # TODO: Clean up on `staging`.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
 
   propagatedBuildInputs = [
@@ -256,13 +250,6 @@ stdenv.mkDerivation (finalAttrs: {
       "-DG_DISABLE_CAST_CHECKS"
     ];
     DETERMINISTIC_BUILD = 1;
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # Work around ld64 hardening issue.
-    #
-    # TODO: Clean up on `staging`.
-    CC_LD = "lld";
-    OBJC_LD = "lld";
   };
 
   postPatch = ''

From 0f8e2da9cb7347b32fe9c090f92d08a1caf36b3b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:18:59 +0100
Subject: [PATCH 264/310] Revert "gtk3: fix build on darwin"

The ld64 issue has been fixed.

This reverts commit 7487e9cc518250e1c7085640f74fbe08d5d74a90.
---
 pkgs/by-name/gt/gtk3/package.nix | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/pkgs/by-name/gt/gtk3/package.nix b/pkgs/by-name/gt/gtk3/package.nix
index bd66967f1014..3c3ffc066dbb 100644
--- a/pkgs/by-name/gt/gtk3/package.nix
+++ b/pkgs/by-name/gt/gtk3/package.nix
@@ -58,8 +58,6 @@
   broadwaySupport ? true,
   wayland-scanner,
   testers,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 let
@@ -144,10 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
       ]
   ++ lib.optionals waylandSupport [
     wayland-scanner
-  ]
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
 
   buildInputs =
@@ -219,17 +213,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # These are the defines that'd you'd get with --enable-debug=minimum (default).
   # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
-  env = {
-    NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # workaround for ld64 hardening issue
-    #
-    # TODO: Clean up on `staging`
-
-    CC_LD = "lld";
-    OBJC_LD = "lld";
-  };
+  env.NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
 
   postPatch = ''
     # See https://github.com/NixOS/nixpkgs/issues/132259

From e6b2583ec23ed8e6024ebb6a38541969c6a48c7e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:18:59 +0100
Subject: [PATCH 265/310] Revert "vim: fix build on darwin"

The ld64 issue has been fixed.

This reverts commit ade4a26bc1c6ecc3098e9fa80c7c4dc43eaff275.
---
 pkgs/applications/editors/vim/default.nix | 13 -------------
 pkgs/applications/editors/vim/full.nix    | 12 ++----------
 pkgs/applications/editors/vim/macvim.nix  |  7 +------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index d9abd14e2e51..ec3e7c9a6253 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -14,8 +14,6 @@
     url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/68f6d131750aa778807119e03eed70286a17b1cb/trunk/archlinux.vim";
     sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
   },
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 let
@@ -39,10 +37,6 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     gettext
     pkg-config
-  ]
-  # TODO: Clean up on `staging`.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
   buildInputs = [
     ncurses
@@ -50,13 +44,6 @@ stdenv.mkDerivation {
     gawk
   ];
 
-  # workaround for ld64 hardening issue
-  #
-  # TODO: Clean up on `staging`
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_COMPILE = "-fuse-ld=lld";
-  };
-
   strictDeps = true;
 
   configureFlags = [
diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix
index f07960cf950c..a2a105e3182c 100644
--- a/pkgs/applications/editors/vim/full.nix
+++ b/pkgs/applications/editors/vim/full.nix
@@ -48,9 +48,6 @@
   darwinSupport ? config.vim.darwin or false, # Enable Darwin support
   ftNixSupport ? config.vim.ftNix or true, # Add nix indentation support from vim-nix (not needed for basic syntax highlighting)
   sodiumSupport ? config.vim.sodium or true, # Enable sodium based encryption
-
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 let
@@ -172,9 +169,7 @@ stdenv.mkDerivation {
   ++ lib.optional nlsSupport gettext
   ++ lib.optional perlSupport perl
   ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook3
-  ++ lib.optional waylandSupport wayland-scanner
-  # TODO: Clean up on `staging`
-  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
+  ++ lib.optional waylandSupport wayland-scanner;
 
   buildInputs = [
     ncurses
@@ -201,10 +196,7 @@ stdenv.mkDerivation {
   ++ lib.optional sodiumSupport libsodium;
 
   # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
-  # workaround for ld64 hardening issue
-  #
-  # TODO: Clean up on `staging`
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec -fuse-ld=lld";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec";
 
   preConfigure = lib.optionalString ftNixSupport ''
     cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 9e48750c0b0a..36e22ddc2b0a 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -17,8 +17,6 @@
   # This can be set to one of the `darwin.xcode_*` packages as well.
   # If set, this should be a path to Xcode.app, e.g. `"/Applications/Xcode.app"`.
   withXcodePath ? null,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 # Try to match MacVim's documented script interface compatibility
@@ -50,8 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
-    # TODO: Clean up on `staging`
-    llvmPackages.lld
   ];
   buildInputs = [
     # MacVim references up to MAC_OS_VERSION_14_0 in its source
@@ -192,8 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
   # macvim obj-c log macro triggers -Wformat-security (seems like a bug? it's a string literal!)
   hardeningDisable = common.hardeningDisable ++ [ "format" ];
   # os_log also enables -Werror,-Wformat by default
-  # TODO: Clean up on `staging`
-  env.NIX_CFLAGS_COMPILE = "-DOS_LOG_FORMAT_WARNINGS -fuse-ld=lld";
+  env.NIX_CFLAGS_COMPILE = "-DOS_LOG_FORMAT_WARNINGS";
 
   # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and
   # it's not clear what system-level components it may require, so for now we'll just allow full

From 75de6157388d55f8b8c2c4576f23591de8f3c0f5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:18:59 +0100
Subject: [PATCH 266/310] Revert "emacs: fix build on darwin"

The ld64 issue has been fixed.

This reverts commit 27f813249bb0dc258b17be085f7a2f5edd8c3622.
---
 .../applications/editors/emacs/make-emacs.nix | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index ce8cd1d2b9ba..1a650a3b2af6 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -116,8 +116,6 @@
 
   # test
   callPackage,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 assert (withGTK3 && !withNS && variant != "macport") -> withX || withPgtk;
@@ -254,11 +252,7 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ]
   ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    sigtool
-    # TODO: Clean up on `staging`
-    llvmPackages.lld
-  ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
 
   buildInputs = [
     gnutls
@@ -424,15 +418,10 @@ stdenv.mkDerivation (finalAttrs: {
       NATIVE_FULL_AOT = "1";
       LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;
     }
-    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-      # workaround for ld64 hardening issue
-      #
-      # TODO: Clean up on `staging`
-      NIX_CFLAGS_COMPILE =
-        "-fuse-ld=lld"
-        # Fixes intermittent segfaults when compiled with LLVM >= 7.0.
-        # See https://github.com/NixOS/nixpkgs/issues/127902
-        + lib.optionalString (variant == "macport") " -isystem ${./macport-noescape-noop}";
+    // lib.optionalAttrs (variant == "macport") {
+      # Fixes intermittent segfaults when compiled with LLVM >= 7.0.
+      # See https://github.com/NixOS/nixpkgs/issues/127902
+      NIX_CFLAGS_COMPILE = "-isystem ${./macport-noescape-noop}";
     };
 
   enableParallelBuilding = true;

From 7c7067ca42769adef5ed97749b2564e33855117c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:01 +0100
Subject: [PATCH 267/310] Revert "gtk-mac-integration: Fix build on darwin"

The ld64 issue has been fixed.

This reverts commit 30585245b95977313ae04446f15f1447818be62e.
---
 pkgs/by-name/gt/gtk-mac-integration/package.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-mac-integration/package.nix b/pkgs/by-name/gt/gtk-mac-integration/package.nix
index 26b30559c991..19976e462e15 100644
--- a/pkgs/by-name/gt/gtk-mac-integration/package.nix
+++ b/pkgs/by-name/gt/gtk-mac-integration/package.nix
@@ -9,8 +9,6 @@
   gtk ? gtk3,
   gtk3,
   gobject-introspection,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 stdenv.mkDerivation rec {
@@ -30,8 +28,6 @@ stdenv.mkDerivation rec {
     pkg-config
     gtk-doc
     gobject-introspection
-    # TODO: Clean up on `staging`
-    llvmPackages.lld
   ];
   buildInputs = [ glib ];
   propagatedBuildInputs = [ gtk ];
@@ -40,13 +36,6 @@ stdenv.mkDerivation rec {
     gtkdocize
   '';
 
-  # Fix for ld64 hardening issue
-  #
-  # TODO: Clean up on `staging`
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   meta = {
     description = "Provides integration for GTK applications into the Mac desktop";
     license = lib.licenses.lgpl21;

From ae39e41c5a8a71db246bbb2170f8986d2c99770f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:01 +0100
Subject: [PATCH 268/310] Revert "pinentry-mac: fix build"

The ld64 issue has been fixed.

This reverts commit 3aa4bf236f9cc482420331fdbe805465e37fc564.
---
 pkgs/tools/security/pinentry/mac.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index fd9dee1723a7..6b354ef48d23 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -10,8 +10,6 @@
   common-updater-scripts,
   writers,
   re-plistbuddy,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 stdenv.mkDerivation rec {
@@ -49,8 +47,6 @@ stdenv.mkDerivation rec {
     makeBinaryWrapper
     texinfo
     re-plistbuddy
-    # TODO: Clean up on `staging`
-    llvmPackages.lld
   ];
 
   configureFlags = [
@@ -60,11 +56,6 @@ stdenv.mkDerivation rec {
     "--with-libassuan-prefix=${libassuan.dev}"
   ];
 
-  # Fix for ld64 hardening issue
-  #
-  # TODO: Clean up on `staging`
-  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
-
   installPhase = ''
     mkdir -p $out/Applications $out/bin
     mv macosx/pinentry-mac.app $out/Applications

From cdc9d7628c35854e23b6e15c853221265b70ba40 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:01 +0100
Subject: [PATCH 269/310] Revert "qt5.qtbase: fix build on darwin"

The ld64 issue has been fixed.

This reverts commit 17cafcb3652f5a7a36fe5a5c7fb46991cc7af851.
---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 480bd31a6bc1..c1e05d0a8b62 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -20,8 +20,6 @@
   which,
   # darwin support
   xcbuild,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 
   dbus,
   fontconfig,
@@ -194,8 +192,6 @@ stdenv.mkDerivation (
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         xcbuild
-        # TODO: Clean up on `staging`
-        llvmPackages.lld
       ];
 
     }
@@ -377,12 +373,6 @@ stdenv.mkDerivation (
         # if dependency paths contain the string "pq", which can occur in the hash.
         # To prevent these failures, we need to override PostgreSQL detection.
         PSQL_LIBS = "-L${libpq}/lib -lpq";
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-        # Fix for ld64 hardening issue
-        #
-        # TODO: Clean up on `staging`
-        NIX_CFLAGS_LINK = "-fuse-ld=lld";
       };
 
       prefixKey = "-prefix ";

From 47052acf7c8d94ba1b120105ba5811423223825f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:01 +0100
Subject: [PATCH 270/310] Revert "gstreamer: fix build on darwin"

The ld64 issue has been fixed.

This reverts commit fb7e04210400b472485bbd8f81adf6e8cd592ca6.
---
 .../libraries/gstreamer/base/default.nix           | 14 --------------
 .../libraries/gstreamer/core/default.nix           | 14 --------------
 .../libraries/gstreamer/good/default.nix           | 13 -------------
 3 files changed, 41 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 8b779a923226..a2a478c76ff2 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -46,8 +46,6 @@
   hotdoc,
   directoryListingUpdater,
   apple-sdk_gstreamer,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -89,10 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableWayland [
     wayland-scanner
-  ]
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -165,14 +159,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
   ++ lib.optional stdenv.hostPlatform.isDarwin "-Ddrm=disabled";
 
-  # Fix for ld64 hardening issue
-  #
-  # TODO: Clean up on `staging`
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    CC_LD = "lld";
-    OBJC_LD = "lld";
-  };
-
   postPatch = ''
     patchShebangs \
       scripts/meson-pkg-config-file-fixup.py \
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 35151386097a..d50923558017 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -33,8 +33,6 @@
   hotdoc,
   directoryListingUpdater,
   apple-sdk_gstreamer,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 let
@@ -86,10 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableDocumentation [
     hotdoc
-  ]
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -123,14 +117,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "libdw" (withLibunwind && hasElfutils))
   ];
 
-  # Fix for ld64 hardening issue
-  #
-  # TODO: Clean up on `staging`
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    CC_LD = "lld";
-    OBJC_LD = "lld";
-  };
-
   postPatch = ''
     patchShebangs \
       gst/parse/get_flex_version.py \
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 6d0dd4edbdaf..4a689f5d82c7 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -66,8 +66,6 @@
   gst-plugins-good,
   directoryListingUpdater,
   apple-sdk_gstreamer,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 let
@@ -139,10 +137,6 @@ stdenv.mkDerivation (finalAttrs: {
   )
   ++ lib.optionals enableWayland [
     wayland-protocols
-  ]
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -271,13 +265,6 @@ stdenv.mkDerivation (finalAttrs: {
       # linking error on Darwin
       # https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553694896
       "-lncurses";
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # Fix for ld64 hardening issue
-    #
-    # TODO: Clean up on `staging`
-    CC_LD = "lld";
-    OBJC_LD = "lld";
   };
 
   # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"

From 002e6194af9855bfa23026eb3d78228de0c67b3d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:01 +0100
Subject: [PATCH 271/310] Revert "swiftPackages.swift-unwrapped: fix darwin
 build"

The ld64 issue has been fixed.

This reverts commit 401b87c97d4922866c708247b3d23818dbc308fa.
---
 pkgs/development/compilers/swift/compiler/default.nix | 10 ----------
 pkgs/development/compilers/swift/default.nix          |  3 +--
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix
index dc15009aac72..2f6fa2a9450f 100644
--- a/pkgs/development/compilers/swift/compiler/default.nix
+++ b/pkgs/development/compilers/swift/compiler/default.nix
@@ -37,8 +37,6 @@
   DarwinTools,
   apple-sdk_14,
   darwinMinVersionHook,
-  # TODO: Clean up on `staging`
-  lld,
 }:
 
 let
@@ -254,8 +252,6 @@ stdenv.mkDerivation {
     DarwinTools # sw_vers
     fixDarwinDylibNames
     cctools.libtool
-    # TODO: Clean up on `staging`
-    lld
   ];
 
   buildInputs = [
@@ -566,12 +562,6 @@ stdenv.mkDerivation {
     #   Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232
     cmakeFlags="
       -GNinja
-      ${
-        # Fix for ld64 hardening issue
-        #
-        # TODO: Clean up on staging
-        lib.optionalString stdenv.hostPlatform.isDarwin "-DCMAKE_LINKER_TYPE=LLD"
-      }
       -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.hostPlatform.isDarwin "-WITH-HOSTLIBS"}
       -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON
       -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 8af33b495e9d..ad4fe81c46cb 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -15,8 +15,7 @@ let
     inherit stdenv;
 
     swift-unwrapped = callPackage ./compiler {
-      # TODO: Clean up on `staging`
-      inherit (llvmPackages) stdenv lld;
+      inherit (llvmPackages) stdenv;
       inherit (darwin) DarwinTools sigtool;
     };
 

From 075a8a4c381653c872c4db8712639eb16bd43f87 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:01 +0100
Subject: [PATCH 272/310] Revert "moltenvk: fix darwin build"

The ld64 issue has been fixed.

This reverts commit f3c69aae506bd64cbc7afff907e09b01af7e744f.
---
 pkgs/by-name/mo/moltenvk/package.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix
index 7c028f16e0f5..d39bb52b35e9 100644
--- a/pkgs/by-name/mo/moltenvk/package.nix
+++ b/pkgs/by-name/mo/moltenvk/package.nix
@@ -17,8 +17,6 @@
   # but that’s not really a concern for nixpkgs, so use them by default.
   # See: https://github.com/KhronosGroup/MoltenVK/blob/main/README.md#metal_private_api
   enablePrivateAPIUsage ? true,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,11 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ];
 
-  nativeBuildInputs = [
-    xcbuildHook
-    # TODO: Clean up on `staging`
-    llvmPackages.lld
-  ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   outputs = [
     "out"
@@ -120,11 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional enablePrivateAPIUsage "-DMVK_USE_METAL_PRIVATE_API=1"
   );
 
-  # Fix for ld64 hardening issue
-  #
-  # TODO: Clean up on `staging`
-  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
-
   env.NIX_LDFLAGS = toString [
     "-lglslang"
     "-lSPIRV"

From 9ae58090350dfebe6400e18a2f956ab6f832dad6 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:01 +0100
Subject: [PATCH 273/310] Revert "gtk2: fix darwin build"

The ld64 issue has been fixed.

This reverts commit adf395eab93e4ad624fce769455bf51e9b96f9e9.
---
 pkgs/by-name/gt/gtk2/package.nix | 41 ++++++++++----------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/gt/gtk2/package.nix b/pkgs/by-name/gt/gtk2/package.nix
index 369cfbee3695..3f05469c1afc 100644
--- a/pkgs/by-name/gt/gtk2/package.nix
+++ b/pkgs/by-name/gt/gtk2/package.nix
@@ -27,8 +27,6 @@
   gdktarget ? if stdenv.hostPlatform.isDarwin then "quartz" else "x11",
   cupsSupport ? config.gtk2.cups or stdenv.hostPlatform.isLinux,
   xineramaSupport ? stdenv.hostPlatform.isLinux,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 let
@@ -58,19 +56,13 @@ stdenv.mkDerivation (finalAttrs: {
     gtkCleanImmodulesCache
   ];
 
-  nativeBuildInputs =
-    finalAttrs.setupHooks
-    ++ [
-      gdk-pixbuf
-      gettext
-      gobject-introspection
-      perl
-      pkg-config
-    ]
-    # TODO: Clean up on `staging`
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      llvmPackages.lld
-    ];
+  nativeBuildInputs = finalAttrs.setupHooks ++ [
+    gdk-pixbuf
+    gettext
+    gobject-introspection
+    perl
+    pkg-config
+  ];
 
   patches = [
     ./patches/2.0-immodules.cache.patch
@@ -128,19 +120,12 @@ stdenv.mkDerivation (finalAttrs: {
     "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource"
   ];
 
-  env =
-    lib.optionalAttrs stdenv.cc.isGNU {
-      NIX_CFLAGS_COMPILE = toString [
-        "-Wno-error=implicit-int"
-        "-Wno-error=incompatible-pointer-types"
-      ];
-    }
-    # Fix for ld64 hardening issue
-    #
-    # TODO: Clean up on `staging`
-    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-      NIX_CFLAGS_LINK = "-fuse-ld=lld";
-    };
+  env = lib.optionalAttrs stdenv.cc.isGNU {
+    NIX_CFLAGS_COMPILE = toString [
+      "-Wno-error=implicit-int"
+      "-Wno-error=incompatible-pointer-types"
+    ];
+  };
 
   enableParallelBuilding = true;
 

From 0de2f5816b3b0d186efa114ea518908ade4db040 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:01 +0100
Subject: [PATCH 274/310] Revert "fltk_1_{3,4}: fix darwin build"

The ld64 issue has been fixed.

This reverts commit a450c2d068f288e3ca1279f889265101ec08790a.
---
 pkgs/by-name/fl/fltk_1_3/package.nix | 12 ------------
 pkgs/by-name/fl/fltk_1_4/package.nix | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/pkgs/by-name/fl/fltk_1_3/package.nix b/pkgs/by-name/fl/fltk_1_3/package.nix
index af71afe150d8..41762add1ce7 100644
--- a/pkgs/by-name/fl/fltk_1_3/package.nix
+++ b/pkgs/by-name/fl/fltk_1_3/package.nix
@@ -35,8 +35,6 @@
   withShared ? true,
 
   nix-update-script,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -70,10 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withDocs [
     doxygen
     graphviz
-  ]
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
 
   buildInputs =
@@ -145,12 +139,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
     (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
-  ]
-  # Fix for ld64 hardening issue
-  #
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    (lib.cmakeFeature "CMAKE_LINKER_TYPE" "LLD")
   ];
 
   preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) ''
diff --git a/pkgs/by-name/fl/fltk_1_4/package.nix b/pkgs/by-name/fl/fltk_1_4/package.nix
index f6fe650fafd7..57d9b9d87805 100644
--- a/pkgs/by-name/fl/fltk_1_4/package.nix
+++ b/pkgs/by-name/fl/fltk_1_4/package.nix
@@ -46,8 +46,6 @@
   withExamples ? (stdenv.buildPlatform == stdenv.hostPlatform),
 
   nix-update-script,
-  # TODO: Clean up on `staging`
-  llvmPackages,
 }:
 
 # pango support depends on Xft
@@ -86,10 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withDocs [
     doxygen
     graphviz
-  ]
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
 
   buildInputs =
@@ -175,12 +169,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
     (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
-  ]
-  # Fix for ld64 hardening issue
-  #
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    (lib.cmakeFeature "CMAKE_LINKER_TYPE" "LLD")
   ];
 
   postBuild = lib.optionalString withDocs ''

From c336281d85a8d0c956316f2927d0c88453941bbb Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:03 +0100
Subject: [PATCH 275/310] Revert "ffmpeg: work around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit 05e5a4e27941717c399a477ffa1d44ac9f412e15.
---
 pkgs/development/libraries/ffmpeg/generic.nix | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index d036b01bb5c9..96166235a309 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -366,9 +366,6 @@
   libnpp,
   # Testing
   testers,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 /*
@@ -837,9 +834,7 @@ stdenv.mkDerivation (
     ++ optionals stdenv.hostPlatform.isx86 [ nasm ]
     # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
     ++ optionals (lib.versionAtLeast version "6") [ texinfo ]
-    ++ optionals withCudaNVCC [ cuda_nvcc ]
-    # TODO: Clean up on `staging`.
-    ++ optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+    ++ optionals withCudaNVCC [ cuda_nvcc ];
 
     buildInputs =
       [ ]
@@ -983,17 +978,12 @@ stdenv.mkDerivation (
 
     buildFlags = [ "all" ] ++ optional buildQtFaststart "tools/qt-faststart"; # Build qt-faststart executable
 
-    env =
-      lib.optionalAttrs stdenv.cc.isGNU {
-        NIX_CFLAGS_COMPILE = toString [
-          "-Wno-error=incompatible-pointer-types"
-          "-Wno-error=int-conversion"
-        ];
-      }
-      # TODO: Clean up on `staging`.
-      // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-        NIX_CFLAGS_LINK = "-fuse-ld=lld";
-      };
+    env = lib.optionalAttrs stdenv.cc.isGNU {
+      NIX_CFLAGS_COMPILE = toString [
+        "-Wno-error=incompatible-pointer-types"
+        "-Wno-error=int-conversion"
+      ];
+    };
 
     # tests linking broken with shaderc after https://github.com/NixOS/nixpkgs/pull/477464/changes/5a47b12dfcd1b909ba35778a866394430054319a
     doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !withShaderc;

From a63bd182681f6ad1c55763321884e5b01a2098e7 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:04 +0100
Subject: [PATCH 276/310] Revert "sdl3: work around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit 984fe3dd058506862bce440677cfaf2e1749e320.
---
 pkgs/by-name/sd/sdl3/package.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index 691b8edf7a8f..9345096f3fa7 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -61,9 +61,6 @@
   vulkanSupport ? true,
   waylandSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   x11Support ? !stdenv.hostPlatform.isAndroid && !stdenv.hostPlatform.isWindows,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 assert lib.assertMsg (
@@ -130,8 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     validatePkgConfig
   ]
-  ++ lib.optional waylandSupport wayland-scanner
-  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
+  ++ lib.optional waylandSupport wayland-scanner;
 
   buildInputs =
     lib.optionals libusbSupport [
@@ -211,10 +207,6 @@ stdenv.mkDerivation (finalAttrs: {
       && !(stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAndroid)
       && !(x11Support || waylandSupport)
     ))
-  ]
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    (lib.cmakeFeature "CMAKE_LINKER_TYPE" "LLD")
   ];
 
   doCheck = true;

From 4e60e200cc748c67a79ae546ab2a3674ec43e855 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:06 +0100
Subject: [PATCH 277/310] Revert "qemu: work around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit 7a83e820ddc2dd54a2ff6038ffe5a2f7a4005fb8.
---
 pkgs/by-name/qe/qemu/package.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/by-name/qe/qemu/package.nix b/pkgs/by-name/qe/qemu/package.nix
index 57796c752243..978d4e21cecc 100644
--- a/pkgs/by-name/qe/qemu/package.nix
+++ b/pkgs/by-name/qe/qemu/package.nix
@@ -123,9 +123,6 @@
   minimal ? toolsOnly || userOnly,
   gitUpdater,
   qemu-utils, # for tests attribute
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 assert lib.assertMsg (
@@ -183,9 +180,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals hexagonSupport [ glib ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.sigtool
-
-    # TODO: Clean up on `staging`.
-    llvmPackages.lld
   ]
   ++ lib.optionals (!userOnly) [ dtc ];
 
@@ -431,10 +425,6 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm
   '';
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   passthru = {
     qemu-system-i386 = "bin/qemu-system-i386";
     tests = lib.optionalAttrs (!toolsOnly) {

From a0509f9918bbf9f4f994333e7c4b28b5bf1b6601 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:06 +0100
Subject: [PATCH 278/310] Revert "glfw3: work around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit 3b114d3460c13c07f259ee6ffb24e43de5f03277.
---
 pkgs/by-name/gl/glfw3/package.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix
index 6ecf627adce1..711406030b70 100644
--- a/pkgs/by-name/gl/glfw3/package.nix
+++ b/pkgs/by-name/gl/glfw3/package.nix
@@ -20,9 +20,6 @@
   libxkbcommon,
   libdecor,
   withMinecraftPatch ? false,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 let
   version = "3.4";
@@ -61,11 +58,7 @@ stdenv.mkDerivation {
     cmake
     pkg-config
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    fixDarwinDylibNames
-    # TODO: Clean up on `staging`.
-    llvmPackages.lld
-  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
@@ -93,9 +86,6 @@ stdenv.mkDerivation {
   cmakeFlags = [
     # Static linking isn't supported
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    (lib.cmakeFeature "CMAKE_LINKER_TYPE" "LLD")
   ];
 
   env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows) {

From c00cb4542ad52c633888d0da93460edc3934fca5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:06 +0100
Subject: [PATCH 279/310] Revert "python{313,314}Packages.pyobjc-core: work
 around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit 2c0e8d977ae15f20f251167091b61e5a3e62bc27.
---
 pkgs/development/python-modules/pyobjc-core/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix
index 278ad48196d8..e07a01289f74 100644
--- a/pkgs/development/python-modules/pyobjc-core/default.nix
+++ b/pkgs/development/python-modules/pyobjc-core/default.nix
@@ -4,9 +4,6 @@
   fetchFromGitHub,
   lib,
   setuptools,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 buildPythonPackage rec {
@@ -31,9 +28,6 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     darwin.DarwinTools # sw_vers
-
-    # TODO: Clean up on `staging`.
-    llvmPackages.lld
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
@@ -42,9 +36,6 @@ buildPythonPackage rec {
     "-Wno-error=unused-command-line-argument"
   ];
 
-  # TODO: Clean up on `staging`.
-  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
-
   pythonImportsCheck = [ "objc" ];
 
   meta = {

From 7b6ed7cb7ae909d69697fdc1a9d47f088c669c66 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:06 +0100
Subject: [PATCH 280/310] Revert "wxwidgets_{3_1,3_2,3_3}: work around `ld64`
 hardening issue"

The ld64 issue has been fixed.

This reverts commit 89af4db9cfc5c1b13ba5b9e666683699f8179fab.
---
 pkgs/by-name/wx/wxwidgets_3_1/package.nix | 26 ++++++-----------------
 pkgs/by-name/wx/wxwidgets_3_2/package.nix | 26 ++++++-----------------
 pkgs/by-name/wx/wxwidgets_3_3/package.nix | 26 ++++++-----------------
 3 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/pkgs/by-name/wx/wxwidgets_3_1/package.nix b/pkgs/by-name/wx/wxwidgets_3_1/package.nix
index bea53d1e25e1..17b1d60e360f 100644
--- a/pkgs/by-name/wx/wxwidgets_3_1/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_1/package.nix
@@ -23,9 +23,6 @@
   withWebKit ? stdenv.hostPlatform.isDarwin,
   webkitgtk_4_1,
   libpng,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -48,11 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     ./0002-support-webkitgtk-41.patch
   ];
 
-  nativeBuildInputs = [
-    pkg-config
-  ]
-  # TODO: Clean up on `staging`.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     gst_all_1.gst-plugins-base
@@ -96,17 +89,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-webviewwebkit"
   ];
 
-  env =
-    lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
-      SEARCH_LIB = toString [
-        "${libGLU.out}/lib"
-        "${libGL.out}/lib"
-      ];
-    }
-    # TODO: Clean up on `staging`.
-    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-      NIX_CFLAGS_LINK = "-fuse-ld=lld";
-    };
+  env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+    SEARCH_LIB = toString [
+      "${libGLU.out}/lib"
+      "${libGL.out}/lib"
+    ];
+  };
 
   preConfigure = ''
     substituteInPlace configure --replace \
diff --git a/pkgs/by-name/wx/wxwidgets_3_2/package.nix b/pkgs/by-name/wx/wxwidgets_3_2/package.nix
index 164911b73410..0b1edf024fd9 100644
--- a/pkgs/by-name/wx/wxwidgets_3_2/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_2/package.nix
@@ -29,9 +29,6 @@
   withMesa ? !stdenv.hostPlatform.isDarwin,
   withWebKit ? true,
   webkitgtk_4_1,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 let
   catch = fetchFromGitHub {
@@ -59,11 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-YaQrPJSlTpJKwjXLdRsGB04f7wKJCWfHjXWkB45qyEg=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ]
-  # TODO: Clean up on `staging`.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     gst_all_1.gst-plugins-base
@@ -121,17 +114,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-webviewwebkit"
   ];
 
-  env =
-    lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
-      SEARCH_LIB = toString [
-        "${libGLU.out}/lib"
-        "${libGL.out}/lib"
-      ];
-    }
-    # TODO: Clean up on `staging`.
-    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-      NIX_CFLAGS_LINK = "-fuse-ld=lld";
-    };
+  env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+    SEARCH_LIB = toString [
+      "${libGLU.out}/lib"
+      "${libGL.out}/lib"
+    ];
+  };
 
   preConfigure = ''
     cp -r ${catch}/* 3rdparty/catch/
diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
index d7e649b1e8ea..d15b0a4de841 100644
--- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
@@ -30,9 +30,6 @@
   withEGL ? true,
   withPrivateFonts ? false,
   webkitgtk_4_1,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -47,11 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-gB+mEk8rHpB4z1m8RWJSV+upKzLt7pZtlviS2g03EHY=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ]
-  # TODO: Clean up on `staging`.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     gst_all_1.gst-plugins-base
@@ -110,17 +103,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-webviewwebkit"
   ];
 
-  env =
-    lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
-      SEARCH_LIB = toString [
-        "${libGLU.out}/lib"
-        "${libGL.out}/lib"
-      ];
-    }
-    # TODO: Clean up on `staging`.
-    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-      NIX_CFLAGS_LINK = "-fuse-ld=lld";
-    };
+  env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+    SEARCH_LIB = toString [
+      "${libGLU.out}/lib"
+      "${libGL.out}/lib"
+    ];
+  };
 
   postInstall = "
     pushd $out/include

From 1d1caa92dd1f41095b56fcb694499833a9f9887e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:06 +0100
Subject: [PATCH 281/310] Revert "qt6.qtbase: work around `ld64` hardening
 issue"

The ld64 issue has been fixed.

This reverts commit fc952632d96e506faa958a807771a6577b48cf1a.
---
 .../libraries/qt-6/modules/qtbase/default.nix         | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index e3f60553ee63..7686093f4d75 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -89,9 +89,6 @@
   # options
   qttranslations ? null,
   fetchpatch,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 let
@@ -200,11 +197,7 @@ stdenv.mkDerivation {
     cmake
     ninja
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    moveBuildTree
-    # TODO: Clean up on `staging`.
-    llvmPackages.lld
-  ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
 
   propagatedNativeBuildInputs = [
     lndir
@@ -319,8 +312,6 @@ stdenv.mkDerivation {
     # When this variable is not set, cmake tries to execute xcodebuild
     # to query the version.
     "-DQT_INTERNAL_XCODE_VERSION=0.1"
-    # TODO: Clean up on `staging`.
-    (lib.cmakeFeature "CMAKE_LINKER_TYPE" "LLD")
   ]
   ++ lib.optionals isCrossBuild [
     "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"

From d18b05d487863ad1782190404eb56b7350167d1f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:06 +0100
Subject: [PATCH 282/310] Revert "python{313,314}Packages.matplotlib: work
 around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit e39e53c6c6a82f41bef75c5e0a3d01315d17bb88.
---
 .../python-modules/matplotlib/default.nix         | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index bee69a777e5e..ab1d363fc6ab 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -62,9 +62,6 @@
 
   # Reverse dependency
   sage,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 let
@@ -107,12 +104,7 @@ buildPythonPackage (finalAttrs: {
         --replace-fail libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
     '';
 
-  nativeBuildInputs = [
-    pkg-config
-  ]
-  ++ lib.optionals enableGtk3 [ gobject-introspection ]
-  # TODO: Clean up on `staging`.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+  nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableGtk3 [ gobject-introspection ];
 
   buildInputs = [
     ffmpeg-headless
@@ -168,11 +160,6 @@ buildPythonPackage (finalAttrs: {
     b_lto = false;
   };
 
-  # TODO: Clean up on `staging`.
-  env.${if stdenv.hostPlatform.isDarwin then "CC_LD" else null} = "lld";
-  env.${if stdenv.hostPlatform.isDarwin then "CXX_LD" else null} = "lld";
-  env.${if stdenv.hostPlatform.isDarwin then "OBJC_LD" else null} = "lld";
-
   passthru.tests = {
     inherit sage;
   };

From 6472ba3a88c6fce9fabeed0eb0d06d0dda64e383 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:08 +0100
Subject: [PATCH 283/310] Revert "opencv: work around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit 8f2f727a6786bede3b45b2ae637dc0b88299306d.
---
 pkgs/development/libraries/opencv/4.x.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index a7412473707e..85163117298f 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -91,9 +91,6 @@
 
   bzip2,
   callPackage,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }@inputs:
 
 let
@@ -478,10 +475,6 @@ effectiveStdenv.mkDerivation {
   )
   ++ optionals enableCuda [
     cudaPackages.cuda_nvcc
-  ]
-  # TODO: Clean up on `staging`.
-  ++ optionals effectiveStdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
 
   env = {
@@ -572,10 +565,6 @@ effectiveStdenv.mkDerivation {
   ]
   ++ optionals (enabledModules != [ ]) [
     (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules))
-  ]
-  # TODO: Clean up on `staging`.
-  ++ optionals effectiveStdenv.hostPlatform.isDarwin [
-    (cmakeFeature "CMAKE_LINKER_TYPE" "LLD")
   ];
 
   postBuild = optionalString enableDocs ''

From 6d9191113982f171b72743e34723143d2bce95e0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:10 +0100
Subject: [PATCH 284/310] Revert "swiftPackages.swift{,NoSwiftDriver}: work
 around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit eb22b856d1d0d35f75ebf991f9163b8d1d314b13.
---
 .../development/compilers/swift/swiftpm/default.nix |  5 -----
 .../development/compilers/swift/wrapper/default.nix | 13 -------------
 2 files changed, 18 deletions(-)

diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix
index 2d5db28d68c7..9d8e414b72c9 100644
--- a/pkgs/development/compilers/swift/swiftpm/default.nix
+++ b/pkgs/development/compilers/swift/swiftpm/default.nix
@@ -135,11 +135,6 @@ let
           # so we don't have to account for that scenario.
           "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
         ];
-
-        # TODO: Clean up on `staging`.
-        env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-          NIX_LDFLAGS = "-headerpad_max_install_names";
-        };
       }
     );
 
diff --git a/pkgs/development/compilers/swift/wrapper/default.nix b/pkgs/development/compilers/swift/wrapper/default.nix
index 0bd4a818da6d..e446bec66868 100644
--- a/pkgs/development/compilers/swift/wrapper/default.nix
+++ b/pkgs/development/compilers/swift/wrapper/default.nix
@@ -5,10 +5,6 @@
   useSwiftDriver ? true,
   swift-driver,
   clang,
-
-  # TODO: Clean up on `staging`.
-  llvmPackages,
-  writeShellScriptBin,
 }:
 
 stdenv.mkDerivation (
@@ -94,15 +90,6 @@ stdenv.mkDerivation (
           cp "$input" "$out/nix-support/$(basename "$input")"
         done
       fi
-    ''
-    # TODO: Clean up on `staging`.
-    + lib.optionalString stdenv.targetPlatform.isDarwin ''
-      printf "NIX_SWIFTFLAGS_COMPILE+=' -use-ld=lld -tools-directory %s'\n" \
-        ${writeShellScriptBin "ld" ''
-          exec ${lib.getExe' llvmPackages.lld "ld64.lld"} "$@"
-        ''}/bin \
-        >> $out/nix-support/setup-hook
-      printf '%s\n' ${lib.getBin llvmPackages.lld} >> $out/nix-support/propagated-build-inputs
     '';
 
     passthru = {

From ce07aaecd6ae79098599699db471fcada6a7f12e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:12 +0100
Subject: [PATCH 285/310] Revert "gfxstream: work around `ld64` hardening
 issue"

The ld64 issue has been fixed.

This reverts commit ba224f14b0e34098f24c5e9fa2a3576d5632d1a3.
---
 pkgs/by-name/gf/gfxstream/package.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/by-name/gf/gfxstream/package.nix b/pkgs/by-name/gf/gfxstream/package.nix
index 42f9ba41d58f..5ec352798319 100644
--- a/pkgs/by-name/gf/gfxstream/package.nix
+++ b/pkgs/by-name/gf/gfxstream/package.nix
@@ -13,8 +13,6 @@
   vulkan-headers,
   vulkan-loader,
   libx11,
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -43,10 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     python3
-  ]
-  # TODO: Clean up on `staging`.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
   buildInputs = [
     aemu
@@ -66,8 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
       "-framework QuartzCore"
       "-needed-lvulkan"
     ];
-    # TODO: Clean up on `staging`.
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
   };
 
   # dlopens libvulkan.

From c331209980ea6072843f4691b76870bed8aae54d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:14 +0100
Subject: [PATCH 286/310] Revert "livekit-libwebrtc: link with lld on darwin"

The ld64 issue has been fixed.

This reverts commit 7149c9fa371b483948da77550d66f70c265ac396.
---
 pkgs/by-name/li/livekit-libwebrtc/package.nix | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix
index b4cebbf58efd..f7e1fd2e88b3 100644
--- a/pkgs/by-name/li/livekit-libwebrtc/package.nix
+++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix
@@ -7,8 +7,6 @@
   fetchurl,
   fetchpatch,
   xcbuild,
-  lld,
-  llvm,
   python3,
   ninja,
   git,
@@ -184,13 +182,7 @@ stdenv.mkDerivation {
     ln -sf ${lib.getExe gn} buildtools/mac/gn
     chmod +x build/toolchain/apple/linker_driver.py
     patchShebangs build/toolchain/apple/linker_driver.py
-
-    # When 'use_lld=true' is set, llvm-ar is used instead of ar.
-    # The build config expects llvm-ar to be inside the provided clang base path,
-    # but this is not the case in nixpkgs.
-    substituteInPlace build/toolchain/apple/toolchain.gni \
-      --replace-fail "/bin/cp -Rc" "cp -a" \
-      --replace-fail '${"$"}{prefix}llvm-ar' '${lib.getExe' llvm "llvm-ar"}'
+    substituteInPlace build/toolchain/apple/toolchain.gni --replace-fail "/bin/cp -Rc" "cp -a"
 
     # nixpkgs calls the target "darwin" instead of "macos", and passing a different target
     # results in warnings by the nixpkgs compiler wrapper
@@ -218,10 +210,7 @@ stdenv.mkDerivation {
       cpio
       pkg-config
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-      lld
-    ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
   buildInputs = [
     nasm
@@ -290,8 +279,7 @@ stdenv.mkDerivation {
     "rtc_enable_objc_symbol_export=true"
     "rtc_include_dav1d_in_internal_decoder_factory=true"
     "clang_use_chrome_plugins=false"
-    # ld64 traps on linking because of C++ hardening
-    "use_lld=true"
+    "use_lld=false"
     ''clang_base_path="${clang}"''
   ]);
 
@@ -309,12 +297,6 @@ stdenv.mkDerivation {
     "desktop_capture_objc"
   ];
 
-  env = {
-    # ensure install_name_tool has enough space in binary headers
-    # to replace rpaths with very long nix store paths
-    NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
-  };
-
   postBuild =
     lib.optionalString stdenv.hostPlatform.isLinux ''
       objcopy --redefine-syms="${boringSslSymbols}" "libwebrtc.so"

From a54c484d7419ae66ccb087c601a397455d6cc46b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:15 +0100
Subject: [PATCH 287/310] Revert "kitty: work around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit 83cc719d53c59fea985d96aaa0f9105b8b49c3fc.
---
 pkgs/by-name/ki/kitty/package.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index 9795d74cdc06..b9483acf8a76 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -45,8 +45,6 @@
   makeBinaryWrapper,
   darwin,
   cairo,
-  # TODO: Clean up on `staging`.
-  llvmPackages,
 }:
 
 with python3Packages;
@@ -119,8 +117,6 @@ buildPythonApplication rec {
     imagemagick
     libicns # For the png2icns tool.
     darwin.autoSignDarwinBinariesHook
-    # TODO: Clean up on `staging`.
-    llvmPackages.lld
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     wayland-scanner
@@ -157,10 +153,6 @@ buildPythonApplication rec {
     CGO_ENABLED = 0;
     GOFLAGS = "-trimpath";
     GOTOOLCHAIN = "local";
-  }
-  # TODO: Clean up on `staging`.
-  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
   };
 
   configurePhase = ''

From 6dfa35220cab1d9c0f7e1364cb3937adec845792 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:17 +0100
Subject: [PATCH 288/310] Revert "mpv-unwrapped: fix darwin build (fixes
 #540682)"

The ld64 issue has been fixed.

This reverts commit 1dbdb986bbaf6551ac3a97871b9b90bf16f44728.
---
 pkgs/by-name/mp/mpv-unwrapped/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix
index 924f515fff27..4333d1ce35f5 100644
--- a/pkgs/by-name/mp/mpv-unwrapped/package.nix
+++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix
@@ -61,7 +61,6 @@
   wayland-protocols,
   wayland-scanner,
   zimg,
-  llvmPackages,
 
   # Boolean
   alsaSupport ? stdenv.hostPlatform.isLinux,
@@ -164,8 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
     buildPackages.darwin.sigtool
     swift
     makeBinaryWrapper
-    # TODO: Remove once #536365 reaches this branch
-    llvmPackages.lld
   ]
   ++ lib.optionals waylandSupport [ wayland-scanner ];
 
@@ -236,9 +233,6 @@ stdenv.mkDerivation (finalAttrs: {
   # ./osdep/mac/swift.h:270:9: fatal error: '.../app_bridge_objc-1.pch' file not found
   env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
     NIX_SWIFTFLAGS_COMPILE = "-disable-bridging-pch";
-
-    # TODO: Remove once #536365 reaches this branch
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
   };
 
   postBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''

From 12301d74a0ed899e0cea420cf716319317310978 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:19 +0100
Subject: [PATCH 289/310] Revert "caffeine: fix darwin build (fixes #540657)"

The ld64 issue has been fixed.

This reverts commit de1fd69eb30dee555e9bbaec2837c5055710e61b.
---
 pkgs/by-name/ca/caffeine/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/ca/caffeine/package.nix b/pkgs/by-name/ca/caffeine/package.nix
index 36a4aaa70e15..881d85276502 100644
--- a/pkgs/by-name/ca/caffeine/package.nix
+++ b/pkgs/by-name/ca/caffeine/package.nix
@@ -5,7 +5,6 @@
   apple-sdk,
   darwin,
   xcbuildHook,
-  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,8 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     xcbuildHook
     darwin.autoSignDarwinBinariesHook
-    # TODO: Remove once #536365 reaches this branch
-    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -45,9 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
     "-configuration Release"
   ];
 
-  # TODO: Remove once #536365 reaches this branch
-  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
-
   installPhase = ''
     runHook preInstall
 

From d14250c1b0bc9a583a2597a27679d73bbf970882 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:21 +0100
Subject: [PATCH 290/310] Revert "qbittorrent: fix darwin build"

The ld64 issue has been fixed.

This reverts commit fac56b935339f50c6582b5fccf0bcf33d69b9741.
---
 pkgs/by-name/qb/qbittorrent/package.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index 07f1fe49193e..671e1d0e3d2b 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -17,7 +17,6 @@
   wrapGAppsHook3,
   zlib,
   nixosTests,
-  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     wrapGAppsHook3
     qt6.wrapQtAppsHook
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # TODO: Remove once #536365 reaches this branch
-    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -65,11 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!webuiSupport) [ "-DWEBUI=OFF" ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # TODO: Remove once #536365 reaches this branch
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   qtWrapperArgs = lib.optionals trackerSearch [ "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ];
 
   dontWrapGApps = true;

From 1077d6b0cd9569c66d51aaa8480bfc86ce6c2070 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:22 +0100
Subject: [PATCH 291/310] Revert "iamb: fix darwin build"

The ld64 issue has been fixed.

This reverts commit 8f575ecf14910e22d1bf6a41c3ad1b6c8af27533.
---
 pkgs/by-name/ia/iamb/package.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix
index 59f21eb62b36..8a15554b29cf 100644
--- a/pkgs/by-name/ia/iamb/package.nix
+++ b/pkgs/by-name/ia/iamb/package.nix
@@ -6,8 +6,6 @@
   writableTmpDirAsHomeHook,
   versionCheckHook,
   nix-update-script,
-  llvmPackages,
-  stdenv,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -29,17 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [
     installShellFiles
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # TODO: Remove once #536365 reaches this branch
-    llvmPackages.lld
   ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # TODO: Remove once #536365 reaches this branch
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   postInstall = ''
     installManPage $src/docs/iamb.{1,5}
     install -D $src/docs/iamb.svg -t $out/share/icons/hicolor/scalable/apps

From 45ffb993fa878471256a11256487ba64240f7f9d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:24 +0100
Subject: [PATCH 292/310] Revert "starship: fix build on Darwin"

The ld64 issue has been fixed.

This reverts commit 883e799eb2843d1438a5ce76ed8ac4a924cf6ce5.
---
 pkgs/by-name/st/starship/package.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix
index d5482bf24114..877f887a9569 100644
--- a/pkgs/by-name/st/starship/package.nix
+++ b/pkgs/by-name/st/starship/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   rustPlatform,
-  llvmPackages,
   installShellFiles,
   writableTmpDirAsHomeHook,
   gitMinimal,
@@ -23,24 +22,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-pStNE8SMMVavL3ld6RO+5QQRJPXpqlU3asccS2tUoMQ=";
   };
 
-  nativeBuildInputs = [
-    installShellFiles
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+  nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     writableTmpDirAsHomeHook
   ];
 
-  env = {
-    TZDIR = "${tzdata}/share/zoneinfo";
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # Work around ld64's libc++ hardening issue.
-    #
-    # TODO: Remove once #536365 reaches this branch.
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
+  env.TZDIR = "${tzdata}/share/zoneinfo";
 
   postInstall = ''
     presetdir=$out/share/starship/presets/

From ac9166993a6f1462efbd1da01e55b5589e0c6e3b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:26 +0100
Subject: [PATCH 293/310] Revert "picocrypt{,-ng}: fix build on darwin"

The ld64 issue has been fixed.

This reverts commit 53bd18aca0a74eae9553c36ecccb84211d75a206.
---
 pkgs/by-name/pi/picocrypt-ng/package.nix | 13 ++-----------
 pkgs/by-name/pi/picocrypt/package.nix    | 13 ++-----------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/pi/picocrypt-ng/package.nix b/pkgs/by-name/pi/picocrypt-ng/package.nix
index f3535dfa8f22..026dbbad8989 100644
--- a/pkgs/by-name/pi/picocrypt-ng/package.nix
+++ b/pkgs/by-name/pi/picocrypt-ng/package.nix
@@ -12,7 +12,6 @@
   pkg-config,
   wrapGAppsHook3,
   writableTmpDirAsHomeHook,
-  llvmPackages,
 }:
 
 buildGoModule (finalAttrs: {
@@ -50,9 +49,7 @@ buildGoModule (finalAttrs: {
     pkg-config
     wrapGAppsHook3
     writableTmpDirAsHomeHook
-  ]
-  # TODO: Remove once #536365 reaches this branch
-  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
+  ];
 
   # git ls-files doesn't work as source is not a git repo
   checkFlags =
@@ -64,13 +61,7 @@ buildGoModule (finalAttrs: {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  env = {
-    CGO_ENABLED = 1;
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # TODO: Remove once #536365 reaches this branch
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
+  env.CGO_ENABLED = 1;
 
   postInstall = ''
     mv $out/bin/picocrypt $out/bin/picocrypt-ng-gui
diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix
index 4728d400dc5c..cfa8906fdd91 100644
--- a/pkgs/by-name/pi/picocrypt/package.nix
+++ b/pkgs/by-name/pi/picocrypt/package.nix
@@ -11,7 +11,6 @@
   gtk3,
   pkg-config,
   wrapGAppsHook3,
-  llvmPackages,
 }:
 
 buildGoModule (finalAttrs: {
@@ -47,17 +46,9 @@ buildGoModule (finalAttrs: {
     copyDesktopItems
     pkg-config
     wrapGAppsHook3
-  ]
-  # TODO: Remove once #536365 reaches this branch
-  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
+  ];
 
-  env = {
-    CGO_ENABLED = 1;
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # TODO: Remove once #536365 reaches this branch
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
+  env.CGO_ENABLED = 1;
 
   postInstall = ''
     mv $out/bin/Picocrypt $out/bin/picocrypt-gui

From 0ae746de77e3776d2125a1aa4ea2f53746623989 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:28 +0100
Subject: [PATCH 294/310] Revert "imhex: fix build on darwin"

The ld64 issue has been fixed.

This reverts commit 1f6f094ec0e18408b25b9487d34b402e79cdebc7.
---
 pkgs/by-name/im/imhex/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index 0ce61eea2f86..7b9f98853290 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -23,7 +23,6 @@
   nix-update-script,
   autoPatchelfHook,
   makeWrapper,
-  llvmPackages,
 }:
 
 let
@@ -62,9 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     makeWrapper
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
-  # TODO: Remove once #536365 reaches this branch
-  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   buildInputs = [
     capstone
@@ -106,13 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "@executable_path/../Frameworks")
   ];
 
-  env = {
-    NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # TODO: Remove once #536365 reaches this branch
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
   # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application
   postPatch = ''

From 734bc6c4e9411321aeb2e29da318f3a9ea330516 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:29 +0100
Subject: [PATCH 295/310] Revert "R: fix build on darwin"

The ld64 issue has been fixed.

This reverts commit f03ea24eb13ee4d647def42e799ed0644e4d7ca8.
---
 pkgs/applications/science/math/R/default.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index f227a7f742f0..6376bf4f08e8 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -27,7 +27,6 @@
   pkg-config,
   bison,
   which,
-  llvmPackages,
   jdk,
   blas,
   lapack,
@@ -69,10 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     tzdata
     which
-  ]
-  # TODO: Remove once #536365 reaches this branch
-  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
-
+  ];
   buildInputs = [
     bzip2
     gfortran
@@ -130,11 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontDisableStatic = static;
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # TODO: Remove once #536365 reaches this branch
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   preConfigure = ''
     configureFlagsArray=(
       --disable-lto

From 975a5cb35076e523cf2117fc8d3184562b284a0f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:31 +0100
Subject: [PATCH 296/310] Revert "topgrade: fix Darwin build"

The ld64 issue has been fixed.

This reverts commit f93cef19e8c20f24cd5aff2617ac99917b489ea6.
---
 pkgs/by-name/to/topgrade/package.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index 45ef928a6052..c3609237d5a3 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   rustPlatform,
   installShellFiles,
-  llvmPackages,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -22,18 +21,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [
     installShellFiles
-  ]
-  # TODO: Remove once #536365 reaches this branch
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+  ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_COMPILE = toString [
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.hostPlatform.isDarwin [
       "-framework"
       "AppKit"
-    ];
-    # TODO: Remove once #536365 reaches this branch
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
+    ]
+  );
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd topgrade \

From bc6d2bc1aa75a53726132f6726ffa231036844fc Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:33 +0100
Subject: [PATCH 297/310] Revert "rectangle: fix darwin build (second attempt)"

The ld64 issue has been fixed.

This reverts commit ec3327048366853e58afb5132b0d9908f811cb1a.
---
 pkgs/by-name/re/rectangle/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index c0cd0994b03f..2726452ff546 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -199,11 +199,10 @@ stdenv.mkDerivation (finalAttrs: {
     ) masShortcutSources}
 
     nixLog "linking MASShortcut dylib"
-    # `-fuse-ld=lld`: fix for ld64 hardening issue
-    # TODO: Clean up on `staging`
     clang -dynamiclib "''${masObjFiles[@]}" \
       -framework AppKit -framework Carbon -framework Foundation \
       -install_name "@rpath/MASShortcut.framework/MASShortcut" \
+      # TODO: Clean up on `staging`
       -fuse-ld=lld \
       -o "$buildDir/libMASShortcut.dylib"
 

From 27e7e37de42bd57c81a11482c0ba7a47475e39f1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:34 +0100
Subject: [PATCH 298/310] Revert "rectangle: fix darwin build"

The ld64 issue has been fixed.

This reverts commit 08e2d92d786eb15eb97f9bb9a4c3d3136195c2f2.
---
 pkgs/by-name/re/rectangle/package.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index 2726452ff546..19438c2cba8d 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -5,8 +5,6 @@
   darwin,
   actool,
   ibtool,
-  # TODO: Clean up on `staging`
-  llvmPackages,
   makeWrapper,
   nix-update-script,
 }:
@@ -151,8 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
     ibtool
     darwin.autoSignDarwinBinariesHook
     makeWrapper
-    # TODO: Clean up on `staging`
-    llvmPackages.lld
   ];
 
   dontConfigure = true;
@@ -165,8 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
     commonSwiftFlags=(
       -O -disable-bridging-pch
       -Xlinker -platform_version -Xlinker macos -Xlinker 14.0 -Xlinker 26.0
-      # TODO: Clean up on `staging`
-      -use-ld=lld
     )
 
     nixLog "building Sparkle stub framework"
@@ -202,8 +196,6 @@ stdenv.mkDerivation (finalAttrs: {
     clang -dynamiclib "''${masObjFiles[@]}" \
       -framework AppKit -framework Carbon -framework Foundation \
       -install_name "@rpath/MASShortcut.framework/MASShortcut" \
-      # TODO: Clean up on `staging`
-      -fuse-ld=lld \
       -o "$buildDir/libMASShortcut.dylib"
 
     rectSwiftFiles=()

From 4378d0d124097a7c872518f81c25ff7f72da61dd Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:36 +0100
Subject: [PATCH 299/310] Revert "terminal-notifier: fix darwin build"

The ld64 issue has been fixed.

This reverts commit 1f1964ac3df2ff2966c91942898204e39cc449ad.
---
 pkgs/by-name/te/terminal-notifier/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/te/terminal-notifier/package.nix b/pkgs/by-name/te/terminal-notifier/package.nix
index 59cd6469b99d..ecfea7c2fb1d 100644
--- a/pkgs/by-name/te/terminal-notifier/package.nix
+++ b/pkgs/by-name/te/terminal-notifier/package.nix
@@ -3,7 +3,6 @@
   fetchFromGitHub,
   ibtool,
   lib,
-  llvmPackages,
   makeBinaryWrapper,
   stdenv,
   xcbuildHook,
@@ -24,8 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
     ibtool
     makeBinaryWrapper
     xcbuildHook
-    # TODO: Clean up on `staging`
-    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -39,9 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     "Release"
   ];
 
-  # TODO: Clean up on `staging`
-  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
-
   installPhase = ''
     runHook preInstall
 

From c0324ab3a33db96ec7776724a3c6f078dac1288b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:37 +0100
Subject: [PATCH 300/310] Revert "telegram-desktop: work around ld64 hardening
 issue"

The ld64 issue has been fixed.

This reverts commit f5616cc38c3ec227efa85d9f7c9195837efab8c3.
---
 .../telegram/telegram-desktop/unwrapped.nix          | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index e1072e07d6ea..7472cc1155db 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -34,7 +34,6 @@
   libjxl,
   libicns,
   apple-sdk_15,
-  llvmPackages,
   nix-update-script,
 }:
 
@@ -68,11 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
     # to build bundled libdispatch
     clang
     gobject-introspection
-  ]
-  # Work around ld64's libc++ hardening issue causing Trace/BPT trap: 5
-  # TODO: Remove once nixpkgs#536365 reaches this branch.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -108,12 +102,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
-  # Work around ld64's libc++ hardening issue causing Trace/BPT trap: 5
-  # TODO: Remove once nixpkgs#536365 reaches this branch.
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   cmakeFlags = [
     # We're allowed to used the API ID of the Snap package:
     (lib.cmakeFeature "TDESKTOP_API_ID" "611335")

From 7f3a48d8db1ab40fb8ff8884e767a5d328abfe41 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:39 +0100
Subject: [PATCH 301/310] Revert "blueutil: fix build by linking with lld"

The ld64 issue has been fixed.

This reverts commit 7168ff819ba911776e0bfd96ad949d05854339d7.
---
 pkgs/by-name/bl/blueutil/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/bl/blueutil/package.nix b/pkgs/by-name/bl/blueutil/package.nix
index 6f13a65ab4f1..31d6eaf1cadd 100644
--- a/pkgs/by-name/bl/blueutil/package.nix
+++ b/pkgs/by-name/bl/blueutil/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  llvmPackages,
   testers,
   nix-update-script,
 }:
@@ -18,12 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Qw5c9dp7wpuOcQSLsg1pfJ+NbrEtme2o6nKD3Ba3A3M=";
   };
 
-  # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
-  nativeBuildInputs = [ llvmPackages.lld ];
-
   env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Werror -mmacosx-version-min=10.9 -framework Foundation -framework IOBluetooth";
-  # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
-  env.NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
 
   installPhase = ''
     runHook preInstall

From 041ff67b5ec5c6129af8d995b6fe667049efc952 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:41 +0100
Subject: [PATCH 302/310] Revert "yabai: work around `ld64` hardening issue"

The ld64 issue has been fixed.

This reverts commit 0125c384a55ce6d6df59fd279edeaa787ff67bc6.
---
 pkgs/by-name/ya/yabai/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix
index 3f2e417939d3..e650f1b735f4 100644
--- a/pkgs/by-name/ya/yabai/package.nix
+++ b/pkgs/by-name/ya/yabai/package.nix
@@ -28,17 +28,12 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     installShellFiles
     xxd
-    # TODO: Clean up on `staging`.
-    llvmPackages.lld
   ];
 
   buildInputs = [
     apple-sdk_15
   ];
 
-  # TODO: Clean up on `staging`.
-  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
-
   # Upstream Makefile races clean-build against linking under parallel make.
   enableParallelBuilding = false;
 

From 3bb4c65bd227287564913eabf63dbe48a197691e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:42 +0100
Subject: [PATCH 303/310] Revert "qtspeech: fix build on Darwin"

The ld64 issue has been fixed.

This reverts commit 23c83f33eca0e330ce1304cc5d9fdfe8bad7b538.
---
 pkgs/development/libraries/qt-6/modules/qtspeech.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix
index f87953f6fe81..4867bcaf7ee9 100644
--- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix
@@ -2,7 +2,6 @@
   qtModule,
   lib,
   stdenv,
-  llvmPackages,
   qtbase,
   qtmultimedia,
   pkg-config,
@@ -13,10 +12,7 @@
 
 qtModule {
   pname = "qtspeech";
-  nativeBuildInputs = [
-    pkg-config
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     flite
     alsa-lib
@@ -26,9 +22,4 @@ qtModule {
     qtbase
     qtmultimedia
   ];
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # Work around ld64's libc++ hardening issue.
-    # TODO: Remove once #536365 reaches this branch.
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
 }

From e25c85530fccecf4ebbff23537a8c948615ed01c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:44 +0100
Subject: [PATCH 304/310] Revert "mactop: fix build on Darwin"

The ld64 issue has been fixed.

This reverts commit c0984aabedab91dd368f572dad3e7c6015abed3f.
---
 pkgs/by-name/ma/mactop/package.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix
index 7b0a15ee20c7..e54d58aec534 100644
--- a/pkgs/by-name/ma/mactop/package.nix
+++ b/pkgs/by-name/ma/mactop/package.nix
@@ -2,7 +2,6 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  llvmPackages,
   versionCheckHook,
   nix-update-script,
 }:
@@ -22,14 +21,6 @@ buildGoModule rec {
 
   proxyVendor = true;
 
-  nativeBuildInputs = [ llvmPackages.lld ];
-
-  env = {
-    # Work around ld64's libc++ hardening issue.
-    # TODO: Remove once #536365 reaches this branch.
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   ldflags = [
     "-s"
     "-w"

From b3d3cfb2709632a68d8293fc71b014a1c1f7e5bf Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:45 +0100
Subject: [PATCH 305/310] Revert "darktable: fix build on Darwin"

The ld64 issue has been fixed.

This reverts commit 3aad607343efb414fdf22fc1284c99c3f640ed3e.
---
 pkgs/by-name/da/darktable/package.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index d70fc071213a..c954ded2f1f6 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -103,8 +103,7 @@ stdenv.mkDerivation rec {
     pkg-config
     wrapGAppsHook3
     saxon # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+  ];
 
   buildInputs = [
     SDL2
@@ -185,12 +184,6 @@ stdenv.mkDerivation rec {
     "-DUSE_KWALLET=OFF"
   ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # Work around ld64's libc++ hardening issue.
-    # TODO: Remove once #536365 reaches this branch.
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   # darktable changed its rpath handling in commit
   # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
   # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in

From cd3be32b01dbe24563d85040f3822315ef1bc230 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:47 +0100
Subject: [PATCH 306/310] Revert "noti: fix build on Darwin"

The ld64 issue has been fixed.

This reverts commit f2722a7fade8fdda3a0ee2d682c9009f543d2b06.
---
 pkgs/by-name/no/noti/package.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix
index a51018ab362d..264e5e34fbfe 100644
--- a/pkgs/by-name/no/noti/package.nix
+++ b/pkgs/by-name/no/noti/package.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  stdenv,
   buildGoModule,
   fetchFromCodeberg,
-  llvmPackages,
   installShellFiles,
 }:
 
@@ -20,19 +18,10 @@ buildGoModule (finalAttrs: {
 
   vendorHash = null;
 
-  nativeBuildInputs = [
-    installShellFiles
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
+  nativeBuildInputs = [ installShellFiles ];
 
   subPackages = [ "cmd/noti" ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # Work around ld64's libc++ hardening issue.
-    # TODO: Remove once #536365 reaches this branch.
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   ldflags = [
     "-s"
     "-w"

From 1b1b7273ebba49ee0d1c7364a0bdda7293cce22b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:49 +0100
Subject: [PATCH 307/310] Revert "lima: fix build on Darwin by linking with
 lld"

The ld64 issue has been fixed.

This reverts commit 5ce128c4d99036a72c5c4c2044a954ebcd8e0801.
---
 pkgs/by-name/li/lima/package.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix
index 8d4d63925e30..c998ae4731b6 100644
--- a/pkgs/by-name/li/lima/package.nix
+++ b/pkgs/by-name/li/lima/package.nix
@@ -11,7 +11,6 @@
   apple-sdk_15,
   withAdditionalGuestAgents ? false,
   lima-additional-guestagents,
-  llvmPackages,
   writableTmpDirAsHomeHook,
   versionCheckHook,
   testers,
@@ -36,16 +35,7 @@ buildGoModule (finalAttrs: {
     # For checkPhase, and installPhase(required to build completion)
     writableTmpDirAsHomeHook
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.sigtool
-    # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
-    llvmPackages.lld
-  ];
-
-  # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' llvmPackages.lld "ld64.lld"}";
-  };
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];
 

From be99681c30cadf7d2602835e8ba06fc581ddbb09 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:50 +0100
Subject: [PATCH 308/310] Revert "gtk4: fix build on darwin by linking with
 lld"

The ld64 issue has been fixed.

This reverts commit d846912fb0b533478ce337c08bd303c8635015cd.
---
 pkgs/by-name/gt/gtk4/package.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix
index c92464ba6e3d..9b7807508a35 100644
--- a/pkgs/by-name/gt/gtk4/package.nix
+++ b/pkgs/by-name/gt/gtk4/package.nix
@@ -60,7 +60,6 @@
   compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages,
   cups,
   libexecinfo,
-  llvmPackages,
   broadwaySupport ? true,
   testers,
   darwinMinVersionHook,
@@ -131,10 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals vulkanSupport [
     shaderc # for glslc
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
-    llvmPackages.lld
-  ]
   ++ finalAttrs.setupHooks;
 
   buildInputs = [
@@ -226,10 +221,6 @@ stdenv.mkDerivation (finalAttrs: {
   }
   // lib.optionalAttrs stdenv.hostPlatform.isMusl {
     NIX_LDFLAGS = "-lexecinfo";
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
-    NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
   };
 
   postPatch = ''

From 03741d43de97bfa594fab5ca8e29ffebe3f4e3fa Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:52 +0100
Subject: [PATCH 309/310] Revert "godot: fix build on darwin by linking with
 lld"

The ld64 issue has been fixed.

This reverts commit 0a930dd847a2a0d3e25ea733537138fbd64687db.
---
 pkgs/development/tools/godot/common.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index ac25ea3cfde6..1ff39286d4bf 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -38,7 +38,6 @@
   libxkbcommon,
   libxrandr,
   libxrender,
-  llvmPackages,
   makeWrapper,
   mbedtls,
   miniupnpc,
@@ -399,8 +398,6 @@ let
             "-I${lib.getDev harfbuzz-icu}/include/harfbuzz"
             "-I${lib.getDev recastnavigation}/include/recastnavigation"
           ];
-          # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
-          NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
         };
 
         preConfigure = lib.optionalString (editor && withMono) ''
@@ -646,8 +643,6 @@ let
         ++ lib.optionals stdenv.hostPlatform.isDarwin (
           [
             darwin.sigtool
-            # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
-            llvmPackages.lld
           ]
           ++ lib.optionals (!editor) [
             strip-nondeterminism

From b5cd571e922633a37cbacd083308407b4d61d778 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jul 2026 03:19:54 +0100
Subject: [PATCH 310/310] Revert "stats: fix darwin build"

The ld64 issue has been fixed.

This reverts commit 490db099aa4330d875b6f6c0d02f57d3b7a29d98.
---
 pkgs/by-name/st/stats/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 00ef020ed709..5168a4051808 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -3,8 +3,6 @@
   swiftPackages,
   fetchFromGitHub,
   leveldb,
-  # TODO: Clean up on `staging`.
-  llvmPackages,
   perl,
   actool,
   makeWrapper,
@@ -90,8 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
     actool
     makeWrapper
     rcodesign
-    # TODO: Clean up on `staging`.
-    llvmPackages.lld
   ];
 
   buildInputs = [ leveldb ];
@@ -130,8 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
       # The Swift compiler in nixpkgs uses SDK 14 headers (which compile fine), but without
       # this flag the linker records SDK 14 and macOS withholds it (Liquid Glass)
       -Xlinker -platform_version -Xlinker macos -Xlinker 14.0 -Xlinker 26.0
-      # TODO: Clean up on `staging`
-      -use-ld=lld
     )
 
     buildFramework() {