From d0ead9021e93bbf162c7625627d426ea4206b9a4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 14 Apr 2021 12:14:59 +0000
Subject: [PATCH] Revert "mailman-web-unstable: 2019-09-29 -> 2021-04-10
 (#119135)"

This reverts commit 8dbd553792dcaf5074c47367ed6740f516862bad.

The update has changed where mailman-web looks for its database and
broken the Mailman module in NixOS.
---
 nixos/modules/services/mail/mailman.nix |  3 +--
 pkgs/servers/mail/mailman/web.nix       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index a5b17be349ce..832b496f31c9 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -263,8 +263,7 @@ in {
       # settings_local.json is loaded.
       os.environ["SECRET_KEY"] = ""
 
-      from mailman_web.settings.base import *
-      from mailman_web.settings.mailman import *
+      from mailman_web.settings import *
 
       import json
 
diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix
index 2f1e9cd251e7..53fdf851cfe8 100644
--- a/pkgs/servers/mail/mailman/web.nix
+++ b/pkgs/servers/mail/mailman/web.nix
@@ -1,16 +1,16 @@
 { buildPythonPackage, lib, fetchgit, isPy3k
-, git, makeWrapper, sassc, hyperkitty, postorius, whoosh, setuptools-scm
+, git, makeWrapper, sassc, hyperkitty, postorius, whoosh
 }:
 
 buildPythonPackage rec {
-  pname = "mailman-web";
-  version = "unstable-2021-04-10";
+  pname = "mailman-web-unstable";
+  version = "2019-09-29";
   disabled = !isPy3k;
 
   src = fetchgit {
     url = "https://gitlab.com/mailman/mailman-web";
-    rev = "19a7abe27dd3bc39c0250440de073f0adecd4da1";
-    sha256 = "0h25140n2jaisl0ri5x7gdmbypiys8vlq8dql1zmaxvq459ybxkn";
+    rev = "d17203b4d6bdc71c2b40891757f57a32f3de53d5";
+    sha256 = "124cxr4vfi1ibgxygk4l74q4fysx0a6pga1kk9p5wq2yvzwg9z3n";
     leaveDotGit = true;
   };
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     sed -i '/^  Django/d' setup.cfg
   '';
 
-  nativeBuildInputs = [ git setuptools-scm makeWrapper ];
+  nativeBuildInputs = [ git makeWrapper ];
   propagatedBuildInputs = [ hyperkitty postorius whoosh ];
 
   # Tries to check runtime configuration.
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Django project for Mailman 3 web interface";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ peti qyliss m1cr0man ];
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ peti qyliss ];
   };
 }