diff options
author | Florian Friesdorf <flo@chaoflow.net> | 2013-04-22 22:48:09 +0200 |
---|---|---|
committer | Florian Friesdorf <flo@chaoflow.net> | 2013-04-22 22:49:40 +0200 |
commit | b67cf97f5c56669d0e7abec966c16a36c0eb4030 (patch) | |
tree | c154c695df057cfc7a10bef3bdf1fe89d3738972 | |
parent | 40502b492d5eaa51038fb2aaf2407088b8a0e4a8 (diff) | |
download | nixlib-b67cf97f5c56669d0e7abec966c16a36c0eb4030.tar nixlib-b67cf97f5c56669d0e7abec966c16a36c0eb4030.tar.gz nixlib-b67cf97f5c56669d0e7abec966c16a36c0eb4030.tar.bz2 nixlib-b67cf97f5c56669d0e7abec966c16a36c0eb4030.tar.lz nixlib-b67cf97f5c56669d0e7abec966c16a36c0eb4030.tar.xz nixlib-b67cf97f5c56669d0e7abec966c16a36c0eb4030.tar.zst nixlib-b67cf97f5c56669d0e7abec966c16a36c0eb4030.zip |
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.
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files 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; |