diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-03-26 09:43:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-26 09:43:41 +0200 |
| commit | fffb511607dadde2340d1b09169949091509a7f5 (patch) | |
| tree | ed78084ded8b7e24fd5da5541d7b99c95e916fef | |
| parent | f876727005b800353336f0025c8043c8a5d7cb4e (diff) | |
| parent | d284e37a59ef759b1bdca7f92f8b0278d6a70ad0 (diff) | |
| download | nixlib-fffb511607dadde2340d1b09169949091509a7f5.tar nixlib-fffb511607dadde2340d1b09169949091509a7f5.tar.gz nixlib-fffb511607dadde2340d1b09169949091509a7f5.tar.bz2 nixlib-fffb511607dadde2340d1b09169949091509a7f5.tar.lz nixlib-fffb511607dadde2340d1b09169949091509a7f5.tar.xz nixlib-fffb511607dadde2340d1b09169949091509a7f5.tar.zst nixlib-fffb511607dadde2340d1b09169949091509a7f5.zip | |
Merge pull request #24208 from lsix/update_django_1_10
pythonPackages.django: 1.10.5 -> 1.10.6
| -rw-r--r-- | pkgs/development/python-modules/django/1_10.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 32 |
2 files changed, 37 insertions, 30 deletions
diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix new file mode 100644 index 000000000000..271f8a5467ba --- /dev/null +++ b/pkgs/development/python-modules/django/1_10.nix @@ -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/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3bc3732d9f0d..141957db2226 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10316,36 +10316,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 { |