From b67cf97f5c56669d0e7abec966c16a36c0eb4030 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 22 Apr 2013 22:48:09 +0200 Subject: [PATCH] Revert "let hydra also build python26Packages" This reverts commit a2ddd3643e03767321edee7edffb3cbab7f9ab83. @peti pointed out that python2.6 packages are now prefered over python2.7. In a local test it was the other way round. seems to be arbitrary or I messed up the test. --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0cc4a117b6e..819f6978b1f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5325,11 +5325,15 @@ let pythonPackages = python27Packages; - python26Packages = recurseIntoAttrs (import ./python-packages.nix { + # `nix-env -i python-nose` installs for 2.7, the default python. + # Therefore we do not recurse into attributes here, in contrast to + # python27Packages. `nix-env -iA python26Packages.nose` works + # regardless. + python26Packages = import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = python26; - }); + }; python27Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs;