Unverified Commit 9320d9e7 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #260527: Mailman fixes 

...into staging-next
parents af038be3 09e0a34f

nixos/modules/services/mail/mailman.nix

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ in { 
          # Since the mailman-web settings.py obstinately creates a logs

          # dir in the cwd, change to the (writable) runtime directory before

          # starting uwsgi.

          ExecStart = "${pkgs.coreutils}/bin/env -C $RUNTIME_DIRECTORY ${pkgs.uwsgi.override { plugins = ["python3"]; }}/bin/uwsgi --json ${uwsgiConfigFile}";

          ExecStart = "${pkgs.coreutils}/bin/env -C $RUNTIME_DIRECTORY ${pkgs.uwsgi.override { plugins = ["python3"]; python3 = webEnv.python; }}/bin/uwsgi --json ${uwsgiConfigFile}";

          User = cfg.webUser;

          Group = "mailman";

          RuntimeDirectory = "mailman-uwsgi";

pkgs/development/python-modules/django-allauth/default.nix

+3 −8
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


buildPythonPackage rec {

  pname = "django-allauth";

  version = "0.55.2";

  version = "0.57.0";

  format = "pyproject";



  disabled = pythonOlder "3.7";
@@ -37,7 +37,7 @@ buildPythonPackage rec { 
    owner = "pennersr";

    repo = pname;

    rev = version;

    hash = "sha256-i0thQymrEDkx2Yt9kM10j4LxL7yChHkG9vsS0508EQA=";

    hash = "sha256-zhKqvm43rw28UKNFdfJ2C1dIeZfPqmchb1rJykm1lx4=";

  };



  nativeBuildInputs = [
@@ -73,11 +73,6 @@ buildPythonPackage rec { 
  ]

  ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);



  disabledTestPaths = [

    # tests are out of date

    "allauth/socialaccount/providers/cern/tests.py"

  ];



  passthru.tests = {

    inherit dj-rest-auth;

  };

pkgs/development/python-modules/django-mailman3/default.nix

+12 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, fetchpatch



# propagates

, django-gravatar2
@@ -24,6 +25,17 @@ buildPythonPackage rec { 
    hash = "sha256-GpI1W0O9aJpLF/mcS23ktJDZsP69S2zQy7drOiWBnTM=";

  };



  patches = [

    (fetchpatch {

      url = "https://gitlab.com/mailman/django-mailman3/-/commit/840d0d531a0813de9a30e72427e202aea21b40fe.patch";

      hash = "sha256-vltvsIP/SWpQZeXDUB+GWlTu+ghFMUqIT8i6CrYcmGo=";

    })

    (fetchpatch {

      url = "https://gitlab.com/mailman/django-mailman3/-/commit/25c55e31d28f2fa8eb23f0e83c12f9b0a05bfbf0.patch";

      hash = "sha256-ug5tBmnVfJTn5ufDDVg/cEtsZM59jQYJpQZV51T3qIc=";

    })

  ];



  postPatch = ''

    substituteInPlace setup.py \

      --replace 'django>=3.2,<4.2' 'django>=3.2,<4.3'

pkgs/development/python-modules/python3-saml/default.nix

+12 −3
Original line number Diff line number Diff line
@@ -24,14 +24,23 @@ buildPythonPackage rec { 
  };



  patches = [

    # skip tests with expired test data

    # upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373

    (fetchpatch {

      name = "test-expired.patch";

      url = "https://github.com/SAML-Toolkits/python3-saml/commit/bd65578e5a21494c89320094c61c1c77250bea33.diff";

      hash = "sha256-9Trew6R5JDjtc0NRGoklqMVDEI4IEqFOdK3ezyBU6gI=";

    })

    # skip tests with expired test data

    # upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373

    ./skip-broken-tests.patch

    (fetchpatch {

      name = "test-expired.patch";

      url = "https://github.com/SAML-Toolkits/python3-saml/commit/ea3a6d4ee6ea0c5cfb0f698d8c0ed25638150f47.patch";

      hash = "sha256-Q9+GM+mCEZK0QVp7ulH2hORVig2411OvkC4+o36DeXg=";

    })

    (fetchpatch {

      name = "test-expired.patch";

      url = "https://github.com/SAML-Toolkits/python3-saml/commit/feb0d1d954ee4d0ad1ad1d7d536bf9e83fa9431b.patch";

      hash = "sha256-NURGI4FUnFlWRZfkioU9IYmZ+Zk9FKfZchjdn7N9abU=";

    })

  ];



  propagatedBuildInputs = [

pkgs/development/python-modules/python3-saml/skip-broken-tests.patch

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
diff --git a/tests/src/OneLogin/saml2_tests/response_test.py b/tests/src/OneLogin/saml2_tests/response_test.py

index fbe714f..bbed3c2 100644

--- a/tests/src/OneLogin/saml2_tests/response_test.py

+++ b/tests/src/OneLogin/saml2_tests/response_test.py

@@ -562,6 +562,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase):

         response_2 = OneLogin_Saml2_Response(settings, xml_2)

         self.assertTrue(response_2.check_one_condition())

 

+    @unittest.skip("test data expired")

     def testCheckOneAuthnStatement(self):

         """

         Tests the check_one_authnstatement method of SamlResponse

@@ -970,6 +971,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase):

         with self.assertRaisesRegex(Exception, 'Could not validate timestamp: expired. Check system clock.'):

             response_2.is_valid(self.get_request_data(), raise_exceptions=True)

 

+    @unittest.skip("test data expired")

     def testIsInValidNoStatement(self):

         """

         Tests the is_valid method of the OneLogin_Saml2_Response

@@ -1080,6 +1082,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase):

         with self.assertRaisesRegex(Exception, 'Found an Attribute element with duplicated Name'):

             response.get_attributes()

 

+    @unittest.skip("test data expired")

     def testIsInValidDestination(self):

         """

         Tests the is_valid method of the OneLogin_Saml2_Response class