Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

pkgs/stdenv/linux/default.nix

@@ -210,9 +210,13 @@ rec {
       gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      isl_0_14 = pkgs.isl_0_14.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
+      isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
+      cloog = pkgs.cloog.override {
+        stdenv = pkgs.makeStaticLibraries pkgs.stdenv;
+        inherit isl;
+      };
       gccPlain = pkgs.gcc.cc.override {
-        isl = isl_0_14;
+        inherit isl cloog;
       };
     };
     extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];

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

@@ -34,7 +34,7 @@ rec {
   build =
 
     stdenv.mkDerivation {
-      name = "build";
+      name = "stdenv-bootstrap-tools";
 
       buildInputs = [nukeReferences cpio];
 
@@ -154,9 +154,19 @@ rec {
       allowedReferences = [];
     };
 
+  dist = stdenv.mkDerivation {
+    name = "stdenv-bootstrap-tools";
+
+    buildCommand = ''
+      mkdir -p $out/nix-support
+      echo "file tarball ${build}/on-server/bootstrap-tools.tar.xz" >> $out/nix-support/hydra-build-products
+      echo "file busybox ${build}/on-server/busybox" >> $out/nix-support/hydra-build-products
+    '';
+  };
+
   test = ((import ./default.nix) {
     inherit system;
-    
+
     customBootstrapFiles = {
       busybox = "${build}/on-server/busybox";
       bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz";