From 82d7a8b959a101dc9cc873b6aba3cfe45101f692 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Apr 2024 15:47:33 +0200
Subject: [PATCH] python312Packages.dulwich: 0.21.7 -> 0.22.1

Changelog: https://github.com/jelmer/dulwich/blob/dulwich-0.22.1/NEWS
---
 .../python-modules/dulwich/default.nix        | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index a0690f4bb7e3..ec048f0d4cad 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -3,7 +3,7 @@
 , buildPythonPackage
 , certifi
 , fastimport
-, fetchPypi
+, fetchFromGitHub
 , gevent
 , geventhttpclient
 , git
@@ -15,23 +15,27 @@
 , pytestCheckHook
 , pythonOlder
 , setuptools
+, setuptools-rust
 , urllib3
 }:
 
 buildPythonPackage rec {
   pname = "dulwich";
-  version = "0.21.7";
+  version = "0.22.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-qenGaDPOpYDDrBKSfkuXEZhddq/KmNqXFAXUFN5g6Wg=";
+  src = fetchFromGitHub {
+    owner = "jelmer";
+    repo = "dulwich";
+    rev = "refs/tags/${version}";
+    hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk=";
   };
 
   build-system = [
     setuptools
+    setuptools-rust
   ];
 
   dependencies = [
@@ -59,26 +63,15 @@ buildPythonPackage rec {
     glibcLocales
     pytest-xdist
     pytestCheckHook
-  ] ++ passthru.optional-dependencies.fastimport
-  ++ passthru.optional-dependencies.pgp
-  ++ passthru.optional-dependencies.paramiko;
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   doCheck = !stdenv.isDarwin;
 
-  disabledTests = [
-    # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpsqwlbpd1/\xc0'
-    "test_no_decode_encode"
-    # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpwmtfyvo2/refs.git/refs/heads/\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01'
-    "test_cyrillic"
-    # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0'
-    "test_commit_no_encode_decode"
-  ];
-
   disabledTestPaths = [
-    # missing test inputs
-    "dulwich/contrib/test_swift_smoke.py"
-    # flaky on high core count >4
-    "dulwich/tests/compat/test_client.py"
+    # Missing test inputs
+    "tests/contrib/test_swift_smoke.py"
+    # Import issue
+    "tests/test_greenthreads.py"
   ];
 
   pythonImportsCheck = [