summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorLancelot SIX <lsix@lancelotsix.com>2016-08-03 09:10:38 +0200
committerLancelot SIX <lsix@lancelotsix.com>2016-08-03 09:20:37 +0200
commitaf154d1ca676ef33d58e540e0718490fd0283438 (patch)
treee951b0820b0bdc2f219cc877748eb2b1eb2a236e /pkgs/development/python-modules
parent3f093b9c9c1c33e826f578f76e9f38ad45856f96 (diff)
downloadnixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.gz
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.bz2
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.lz
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.xz
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.zst
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.zip
pythonPackags.django: default from 1_9 to 1_10
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/django/1.10-gis-libs.template.patch (renamed from pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch)16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
index 7757691bfca1..be196d000bcf 100644
--- a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch
+++ b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
@@ -13,12 +13,12 @@ diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgda
 diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
 --- a/django/contrib/gis/geos/libgeos.py
 +++ b/django/contrib/gis/geos/libgeos.py
-@@ -23,7 +23,7 @@ try:
-     lib_path = settings.GEOS_LIBRARY_PATH
- except (AttributeError, EnvironmentError,
-         ImportError, ImproperlyConfigured):
--    lib_path = None
-+    lib_path = "@geos@/lib/libgeos_c.so"
+@@ -26,7 +26,7 @@ try:
+         lib_path = settings.GEOS_LIBRARY_PATH
+     except (AttributeError, EnvironmentError,
+             ImportError, ImproperlyConfigured):
+-        lib_path = None
++        lib_path = "@geos@/lib/libgeos_c.so"
  
- # Setting the appropriate names for the GEOS-C library.
- if lib_path:
+     # Setting the appropriate names for the GEOS-C library.
+     if lib_path: