about summary refs log tree commit diff
path: root/pkgs/top-level/python-packages.nix
diff options
context:
space:
mode:
authorLancelot SIX <lsix@lancelotsix.com>2016-08-03 09:10:38 +0200
committerLancelot SIX <lsix@lancelotsix.com>2016-08-03 09:20:37 +0200
commitaf154d1ca676ef33d58e540e0718490fd0283438 (patch)
treee951b0820b0bdc2f219cc877748eb2b1eb2a236e /pkgs/top-level/python-packages.nix
parent3f093b9c9c1c33e826f578f76e9f38ad45856f96 (diff)
downloadnixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.gz
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.bz2
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.lz
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.xz
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.tar.zst
nixlib-af154d1ca676ef33d58e540e0718490fd0283438.zip
pythonPackags.django: default from 1_9 to 1_10
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r--pkgs/top-level/python-packages.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 44fe5f6fb05e..6edb92b4026c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8891,12 +8891,12 @@ in modules // {
     };
   };
 
-  django = self.django_1_9;
+  django = self.django_1_10;
 
   django_gis = self.django.override rec {
     patches = [
       (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;
         gdal = pkgs.gdal;
       })
@@ -9202,7 +9202,14 @@ in modules // {
       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 = {
       description = "Allows superusers to hijack (=login as) and work on behalf of another user";