From 98d16045cc1e648b349b0c2136b89bdc97f76256 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 19 Sep 2016 14:23:33 +0200 Subject: [PATCH] Revert "pythonPackages.futures: null when Python 3" This reverts commit 61859b9d598784f848aebc81283bd059ba26ee7e. This broke eval because futures_2_2 overrides the derivation. --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a81a9270ff..cea0d8bbaeb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11024,7 +11024,7 @@ in modules // { }; }; - futures = if !(isPy3k) then (buildPythonPackage rec { + futures = buildPythonPackage rec { name = "futures-${version}"; version = "3.0.5"; @@ -11049,7 +11049,7 @@ in modules // { license = licenses.bsd2; maintainers = with maintainers; [ garbas ]; }; - }) else null; + }; futures_2_2 = self.futures.override rec { version = "2.2.0";