From 7617aa5f11549d0b7c0c33b5d034d08760e90159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 17:46:34 -0700
Subject: [PATCH 1/3] python3Packages.aiohttp: only depend on async-timeout for
 Python < 3.11

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

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 7a7163164594..010a997cd972 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -94,15 +94,18 @@ buildPythonPackage rec {
   dependencies = [
     aiohappyeyeballs
     aiosignal
-    async-timeout
     attrs
     frozenlist
     multidict
     propcache
     yarl
   ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    async-timeout
+  ]
   ++ optional-dependencies.speedups;
 
+
   optional-dependencies.speedups = [
     aiodns
     (if isPyPy then brotlicffi else brotli)

From 97124c2e99def1518b92b1384d8ba117f50507b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 17:54:29 -0700
Subject: [PATCH 2/3] python3Packages.backports-zstd: init at 1.0.0

---
 .../python-modules/backports-zstd/default.nix | 55 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  8 +++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/python-modules/backports-zstd/default.nix

diff --git a/pkgs/development/python-modules/backports-zstd/default.nix b/pkgs/development/python-modules/backports-zstd/default.nix
new file mode 100644
index 000000000000..6050f2c4975b
--- /dev/null
+++ b/pkgs/development/python-modules/backports-zstd/default.nix
@@ -0,0 +1,55 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+  zstd,
+}:
+
+buildPythonPackage rec {
+  pname = "backports-zstd";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rogdham";
+    repo = "backports.zstd";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-MRtj40vjCPtV9/RDgun/APzva4lv+TnXeBKD9RNlkII=";
+  };
+
+  postPatch = ''
+    # need to preserve $PYTHONPATH when calling sys.executable
+    substituteInPlace tests/test/support/script_helper.py \
+      --replace-fail "return __cached_interp_requires_environment" "return True"
+  '';
+
+  build-system = [ setuptools ];
+
+  pypaBuildFlags = [ "--config-setting=--build-option=--system-zstd" ];
+
+  buildInputs = [ zstd ];
+
+  pythonImportsCheck = [ "backports.zstd" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  enabledTestPaths = [ "tests" ];
+
+  disabledTestPaths = [
+    # sandbox doesn't allow setting SUID bit
+    "tests/test/test_tarfile.py::TestExtractionFilters::test_modes"
+  ];
+
+  meta = {
+    changelog = "https://github.com/rogdham/backports.zstd/blob/${src.tag}/CHANGELOG.md";
+    description = "Backport of compression.zstd";
+    homepage = "https://github.com/rogdham/backports.zstd";
+    license = lib.licenses.psfl;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a61be6e913c..04cc5c5c9206 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1687,6 +1687,14 @@ self: super: with self; {
 
   backports-tarfile = callPackage ../development/python-modules/backports-tarfile { };
 
+  backports-zstd =
+    if pythonAtLeast "3.14" then
+      null
+    else
+      callPackage ../development/python-modules/backports-zstd {
+        inherit (pkgs) zstd;
+      };
+
   backrefs = callPackage ../development/python-modules/backrefs { };
 
   backtesting = callPackage ../development/python-modules/backtesting { };

From 6faaad0df64a89bdbc81f3fd773b6a23ea5575ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 17:46:51 -0700
Subject: [PATCH 3/3] python3Packages.aiohttp: 3.13.0 -> 3.13.1

Diff: https://github.com/aio-libs/aiohttp/compare/v3.13.0...v3.13.1

Changelog: https://docs.aiohttp.org/en/v3.13.1/changes.html
---
 pkgs/development/python-modules/aiohttp/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 010a997cd972..d9897a535929 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -21,11 +21,11 @@
   aiosignal,
   async-timeout,
   attrs,
+  backports-zstd,
   frozenlist,
   multidict,
   propcache,
   yarl,
-  zstandard,
 
   # optional dependencies
   aiodns,
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.13.0";
+  version = "3.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp";
     tag = "v${version}";
-    hash = "sha256-X4igOjBeAGDfUGwZAsjUWOWt3EFt53QSuUcdJ/5vBVU=";
+    hash = "sha256-gjFNGHfbajktxApj1RfUdMB4FuD8cFc6ueHZsRbV/uU=";
   };
 
   patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [
@@ -105,13 +105,10 @@ buildPythonPackage rec {
   ]
   ++ optional-dependencies.speedups;
 
-
   optional-dependencies.speedups = [
     aiodns
+    backports-zstd
     (if isPyPy then brotlicffi else brotli)
-  ]
-  ++ lib.optionals (pythonOlder "3.14") [
-    zstandard
   ];
 
   nativeCheckInputs = [