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
commit 17e8dda597
2 changed files with 45 additions and 14 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:

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

@ -8891,18 +8891,42 @@ 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;
}) })
]; ];
}; };
django_1_10 = buildPythonPackage rec {
name = "Django-${version}";
version = "1.10";
disabled = pythonOlder "2.7";
src = pkgs.fetchurl {
url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
sha256 = "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26";
};
# patch only $out/bin to avoid problems with starter templates (see #3134)
postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"
'';
# too complicated to setup
doCheck = false;
meta = {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
};
};
django_1_9 = buildPythonPackage rec { django_1_9 = buildPythonPackage rec {
name = "Django-${version}"; name = "Django-${version}";
version = "1.9.5"; version = "1.9.5";
@ -9090,21 +9114,21 @@ in modules // {
django_compat = buildPythonPackage rec { django_compat = buildPythonPackage rec {
name = "django-compat-${version}"; name = "django-compat-${version}";
version = "1.0.8"; version = "1.0.13";
# build process attempts to access a missing README.rst # build process attempts to access a missing README.rst
disabled = isPy35; disabled = isPy35;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/d/django-compat/${name}.tar.gz"; url = "mirror://pypi/d/django-compat/${name}.tar.gz";
sha256 = "195dgr55vzpw1fbjvbw2h35k9bfhvm5zchh2p7nzbq57xmwb3sra"; sha256 = "0s0z7cx0vv1kjsyzk24sg256hfnd09ssilc9rakhxrzr3firgx80";
}; };
buildInputs = with self; [ django_nose ]; buildInputs = with self; [ django_nose ];
propagatedBuildInputs = with self; [ django six ]; propagatedBuildInputs = with self; [ django six ];
meta = { meta = {
description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, and 1.9"; description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9 and 1.10";
homepage = https://github.com/arteria/django-compat; homepage = https://github.com/arteria/django-compat;
license = licenses.mit; license = licenses.mit;
}; };
@ -9178,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";