From 6fc51d1d7f5a6d763bf7be39e0274051f3275b3a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 1 May 2017 17:42:13 +0200
Subject: [PATCH] django_hijack: reduce hackishness of overrides

---
 pkgs/development/python-modules/django-compat/default.nix | 4 +---
 pkgs/top-level/python-packages.nix                        | 8 +++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
index daf97b19dae..d8a314750ca 100644
--- a/pkgs/development/python-modules/django-compat/default.nix
+++ b/pkgs/development/python-modules/django-compat/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchurl,
   django, django_nose, six
 }:
-let x =
 buildPythonPackage rec {
   name = "django-compat-${version}";
   version = "1.0.14";
@@ -21,5 +20,4 @@ buildPythonPackage rec {
     homepage = https://github.com/arteria/django-compat;
     license = licenses.mit;
   };
-};
-in x // {overrideBPP = x.override;}
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f26d40af47..8a4e44192fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10623,11 +10623,9 @@ in {
 
     # 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.overrideBPP {
-      buildInputs = with self; [ (django_nose.override {
-        propagatedBuildInputs = with self; [ django_1_9 nose ];
-      }) ];
-      propagatedBuildInputs = with self; [ django_1_9 six ];
+    propagatedBuildInputs = with self; [ django_1_9 (django_compat.override {
+      django = django_1_9;
+      django_nose = django_nose.override { propagatedBuildInputs = [django_1_9 nose]; };
     }) ];
 
     meta = {