From ea89e464a666b915b8ffb80a7d5eee9182e4184f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 28 Dec 2025 12:45:59 -0800
Subject: [PATCH 1/3] python3Packages.dulwich: Remove accomodations for
 unsupported python

---
 pkgs/development/python-modules/dulwich/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index d35379ceb8ab..3d397600d9ec 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -13,13 +13,11 @@
   merge3,
   paramiko,
   pytestCheckHook,
-  pythonOlder,
   rich,
   rustPlatform,
   rustc,
   setuptools,
   setuptools-rust,
-  typing-extensions,
   urllib3,
 }:
 
@@ -28,8 +26,6 @@ buildPythonPackage rec {
   version = "0.24.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = "dulwich";
@@ -55,9 +51,6 @@ buildPythonPackage rec {
 
   dependencies = [
     urllib3
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    typing-extensions
   ];
 
   optional-dependencies = {

From 773ed694973cdb1720037881f2aae0d636b59683 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 28 Dec 2025 12:45:59 -0800
Subject: [PATCH 2/3] python3Packages.dulwich: Disable contrib tests, simplify
 disabledTests

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

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 3d397600d9ec..640b43bc5472 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -81,17 +81,17 @@ buildPythonPackage rec {
     "test_file_win"
     # dulwich.errors.NotGitRepository: No git repository was found at .
     "WorktreeCliTests"
-    # 'SwiftPackData' object has no attribute '_file'
-    "test_iterobjects_subset_all_present"
-    "test_iterobjects_subset_missing_allowed"
-    "test_iterobjects_subset_missing_not_allowed"
     # Adding a symlink to a directory outside the repo doesn't raise
     "test_add_symlink_absolute_to_system"
+    # Depends on setuid which is not available in sandboxed environments
+    "SharedRepositoryTests"
+    # TypeError: pack index v1 only supports SHA-1 names
+    "test_pack_index_v1_with_sha256"
   ];
 
   disabledTestPaths = [
-    # requires swift config file
-    "tests/contrib/test_swift_smoke.py"
+    # "Code [in contrib] is not an official part of Dulwich, and may no longer work"
+    "tests/contrib"
   ];
 
   __darwinAllowLocalNetworking = true;

From ad6e1340c802b2e77a0a18081ee4459702c4093b Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 29 Dec 2025 09:48:15 -0800
Subject: [PATCH 3/3] python3Packages.dulwich: add sarahec as maintainer

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

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 640b43bc5472..b2ed18893711 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -110,6 +110,9 @@ buildPythonPackage rec {
       asl20
       gpl2Plus
     ];
-    maintainers = with lib.maintainers; [ koral ];
+    maintainers = with lib.maintainers; [
+      koral
+      sarahec
+    ];
   };
 }