Merge from trunk up through r28790

svn path=/nixpkgs/branches/stdenv-updates/; revision=28792

pkgs/stdenv/adapters.nix

@@ -101,7 +101,7 @@ rec {
         NIX_CFLAGS_LINK = "-static";
 
         configureFlags =
-          (if args ? configureFlags then args.configureFlags else "")
+          (if args ? configureFlags then toString args.configureFlags else "")
           + " --disable-shared"; # brrr...
       });
       isStatic = true;
@@ -197,7 +197,7 @@ rec {
     { mkDerivation = args: stdenv.mkDerivation (args // extraAttrs); };
 
 
-  /* Return a modified stdenv that perfoms the build under $out/.build
+  /* Return a modified stdenv that performs the build under $out/.build
      instead of in $TMPDIR.  Thus, the sources are kept available.
      This is useful for things like debugging or generation of
      dynamic analysis reports. */ 

pkgs/stdenv/linux/default.nix

@@ -212,17 +212,17 @@ rec {
   };
 
   gccWithStaticLibs = stdenvLinuxBoot3Pkgs.gcc.gcc.override (rec {
-        ppl = stdenvLinuxBoot3Pkgs.ppl.override {
-          static = true;
-          gmpxx = stdenvLinuxBoot3Pkgs.gmpxx.override {
-            static = true;
-          };
-        };
-        cloogppl = stdenvLinuxBoot3Pkgs.cloogppl.override {
-          inherit ppl;
-          static = true;
-        };
-      });
+    ppl = stdenvLinuxBoot3Pkgs.ppl.override {
+      static = true;
+      gmpxx = stdenvLinuxBoot3Pkgs.gmpxx.override {
+        static = true;
+      };
+    };
+    cloogppl = stdenvLinuxBoot3Pkgs.cloogppl.override {
+      inherit ppl;
+      static = true;
+    };
+  });
 
   # 8) Construct a fourth stdenv identical to the second, except that
   #    this one uses the dynamically linked GCC and Binutils from step

pkgs/stdenv/linux/make-bootstrap-tools.nix

@@ -77,6 +77,7 @@ rec {
       CLEAR
       CONFIG_STATIC y
       CONFIG_CPIO y
+      # (shlevy) Are these necessary?
       CONFIG_FEATURE_CPIO_O y
       CONFIG_FEATURE_CPIO_P y
     '';
@@ -218,7 +219,7 @@ rec {
 
       buildCommand = ''
         ${build}/in-nixpkgs/mkdir $out
-        ${build}/in-nixpkgs/bzip2 -d < ${build}/on-server/bootstrap-tools.cpio.bz2 | (cd $out && ${build}/in-nixpkgs/cpio -V -i)
+        ${build}/in-nixpkgs/bzip2 -d < ${build}/on-server/bootstrap-tools.cpio.bz2 | (cd $out && ${build}/in-nixpkgs/cpio -v -i)
 
         for i in $out/bin/* $out/libexec/gcc/*/*/*; do
             echo patching $i