diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index a990f3cdb056..d4040458307f 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 359f974f598c..c462ada1d37c 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`