* Various updates.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12051
This commit is contained in:
Eelco Dolstra 2008-06-12 09:49:40 +00:00
parent 62835f4090
commit cd60dc0ede
8 changed files with 26 additions and 21 deletions

View File

@ -3,11 +3,11 @@
assert freetype != null && expat != null; assert freetype != null && expat != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fontconfig-2.5.0"; name = "fontconfig-2.6.0";
src = fetchurl { src = fetchurl {
url = http://fontconfig.org/release/fontconfig-2.5.0.tar.gz; url = http://fontconfig.org/release/fontconfig-2.6.0.tar.gz;
sha256 = "1zhfvxgslgpnlz13ksiq90jgl0747n81c1nkg5klksxp9kdvmiil"; sha256 = "19fqr2vh7rzpqfh2lnkymh7q5pxn9r4w2z35lh36crp5l3m3k9m9";
}; };
buildInputs = [freetype]; buildInputs = [freetype];

View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "freetype-2.3.5"; name = "freetype-2.3.6";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/freetype/freetype-2.3.5.tar.bz2; url = mirror://sourceforge/freetype/freetype-2.3.6.tar.bz2;
sha256 = "0zk73lj0rrq4ahg4lfh6qzgs7agsqda3hpnjvy08riq624x7ld8v"; sha256 = "0xqf24d42qj5x8h6cmwpdqg455kpcbaxc3jlwqf4rlbn0g1ri9nm";
}; };
meta = { meta = {

View File

@ -1,11 +1,11 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gtk+-2.12.9"; name = "gtk+-2.12.10";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gtk+/2.12/gtk+-2.12.9.tar.bz2; url = mirror://gnome/sources/gtk+/2.12/gtk+-2.12.10.tar.bz2;
md5 = "33499772fdc3bea569c6d5673e5831b4"; md5 = "5fcbdd2254eedb6b9ae828afc01d9eaa";
}; };
buildInputs = [pkgconfig perl]; buildInputs = [pkgconfig perl];

View File

@ -4,11 +4,14 @@ assert zlib != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libpng-1.2.29"; name = "libpng-1.2.29";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/libpng/libpng-1.2.29.tar.bz2; url = mirror://sourceforge/libpng/libpng-1.2.29.tar.bz2;
md5 = "f588cb4ee39e3a333604096f937ea157"; md5 = "f588cb4ee39e3a333604096f937ea157";
}; };
propagatedBuildInputs = [zlib]; propagatedBuildInputs = [zlib];
inherit zlib; inherit zlib;
meta = { meta = {

View File

@ -4,12 +4,12 @@ assert zlib != null;
assert pythonSupport -> python != null; assert pythonSupport -> python != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libxml2-2.6.30"; name = "libxml2-2.6.32";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxml2-2.6.30.tar.gz; url = ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz;
sha256 = "0pkk6cw0qd56kz2fkn768dcygbb4ncyvvmvyfiyli1a7yjh64xw7"; sha256 = "0lsxr0akvp1sx29yh0nmzdhhc15dpa1i5chk40yaxjmgg6w2hi0v";
}; };
python = if pythonSupport then python else null; python = if pythonSupport then python else null;

View File

@ -3,10 +3,10 @@
assert libxml2 != null; assert libxml2 != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libxslt-1.1.22"; name = "libxslt-1.1.24";
src = fetchurl { src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxslt-1.1.22.tar.gz; url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz;
sha256 = "1nj9pvn4ibhwxpl3ry9n6d7jahppcnqc7mi87nld4vsr2vp3j7sf"; sha256 = "0ghb31mgm3bq5k41jf7b0c2azcfil26nz720kpr7k6hyhi20khf0";
}; };
buildInputs = [libxml2]; buildInputs = [libxml2];
postInstall = "ensureDir $out/nix-support; ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/"; postInstall = "ensureDir $out/nix-support; ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/";

View File

@ -1,16 +1,18 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "bzip2-1.0.4"; name = "bzip2-1.0.5";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://www.bzip.org/1.0.4/bzip2-1.0.4.tar.gz; url = http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz;
md5 = "fc310b254f6ba5fbb5da018f04533688"; sha256 = "08py2s9vw6dgw457lbklh1vsr3b8x8dlv7d8ygdfaxlx61l57gzp";
}; };
sharedLibrary = sharedLibrary =
!stdenv.isDarwin && !(stdenv ? isDietLibC) && stdenv.system != "i686-cygwin"; !stdenv.isDarwin && !(stdenv ? isDietLibC) && stdenv.system != "i686-cygwin";
meta = { meta = {
homepage = http://www.bzip.org; homepage = http://www.bzip.org;
}; };

View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, aclSupport ? false, acl}: {stdenv, fetchurl, aclSupport ? false, acl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "coreutils-6.11"; name = "coreutils-6.12";
src = fetchurl { src = fetchurl {
url = mirror://gnu/coreutils/coreutils-6.11.tar.gz; url = mirror://gnu/coreutils/coreutils-6.12.tar.gz;
sha256 = "1klb7bm461nm02161wn25ivnbq2d09lidi4sdicdv4md38lpd6gb"; sha256 = "12pi7i2mxff5jab48pqpwlz2pi0j6sp9p7bgrcl663iiw81zglj9";
}; };
meta = { meta = {