diff options
| author | Rok Garbas <rok@garbas.si> | 2016-08-07 04:08:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-07 04:08:26 +0200 |
| commit | 17e8dda59713e2758928aae63d182961176a212c (patch) | |
| tree | c45005aa55719ff67fe9ba06f4a78c3b1f7d1a1f /pkgs/development/python-modules | |
| parent | 486b8e7f5cd4d2a476c1f0fd50f71273d575d0e3 (diff) | |
| parent | af154d1ca676ef33d58e540e0718490fd0283438 (diff) | |
| download | nixlib-17e8dda59713e2758928aae63d182961176a212c.tar nixlib-17e8dda59713e2758928aae63d182961176a212c.tar.gz nixlib-17e8dda59713e2758928aae63d182961176a212c.tar.bz2 nixlib-17e8dda59713e2758928aae63d182961176a212c.tar.lz nixlib-17e8dda59713e2758928aae63d182961176a212c.tar.xz nixlib-17e8dda59713e2758928aae63d182961176a212c.tar.zst nixlib-17e8dda59713e2758928aae63d182961176a212c.zip | |
Merge pull request #17473 from lancelotsix/add_django_1_10
Add django 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: |