diff options
author | Guillaume Maudoux | 2017-11-01 01:09:39 +0100 |
---|---|---|
committer | Bas van Dijk | 2017-11-04 17:53:35 +0100 |
commit | 7325ad9ab735424257b05a81e0c8197e4651e68f (patch) | |
tree | dc726222579ddadc371a1ef61bf615e6c3d512d4 /pkgs/top-level | |
parent | b51aa7b6d8b5d5ca207cdc6e3c515d26488de265 (diff) |
graphite: override django and django_tagging
instead of depending on specific versions in the django_tagging_0_4_3 and graphite_web derivations. This should fix: https://github.com/NixOS/nixpkgs/pull/30277#discussion_r145393088 This was joint work of @basvandijk and @layus at NixCon 2017.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0be1ff17ee01..7013b980865a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8093,14 +8093,17 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_tagging_0_4_3 = self.django_tagging.overrideAttrs (attrs: rec { + django_tagging_0_4_3 = if + self.django != self.django_1_8 + then throw "django_tagging_0_4_3 should be build with django_1_8" + else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec { name = "django-tagging-0.4.3"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs"; }; - propagatedBuildInputs = with self; [ django_1_8 ]; + propagatedBuildInputs = with self; [ django ]; }); django_classytags = buildPythonPackage rec { @@ -22835,7 +22838,11 @@ EOF }; }; - graphite_web = buildPythonPackage rec { + graphite_web = if + self.django != self.django_1_8 + || self.django_tagging != self.django_tagging_0_4_3 + then throw "graphite_web should be build with django_1_8 and django_tagging_0_4_3" + else buildPythonPackage rec { name = "graphite-web-${version}"; disabled = isPy3k; version = graphiteVersion; @@ -22846,7 +22853,7 @@ EOF }; propagatedBuildInputs = with self; [ - django_1_8 django_tagging_0_4_3 whisper pycairo cairocffi + django django_tagging whisper pycairo cairocffi ldap memcached pytz urllib3 scandir ]; |