diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 467867a3cead..f6099fb25799 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -41,6 +41,18 @@ buildPythonPackage rec { ]; hash = "sha256-gSFczuNLlMclqixOu6ElS0BewUTGyhP6RXtE/waLzyo="; }) + + (fetchpatch { + # Only needed so the next one applies. + name = "allauth-64-1.patch"; + url = "https://gitlab.com/mailman/django-mailman3/-/commit/96f3f3bf0c718395ccd1b0d539a40d627522a9c4.patch"; + hash = "sha256-xgQu70DkbPz+ULRFgKeJTbx/Tq2PLEyGgrncf26ChA4="; + }) + (fetchpatch { + name = "allauth-64-2.patch"; + url = "https://gitlab.com/mailman/django-mailman3/-/commit/cfdacb9195ce266e5ae23307b31304898369f696.patch"; + hash = "sha256-6mwGSw31Q0+APwdGFe0JE0gBigdo453HZZ6JApqgtTE="; + }) ]; pythonRelaxDeps = [ "django-allauth" ]; @@ -77,7 +89,6 @@ buildPythonPackage rec { homepage = "https://gitlab.com/mailman/django-mailman3"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ qyliss ]; - broken = - lib.versionAtLeast django-allauth.version "65.0.0" || lib.versionAtLeast django.version "5.3"; + broken = lib.versionAtLeast django.version "5.3"; }; } diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 9a1b7b094413..c470f72e7f4c 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -27,19 +27,6 @@ lib.fix ( [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ django = super.django_5; - - django-allauth = super.django-allauth.overrideAttrs ( - new: - { src, ... }: - { - version = "0.63.6"; - src = src.override { - tag = new.version; - hash = "sha256-13/QbA//wyHE9yMB7Jy/sJEyqPKxiMN+CZwSc4U6okU="; - }; - patches = [ ]; - } - ); }) overlay;