From 89b311fa4d97da37b773985012488e91e687b78d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 20 Oct 2019 02:23:53 +0000 Subject: mailman: remove unused derivation for mailman 2 This isn't referenced anywhere, so it's just dead code. --- pkgs/servers/mail/mailman/default.nix | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 pkgs/servers/mail/mailman/default.nix (limited to 'pkgs/servers/mail/mailman') diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix deleted file mode 100644 index e9f66b92be2..00000000000 --- a/pkgs/servers/mail/mailman/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, python2 }: - -stdenv.mkDerivation rec { - pname = "mailman"; - version = "2.1.29"; - - src = fetchurl { - url = "mirror://gnu/mailman/${pname}-${version}.tgz"; - sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243"; - }; - - buildInputs = [ python2 python2.pkgs.dnspython ]; - - patches = [ ./fix-var-prefix.patch ]; - - configureFlags = [ - "--without-permcheck" - "--with-cgi-ext=.cgi" - "--with-var-prefix=/var/lib/mailman" - ]; - - installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. - - makeFlags = [ "DIRSETGID=:" ]; - - meta = { - homepage = https://www.gnu.org/software/mailman/; - description = "Free software for managing electronic mail discussion and e-newsletter lists"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; - }; -} -- cgit 1.4.1 From 0b9bfc01322dc44cfd344afb5c019acc11aa6936 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 20 Oct 2019 02:26:14 +0000 Subject: python3.pkgs.mailman: core.nix -> default.nix The actual upstream "mailman" name just refers to this, so we should use the Nixpkgs convention of default.nix. --- pkgs/servers/mail/mailman/core.nix | 47 ----------------------------------- pkgs/servers/mail/mailman/default.nix | 47 +++++++++++++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 pkgs/servers/mail/mailman/core.nix create mode 100644 pkgs/servers/mail/mailman/default.nix (limited to 'pkgs/servers/mail/mailman') diff --git a/pkgs/servers/mail/mailman/core.nix b/pkgs/servers/mail/mailman/core.nix deleted file mode 100644 index 1ba220039ea..00000000000 --- a/pkgs/servers/mail/mailman/core.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython -, flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib -, requests, zope_configuration, click, falcon, importlib-resources -, zope_component, lynx, postfix -}: - -buildPythonPackage rec { - pname = "mailman"; - version = "3.2.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6"; - }; - - propagatedBuildInputs = [ - alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock - importlib-resources lazr_config passlib requests zope_configuration - zope_component - ]; - - patchPhase = '' - substituteInPlace src/mailman/config/postfix.cfg \ - --replace /usr/sbin/postmap ${postfix}/bin/postmap - substituteInPlace src/mailman/config/schema.cfg \ - --replace /usr/bin/lynx ${lynx}/bin/lynx - ''; - - # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping - # them in shell code breaks this assumption. The proper way to use mailman is - # to create a specialized python interpreter: - # - # python37.withPackages (ps: [ps.mailman]) - # - # This gives a properly wrapped 'mailman' command plus an interpreter that - # has all the necessary search paths to execute unwrapped 'master' and - # 'runner' scripts. The setup is a little tricky, but fortunately NixOS is - # about to get a OS module that takes care of those details. - dontWrapPythonPrograms = true; - - meta = { - homepage = https://www.gnu.org/software/mailman/; - description = "Free software for managing electronic mail discussion and newsletter lists"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }; -} diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix new file mode 100644 index 00000000000..1ba220039ea --- /dev/null +++ b/pkgs/servers/mail/mailman/default.nix @@ -0,0 +1,47 @@ +{ stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython +, flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib +, requests, zope_configuration, click, falcon, importlib-resources +, zope_component, lynx, postfix +}: + +buildPythonPackage rec { + pname = "mailman"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6"; + }; + + propagatedBuildInputs = [ + alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock + importlib-resources lazr_config passlib requests zope_configuration + zope_component + ]; + + patchPhase = '' + substituteInPlace src/mailman/config/postfix.cfg \ + --replace /usr/sbin/postmap ${postfix}/bin/postmap + substituteInPlace src/mailman/config/schema.cfg \ + --replace /usr/bin/lynx ${lynx}/bin/lynx + ''; + + # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping + # them in shell code breaks this assumption. The proper way to use mailman is + # to create a specialized python interpreter: + # + # python37.withPackages (ps: [ps.mailman]) + # + # This gives a properly wrapped 'mailman' command plus an interpreter that + # has all the necessary search paths to execute unwrapped 'master' and + # 'runner' scripts. The setup is a little tricky, but fortunately NixOS is + # about to get a OS module that takes care of those details. + dontWrapPythonPrograms = true; + + meta = { + homepage = https://www.gnu.org/software/mailman/; + description = "Free software for managing electronic mail discussion and newsletter lists"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1e854b007e..dc0727594c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -817,7 +817,7 @@ in { mail-parser = callPackage ../development/python-modules/mail-parser { }; - mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/core.nix { }); + mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman { }); mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { }); -- cgit 1.4.1 From 38f2103de9fd65f4656d50847783a0c5170b4201 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 16 Dec 2019 19:06:10 +0100 Subject: python3.pkgs.hyperkitty: 1.2.2 -> 1.3.2 --- pkgs/servers/mail/mailman/hyperkitty.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pkgs/servers/mail/mailman') diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 8f060da3446..758433ba3a4 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,25 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi, coverage, mock +{ stdenv, buildPythonPackage, fetchPypi, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 -, django-haystack, lockfile, networkx, dateutil, defusedxml +, django-haystack, flufl_lock, networkx, dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q -, django_compressor, beautifulsoup4, six, psycopg2, whoosh +, django_compressor, beautifulsoup4, six, psycopg2, whoosh, elasticsearch }: buildPythonPackage rec { pname = "HyperKitty"; - version = "1.2.2"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1z2zswlml6nppxhzw9a4nrj7i5wsxd29s3q78ka1rwr5m5n7s1rz"; + sha256 = "092fkv0xyf5vgj33xwq0mh9h5c5d56ifwimaqbfpx5cwc6yivb88"; }; + nativeBuildInputs = [ isort ]; buildInputs = [ coverage mock ]; propagatedBuildInputs = [ robot-detection django_extensions rjsmin cssmin django-mailman3 - django-haystack lockfile networkx dateutil defusedxml + django-haystack flufl_lock networkx dateutil defusedxml django-paintstore djangorestframework django django-q - django_compressor beautifulsoup4 six psycopg2 whoosh + django_compressor beautifulsoup4 six psycopg2 whoosh isort elasticsearch ]; checkPhase = '' -- cgit 1.4.1 From 6af4de84d3a487ce3c0c00e857958859263acc8c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Jan 2020 01:57:13 +0000 Subject: python3.pkgs.hyperkitty: use checkInputs The previously propagated build inputs are optional, and so are included in checkInputs so the tests can run, but not propagated so they aren't included if unneeded. --- pkgs/servers/mail/mailman/hyperkitty.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs/servers/mail/mailman') diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 758433ba3a4..7e696f6d27f 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -15,14 +15,19 @@ buildPythonPackage rec { }; nativeBuildInputs = [ isort ]; - buildInputs = [ coverage mock ]; propagatedBuildInputs = [ robot-detection django_extensions rjsmin cssmin django-mailman3 django-haystack flufl_lock networkx dateutil defusedxml django-paintstore djangorestframework django django-q - django_compressor beautifulsoup4 six psycopg2 whoosh isort elasticsearch + django_compressor six psycopg2 isort ]; + # Some of these are optional runtime dependencies that are not + # listed as dependencies in setup.py. To use these, they should be + # dependencies of the Django Python environment, but not of + # HyperKitty so they're not included for people who don't need them. + checkInputs = [ beautifulsoup4 coverage elasticsearch mock whoosh ]; + checkPhase = '' cd $NIX_BUILD_TOP/$sourceRoot PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test \ -- cgit 1.4.1 From 9a43cdc1c64be351b8da4328283c1a89e8e387e7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Jan 2020 02:02:51 +0000 Subject: python3.pkgs.postorius: use checkInputs --- pkgs/servers/mail/mailman/postorius.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/servers/mail/mailman') diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 871f2ea244d..e2e729b6e67 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { sha256 = "1722lnscxfl8wdigf5d80d1qmd5gblr439wa989jxlww0wkjg9fl"; }; - buildInputs = [ beautifulsoup4 vcrpy mock ]; propagatedBuildInputs = [ django-mailman3 ]; + checkInputs = [ beautifulsoup4 vcrpy mock ]; checkPhase = '' cd $NIX_BUILD_TOP/$sourceRoot -- cgit 1.4.1 From aec2382b38928095a6441df895d07ac800615afb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Jan 2020 02:22:28 +0000 Subject: python3.pkgs.postorius: 1.2.4 -> 1.3.2 --- pkgs/servers/mail/mailman/postorius.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'pkgs/servers/mail/mailman') diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index e2e729b6e67..bcb92051fc8 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -1,23 +1,21 @@ { stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock -, django-mailman3, mailmanclient +, django-mailman3, mailmanclient, readme_renderer }: buildPythonPackage rec { pname = "postorius"; - version = "1.2.4"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1722lnscxfl8wdigf5d80d1qmd5gblr439wa989jxlww0wkjg9fl"; + sha256 = "0wrm0hda7ym9qaygxirqaaii66ndmgyy7gx8wqdg07pfx14zcyja"; }; - propagatedBuildInputs = [ django-mailman3 ]; + propagatedBuildInputs = [ django-mailman3 readme_renderer ]; checkInputs = [ beautifulsoup4 vcrpy mock ]; - checkPhase = '' - cd $NIX_BUILD_TOP/$sourceRoot - PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test --settings=test_settings postorius - ''; + # Tries to connect to database. + doCheck = false; meta = { homepage = https://www.gnu.org/software/mailman/; -- cgit 1.4.1 From 3e2664035255e79c30bf99d82dc0a104e229f2fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2019 19:15:32 +0100 Subject: python3.pkgs.mailman: 3.2.2 -> 3.3.0 --- pkgs/servers/mail/mailman/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/servers/mail/mailman') diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 1ba220039ea..4c5d56341a0 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,22 +1,22 @@ { stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources -, zope_component, lynx, postfix +, zope_component, lynx, postfix, authheaders, gunicorn }: buildPythonPackage rec { pname = "mailman"; - version = "3.2.2"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6"; + sha256 = "1qph9i93ndahfxi3bb2sd0kjm2c0pkh844ai6zacfmvihl1k3pvy"; }; propagatedBuildInputs = [ alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock importlib-resources lazr_config passlib requests zope_configuration - zope_component + zope_component authheaders gunicorn ]; patchPhase = '' -- cgit 1.4.1 From 126ff4d97eb14cce20248c8399a122984ffb2c9a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Jan 2020 20:19:14 +0000 Subject: python3.pkgs.mailman*: check isPy3k inside package --- pkgs/development/python-modules/mailmanclient/default.nix | 3 ++- pkgs/servers/mail/mailman/default.nix | 3 ++- pkgs/servers/mail/mailman/hyperkitty.nix | 3 ++- pkgs/servers/mail/mailman/web.nix | 3 ++- pkgs/top-level/python-packages.nix | 8 ++++---- 5 files changed, 12 insertions(+), 8 deletions(-) (limited to 'pkgs/servers/mail/mailman') diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 9fe9adbe6cf..e6233de93d1 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, httplib2, requests }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }: buildPythonPackage rec { pname = "mailmanclient"; version = "3.3.0"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 4c5d56341a0..8e763800f65 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "mailman"; version = "3.3.0"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 7e696f6d27f..fedd6c9f759 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isort, coverage, mock +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 , django-haystack, flufl_lock, networkx, dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "HyperKitty"; version = "1.3.2"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index b0ead765a60..ec16775b1d4 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,4 +1,4 @@ -{ stdenv, python, hyperkitty, postorius, buildPythonPackage +{ stdenv, python, hyperkitty, postorius, buildPythonPackage, isPy3k , serverEMail ? "postmaster@example.org" , archiverKey ? "SecretArchiverAPIKey" , allowedHosts ? [] @@ -17,6 +17,7 @@ in buildPythonPackage { name = "mailman-web-0"; + disabled = !isPy3k; propagatedBuildInputs = [ hyperkitty postorius ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4110e96f3d..c14028bae9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -819,11 +819,11 @@ in { mail-parser = callPackage ../development/python-modules/mail-parser { }; - mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman { }); + mailman = callPackage ../servers/mail/mailman { }; - mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { }); + mailman-web = callPackage ../servers/mail/mailman/web.nix { }; - mailmanclient = disabledIf (!isPy3k) (callPackage ../development/python-modules/mailmanclient { }); + mailmanclient = callPackage ../development/python-modules/mailmanclient { }; mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; @@ -3055,7 +3055,7 @@ in { sunpy = callPackage ../development/python-modules/sunpy { }; - hyperkitty = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/hyperkitty.nix { }); + hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; robot-detection = callPackage ../development/python-modules/robot-detection {}; -- cgit 1.4.1