diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2023-02-20 22:10:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-20 22:10:14 +0100 |
commit | 8ed9778a85f9220ffd343df13dea0dd987dbc93f (patch) | |
tree | a43c9a76bf066314fb740c8f575c6bee87bf0fb0 /pkgs | |
parent | ea6d656dd9db3eb6b0408dd23f43c4f7c8a49641 (diff) | |
parent | 48c2d3284a166b3b852a4398a177fe3075cb3902 (diff) |
Merge pull request #212926 from kirillrdy/mailman
mailman: 3.3.5 -> 3.3.8
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/mail/mailman/package.nix | 20 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/python.nix | 13 |
2 files changed, 15 insertions, 18 deletions
diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index a990f3cdb0569..d4040458307fe 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -1,16 +1,22 @@ -{ lib, fetchpatch, python3, postfix, lynx +{ lib +, fetchpatch +, python3 +, docutils +, sphinx +, postfix +, lynx }: with python3.pkgs; buildPythonPackage rec { pname = "mailman"; - version = "3.3.5"; + version = "3.3.8"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "12mgxs1ndhdjjkydx48b95na9k9h0disfqgrr6wxx7vda6dqvcwz"; + hash = "sha256-g6wH7lXqK0yJ8AxO1HFxMvBicBJ9NGWlPePFyxl9Qc4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -33,6 +39,11 @@ buildPythonPackage rec { zope_configuration ]; + checkInputs = [ + docutils + sphinx + ]; + patches = [ (fetchpatch { url = "https://gitlab.com/mailman/mailman/-/commit/4b206e2a5267a0e17f345fd7b2d957122ba57566.patch"; @@ -64,9 +75,6 @@ buildPythonPackage rec { # 'runner' scripts. dontWrapPythonPrograms = true; - # requires flufl.testing, which the upstream has archived - doCheck = false; - meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 359f974f598c2..c462ada1d37c4 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -3,18 +3,7 @@ python3.override { packageOverrides = self: super: { # does not find tests - alembic = super.alembic.overridePythonAttrs (oldAttrs: { - doCheck = false; - }); - # Needed by mailman, see https://gitlab.com/mailman/mailman/-/issues/964 - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.3.24"; - src = super.fetchPypi { - inherit version; - inherit (oldAttrs) pname; - sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb"; - }; - # does not find tests + alembic = super.alembic.overridePythonAttrs (oldAttrs: { doCheck = false; }); # Fixes `AssertionError: database connection isn't set to UTC` |