* Merged from the trunk. Let's see how well this works with

Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
This commit is contained in:
Eelco Dolstra
2008-12-10 09:59:21 +00:00
331 changed files with 14072 additions and 1377 deletions
+4 -4
View File
@@ -6,22 +6,22 @@
tar = ./tar.bz2;
binutilsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/binutils.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/binutils.tar.bz2;
sha1 = "73532561c2f98d0df641fbd778bc92cea298762a";
};
gccURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/gcc.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/gcc.tar.bz2;
sha1 = "522dc2e22dc42f640b0290638382d45bd43a7d55";
};
glibcURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/glibc.tar.bz2;
url = http://nixos.org/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;
url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/static-tools.tar.bz2;
sha1 = "ebe826e848736a82bcdd9a195dd510b533ecc997";
};
}
@@ -6,22 +6,22 @@
tar = ./tar.bz2;
staticToolsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
sha1 = "e4d1680e3dfa752e49a996a31140db53b10061cb";
};
binutilsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
sha1 = "2609f4d9277a60fcd178395d3d49911190e08f36";
};
gccURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
sha1 = "71d79d736bfef6252208fe6239e528a591becbed";
};
glibcURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
sha1 = "bf0245e16235800c8aa9c6a5de6565583a66e46d";
};
}
@@ -6,22 +6,22 @@
tar = ./tar.bz2;
binutilsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/binutils.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/binutils.tar.bz2;
sha1 = "9ac95e34c96c19cd0b925af46c97c9979becaaca";
};
gccURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/gcc.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/gcc.tar.bz2;
sha1 = "e8cb32425c8f55833ca081bd74668a029bdf1755";
};
glibcURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/glibc.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/glibc.tar.bz2;
sha1 = "74b1698a4595ce4b4f43a33b3ceca1e4459e494e";
};
staticToolsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/static-tools.tar.bz2;
url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/static-tools.tar.bz2;
sha1 = "4da3af92c9bcd8fc43b31934d8429412e209741b";
};
}
+1
View File
@@ -40,6 +40,7 @@ rec {
args = [ ./scripts/download.sh ];
outputHashAlgo = "sha1";
outputHash = sha1;
impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ];
};
# This function downloads and unpacks a file.