* Merged the stdenv branch

(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
This commit is contained in:
Eelco Dolstra
2008-06-13 11:46:39 +00:00
89 changed files with 1486 additions and 1852 deletions
+6 -4
View File
@@ -1,15 +1,17 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, aclSupport ? false, acl}:
stdenv.mkDerivation {
name = "coreutils-6.10";
name = "coreutils-6.12";
src = fetchurl {
url = mirror://gnu/coreutils/coreutils-6.10.tar.gz;
sha256 = "0zpbxfl16sq45s53fxw43i9i8lrdcc845714c1j5f84zi13ka08x";
url = mirror://gnu/coreutils/coreutils-6.12.tar.gz;
sha256 = "12pi7i2mxff5jab48pqpwlz2pi0j6sp9p7bgrcl663iiw81zglj9";
};
meta = {
homepage = http://www.gnu.org/software/coreutils/;
description = "The basic file, shell and text manipulation utilities of the GNU operating system";
};
buildInputs = stdenv.lib.optional aclSupport acl;
}
+3 -3
View File
@@ -1,10 +1,10 @@
{stdenv, fetchurl, coreutils}:
stdenv.mkDerivation {
name = "findutils-4.2.32";
name = "findutils-4.2.33";
src = fetchurl {
url = mirror://gnu/findutils/findutils-4.2.32.tar.gz;
sha256 = "05sj0154kl4mbqg7dcabiaa16snjv2ppfwwhcvl2zyn2yc28igc7";
url = mirror://gnu/findutils/findutils-4.2.33.tar.gz;
sha256 = "0y0gmdc55kknf5438c1da5xsvpch3v800r79rgz5rv6fb90djg41";
};
buildInputs = [coreutils];