Unverified Commit a2740915 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #281435 from alyssais/mailman-fixes 

Mailman fixes
parents 3da3b6e8 40b68099

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

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

, buildPythonPackage

, fetchPypi

, fetchpatch



# propagates

, django-gravatar2
@@ -25,17 +24,6 @@ buildPythonPackage rec { 
    hash = "sha256-uIjJaZHWL2evj+oISLprvKWT5Sm5f2EKgUD1twL1VbQ=";

  };



  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/django-q/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
, pytestCheckHook

, pythonOlder

, redis

, setuptools

}:



buildPythonPackage rec {
@@ -40,6 +41,7 @@ buildPythonPackage rec { 


  nativeBuildInputs = [

    poetry-core

    setuptools

  ];



  propagatedBuildInputs = [