summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Friesdorf <flo@chaoflow.net>2013-04-22 13:56:29 +0200
committerFlorian Friesdorf <flo@chaoflow.net>2013-04-22 13:56:29 +0200
commita2ddd3643e03767321edee7edffb3cbab7f9ab83 (patch)
tree28fb4c2a32ed430fc2fc895bd310d3fc9ded172f
parentb6c87f9f29aa1d6445ee6bce995757bc95ba85a9 (diff)
downloadnixlib-a2ddd3643e03767321edee7edffb3cbab7f9ab83.tar
nixlib-a2ddd3643e03767321edee7edffb3cbab7f9ab83.tar.gz
nixlib-a2ddd3643e03767321edee7edffb3cbab7f9ab83.tar.bz2
nixlib-a2ddd3643e03767321edee7edffb3cbab7f9ab83.tar.lz
nixlib-a2ddd3643e03767321edee7edffb3cbab7f9ab83.tar.xz
nixlib-a2ddd3643e03767321edee7edffb3cbab7f9ab83.tar.zst
nixlib-a2ddd3643e03767321edee7edffb3cbab7f9ab83.zip
let hydra also build python26Packages
for `nix-env -i` the later defined python27Packages seems to win.
Another solution might be to have python26 oder python27 either in the
name or the version. Let's have a look at haskelPackages for that.
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c2fd7d03e6d..8e0e375f1dac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5317,15 +5317,11 @@ let
 
   pythonPackages = python27Packages;
 
-  # `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 {
+  python26Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
     inherit (lib) lowPrio;
     python = python26;
-  };
+  });
 
   python27Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;