From f516036cbb4c5f2a79cfdb1fdc70287331c46ed5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Dec 2007 17:56:44 +0000
Subject: * Updated bootstrap binaries except for bash which now somehow  
 segfaults totally randomly.

svn path=/nixpkgs/branches/stdenv-updates/; revision=9840
---
 pkgs/stdenv/linux/bootstrap/i686/bunzip2       | Bin 69060 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/i686/bzip2         | Bin 0 -> 73860 bytes
 pkgs/stdenv/linux/bootstrap/i686/cp            | Bin 51124 -> 50964 bytes
 pkgs/stdenv/linux/bootstrap/i686/curl.bz2      | Bin 147746 -> 112642 bytes
 pkgs/stdenv/linux/bootstrap/i686/default.nix   |  24 ++++++++++++------------
 pkgs/stdenv/linux/bootstrap/i686/tar.bz2       | Bin 94989 -> 95513 bytes
 pkgs/stdenv/linux/bootstrap/x86_64/bunzip2     | Bin 74624 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/x86_64/bzip2       | Bin 0 -> 75744 bytes
 pkgs/stdenv/linux/bootstrap/x86_64/cp          | Bin 59568 -> 59472 bytes
 pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2    | Bin 152587 -> 119172 bytes
 pkgs/stdenv/linux/bootstrap/x86_64/default.nix |  18 +++++++++---------
 pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2     | Bin 425936 -> 431598 bytes
 pkgs/stdenv/linux/default.nix                  |   4 ++--
 pkgs/stdenv/linux/scripts/unpack-curl.sh       |   2 +-
 pkgs/stdenv/linux/scripts/unpack.sh            |   4 ++--
 15 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100755 pkgs/stdenv/linux/bootstrap/i686/bunzip2
 create mode 100755 pkgs/stdenv/linux/bootstrap/i686/bzip2
 delete mode 100755 pkgs/stdenv/linux/bootstrap/x86_64/bunzip2
 create mode 100755 pkgs/stdenv/linux/bootstrap/x86_64/bzip2

(limited to 'pkgs')

diff --git a/pkgs/stdenv/linux/bootstrap/i686/bunzip2 b/pkgs/stdenv/linux/bootstrap/i686/bunzip2
deleted file mode 100755
index 3f3f810e77ee2..0000000000000
Binary files a/pkgs/stdenv/linux/bootstrap/i686/bunzip2 and /dev/null differ
diff --git a/pkgs/stdenv/linux/bootstrap/i686/bzip2 b/pkgs/stdenv/linux/bootstrap/i686/bzip2
new file mode 100755
index 0000000000000..ea45149fa4d34
Binary files /dev/null and b/pkgs/stdenv/linux/bootstrap/i686/bzip2 differ
diff --git a/pkgs/stdenv/linux/bootstrap/i686/cp b/pkgs/stdenv/linux/bootstrap/i686/cp
index 06de68ad9a857..55142a9e0b899 100755
Binary files a/pkgs/stdenv/linux/bootstrap/i686/cp and b/pkgs/stdenv/linux/bootstrap/i686/cp differ
diff --git a/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 b/pkgs/stdenv/linux/bootstrap/i686/curl.bz2
index 8db4439e4b8d8..b7434ff5b9ed9 100755
Binary files a/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 and b/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 differ
diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix
index d48cbc9a5c51d..db5c581453b94 100644
--- a/pkgs/stdenv/linux/bootstrap/i686/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix
@@ -1,27 +1,27 @@
 {
   bash = ./bash;
-  bunzip2 = ./bunzip2;
+  bzip2 = ./bzip2;
   cp = ./cp;
   curl = ./curl.bz2;
   tar = ./tar.bz2;
 
-  staticToolsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/static-tools.tar.bz2;
-    sha1 = "c366d9ee0d969e68311fdb37abc91b46fb13b585";
-  };
-
   binutilsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/binutils.tar.bz2;
-    sha1 = "fa77c29ef4f13ddf43bba3f4f020ceafa6604ccc";
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/binutils.tar.bz2;
+    sha1 = "73532561c2f98d0df641fbd778bc92cea298762a";
   };
 
   gccURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/gcc.tar.bz2;
-    sha1 = "ea7171fc2f70880e8a6c2480b3d3fed7409b7a4e";
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/gcc.tar.bz2;
+    sha1 = "522dc2e22dc42f640b0290638382d45bd43a7d55";
   };
 
   glibcURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/glibc.tar.bz2;
-    sha1 = "728e0a9e66e01cf2815eca8cc638e5ed140a36cd";
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/glibc.tar.bz2;
+    sha1 = "b9ae1e43e9977476ef53f8c1c9cd1cff5526ff40";
+  };
+
+  staticToolsURL = {
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/static-tools.tar.bz2;
+    sha1 = "ebe826e848736a82bcdd9a195dd510b533ecc997";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap/i686/tar.bz2 b/pkgs/stdenv/linux/bootstrap/i686/tar.bz2
index 189bcce24ebf6..b6241bf3d2314 100755
Binary files a/pkgs/stdenv/linux/bootstrap/i686/tar.bz2 and b/pkgs/stdenv/linux/bootstrap/i686/tar.bz2 differ
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/bunzip2 b/pkgs/stdenv/linux/bootstrap/x86_64/bunzip2
deleted file mode 100755
index 9ca924e2bc454..0000000000000
Binary files a/pkgs/stdenv/linux/bootstrap/x86_64/bunzip2 and /dev/null differ
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/bzip2 b/pkgs/stdenv/linux/bootstrap/x86_64/bzip2
new file mode 100755
index 0000000000000..dd2cce8952c9e
Binary files /dev/null and b/pkgs/stdenv/linux/bootstrap/x86_64/bzip2 differ
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/cp b/pkgs/stdenv/linux/bootstrap/x86_64/cp
index b563278f9a626..397b1e898097c 100755
Binary files a/pkgs/stdenv/linux/bootstrap/x86_64/cp and b/pkgs/stdenv/linux/bootstrap/x86_64/cp differ
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2 b/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2
index a4051323193cb..8e40942bcfe18 100755
Binary files a/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2 and b/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2 differ
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
index f43fa42682b20..0608fc4002ee5 100644
--- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
@@ -1,27 +1,27 @@
 {
   bash = ./bash;
-  bunzip2 = ./bunzip2;
+  bzip2 = ./bzip2;
   cp = ./cp;
   curl = ./curl.bz2;
   tar = ./tar.bz2;
 
-  staticToolsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/static-tools.tar.bz2;
-    sha1 = "5467de09c91f0a9bf511a9d476547e10b9f067fb";
-  };
-
   binutilsURL = {
     url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/binutils.tar.bz2;
-    sha1 = "739623c8be225224ed57a76c5f483d5e373fdae8";
+    sha1 = "9ac95e34c96c19cd0b925af46c97c9979becaaca";
   };
 
   gccURL = {
     url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/gcc.tar.bz2;
-    sha1 = "b4bb2b2863d7b368c7c32e789d6877e5b5a97637";
+    sha1 = "e8cb32425c8f55833ca081bd74668a029bdf1755";
   };
 
   glibcURL = {
     url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/glibc.tar.bz2;
-    sha1 = "f0a5e1a224931f59267975a51d4e9c20e6cb3ae8";
+    sha1 = "74b1698a4595ce4b4f43a33b3ceca1e4459e494e";
+  };
+
+  staticToolsURL = {
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/static-tools.tar.bz2;
+    sha1 = "4da3af92c9bcd8fc43b31934d8429412e209741b";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2 b/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2
index c28307335dd6f..94b2bacdb9d80 100755
Binary files a/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2 and b/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2 differ
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index f926469a40300..6a183457f08c9 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -27,7 +27,7 @@ rec {
     inherit system;
     name = "curl";
     builder = bootstrapTools.bash;
-    inherit (bootstrapTools) bunzip2 cp curl;
+    inherit (bootstrapTools) bzip2 cp curl;
     args = [ ./scripts/unpack-curl.sh ];
   };
 
@@ -45,7 +45,7 @@ rec {
   downloadAndUnpack = pkgname: {url, sha1}: derivation {
     name = pkgname;
     builder = bootstrapTools.bash;
-    inherit (bootstrapTools) bunzip2 tar cp;
+    inherit (bootstrapTools) bzip2 tar cp;
     args = [ ./scripts/unpack.sh ];
     tarball = download {inherit url sha1 pkgname;};
     inherit system;
diff --git a/pkgs/stdenv/linux/scripts/unpack-curl.sh b/pkgs/stdenv/linux/scripts/unpack-curl.sh
index 147edcebe04a1..3023f865c946b 100644
--- a/pkgs/stdenv/linux/scripts/unpack-curl.sh
+++ b/pkgs/stdenv/linux/scripts/unpack-curl.sh
@@ -7,5 +7,5 @@ $cp -prvd . $out
 $cp -prvd . $out/bin
 
 $cp $curl curl.bz2
-$bunzip2 -d curl.bz2
+$bzip2 -d curl.bz2
 $cp curl $out/bin
diff --git a/pkgs/stdenv/linux/scripts/unpack.sh b/pkgs/stdenv/linux/scripts/unpack.sh
index ef3eaf6349c29..eb916cbc48d57 100644
--- a/pkgs/stdenv/linux/scripts/unpack.sh
+++ b/pkgs/stdenv/linux/scripts/unpack.sh
@@ -1,8 +1,8 @@
 set -e
 
 $cp $tar .tar.bz2
-$bunzip2 .tar.bz2
+$bzip2 -d .tar.bz2
 
-$bunzip2 -d < $tarball | ./.tar xvf -
+$bzip2 -d < $tarball | ./.tar xvf -
 
 $cp -prd * $out
-- 
cgit 1.4.1