From fbf3f4d473a622dc5faaef52c4b398d498d8419a Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 11 Jul 2017 09:43:30 +0200 Subject: [PATCH 1/4] pythonPackages.rjsmin: init at 1.0.12 --- .../python-modules/rjsmin/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/rjsmin/default.nix diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix new file mode 100644 index 00000000000..24adf830699 --- /dev/null +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "rjsmin"; + version = "1.0.12"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wc62d0f80kw1kjv8nlxychh0iy66a6pydi4vfvhh2shffm935fx"; + }; + + # The package does not ship tests, and the setup machinary confuses + # tests auto-discovery + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://opensource.perlig.de/rjsmin/; + license = licenses.asl20; + description = "Javascript minifier written in python"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ad11bbd4cf..f74e4ccb383 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21222,6 +21222,8 @@ in { }; }; + rjsmin = callPackage ../development/python-modules/rjsmin { }; + pysolr = buildPythonPackage rec { name = "pysolr-${version}"; version = "3.3.3"; From a2c5fbe56d0a94ea8f07c4bcd74ac541fe024790 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 11 Jul 2017 09:44:12 +0200 Subject: [PATCH 2/4] pythonPackages.rcssmin: init at 1.0.6 --- .../python-modules/rcssmin/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/rcssmin/default.nix diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix new file mode 100644 index 00000000000..9347cd55cf3 --- /dev/null +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "rcssmin"; + version = "1.0.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w42l4dhxghcz7pj3q7hkxp015mvb8z2cq9sfxbl31npsfavd1ya"; + }; + + # The package does not ship tests, and the setup machinary confuses + # tests auto-discovery + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://opensource.perlig.de/rcssmin/; + license = licenses.asl20; + description = "CSS minifier written in pure python"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f74e4ccb383..15936af0300 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21072,6 +21072,8 @@ in { }; }; + rcssmin = callPackage ../development/python-modules/rcssmin { }; + recommonmark = buildPythonPackage rec { name = "recommonmark-${version}"; version = "0.4.0"; From 73076f325223bb47c00dcfe5b24772f47e17412f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 11 Jul 2017 09:58:12 +0200 Subject: [PATCH 3/4] pythonPackages.django_appconf: 1.0.1 -> 1.0.2 --- .../python-modules/django_appconf/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/django_appconf/default.nix diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix new file mode 100644 index 00000000000..77fc708a50b --- /dev/null +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: +buildPythonPackage rec { + pname = "django-appconf"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba"; + }; + + # No tests in archive + doCheck = false; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 15936af0300..42cd541f7c1 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}"; From e200a97d6a36c5a40722c03d283c3eb60e25de8b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 11 Jul 2017 09:44:39 +0200 Subject: [PATCH 4/4] pythonPackages.django_compressor: 1.5 -> 2.1.1 --- .../django_compressor/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +---------------- 2 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/django_compressor/default.nix diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix new file mode 100644 index 00000000000..5d8626ec576 --- /dev/null +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, + rcssmin, rjsmin, django_appconf }: +buildPythonPackage rec { + pname = "django_compressor"; + version = "2.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s42dkq3qp1niaf69markd7m3ljgf2bspyz2nk0sa07f8q04004j"; + }; + + # Need to setup django testing + doCheck = false; + + propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; + + meta = with stdenv.lib; { + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42cd541f7c1..e5cc154ee9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9889,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 { };