diff options
Diffstat (limited to 'pkgs/servers/mail/mailman')
-rw-r--r-- | pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch | 36 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/hyperkitty.nix | 20 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/package.nix | 12 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/postorius.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/python.nix | 13 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/web.nix | 13 |
6 files changed, 16 insertions, 84 deletions
diff --git a/pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch b/pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch deleted file mode 100644 index 3b6094bd02f0b..0000000000000 --- a/pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1a914beafe2b00770213fa4d146ffad9d897dc0c Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sat, 12 Aug 2023 12:27:25 +0200 -Subject: [PATCH] Disable broken `test_help_output` testcase - -The assertion fails, but checking for the exact whereabouts of helptext -doesn't bring too much value anyways, so it seems OK to just skip the -test. ---- - .../tests/commands/test_attachments_to_file.py | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/hyperkitty/tests/commands/test_attachments_to_file.py b/hyperkitty/tests/commands/test_attachments_to_file.py -index b3e61f3a..8db7c4b2 100644 ---- a/hyperkitty/tests/commands/test_attachments_to_file.py -+++ b/hyperkitty/tests/commands/test_attachments_to_file.py -@@ -83,16 +83,3 @@ class CommandTestCase(TestCase): - self.assertEqual(fp.getvalue(), """\ - 2 attachments moved. - """) -- -- def test_help_output(self): -- with io.StringIO() as fp, redirect_stdout(fp): -- with suppress(SystemExit): -- call_command('attachments_to_file', '--help') -- -- output_value = fp.getvalue() -- assert ( -- "HYPERKITTY_ATTACHMENT_FOLDER" in output_value -- and "-c CHUNK_SIZE" in output_value -- and "-c CHUNK_SIZE, --chunk-size CHUNK_SIZE" in output_value -- and "-v {0,1}, --verbosity {0,1}" in output_value -- ) --- -2.40.1 - diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index d52964f3a1a2f..89195e5937376 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchPypi -, fetchpatch , nixosTests }: @@ -9,28 +8,17 @@ with python3.pkgs; buildPythonPackage rec { pname = "HyperKitty"; - version = "1.3.7"; - disabled = pythonOlder "3.8"; + version = "1.3.8"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TXSso+wwVGdBymIzns5yOS4pj1EdConmm87b/NyBAss="; + hash = "sha256-j//Mrbos/g1BGenHRmOe5GvAza5nu/mchAgdLQu9h7g="; }; - patches = [ - ./0001-Disable-broken-test_help_output-testcase.patch - (fetchpatch { - url = "https://gitlab.com/mailman/hyperkitty/-/commit/5bb394662882bfc73c3e877458da44343aa06922.patch"; - hash = "sha256-9vcY6nu3txDftH6aYpdh9qSrLzZceGjVFxuD1Ux18gw="; - }) - ]; - postPatch = '' # isort is a development dependency sed -i '/isort/d' setup.py - # Fix mistune imports for mistune >= 2.0.0 - # https://gitlab.com/mailman/hyperkitty/-/merge_requests/379 - sed -i 's/mistune.scanner/mistune.util/' hyperkitty/lib/renderer.py ''; propagatedBuildInputs = [ @@ -56,6 +44,7 @@ buildPythonPackage rec { # HyperKitty so they're not included for people who don't need them. nativeCheckInputs = [ beautifulsoup4 + elastic-transport elasticsearch mock whoosh @@ -70,6 +59,7 @@ buildPythonPackage rec { passthru.tests = { inherit (nixosTests) mailman; }; meta = { + changelog = "https://docs.mailman3.org/projects/hyperkitty/en/latest/news.html"; homepage = "https://www.gnu.org/software/mailman/"; description = "Archiver for GNU Mailman v3"; license = lib.licenses.gpl3; diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 1069c6332306c..f38a182461acc 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -11,12 +11,12 @@ with python3.pkgs; buildPythonPackage rec { pname = "mailman"; - version = "3.3.8"; + version = "3.3.9"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-g6wH7lXqK0yJ8AxO1HFxMvBicBJ9NGWlPePFyxl9Qc4="; + hash = "sha256-GblXI6IwkLl+V1gEbMAe1baVyZOHMaYaYITXcTkp2Mo="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -52,18 +52,10 @@ buildPythonPackage rec { url = "https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch"; sha256 = "0vyw87s857vfxbf7kihwb6w094xyxmxbi1bpdqi3ybjamjycp55r"; }) - (fetchpatch { - url = "https://gitlab.com/mailman/mailman/-/commit/5e4431af6bb7d672a7ed7e3329f8fac7812d47f8.patch"; - excludes = [ ".gitlab-ci.yml" ]; - hash = "sha256-y2AE9hU4Z1BpBlJywxMWiuRvltWkk+R9YgMkpemvlIo="; - }) ./log-stderr.patch ]; postPatch = '' - substituteInPlace setup.py \ - --replace "alembic>=1.6.2,<1.7" "alembic>=1.6.2" - substituteInPlace src/mailman/config/postfix.cfg \ --replace /usr/sbin/postmap ${postfix}/bin/postmap substituteInPlace src/mailman/config/schema.cfg \ diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index de1951ce15c16..1f3171f18a7f4 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -4,14 +4,14 @@ with python3.pkgs; buildPythonPackage rec { pname = "postorius"; - version = "1.3.8"; + version = "1.3.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1mSt+PVx3xUJDc5JwrCmKiRNIDwbsjjbM2Fi5Sgz6h8="; + hash = "sha256-GmbIqO+03LgbUxJ1nTStXrYN3t2MfvzbeYRAipfTW1o="; }; - propagatedBuildInputs = [ django-mailman3 readme_renderer ]; + propagatedBuildInputs = [ django-mailman3 readme-renderer ]; nativeCheckInputs = [ beautifulsoup4 vcrpy mock ]; # Tries to connect to database. diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index e5eb2251b5e1d..ebac15e443bf1 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -18,14 +18,6 @@ python3.override { [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ - elasticsearch = super.elasticsearch.overridePythonAttrs ({ pname, ... }: rec { - version = "7.17.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ZsTs4q3+fMEg4rameYof1cd3rs+C7sObuVzvfPx+orM="; - }; - }); - # https://gitlab.com/mailman/hyperkitty/-/merge_requests/541 mistune = super.mistune.overridePythonAttrs (old: rec { version = "2.0.5"; @@ -37,11 +29,12 @@ python3.override { }); # django-q tests fail with redis 5.0.0. + # https://gitlab.com/mailman/hyperkitty/-/issues/493 redis = super.redis.overridePythonAttrs ({ pname, ... }: rec { - version = "4.5.4"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - hash = "sha256-c+w12k2iZ9aEfkf2hzD91fYuLKaePvWIXGp4qTdMOJM="; + hash = "sha256-WF3FFrnrBCphnvCjnD19Vf6BvbTfCaUsnN3g0Hvxqn0="; }; }); }) diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index e9ef718d84f1b..d347f434ab50e 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchPypi, fetchpatch +{ lib, python3, fetchPypi , sassc, hyperkitty, postorius , nixosTests }: @@ -7,21 +7,14 @@ with python3.pkgs; buildPythonPackage rec { pname = "mailman-web"; - version = "0.0.6"; + version = "0.0.8"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UWdqrcx529r6kwgf0YEHiDrpZlGoUBR6OdYtHMTPMGY="; + hash = "sha256-nN/L+X2Rvm6rqkscns4Tn2TAr59O5lCJObvcJp6M0+Q="; }; - patches = [ - (fetchpatch { - url = "https://gitlab.com/mailman/mailman-web/-/commit/448bba249d39c09c0cef5e059415cc07a3ce569c.patch"; - hash = "sha256-rs1vaV4YyLyJ0+EGY70CirvjArpGQr29DOTvgj68wgs="; - }) - ]; - postPatch = '' # Django is depended on transitively by hyperkitty and postorius, # and mailman_web has overly restrictive version bounds on it, so |