Unverified Commit 8ed9778a authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #212926 from kirillrdy/mailman 

mailman: 3.3.5 -> 3.3.8
parents ea6d656d 48c2d328

pkgs/servers/mail/mailman/package.nix

+14 −6
Original line number Diff line number Diff line 
{ 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";

pkgs/servers/mail/mailman/python.nix

+1 −12
Original line number Diff line number Diff line
@@ -6,17 +6,6 @@ python3.override { 
    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

      doCheck = false;

    });

    # Fixes `AssertionError: database connection isn't set to UTC`

    psycopg2 = super.psycopg2.overridePythonAttrs (a: (rec {

      version = "2.8.6";