From cd60dc0edee6f16e42afd266701fae9a42afd2ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Jun 2008 09:49:40 +0000
Subject: * Various updates.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12051
---
 pkgs/development/libraries/fontconfig/default.nix         | 6 +++---
 pkgs/development/libraries/freetype/default.nix           | 6 +++---
 pkgs/development/libraries/gtk-libs/2.12/gtk+/default.nix | 6 +++---
 pkgs/development/libraries/libpng/default.nix             | 3 +++
 pkgs/development/libraries/libxml2/default.nix            | 6 +++---
 pkgs/development/libraries/libxslt/default.nix            | 6 +++---
 pkgs/tools/compression/bzip2/default.nix                  | 8 +++++---
 pkgs/tools/misc/coreutils/default.nix                     | 6 +++---
 8 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 816da17717f..96303b19bc5 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -3,11 +3,11 @@
 assert freetype != null && expat != null;
 
 stdenv.mkDerivation {
-  name = "fontconfig-2.5.0";
+  name = "fontconfig-2.6.0";
   
   src = fetchurl {
-    url = http://fontconfig.org/release/fontconfig-2.5.0.tar.gz;
-    sha256 = "1zhfvxgslgpnlz13ksiq90jgl0747n81c1nkg5klksxp9kdvmiil";
+    url = http://fontconfig.org/release/fontconfig-2.6.0.tar.gz;
+    sha256 = "19fqr2vh7rzpqfh2lnkymh7q5pxn9r4w2z35lh36crp5l3m3k9m9";
   };
   
   buildInputs = [freetype];
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 433cc812c21..9cdfe730c46 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "freetype-2.3.5";
+  name = "freetype-2.3.6";
   
   src = fetchurl {
-    url = mirror://sourceforge/freetype/freetype-2.3.5.tar.bz2;
-    sha256 = "0zk73lj0rrq4ahg4lfh6qzgs7agsqda3hpnjvy08riq624x7ld8v";
+    url = mirror://sourceforge/freetype/freetype-2.3.6.tar.bz2;
+    sha256 = "0xqf24d42qj5x8h6cmwpdqg455kpcbaxc3jlwqf4rlbn0g1ri9nm";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/gtk-libs/2.12/gtk+/default.nix b/pkgs/development/libraries/gtk-libs/2.12/gtk+/default.nix
index 3a4bf9b912a..890f310f570 100644
--- a/pkgs/development/libraries/gtk-libs/2.12/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs/2.12/gtk+/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "gtk+-2.12.9";
+  name = "gtk+-2.12.10";
   
   src = fetchurl {
-    url = mirror://gnome/sources/gtk+/2.12/gtk+-2.12.9.tar.bz2;
-    md5 = "33499772fdc3bea569c6d5673e5831b4";
+    url = mirror://gnome/sources/gtk+/2.12/gtk+-2.12.10.tar.bz2;
+    md5 = "5fcbdd2254eedb6b9ae828afc01d9eaa";
   };
   
   buildInputs = [pkgconfig perl];
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index e1617a04858..ea194272fff 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -4,11 +4,14 @@ assert zlib != null;
 
 stdenv.mkDerivation {
   name = "libpng-1.2.29";
+  
   src = fetchurl {
     url = mirror://sourceforge/libpng/libpng-1.2.29.tar.bz2;
     md5 = "f588cb4ee39e3a333604096f937ea157";
   };
+  
   propagatedBuildInputs = [zlib];
+  
   inherit zlib;
 
   meta = {
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 7f1e120e775..a1043bad67c 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -4,12 +4,12 @@ assert zlib != null;
 assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
-  name = "libxml2-2.6.30";
+  name = "libxml2-2.6.32";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxml2-2.6.30.tar.gz;
-    sha256 = "0pkk6cw0qd56kz2fkn768dcygbb4ncyvvmvyfiyli1a7yjh64xw7";
+    url = ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz;
+    sha256 = "0lsxr0akvp1sx29yh0nmzdhhc15dpa1i5chk40yaxjmgg6w2hi0v";
   };
 
   python = if pythonSupport then python else null;
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 896d0fc563b..b5026abfa11 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -3,10 +3,10 @@
 assert libxml2 != null;
 
 stdenv.mkDerivation {
-  name = "libxslt-1.1.22";
+  name = "libxslt-1.1.24";
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxslt-1.1.22.tar.gz;
-    sha256 = "1nj9pvn4ibhwxpl3ry9n6d7jahppcnqc7mi87nld4vsr2vp3j7sf";
+    url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz;
+    sha256 = "0ghb31mgm3bq5k41jf7b0c2azcfil26nz720kpr7k6hyhi20khf0";
   };
   buildInputs = [libxml2];
   postInstall = "ensureDir $out/nix-support; ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/";
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 9ed3e941bf6..eedcf242bca 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,16 +1,18 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "bzip2-1.0.4";
+  name = "bzip2-1.0.5";
+  
   builder = ./builder.sh;
     
   src = fetchurl {
-    url = http://www.bzip.org/1.0.4/bzip2-1.0.4.tar.gz;
-    md5 = "fc310b254f6ba5fbb5da018f04533688";
+    url = http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz;
+    sha256 = "08py2s9vw6dgw457lbklh1vsr3b8x8dlv7d8ygdfaxlx61l57gzp";
   };
 
   sharedLibrary =
     !stdenv.isDarwin && !(stdenv ? isDietLibC) && stdenv.system != "i686-cygwin";
+    
   meta = {
     homepage = http://www.bzip.org;
   };
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 092c246ebb8..fb55325dcb7 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, aclSupport ? false, acl}:
 
 stdenv.mkDerivation {
-  name = "coreutils-6.11";
+  name = "coreutils-6.12";
   
   src = fetchurl {
-    url = mirror://gnu/coreutils/coreutils-6.11.tar.gz;
-    sha256 = "1klb7bm461nm02161wn25ivnbq2d09lidi4sdicdv4md38lpd6gb";
+    url = mirror://gnu/coreutils/coreutils-6.12.tar.gz;
+    sha256 = "12pi7i2mxff5jab48pqpwlz2pi0j6sp9p7bgrcl663iiw81zglj9";
   };
 
   meta = {
-- 
cgit 1.4.1