git.iko.soy/typeable/nixpkgs
on master help sign in
mailman-web: 2019-09-29 -> 2021-04-10

* Make it clearer what code comments apply to * Fix the state directory (this was changed in the update) * Add m1cr0man as a maintaner Co-authored-by: Lucas Savva <lucas@m1cr0man.com> Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

commit912e11a468903d481c91f6413c4eb884cbc09fa4 authorAlyssa Ross <hi@alyssa.is> dateWed 14 Apr 2021, 13:32 (6 years ago) parent59917dc
2 files changed+21−13
nixos/modules/services/mail/mailman.nix+2−1 pkgs/servers/mail/mailman/web.nix+19−12
nixos/modules/services/mail/mailman.nix+2−1
@@ -263,7 +263,8 @@ in {
263263 # settings_local.json is loaded.
264264 os.environ["SECRET_KEY"] = ""
265265
266− from mailman_web.settings import *
266+ from mailman_web.settings.base import *
267+ from mailman_web.settings.mailman import *
267268
268269 import json
269270
pkgs/servers/mail/mailman/web.nix+19−12
@@ -3,26 +3,33 @@
33}:
44
55buildPythonPackage rec {
6− pname = "mailman-web-unstable";
7− version = "2019-09-29";
6+ pname = "mailman-web";
7+ version = "unstable-2021-04-10";
88 disabled = !isPy3k;
99
1010 src = fetchgit {
1111 url = "https://gitlab.com/mailman/mailman-web";
12− rev = "d17203b4d6bdc71c2b40891757f57a32f3de53d5";
13− sha256 = "124cxr4vfi1ibgxygk4l74q4fysx0a6pga1kk9p5wq2yvzwg9z3n";
12+ rev = "19a7abe27dd3bc39c0250440de073f0adecd4da1";
13+ sha256 = "0h25140n2jaisl0ri5x7gdmbypiys8vlq8dql1zmaxvq459ybxkn";
1414 leaveDotGit = true;
1515 };
1616
17− # This is just so people installing from pip also get uwsgi
18− # installed, AFAICT.
19−
20− # Django is depended on transitively by hyperkitty and postorius,
21− # and mailman_web has overly restrictive version bounds on it, so
22− # let's remove it.
2317 postPatch = ''
18+ # This is just so people installing from pip also get uwsgi
19+ # installed, AFAICT.
2420 sed -i '/^ uwsgi$/d' setup.cfg
21+
22+ # Django is depended on transitively by hyperkitty and postorius,
23+ # and mailman_web has overly restrictive version bounds on it, so
24+ # let's remove it.
2525 sed -i '/^ Django/d' setup.cfg
26+
27+ # Upstream seems to mostly target installing on top of existing
28+ # distributions, and uses a path appropriate for that, but we are
29+ # a distribution, so use a state directory appropriate for a
30+ # distro package.
31+ substituteInPlace mailman_web/settings/base.py \
32+ --replace /opt/mailman/web /var/lib/mailman-web
2633 '';
2734
2835 nativeBuildInputs = [ git makeWrapper setuptools-scm ];
@@ -38,7 +45,7 @@ buildPythonPackage rec {
3845
3946 meta = with lib; {
4047 description = "Django project for Mailman 3 web interface";
41− license = licenses.gpl3;
42− maintainers = with maintainers; [ peti qyliss ];
48+ license = licenses.gpl3Plus;
49+ maintainers = with maintainers; [ peti qyliss m1cr0man ];
4350 };
4451}