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

pythonPackags.django: default from 1_9 to 1_10

Browse Source
This commit is contained in:
Lancelot SIX 2016-08-03 09:10:38 +02:00
parent 3f093b9c9c
commit af154d1ca6
No known key found for this signature in database
GPG Key ID: 02E1542BA66FB047
2 changed files with 18 additions and 11 deletions
Show Stats 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 diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
--- a/django/contrib/gis/geos/libgeos.py --- a/django/contrib/gis/geos/libgeos.py
+++ b/django/contrib/gis/geos/libgeos.py +++ b/django/contrib/gis/geos/libgeos.py
@@ -23,7 +23,7 @@ try: @@ -26,7 +26,7 @@ try:
lib_path = settings.GEOS_LIBRARY_PATH lib_path = settings.GEOS_LIBRARY_PATH
except (AttributeError, EnvironmentError, except (AttributeError, EnvironmentError,
ImportError, ImproperlyConfigured): ImportError, ImproperlyConfigured):
- lib_path = None - lib_path = None
+ lib_path = "@geos@/lib/libgeos_c.so" + lib_path = "@geos@/lib/libgeos_c.so"
# Setting the appropriate names for the GEOS-C library. # Setting the appropriate names for the GEOS-C library.
if lib_path: if lib_path:

13
pkgs/top-level/python-packages.nix
View File

@ -8891,12 +8891,12 @@ in modules // {
}; };
}; };
django = self.django_1_9; django = self.django_1_10;
django_gis = self.django.override rec { django_gis = self.django.override rec {
patches = [ patches = [
(pkgs.substituteAll { (pkgs.substituteAll {
src = ../development/python-modules/django/1.7.7-gis-libs.template.patch; src = ../development/python-modules/django/1.10-gis-libs.template.patch;
geos = pkgs.geos; geos = pkgs.geos;
gdal = pkgs.gdal; gdal = pkgs.gdal;
}) })
@ -9202,7 +9202,14 @@ in modules // {
sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04"; sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04";
}; };
propagatedBuildInputs = with self; [ django django_compat ]; # TODO improve the that multi-override necessity (the fixpoint based python
# packages work can be the solution)
propagatedBuildInputs = with self; [ django_1_9 (django_compat.override {
buildInputs = with self; [ (django_nose.override {
propagatedBuildInputs = with self; [ django_1_9 nose ];
}) ];
propagatedBuildInputs = with self; [ django_1_9 six ];
}) ];
meta = { meta = {
description = "Allows superusers to hijack (=login as) and work on behalf of another user"; description = "Allows superusers to hijack (=login as) and work on behalf of another user";