public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated bootstrap binaries except for bash which now somehow

Browse Source 
segfaults totally randomly.

svn path=/nixpkgs/branches/stdenv-updates/; revision=9840
This commit is contained in:
Eelco Dolstra 2007-12-03 17:56:44 +00:00
parent ff95bc3eea
commit f516036cbb
15 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pkgs/stdenv/linux/bootstrap/i686/bunzip2
View File

Binary file not shown.

BIN
pkgs/stdenv/linux/bootstrap/i686/bzip2 Executable file
View File

Binary file not shown.

BIN
pkgs/stdenv/linux/bootstrap/i686/cp
View File

Binary file not shown.

BIN
pkgs/stdenv/linux/bootstrap/i686/curl.bz2
View File

Binary file not shown.

24
pkgs/stdenv/linux/bootstrap/i686/default.nix
View File

@ -1,27 +1,27 @@
{ {
bash = ./bash; bash = ./bash;
bunzip2 = ./bunzip2; bzip2 = ./bzip2;
cp = ./cp; cp = ./cp;
curl = ./curl.bz2; curl = ./curl.bz2;
tar = ./tar.bz2; tar = ./tar.bz2;
staticToolsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/static-tools.tar.bz2;
sha1 = "c366d9ee0d969e68311fdb37abc91b46fb13b585";
};
binutilsURL = { binutilsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/binutils.tar.bz2; url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/binutils.tar.bz2;
sha1 = "fa77c29ef4f13ddf43bba3f4f020ceafa6604ccc"; sha1 = "73532561c2f98d0df641fbd778bc92cea298762a";
}; };
gccURL = { gccURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/gcc.tar.bz2; url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/gcc.tar.bz2;
sha1 = "ea7171fc2f70880e8a6c2480b3d3fed7409b7a4e"; sha1 = "522dc2e22dc42f640b0290638382d45bd43a7d55";
}; };
glibcURL = { glibcURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/glibc.tar.bz2; url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/glibc.tar.bz2;
sha1 = "728e0a9e66e01cf2815eca8cc638e5ed140a36cd"; sha1 = "b9ae1e43e9977476ef53f8c1c9cd1cff5526ff40";
};
staticToolsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/static-tools.tar.bz2;
sha1 = "ebe826e848736a82bcdd9a195dd510b533ecc997";
}; };
} }

BIN
pkgs/stdenv/linux/bootstrap/i686/tar.bz2
View File

Binary file not shown.

BIN
pkgs/stdenv/linux/bootstrap/x86_64/bunzip2
View File

Binary file not shown.

BIN
pkgs/stdenv/linux/bootstrap/x86_64/bzip2 Executable file
View File

Binary file not shown.

BIN
pkgs/stdenv/linux/bootstrap/x86_64/cp
View File

Binary file not shown.

BIN
pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2
View File

Binary file not shown.

18
pkgs/stdenv/linux/bootstrap/x86_64/default.nix
View File

@ -1,27 +1,27 @@
{ {
bash = ./bash; bash = ./bash;
bunzip2 = ./bunzip2; bzip2 = ./bzip2;
cp = ./cp; cp = ./cp;
curl = ./curl.bz2; curl = ./curl.bz2;
tar = ./tar.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 = { binutilsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/binutils.tar.bz2; url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/binutils.tar.bz2;
sha1 = "739623c8be225224ed57a76c5f483d5e373fdae8"; sha1 = "9ac95e34c96c19cd0b925af46c97c9979becaaca";
}; };
gccURL = { gccURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/gcc.tar.bz2; url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/gcc.tar.bz2;
sha1 = "b4bb2b2863d7b368c7c32e789d6877e5b5a97637"; sha1 = "e8cb32425c8f55833ca081bd74668a029bdf1755";
}; };
glibcURL = { glibcURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r6905/glibc.tar.bz2; 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";
}; };
} }

BIN
pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2
View File

Binary file not shown.

4
pkgs/stdenv/linux/default.nix
View File

@ -27,7 +27,7 @@ rec {
inherit system; inherit system;
name = "curl"; name = "curl";
builder = bootstrapTools.bash; builder = bootstrapTools.bash;
inherit (bootstrapTools) bunzip2 cp curl; inherit (bootstrapTools) bzip2 cp curl;
args = [ ./scripts/unpack-curl.sh ]; args = [ ./scripts/unpack-curl.sh ];
}; };
@ -45,7 +45,7 @@ rec {
downloadAndUnpack = pkgname: {url, sha1}: derivation { downloadAndUnpack = pkgname: {url, sha1}: derivation {
name = pkgname; name = pkgname;
builder = bootstrapTools.bash; builder = bootstrapTools.bash;
inherit (bootstrapTools) bunzip2 tar cp; inherit (bootstrapTools) bzip2 tar cp;
args = [ ./scripts/unpack.sh ]; args = [ ./scripts/unpack.sh ];
tarball = download {inherit url sha1 pkgname;}; tarball = download {inherit url sha1 pkgname;};
inherit system; inherit system;

2
pkgs/stdenv/linux/scripts/unpack-curl.sh
View File

@ -7,5 +7,5 @@ $cp -prvd . $out
$cp -prvd . $out/bin $cp -prvd . $out/bin
$cp $curl curl.bz2 $cp $curl curl.bz2
$bunzip2 -d curl.bz2 $bzip2 -d curl.bz2
$cp curl $out/bin $cp curl $out/bin

4
pkgs/stdenv/linux/scripts/unpack.sh
View File

@ -1,8 +1,8 @@
set -e set -e
$cp $tar .tar.bz2 $cp $tar .tar.bz2
$bunzip2 .tar.bz2 $bzip2 -d .tar.bz2
$bunzip2 -d < $tarball | ./.tar xvf - $bzip2 -d < $tarball | ./.tar xvf -
$cp -prd * $out $cp -prd * $out