* Log support in the generic builder. Just set $logPhases to 1 and

it will write the output of each phase to a separate log file in
  $out/log/.

svn path=/nixpkgs/trunk/; revision=1152

pkgs/system/stdenvs.nix

@@ -150,7 +150,7 @@
 
 
   # Testing the new stdenv-linux (TODO: remove this eventually).
-  stdenvLinuxTest = (import ../stdenv/nix-linux) {
+  stdenvLinuxTest = (import ../stdenv/nix-linux-branch) {
     stdenv = stdenvLinuxBoot2;
     pkgs = stdenvLinuxBoot2Pkgs;
     glibc = stdenvLinuxGlibc;