From f5207ba6a3407e2029dff70b9fa7b60fc9d7851c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 17 Jan 2024 02:25:27 +0100
Subject: python3.pkgs.django-q: add missing setuptools dep

---
 pkgs/development/python-modules/django-q/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs/development')

diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix
index c6f9ec3bb53c1..7ce4d4b6b7d9c 100644
--- a/pkgs/development/python-modules/django-q/default.nix
+++ b/pkgs/development/python-modules/django-q/default.nix
@@ -16,6 +16,7 @@
 , pytestCheckHook
 , pythonOlder
 , redis
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -40,6 +41,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     poetry-core
+    setuptools
   ];
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From 40b68099580b7f42080273fea08ef373bb02fd6c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 17 Jan 2024 02:26:07 +0100
Subject: python3.pkgs.django-mailman3: drop applied patches

Fixes: d0c27c8077d1 ("python3Packages.django-mailman3: 1.3.9 -> 1.3.11")
---
 pkgs/development/python-modules/django-mailman3/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index 74a2dd61f7cd0..6803c26b01c5a 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 
 # propagates
 , django-gravatar2
@@ -25,17 +24,6 @@ buildPythonPackage rec {
     hash = "sha256-uIjJaZHWL2evj+oISLprvKWT5Sm5f2EKgUD1twL1VbQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://gitlab.com/mailman/django-mailman3/-/commit/840d0d531a0813de9a30e72427e202aea21b40fe.patch";
-      hash = "sha256-vltvsIP/SWpQZeXDUB+GWlTu+ghFMUqIT8i6CrYcmGo=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.com/mailman/django-mailman3/-/commit/25c55e31d28f2fa8eb23f0e83c12f9b0a05bfbf0.patch";
-      hash = "sha256-ug5tBmnVfJTn5ufDDVg/cEtsZM59jQYJpQZV51T3qIc=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace setup.py \
       --replace 'django>=3.2,<4.2' 'django>=3.2,<4.3'
-- 
cgit 1.4.1