* Switching.

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

7 files changed, 23 insertions, 66 deletions

diff --git a/pkgs/development/libraries/glibc-new/builder.sh b/pkgs/development/libraries/glibc-new/builder.sh
index 2007235ab7660..177e8482c90a6 100644
--- a/pkgs/development/libraries/glibc-new/builder.sh
+++ b/pkgs/development/libraries/glibc-new/builder.sh
@@ -5,11 +5,6 @@ export NIX_DONT_SET_RPATH=1
 source $stdenv/setup
 source $substitute
 
-glibc=`cat $NIX_GCC/nix-support/orig-glibc`
-echo $glibc
-
-export LD_LIBRARY_PATH=$glibc/lib
-
 # Explicitly tell glibc to use our pwd, not /bin/pwd.
 export PWD_P=$(type -tP pwd)
 
diff --git a/pkgs/development/libraries/glibc-new/default.nix b/pkgs/development/libraries/glibc-new/default.nix
index e87d14165533b..33ecfc807cd22 100644
--- a/pkgs/development/libraries/glibc-new/default.nix
+++ b/pkgs/development/libraries/glibc-new/default.nix
@@ -8,18 +8,6 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   substitute = ../../../build-support/substitute/substitute.sh;
 
-  /*
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/glibc-2.3.6.tar.bz2;
-    md5 = "bfdce99f82d6dbcb64b7f11c05d6bc96";
-  };
-
-  linuxthreadsSrc = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/glibc-linuxthreads-2.3.6.tar.bz2;
-    md5 = "d4eeda37472666a15cc1f407e9c987a9";
-  };
-  */
-
   src = fetchurl {
     url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2;
     md5 = "1fb29764a6a650a4d5b409dda227ac9f";
diff --git a/pkgs/development/tools/misc/binutils/binutils-2.17.nix b/pkgs/development/tools/misc/binutils/binutils-2.17.nix
deleted file mode 100644
index 019ce0f0375dc..0000000000000
--- a/pkgs/development/tools/misc/binutils/binutils-2.17.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, noSysDirs}:
-
-stdenv.mkDerivation {
-  name = "binutils-2.17";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.17.tar.bz2;
-    md5 = "e26e2e06b6e4bf3acf1dc8688a94c0d1";
-  };
-  inherit noSysDirs;
-  configureFlags = "--disable-werror"; # needed for dietlibc build
-}
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 4875ba10f1b09..019ce0f0375dc 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, noSysDirs}:
 
 stdenv.mkDerivation {
-  name = "binutils-2.16.1";
+  name = "binutils-2.17";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.16.1.tar.bz2;
-    md5 = "6a9d529efb285071dad10e1f3d2b2967";
+    url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.17.tar.bz2;
+    md5 = "e26e2e06b6e4bf3acf1dc8688a94c0d1";
   };
   inherit noSysDirs;
+  configureFlags = "--disable-werror"; # needed for dietlibc build
 }
diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix
index 695039692f5e1..4d467cc68e02c 100644
--- a/pkgs/stdenv/linux/bootstrap/i686/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix
@@ -6,22 +6,22 @@
   tar = ./tar.bz2;
 
   staticToolsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6800/static-tools.tar.bz2;
-    sha1 = "18c5e93a23a16282a12e9af05f4dc28254dc9013";
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6824/static-tools.tar.bz2;
+    sha1 = "4cc936e5c5881eb1466dd8c2cb968e255fa446b7";
   };
 
   binutilsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6800/binutils.tar.bz2;
-    sha1 = "4bf2859aa705acdcc08d333200f0e55754fab4a9";
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6824/binutils.tar.bz2;
+    sha1 = "d7d85684fae7ec5b51d31e105f8fc041a3553c82";
   };
 
   gccURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6800/gcc.tar.bz2;
-    sha1 = "bd69a67b779014a683fa93706497eef0afede2b2";
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6824/gcc.tar.bz2;
+    sha1 = "c1a6f1a6de2cd3cc1b112614661c9f6adf8a6377";
   };
 
   glibcURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6800/glibc.tar.bz2;
-    sha1 = "9f3f3f1248d672d5a845326ed36d8ca470de0094";
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6824/glibc.tar.bz2;
+    sha1 = "666b5a6c179bd6aedeeb40d34336716eb0d659ce";
   };
 }
diff --git a/pkgs/stdenv/linux/new.nix b/pkgs/stdenv/linux/new.nix
index 50305dcfe2fc4..f07fa0b0e12fb 100644
--- a/pkgs/stdenv/linux/new.nix
+++ b/pkgs/stdenv/linux/new.nix
@@ -62,21 +62,11 @@ rec {
 
   # A helper function to call gcc-wrapper.
   wrapGCC =
-    {gcc ? staticGCC, glibc, binutils, shell ? ""}:
+    {gcc ? staticGCC, libc, binutils, shell ? ""}:
     (import ../../build-support/gcc-wrapper) {
       nativeTools = false;
       nativeLibc = false;
-      inherit gcc binutils glibc shell;
-      stdenv = stdenvInitial;
-    };
-
-  wrapGCC2 =
-    {gcc ? staticGCC, glibc, binutils, shell ? ""}:
-    (import ../../build-support/gcc-wrapper-new) {
-      nativeTools = false;
-      nativeLibc = false;
-      inherit gcc binutils shell;
-      libc = glibc;
+      inherit gcc binutils libc shell;
       stdenv = stdenvInitial;
     };
 
@@ -126,7 +116,7 @@ rec {
   # the gcc configure script happy.
   stdenvLinuxBoot1 = stdenvBootFun {
     # Use the statically linked, downloaded glibc/gcc/binutils.
-    gcc = wrapGCC {glibc = staticGlibc; binutils = staticBinutils;};
+    gcc = wrapGCC {libc = staticGlibc; binutils = staticBinutils;};
     staticGlibc = true;
     extraAttrs = {inherit curl;};
   };
@@ -150,7 +140,7 @@ rec {
   #    statically linked tools.
   stdenvLinuxBoot2 = removeAttrs (stdenvBootFun {
     staticGlibc = false;
-    gcc = wrapGCC2 {binutils = staticBinutils; glibc = stdenvLinuxGlibc;};
+    gcc = wrapGCC {binutils = staticBinutils; libc = stdenvLinuxGlibc;};
     extraAttrs = {inherit curl; glibc = stdenvLinuxGlibc;};
   }) ["gcc" "binutils"];
 
@@ -167,10 +157,9 @@ rec {
   #    5.  The other tools (e.g. coreutils) are still static.
   stdenvLinuxBoot3 = stdenvBootFun {
     staticGlibc = false;
-    gcc = wrapGCC2 {
-#      inherit (stdenvLinuxBoot2Pkgs) binutils;
-      binutils = stdenvLinuxBoot2Pkgs.binutils217;
-      glibc = stdenvLinuxGlibc;
+    gcc = wrapGCC {
+      inherit (stdenvLinuxBoot2Pkgs) binutils;
+      libc = stdenvLinuxGlibc;
       gcc = stdenvLinuxBoot2Pkgs.gcc.gcc;
     };
     extraAttrs = {inherit curl;};
@@ -198,9 +187,8 @@ rec {
     stdenv = stdenvInitial;
 
     gcc = wrapGCC {
-#      inherit (stdenvLinuxBoot2Pkgs) binutils;
-      binutils = stdenvLinuxBoot2Pkgs.binutils217;
-      glibc = stdenvLinuxGlibc;
+      inherit (stdenvLinuxBoot2Pkgs) binutils;
+      libc = stdenvLinuxGlibc;
       gcc = stdenvLinuxBoot2Pkgs.gcc.gcc;
       shell = stdenvLinuxBoot3Pkgs.bash + "/bin/sh";
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 739b149a0992f..29b647f267fac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -788,7 +788,8 @@ rec {
     nativeTools = false;
     nativeLibc = false;
     gcc = baseGCC;
-    inherit stdenv binutils glibc;
+    libc = glibc;
+    inherit stdenv binutils;
   };
 
 
@@ -968,10 +969,6 @@ rec {
     cross = "sparc-linux";
   };
 
-  binutils217 = import ../development/tools/misc/binutils/binutils-2.17.nix {
-    inherit fetchurl stdenv noSysDirs;
-  };
-
   bison = bison1875;
 
   bison1875 = import ../development/tools/parsing/bison/bison-1.875.nix {