git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67366 from peti/t/mailman-v3

update mailman to version 3.2.2

commitfa5a231313bb870eea2878ce5035b26ea52d734c authorPeter Simons <simons@cryp.to> dateSun 25 Aug 2019, 22:09 (7 years ago) parent36c6252842942b
9 files changed+111−59
pkgs/development/python-modules/flufl/bounce.nix+14 pkgs/development/python-modules/flufl/i18n.nix+13 pkgs/development/python-modules/flufl/lock.nix+13 pkgs/development/python-modules/lazr/config.nix+13 pkgs/development/python-modules/lazr/delegates.nix+15 pkgs/servers/mail/mailman/default.nix+31−24 pkgs/servers/mail/mailman/fix-var-prefix.patch−33 pkgs/top-level/all-packages.nix−2 pkgs/top-level/python-packages.nix+12
pkgs/development/python-modules/flufl/bounce.nixnew file+14
@@ -0,0 +1,14 @@
1+{ buildPythonPackage, fetchPypi, atpublic, zope_interface, nose2 }:
2+
3+buildPythonPackage rec {
4+ pname = "flufl.bounce";
5+ version = "3.0";
6+
7+ buildInputs = [ nose2 ];
8+ propagatedBuildInputs = [ atpublic zope_interface ];
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2";
13+ };
14+}
pkgs/development/python-modules/flufl/i18n.nixnew file+13
@@ -0,0 +1,13 @@
1+{ buildPythonPackage, fetchPypi, atpublic }:
2+
3+buildPythonPackage rec {
4+ pname = "flufl.i18n";
5+ version = "2.0.2";
6+
7+ propagatedBuildInputs = [ atpublic ];
8+
9+ src = fetchPypi {
10+ inherit pname version;
11+ sha256 = "1csgds59nx0ann9v2alqr69lakp1cnc1ikmbgn96l6n23js7c2ah";
12+ };
13+}
pkgs/development/python-modules/flufl/lock.nixnew file+13
@@ -0,0 +1,13 @@
1+{ buildPythonPackage, fetchPypi, atpublic }:
2+
3+buildPythonPackage rec {
4+ pname = "flufl.lock";
5+ version = "3.2";
6+
7+ propagatedBuildInputs = [ atpublic ];
8+
9+ src = fetchPypi {
10+ inherit pname version;
11+ sha256 = "0nzzd6l30ff6cwsrlrb94xzfja4wkyrqv3ydc6cz0hdbr766mmm8";
12+ };
13+}
pkgs/development/python-modules/lazr/config.nixnew file+13
@@ -0,0 +1,13 @@
1+{ buildPythonPackage, fetchPypi, lazr_delegates }:
2+
3+buildPythonPackage rec {
4+ pname = "lazr.config";
5+ version = "2.2.1";
6+
7+ propagatedBuildInputs = [ lazr_delegates ];
8+
9+ src = fetchPypi {
10+ inherit pname version;
11+ sha256 = "1s7pyvlq06qjrkaw9r6nc290lb095n25ybzgavvy51ygpxkgqxwn";
12+ };
13+}
pkgs/development/python-modules/lazr/delegates.nixnew file+15
@@ -0,0 +1,15 @@
1+{ buildPythonPackage, fetchPypi, nose, zope_interface }:
2+
3+buildPythonPackage rec {
4+ pname = "lazr.delegates";
5+ version = "2.0.4";
6+
7+ propagatedBuildInputs = [ nose zope_interface ];
8+
9+ doCheck = false; # cannot import name 'ClassType' from 'types'
10+
11+ src = fetchPypi {
12+ inherit pname version;
13+ sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx";
14+ };
15+}
pkgs/servers/mail/mailman/default.nix+31−24
@@ -1,33 +1,40 @@
1−{ stdenv, fetchurl, python2 }:
2−
3−stdenv.mkDerivation rec {
4− name = "mailman-${version}";
5− version = "2.1.29";
6−
7− src = fetchurl {
8− url = "mirror://gnu/mailman/${name}.tgz";
9− sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243";
1+{ stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython
2+, flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib
3+, requests, zope_configuration, click, falcon, importlib-resources
4+, zope_component
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "mailman";
9+ version = "3.2.2";
10+
11+ src = fetchPypi {
12+ inherit pname version;
13+ sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6";
1014 };
1115
12− buildInputs = [ python2 python2.pkgs.dnspython ];
13−
14− patches = [ ./fix-var-prefix.patch ];
15−
16− configureFlags = [
17− "--without-permcheck"
18− "--with-cgi-ext=.cgi"
19− "--with-var-prefix=/var/lib/mailman"
16+ propagatedBuildInputs = [
17+ alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock
18+ importlib-resources lazr_config passlib requests zope_configuration
19+ zope_component
2020 ];
2121
22− installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'.
23−
24− makeFlags = [ "DIRSETGID=:" ];
22+ # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping
23+ # them in shell code breaks this assumption. The proper way to use mailman is
24+ # to create a specialized python interpreter:
25+ #
26+ # python37.withPackages (ps: [ps.mailman])
27+ #
28+ # This gives a properly wrapped 'mailman' command plus an interpreter that
29+ # has all the necessary search paths to execute unwrapped 'master' and
30+ # 'runner' scripts. The setup is a little tricky, but fortunately NixOS is
31+ # about to get a OS module that takes care of those details.
32+ dontWrapPythonPrograms = true;
2533
2634 meta = {
2735 homepage = https://www.gnu.org/software/mailman/;
28− description = "Free software for managing electronic mail discussion and e-newsletter lists";
29− license = stdenv.lib.licenses.gpl2Plus;
30− platforms = stdenv.lib.platforms.linux;
31− maintainers = [ stdenv.lib.maintainers.peti ];
36+ description = "Free software for managing electronic mail discussion and newsletter lists";
37+ license = stdenv.lib.licenses.gpl3Plus;
38+ maintainers = with stdenv.lib.maintainers; [ peti ];
3239 };
3340}
pkgs/servers/mail/mailman/fix-var-prefix.patchdeleted−33
@@ -1,33 +0,0 @@
1−diff -ubr mailman-2.1.16-orig/contrib/redhat_fhs.patch mailman-2.1.16/contrib/redhat_fhs.patch
2−--- mailman-2.1.16-orig/contrib/redhat_fhs.patch 2013-10-21 14:55:48.797631434 +0200
3−+++ mailman-2.1.16/contrib/redhat_fhs.patch 2013-10-21 14:56:42.534310378 +0200
4−@@ -197,7 +197,7 @@
5− + else true; \
6− + fi; \
7− + done
8−- chmod o-r $(DESTDIR)$(var_prefix)/archives/private
9−+ chmod o-r $(prefix)$(var_prefix)/archives/private
10− @for d in $(ARCH_INDEP_DIRS); \
11− do \
12− Only in mailman-2.1.5.FHS: Makefile.in~
13−diff -ubr mailman-2.1.16-orig/Makefile.in mailman-2.1.16/Makefile.in
14−--- mailman-2.1.16-orig/Makefile.in 2013-10-21 14:55:48.798631519 +0200
15−+++ mailman-2.1.16/Makefile.in 2013-10-21 14:56:42.562313220 +0200
16−@@ -87,7 +87,7 @@
17− @echo "Creating architecture independent directories..."
18− @for d in $(VAR_DIRS); \
19− do \
20−- dir=$(DESTDIR)$(var_prefix)/$$d; \
21−+ dir=$(prefix)$(var_prefix)/$$d; \
22− if test ! -d $$dir; then \
23− echo "Creating directory hierarchy $$dir"; \
24− $(srcdir)/mkinstalldirs $$dir; \
25−@@ -96,7 +96,7 @@
26− else true; \
27− fi; \
28− done
29−- chmod o-r $(DESTDIR)$(var_prefix)/archives/private
30−+ chmod o-r $(prefix)$(var_prefix)/archives/private
31− @for d in $(ARCH_INDEP_DIRS); \
32− do \
33− dir=$(DESTDIR)$(prefix)/$$d; \
pkgs/top-level/all-packages.nix−2
@@ -14677,8 +14677,6 @@ in
1467714677
1467814678 labelImg = callPackage ../applications/science/machine-learning/labelimg { };
1467914679
14680− mailman = callPackage ../servers/mail/mailman { };
14681−
1468214680 mailman-rss = callPackage ../development/python-modules/mailman-rss { };
1468314681
1468414682 mattermost = callPackage ../servers/mattermost { };
pkgs/top-level/python-packages.nix+12
@@ -583,6 +583,12 @@ in {
583583
584584 firetv = callPackage ../development/python-modules/firetv { };
585585
586+ flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { };
587+
588+ flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { };
589+
590+ flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { };
591+
586592 foxdot = callPackage ../development/python-modules/foxdot { };
587593
588594 fsspec = callPackage ../development/python-modules/fsspec { };
@@ -685,6 +691,10 @@ in {
685691
686692 langdetect = callPackage ../development/python-modules/langdetect { };
687693
694+ lazr_config = callPackage ../development/python-modules/lazr/config.nix { };
695+
696+ lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { };
697+
688698 libmr = callPackage ../development/python-modules/libmr { };
689699
690700 limitlessled = callPackage ../development/python-modules/limitlessled { };
@@ -701,6 +711,8 @@ in {
701711
702712 mail-parser = callPackage ../development/python-modules/mail-parser { };
703713
714+ mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman { });
715+
704716 manhole = callPackage ../development/python-modules/manhole { };
705717
706718 markerlib = callPackage ../development/python-modules/markerlib { };