From c46b6e9af11a4902f6fd9eadc33b578fbd0421a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 6 May 2025 03:55:44 -0700
Subject: [PATCH 1/2] python313Packages.url-normalize: 1.4.3 -> 2.2.1

Diff: https://github.com/niksite/url-normalize/compare/refs/tags/1.4.3...refs/tags/v2.2.1

Changelog: https://github.com/niksite/url-normalize/blob/v2.2.1/CHANGELOG.md
---
 .../python-modules/url-normalize/default.nix  | 46 ++++++-------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/url-normalize/default.nix b/pkgs/development/python-modules/url-normalize/default.nix
index b914c8ae61eb..d800fb80b7a4 100644
--- a/pkgs/development/python-modules/url-normalize/default.nix
+++ b/pkgs/development/python-modules/url-normalize/default.nix
@@ -2,58 +2,42 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
-  poetry-core,
-  pytest-flakes,
-  pytest-mock,
+  idna,
+  pytest-cov-stub,
   pytest-socket,
   pytestCheckHook,
-  six,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "url-normalize";
-  version = "1.4.3";
-  format = "pyproject";
+  version = "2.2.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "niksite";
-    repo = pname;
-    rev = version;
-    hash = "sha256-WE3MM9B/voI23taFbLp2FYhl0uxOfuUWsaCTBG1hyiY=";
+    repo = "url-normalize";
+    tag = "v${version}";
+    hash = "sha256-ZFY1KMEHvteMFVM3QcYjCiTz3dLxRWyv/dZQMzVxGvo=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ six ];
+  dependencies = [ idna ];
 
   nativeCheckInputs = [
-    pytest-flakes
-    pytest-mock
+    pytest-cov-stub
     pytest-socket
     pytestCheckHook
   ];
 
-  patches = [
-    # Switch to poetry-core, https://github.com/niksite/url-normalize/pull/28
-    (fetchpatch {
-      name = "switch-to-poetry-core.patch";
-      url = "https://github.com/niksite/url-normalize/commit/b8557b10c977b191cc9d37e6337afe874a24ad08.patch";
-      hash = "sha256-SVCQATV9V6HbLmjOHs7V7eBagO0PuqZLubIJghBYfQQ=";
-    })
-  ];
-
-  postPatch = ''
-    sed -i "/--cov/d" tox.ini
-    sed -i "/--flakes/d" tox.ini
-  '';
-
   pythonImportsCheck = [ "url_normalize" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/niksite/url-normalize/blob/${src.tag}/CHANGELOG.md";
     description = "URL normalization for Python";
     homepage = "https://github.com/niksite/url-normalize";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 1ddbbe1b819c96e1880a3ac6b46fc96d98fdbbd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 6 May 2025 03:59:22 -0700
Subject: [PATCH 2/2] python313Packages.aiohttp-client-cache: 0.12.4 -> 0.13.0

Changelog: https://github.com/requests-cache/aiohttp-client-cache/blob/v0.13.0/HISTORY.md
---
 .../python-modules/aiohttp-client-cache/default.nix        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix
index e7e1812db0ff..23e833ac89ed 100644
--- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix
+++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix
@@ -14,22 +14,19 @@
   poetry-core,
   pytest-aiohttp,
   pytestCheckHook,
-  pythonOlder,
   redis,
   url-normalize,
 }:
 
 buildPythonPackage rec {
   pname = "aiohttp-client-cache";
-  version = "0.12.4";
+  version = "0.13.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "aiohttp_client_cache";
     inherit version;
-    hash = "sha256-5g/oFhNrWx1m87trJyq4HZeFTqHk2bVwhaNgQmln0mU=";
+    hash = "sha256-3FzWI0CtvuGOD+3HsMN1Qmkt8I+O2ZRddRtykqBDOFM=";
   };
 
   build-system = [ poetry-core ];