Skip to content

Commit

Permalink
pythonPackages.django: 1.10.5 -> 1.10.6
Browse files Browse the repository at this point in the history
This is a bugfix release.
  • Loading branch information
lsix committed Mar 22, 2017
1 parent c7e7feb commit d284e37
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 30 deletions.
35 changes: 35 additions & 0 deletions pkgs/development/python-modules/django/1_10.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ stdenv, buildPythonPackage, fetchurl, substituteAll,
pythonOlder,
geos, gdal
}:
buildPythonPackage rec {
name = "Django-${version}";
version = "1.10.6";
disabled = pythonOlder "2.7";

src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
sha256 = "0q9c7hx720vc0jzq4xlxwhnxmmm8kh0qsqj3l46m29mi98jvwvks";
};

patches = [
(substituteAll {
src = ./1.10-gis-libs.template.patch;
geos = geos;
gdal = gdal;
})
];

# patch only $out/bin to avoid problems with starter templates (see #3134)
postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"
'';

# too complicated to setup
doCheck = false;

meta = {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
};
}
32 changes: 2 additions & 30 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10315,36 +10315,8 @@ in {

django = self.django_1_10;

django_1_10 = buildPythonPackage rec {
name = "Django-${version}";
version = "1.10.5";
disabled = pythonOlder "2.7";

src = pkgs.fetchurl {
url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
sha256 = "12szjsmnfhh2yr54sfynyjr8vl0q9gb6qak3ayqcifcinrs97f0d";
};

patches = [
(pkgs.substituteAll {
src = ../development/python-modules/django/1.10-gis-libs.template.patch;
geos = pkgs.geos;
gdal = self.gdal;
})
];

# patch only $out/bin to avoid problems with starter templates (see #3134)
postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"
'';

# too complicated to setup
doCheck = false;

meta = {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
};
django_1_10 = callPackage ../development/python-modules/django/1_10.nix {
gdal = self.gdal;
};

django_1_9 = buildPythonPackage rec {
Expand Down

0 comments on commit d284e37

Please sign in to comment.