Mailman updates (#517568)

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";
   };
 }

pkgs/servers/mail/mailman/package.nix

@@ -12,16 +12,16 @@ with python3.pkgs;
 
 buildPythonPackage (finalAttrs: {
   pname = "mailman";
-  version = "3.3.9";
+  version = "3.3.10";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-GblXI6IwkLl+V1gEbMAe1baVyZOHMaYaYITXcTkp2Mo=";
+    hash = "sha256-DeR4/PMm8l2TGTjDdE5hxc1nWWtG5bHjuyq/mdVEVjI=";
   };
 
   build-system = with python3.pkgs; [
-    setuptools
+    pdm-backend
   ];
 
   dependencies = with python3.pkgs; [
@@ -71,6 +71,11 @@ buildPythonPackage (finalAttrs: {
       --replace /usr/sbin/postmap ${postfix}/bin/postmap
     substituteInPlace src/mailman/config/schema.cfg \
       --replace /usr/bin/lynx ${lynx}/bin/lynx
+
+    # Backport of
+    # https://gitlab.com/mailman/mailman/-/commit/3a22537382d41ab3e46b859054547755963b069d.patch
+    substituteInPlace pyproject.toml \
+      --replace-fail '"nntplib;' '"standard-nntplib;'
   '';
 
   # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping

pkgs/servers/mail/mailman/postorius.nix

@@ -10,12 +10,12 @@ with python3.pkgs;
 
 buildPythonPackage (finalAttrs: {
   pname = "postorius";
-  version = "1.3.10";
-  format = "setuptools";
+  version = "1.3.13";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-GmbIqO+03LgbUxJ1nTStXrYN3t2MfvzbeYRAipfTW1o=";
+    hash = "sha256-YC3vXEhSkA1J6K2VGWojNOE8MeSdnAhZMkh558UTGiI=";
   };
 
   patches = [
@@ -25,9 +25,20 @@ buildPythonPackage (finalAttrs: {
       excludes = [ "src/postorius/doc/news.rst" ];
       hash = "sha256-M8C7mO/KoVhl1YtZ5x3wqL+aBkepJ/7NoIRUmd0JpiM=";
     })
+
+    (fetchpatch {
+      name = "django-5.2.patch";
+      url = "https://gitlab.com/mailman/postorius/-/commit/0468ab0329df85b89e6b5d9f7b4d1805f47450c9.patch";
+      excludes = [
+        ".gitlab-ci.yml"
+        "src/postorius/doc/news.rst"
+      ];
+      hash = "sha256-4yk7hLF6cRfS7Kelr49LPeVfrqvNoX1jxTy8sdGrMAk=";
+    })
   ];
 
-  propagatedBuildInputs = [
+  build-system = [ pdm-backend ];
+  dependencies = [
     django-mailman3
     readme-renderer
   ]

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;