trunk

diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix
index 0d8f534..04617df 100644
--- a/pkgs/development/compilers/gcc-4.6/default.nix
+++ b/pkgs/development/compilers/gcc-4.6/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false, langTreelang ? false
 , langJava ? false
-, langAda ? false
+, langAda ? true
 , langVhdl ? false
 , langGo ? false
 , profiledCompiler ? false
@@ -34,7 +34,6 @@ assert langTreelang -> bison != null && flex != null;
 assert langJava     -> zip != null && unzip != null
                        && zlib != null && boehmgc != null
                        && perl != null;  # for `--enable-java-home'
-assert langAda      -> gnatboot != null;
 assert langVhdl     -> gnat != null;
 
 # LTO needs libelf and zlib.
@@ -214,7 +213,7 @@ stdenv.mkDerivation ({
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
     ++ (optionals (cross != null) [binutilsCross])
-    ++ (optionals langAda [gnatboot])
+    ++ (optionals (gnatboot != null) [gnatboot])
     ++ (optionals langVhdl [gnat])
     ;
 
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
index d9b9b46..2205f05 100644
--- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
@@ -4,7 +4,7 @@
 
 {
   bootstrapTools = {
-    url = http://nixos.org/tarballs/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2;
-    sha256 = "0w89kqhx47yl0jifp2vffp073pyrqha5f312kp971smi4h41drna";
+    url = http://www.shealevy.com/nix/1/bootstrap-tools.cpio.bz2;
+    sha256 = "1x9vqycqg41l3f167scl5nmflgmysx4a65afdz7zds4m0y27va0g";
   };
 }
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 7e0116e..f45e6ca 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -212,14 +212,17 @@ rec {
   };
 
   gccWithStaticLibs = stdenvLinuxBoot3Pkgs.gcc.gcc.override (rec {
-    ppl = stdenvLinuxBoot3Pkgs.ppl.override {
+    ppl = stdenvLinuxBoot3Pkgs.ppl0_11.override {
       static = true;
       gmpxx = stdenvLinuxBoot3Pkgs.gmpxx.override {
         static = true;
       };
     };
-    cloogppl = stdenvLinuxBoot3Pkgs.cloogppl.override {
-      inherit ppl;
+
+    cloog = stdenvLinuxBoot3Pkgs.cloog.override {
+      isl = stdenvLinuxBoot3Pkgs.isl.override {
+        static = true;
+      };
       static = true;
     };
   });
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index ba2a953..9997fac 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -141,6 +141,7 @@ rec {
         cp -d ${gcc.gcc}/bin/gcc $out/bin
         cp -d ${gcc.gcc}/bin/cpp $out/bin
         cp -d ${gcc.gcc}/bin/g++ $out/bin
+        cp -d ${gcc.gcc}/bin/gnat{make,bind,link} $out/bin
         cp -d ${gcc.gcc}/lib*/libgcc_s.so* $out/lib
         cp -d ${gcc.gcc}/lib*/libstdc++.so* $out/lib
         cp -rd ${gcc.gcc}/lib/gcc $out/lib
@@ -160,8 +161,8 @@ rec {
 
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
         cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
-        cp -d ${ppl}/lib/libppl*.so* $out/lib
-        cp -d ${cloogppl}/lib/libcloog*.so* $out/lib
+        cp -d ${ppl0_11}/lib/libppl*.so* $out/lib
+        cp -d ${cloog}/lib/libcloog*.so* $out/lib
         cp -d ${mpc}/lib/libmpc*.so* $out/lib
         cp -d ${zlib}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
@@ -183,6 +184,7 @@ rec {
 
         nuke-refs $out/bin/*
         nuke-refs $out/lib/*
+        nuke-refs $out/lib/gcc/*/*/adalib/*
         nuke-refs $out/libexec/gcc/*/*/*
 
         mkdir $out/.pack
@@ -221,6 +223,7 @@ rec {
         ${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)
 
+        set +e
         for i in $out/bin/* $out/libexec/gcc/*/*/*; do
             echo patching $i
             if ! test -L $i; then
@@ -228,6 +231,7 @@ rec {
                     $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib --force-rpath $i
             fi
         done
+        set -e
 
         # Fix the libc linker script.
         for i in $out/lib/libc.so; do
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
index 422dc6d..ea17faa 100644
--- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
+++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
@@ -20,6 +20,7 @@ fi
 # use a copy of patchelf.
 LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf .
 
+set +e
 for i in $out/bin/* $out/libexec/gcc/*/*/*; do
     echo patching $i
     if ! test -L $i; then
@@ -29,6 +30,7 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do
              $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath $i
     fi
 done
+set -e
 for i in $out/lib/librt* ; do
     echo patching $i
     if ! test -L $i; then
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f34de3..e8209a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1580,7 +1600,7 @@ let
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc = gcc45;
+  gcc = gcc46;
 
   gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
     inherit fetchurl stdenv noSysDirs;