diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-08-25 15:52:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-25 15:52:35 +0200 |
commit | b71d71c576df3dbac8af76241260246010e08536 (patch) | |
tree | 1bb2b1779901f98650f47dc795c5619c1d76b260 /pkgs | |
parent | 8512747ca5120a4cf6cd41ad9e049866e37a351c (diff) | |
parent | 6e9d8efbd17b478e7b3fa8bd2159989f6aba47a9 (diff) | |
download | nixpkgs-b71d71c576df3dbac8af76241260246010e08536.tar nixpkgs-b71d71c576df3dbac8af76241260246010e08536.tar.gz nixpkgs-b71d71c576df3dbac8af76241260246010e08536.tar.bz2 nixpkgs-b71d71c576df3dbac8af76241260246010e08536.tar.lz nixpkgs-b71d71c576df3dbac8af76241260246010e08536.tar.xz nixpkgs-b71d71c576df3dbac8af76241260246010e08536.tar.zst nixpkgs-b71d71c576df3dbac8af76241260246010e08536.zip |
Merge pull request #17963 from lancelotsix/update_django_raster_0_3
django_raster: 0.2 -> 0.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba7cb8f1c80..231f29bc2ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9010,16 +9010,6 @@ in modules // { django = self.django_1_10; - django_gis = self.django.override rec { - patches = [ - (pkgs.substituteAll { - src = ../development/python-modules/django/1.10-gis-libs.template.patch; - geos = pkgs.geos; - gdal = pkgs.gdal; - }) - ]; - }; - django_1_10 = buildPythonPackage rec { name = "Django-${version}"; version = "1.10"; @@ -9030,6 +9020,14 @@ in modules // { sha256 = "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26"; }; + 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" @@ -9442,11 +9440,11 @@ in modules // { django_raster = buildPythonPackage rec { name = "django-raster-${version}"; - version = "0.2"; + version = "0.3"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-raster/${name}.tar.gz"; - sha256 = "1zdcxzj43qrv7cl6q9nb2dkfnsyn74dzf2igpnd6nbbfdnkif9bm"; + sha256 = "0vn11y07wag7yvjzrk7m99xs3cqyaaaklwcsik9zbvw0kwp2khni"; }; propagatedBuildInputs = with self ; [ numpy django_colorful pillow psycopg2 @@ -10850,6 +10848,12 @@ in modules // { }; }; + gdal = (pkgs.gdal.overrideDerivation (oldattrs: { + name = "${python.libPrefix}-" + oldattrs.name; + })).override { + pythonPackages = self; + }; + gdrivefs = buildPythonPackage rec { version = "0.14.3"; name = "gdrivefs-${version}"; @@ -19180,11 +19184,11 @@ in modules // { pyparsing = buildPythonPackage rec { name = "pyparsing-${version}"; - version = "2.1.4"; + version = "2.1.8"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyparsing/${name}.tar.gz"; - sha256 = "0z3rn5cl22kglrvlkfbdjgrp7s443k6k4hcr5awlj3dmg7m4s8x9"; + sha256 = "0sy5fxhsvhf0fwk9h6nqlhn1lsjpdmg41jziw5z814rlkydqd903"; }; # Not everything necessary to run the tests is included in the distribution |