diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-10-20 18:56:03 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-10-20 18:56:03 +0200 |
commit | 9320d9e7bcb350ad84b59f6f0f88abc7b8379970 (patch) | |
tree | e8565906732f41a68069772283fded34b4e61586 /pkgs/servers/mail/mailman | |
parent | af038be354d32b1b415b50cde7e7c7534db9cb1c (diff) | |
parent | 09e0a34f92cb8145a8e1dd24b367af9ca9d4dbf9 (diff) |
Merge #260527: Mailman fixes
...into staging-next
Diffstat (limited to 'pkgs/servers/mail/mailman')
-rw-r--r-- | pkgs/servers/mail/mailman/hyperkitty.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/package.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/python.nix | 17 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/web.nix | 9 |
4 files changed, 35 insertions, 3 deletions
diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 334a24b1ed00..ba2a894e12b8 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchPypi +, fetchpatch }: with python3.pkgs; @@ -17,6 +18,10 @@ buildPythonPackage rec { patches = [ ./0001-Disable-broken-test_help_output-testcase.patch + (fetchpatch { + url = "https://gitlab.com/mailman/hyperkitty/-/commit/5bb394662882bfc73c3e877458da44343aa06922.patch"; + hash = "sha256-9vcY6nu3txDftH6aYpdh9qSrLzZceGjVFxuD1Ux18gw="; + }) ]; postPatch = '' diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 0ae9bc5f4eae..47d09bff6717 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -2,7 +2,6 @@ , fetchpatch , python3 , fetchPypi -, sphinx , postfix , lynx }: @@ -30,7 +29,6 @@ buildPythonPackage rec { flufl_i18n flufl_lock gunicorn - importlib-resources lazr_config passlib requests @@ -52,6 +50,11 @@ 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 ]; diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 7c6edbd5e9ea..e4f96db0224d 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -20,6 +20,14 @@ python3.override { */ django = super.django_3; + 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"; @@ -29,6 +37,15 @@ python3.override { hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; }; }); + + # django-q tests fail with redis 5.0.0. + redis = super.redis.overridePythonAttrs ({ pname, ... }: rec { + version = "4.5.4"; + src = fetchPypi { + inherit pname version; + hash = "sha256-c+w12k2iZ9aEfkf2hzD91fYuLKaePvWIXGp4qTdMOJM="; + }; + }); }) overlay; diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index ed5c267ad0c2..21fa64085d57 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchPypi +{ lib, python3, fetchPypi, fetchpatch , sassc, hyperkitty, postorius }: @@ -14,6 +14,13 @@ buildPythonPackage rec { sha256 = "sha256-UWdqrcx529r6kwgf0YEHiDrpZlGoUBR6OdYtHMTPMGY="; }; + 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 |