From bfbe0e92723ed30bf3511383e7a7a734b29921fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 10 Sep 2024 19:29:12 -0700
Subject: [PATCH] python312Packages.multidict: 6.0.5 -> 6.1.0

Diff: https://github.com/aio-libs/multidict/compare/refs/tags/v6.0.5...v6.1.0

Changelog: https://github.com/aio-libs/multidict/blob/v6.1.0/CHANGES.rst
---
 .../python-modules/multidict/default.nix      | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 0321c5deba97..416df76262f4 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -1,37 +1,45 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "multidict";
-  version = "6.0.5";
+  version = "6.1.0";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-9+MBB17a9QUA8LNBVDxBGU2N865cr0cC8glfPKc92No=";
+  src = fetchFromGitHub {
+    owner = "aio-libs";
+    repo = "multidict";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-rvL1XzMNBVBlElE5wznecL3Ku9h4tG9VeqGRd04iPXw=";
   };
 
   postPatch = ''
-    substituteInPlace pytest.ini \
-      --replace-fail "-p pytest_cov" ""
-    sed -i '/--cov/d' pytest.ini
     # `python3 -I -c "import multidict"` fails with ModuleNotFoundError
     substituteInPlace tests/test_circular_imports.py \
       --replace-fail '"-I",' ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  dependencies = lib.optionals (pythonOlder "3.11") [
+    typing-extensions
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
   preCheck = ''
     # import from $out