about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-07-12 20:34:24 +0100
committerGitHub <noreply@github.com>2017-07-12 20:34:24 +0100
commit575ce53d14bb7ee0bf9e7da3e834bd463924746a (patch)
treeec607c928a5405ccdae956047a6d4d04b7533074 /pkgs/top-level
parent61c1313bd1a71fce3b074d9c5d1482604a75529e (diff)
parente200a97d6a36c5a40722c03d283c3eb60e25de8b (diff)
downloadnixlib-575ce53d14bb7ee0bf9e7da3e834bd463924746a.tar
nixlib-575ce53d14bb7ee0bf9e7da3e834bd463924746a.tar.gz
nixlib-575ce53d14bb7ee0bf9e7da3e834bd463924746a.tar.bz2
nixlib-575ce53d14bb7ee0bf9e7da3e834bd463924746a.tar.lz
nixlib-575ce53d14bb7ee0bf9e7da3e834bd463924746a.tar.xz
nixlib-575ce53d14bb7ee0bf9e7da3e834bd463924746a.tar.zst
nixlib-575ce53d14bb7ee0bf9e7da3e834bd463924746a.zip
Merge pull request #27296 from lsix/update_django_compressor
pythonPackages.django_compressor: 1.5 -> 2.1.1
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/python-packages.nix48
1 files changed, 6 insertions, 42 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfb5a901f5a9..6f3adb9d9d50 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9865,27 +9865,7 @@ in {
     };
   };
 
-  django_appconf = buildPythonPackage rec {
-    name = "django-appconf-${version}";
-    version = "1.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-appconf/django-appconf-${version}.tar.gz";
-      sha256 = "0q3fg17qi4vwpipbj075zn4wk58p6a946kah8wayks1423xpa4xs";
-    };
-
-    # No tests in archive
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ six ];
-
-    meta = {
-      description = "A helper class for handling configuration defaults of packaged apps gracefully";
-      homepage = http://django-appconf.readthedocs.org/;
-      license = licenses.bsd2;
-      maintainers = with maintainers; [ desiderius ];
-    };
-  };
+  django_appconf = callPackage ../development/python-modules/django_appconf { };
 
   django_colorful = buildPythonPackage rec {
     name = "django-colorful-${version}";
@@ -9909,27 +9889,7 @@ in {
     };
   };
 
-  django_compressor = buildPythonPackage rec {
-    name = "django-compressor-${version}";
-    version = "1.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django_compressor/django_compressor-${version}.tar.gz";
-      sha256 = "0bp2acagc6b1mmcajlmjf5vvp6zj429bq7p2wks05n47pwfzv281";
-    };
-
-    # Need to setup django testing
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ django_appconf ];
-
-    meta = {
-      description = "Compresses linked and inline JavaScript or CSS into single cached files";
-      homepage = http://django-compressor.readthedocs.org/en/latest/;
-      license = licenses.mit;
-      maintainers = with maintainers; [ desiderius ];
-    };
-  };
+  django_compressor = callPackage ../development/python-modules/django_compressor { };
 
   django_compat = callPackage ../development/python-modules/django-compat { };
 
@@ -21072,6 +21032,8 @@ in {
     };
   };
 
+  rcssmin = callPackage ../development/python-modules/rcssmin { };
+
   recommonmark = buildPythonPackage rec {
     name = "recommonmark-${version}";
     version = "0.4.0";
@@ -21222,6 +21184,8 @@ in {
     };
   };
 
+  rjsmin = callPackage ../development/python-modules/rjsmin { };
+
   pysolr = buildPythonPackage rec {
     name = "pysolr-${version}";
     version = "3.3.3";