BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

django_hijack: reduce hackishness of overrides

Browse source
This commit is contained in:
Michael Raskin 2017-05-01 17:42:13 +02:00
parent f87e4c9f53
commit 6fc51d1d7f
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/django-compat/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv, buildPythonPackage, fetchurl, { stdenv, buildPythonPackage, fetchurl,
django, django_nose, six django, django_nose, six
}: }:
let x =
buildPythonPackage rec { buildPythonPackage rec {
name = "django-compat-${version}"; name = "django-compat-${version}";
version = "1.0.14"; version = "1.0.14";
@ -21,5 +20,4 @@ buildPythonPackage rec {
homepage = https://github.com/arteria/django-compat; homepage = https://github.com/arteria/django-compat;
license = licenses.mit; license = licenses.mit;
}; };
}; }
in x // {overrideBPP = x.override;}

8
pkgs/top-level/python-packages.nix
View file

@ -10623,11 +10623,9 @@ in {
# TODO improve the that multi-override necessity (the fixpoint based python # TODO improve the that multi-override necessity (the fixpoint based python
# packages work can be the solution) # packages work can be the solution)
propagatedBuildInputs = with self; [ django_1_9 (django_compat.overrideBPP { propagatedBuildInputs = with self; [ django_1_9 (django_compat.override {
buildInputs = with self; [ (django_nose.override { django = django_1_9;
propagatedBuildInputs = with self; [ django_1_9 nose ]; django_nose = django_nose.override { propagatedBuildInputs = [django_1_9 nose]; };
}) ];
propagatedBuildInputs = with self; [ django_1_9 six ];
}) ]; }) ];
meta = { meta = {