JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "mailman-web-unstable: 2019-09-29 -> 2021-04-10 (#119135)"

Browse Source 
This reverts commit 8dbd553792.

The update has changed where mailman-web looks for its database and
broken the Mailman module in NixOS.
This commit is contained in:
Alyssa Ross 2021-04-14 12:14:59 +00:00
parent 05133d55b5
commit d0ead9021e
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/mail/mailman.nix
View File

@ -263,8 +263,7 @@ in {
# settings_local.json is loaded. # settings_local.json is loaded.
os.environ["SECRET_KEY"] = "" os.environ["SECRET_KEY"] = ""
from mailman_web.settings.base import * from mailman_web.settings import *
from mailman_web.settings.mailman import *
import json import json

16
pkgs/servers/mail/mailman/web.nix
View File

@ -1,16 +1,16 @@
{ buildPythonPackage, lib, fetchgit, isPy3k { buildPythonPackage, lib, fetchgit, isPy3k
, git, makeWrapper, sassc, hyperkitty, postorius, whoosh, setuptools-scm , git, makeWrapper, sassc, hyperkitty, postorius, whoosh
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mailman-web"; pname = "mailman-web-unstable";
version = "unstable-2021-04-10"; version = "2019-09-29";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchgit { src = fetchgit {
url = "https://gitlab.com/mailman/mailman-web"; url = "https://gitlab.com/mailman/mailman-web";
rev = "19a7abe27dd3bc39c0250440de073f0adecd4da1"; rev = "d17203b4d6bdc71c2b40891757f57a32f3de53d5";
sha256 = "0h25140n2jaisl0ri5x7gdmbypiys8vlq8dql1zmaxvq459ybxkn"; sha256 = "124cxr4vfi1ibgxygk4l74q4fysx0a6pga1kk9p5wq2yvzwg9z3n";
leaveDotGit = true; leaveDotGit = true;
}; };
@ -25,7 +25,7 @@ buildPythonPackage rec {
sed -i '/^ Django/d' setup.cfg sed -i '/^ Django/d' setup.cfg
''; '';
nativeBuildInputs = [ git setuptools-scm makeWrapper ]; nativeBuildInputs = [ git makeWrapper ];
propagatedBuildInputs = [ hyperkitty postorius whoosh ]; propagatedBuildInputs = [ hyperkitty postorius whoosh ];
# Tries to check runtime configuration. # Tries to check runtime configuration.
@ -38,7 +38,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Django project for Mailman 3 web interface"; description = "Django project for Mailman 3 web interface";
license = licenses.gpl3Plus; license = licenses.gpl3;
maintainers = with maintainers; [ peti qyliss m1cr0man ]; maintainers = with maintainers; [ peti qyliss ];
}; };
} }