public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17473 from lancelotsix/add_django_1_10

Browse Source 
Add django 1.10
This commit is contained in:
Rok Garbas
2016-08-07 04:08:26 +02:00
committed by GitHub
parent 486b8e7f5c af154d1ca6
commit 17e8dda597
2 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch → pkgs/development/python-modules/django/1.10-gis-libs.template.patch
View File

@@ -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: