Merge pull request #184545 from r-ryantm/auto-update/python3.10-rjsmin

pkgs/applications/networking/seahub/default.nix

@@ -40,6 +40,7 @@ python.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with python.pkgs; [
     django
     future
+    django-compressor
     django-statici18n
     django-webpack-loader
     django-simple-captcha
@@ -48,7 +49,6 @@ python.pkgs.buildPythonApplication rec {
     mysqlclient
     pillow
     python-dateutil
-    django_compressor
     djangorestframework
     openpyxl
     requests

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

@@ -0,0 +1,55 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, rcssmin
+, rjsmin
+, django-appconf
+, beautifulsoup4
+, brotli
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "django-compressor";
+  version = "4.1";
+  format = "setuptools";
+
+  src = fetchPypi {
+    pname = "django_compressor";
+    inherit version;
+    hash = "sha256-js5iHSqY9sZjVIDLizcB24kKmfeT+VyiDLAKvBlNMx0=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "rcssmin == 1.1.0" "rcssmin>=1.1.0" \
+      --replace "rjsmin == 1.2.0" "rjsmin>=1.2.0"
+  '';
+
+  propagatedBuildInputs = [
+    rcssmin
+    rjsmin
+    django-appconf
+  ];
+
+  pythonImportsCheck = [
+    "compressor"
+  ];
+
+  doCheck = false; # missing package django-sekizai
+
+  checkInputs = [
+    beautifulsoup4
+    brotli
+    pytestCheckHook
+  ];
+
+  DJANGO_SETTINGS_MODULE = "compressor.test_settings";
+
+  meta = with lib; {
+    description = "Compresses linked and inline JavaScript or CSS into single cached files";
+    homepage = "https://django-compressor.readthedocs.org/en/latest/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ desiderius ];
+  };
+}

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

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor
+{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django-compressor
 , django-allauth, mailmanclient, django, mock
 }:
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    django-gravatar2 django_compressor django-allauth mailmanclient
+    django-gravatar2 django-compressor django-allauth mailmanclient
   ];
   checkInputs = [ django mock ];
 

pkgs/development/python-modules/django_compressor/default.nix

@@ -1,29 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi,
-  rcssmin, rjsmin, django-appconf }:
-
-buildPythonPackage rec {
-    pname = "django_compressor";
-    version = "4.0";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "sha256-HbkbbQQpNjami9Eyjce7kNY2sClfZ7HMbU+hArn9JfY=";
-    };
-    postPatch = ''
-      substituteInPlace setup.py \
-        --replace 'rcssmin == 1.0.6' 'rcssmin' \
-        --replace 'rjsmin == 1.1.0' 'rjsmin'
-    '';
-
-    # requires django-sekizai, which we don't have packaged yet
-    doCheck = false;
-
-    propagatedBuildInputs = [ rcssmin rjsmin django-appconf ];
-
-    meta = with lib; {
-      description = "Compresses linked and inline JavaScript or CSS into single cached files";
-      homepage = "https://django-compressor.readthedocs.org/en/latest/";
-      license = licenses.mit;
-      maintainers = with maintainers; [ desiderius ];
-    };
-}

pkgs/development/python-modules/rjsmin/default.nix

@@ -1,11 +1,11 @@
 { lib, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "rjsmin";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6c529feb6c400984452494c52dd9fdf59185afeacca2afc5174a28ab37751a1b";
+    sha256 = "sha256-H5gr6OARQ4d3qUMHJ5tAE0o5NfwPB5MS7imXJbivVBE=";
   };
 
   # The package does not ship tests, and the setup machinary confuses

pkgs/servers/mail/mailman/hyperkitty.nix

@@ -46,7 +46,7 @@ buildPythonPackage rec {
     django-haystack
     django-mailman3
     django-q
-    django_compressor
+    django-compressor
     django-extensions
     djangorestframework
     flufl_lock

pkgs/servers/web-apps/healthchecks/default.nix

@@ -38,7 +38,7 @@ py.pkgs.buildPythonApplication rec {
     cronsim
     cryptography
     django
-    django_compressor
+    django-compressor
     fido2
     minio
     psycopg2

pkgs/top-level/python-packages.nix

@@ -2386,7 +2386,7 @@ in {
 
   django_compat = callPackage ../development/python-modules/django-compat { };
 
-  django_compressor = callPackage ../development/python-modules/django_compressor { };
+  django-compressor = callPackage ../development/python-modules/django-compressor { };
 
   django-configurations = callPackage ../development/python-modules/django-configurations { };