diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-01-18 18:12:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-18 18:12:23 +0100 |
| commit | a27409157f1415ddc9c4ecab32c2fab5ddd1fa60 (patch) | |
| tree | 00197f294c236bfebd5104bba5c67fd6a6df875f /pkgs/development | |
| parent | 3da3b6e819d1a5a80aeaa1120ff715a423a34510 (diff) | |
| parent | 40b68099580b7f42080273fea08ef373bb02fd6c (diff) | |
Merge pull request #281435 from alyssais/mailman-fixes
Mailman fixes
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/python-modules/django-mailman3/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/python-modules/django-q/default.nix | 2 |
2 files changed, 2 insertions, 12 deletions
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' 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 = [ |