Merge branch 'master' into staging-next

2021-03-03 19:47:08 +01:00
parent 7fe25d37fa 58a5417197
commit 9bfe3b3e41
130 changed files with 930 additions and 482 deletions
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -21,10 +21,12 @@ buildPythonPackage rec {
    PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test
  '';

+  pythonImportsCheck = [ "django_mailman3" ];
+
  meta = with lib; {
    description = "Django library for Mailman UIs";
    homepage = "https://gitlab.com/mailman/django-mailman3";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ globin peti ];
  };
 }