Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 61c1313bd1a7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 575ce53d14bb
Choose a head ref
  • 5 commits
  • 5 files changed
  • 2 contributors

Commits on Jul 11, 2017

  1. pythonPackages.rjsmin: init at 1.0.12

    @lsix
    lsix committed Jul 11, 2017
    Copy the full SHA
    fbf3f4d View commit details

  2. pythonPackages.rcssmin: init at 1.0.6

    @lsix
    lsix committed Jul 11, 2017
    Copy the full SHA
    a2c5fbe View commit details

  3. pythonPackages.django_appconf: 1.0.1 -> 1.0.2

    @lsix
    lsix committed Jul 11, 2017
    Copy the full SHA
    73076f3 View commit details

  4. pythonPackages.django_compressor: 1.5 -> 2.1.1

    @lsix
    lsix committed Jul 11, 2017
    Copy the full SHA
    e200a97 View commit details

Commits on Jul 12, 2017

  1. Merge pull request #27296 from lsix/update_django_compressor 

    pythonPackages.django_compressor: 1.5 -> 2.1.1
    @Mic92
    Mic92 authored Jul 12, 2017
    Copy the full SHA
    575ce53 View commit details
23 changes: 23 additions & 0 deletions pkgs/development/python-modules/django_appconf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/django_compressor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
21 changes: 21 additions & 0 deletions pkgs/development/python-modules/rcssmin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
}
21 changes: 21 additions & 0 deletions pkgs/development/python-modules/rjsmin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
}
48 changes: 6 additions & 42 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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";