lol

django: add a django_gis variant which patches django to properly point at its gis libs but therefore also has them as dependencies (gdal for one can be quite big)

Conflicts:
pkgs/top-level/python-packages.nix

+34
+24
pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch
··· 1 + diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py 2 + --- a/django/contrib/gis/gdal/libgdal.py 3 + +++ b/django/contrib/gis/gdal/libgdal.py 4 + @@ -17,7 +17,7 @@ try: 5 + lib_path = settings.GDAL_LIBRARY_PATH 6 + except (AttributeError, EnvironmentError, 7 + ImportError, ImproperlyConfigured): 8 + - lib_path = None 9 + + lib_path = "@gdal@/lib/libgdal.so" 10 + 11 + if lib_path: 12 + lib_names = None 13 + diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py 14 + --- a/django/contrib/gis/geos/libgeos.py 15 + +++ b/django/contrib/gis/geos/libgeos.py 16 + @@ -23,7 +23,7 @@ try: 17 + lib_path = settings.GEOS_LIBRARY_PATH 18 + except (AttributeError, EnvironmentError, 19 + ImportError, ImproperlyConfigured): 20 + - lib_path = None 21 + + lib_path = "@geos@/lib/libgeos_c.so" 22 + 23 + # Setting the appropriate names for the GEOS-C library. 24 + if lib_path:
+10
pkgs/top-level/python-packages.nix
··· 6226 6226 6227 6227 django = self.django_1_7; 6228 6228 6229 + django_gis = self.django.override rec { 6230 + patches = [ 6231 + (pkgs.substituteAll { 6232 + src = ../development/python-modules/django/1.7.7-gis-libs.template.patch; 6233 + geos = pkgs.geos; 6234 + gdal = pkgs.gdal; 6235 + }) 6236 + ]; 6237 + }; 6238 + 6229 6239 django_1_8 = buildPythonPackage rec { 6230 6240 name = "Django-${version}"; 6231 6241 version = "1.8.4";