From 12f0f1ad20c3b559efb848d5a700660b18df977e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 May 2006 17:57:42 +0000
Subject: [PATCH] * Updated a few packages.

svn path=/nixpkgs/trunk/; revision=5246
---
 pkgs/development/libraries/cairo/default.nix              | 4 ++--
 pkgs/development/libraries/expat/default.nix              | 6 +++---
 pkgs/development/libraries/gtk-libs-2.8/glib/default.nix  | 6 +++---
 pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix  | 6 +++---
 pkgs/development/libraries/gtk-libs-2.8/pango/default.nix | 6 +++---
 pkgs/development/libraries/libpng/default.nix             | 6 +++---
 pkgs/development/libraries/libtiff/default.nix            | 6 +++---
 pkgs/development/libraries/libxml2/default.nix            | 6 +++---
 pkgs/development/libraries/libxslt/default.nix            | 4 ++--
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 22ef287901bf..772667e6c59a 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -11,8 +11,8 @@ assert pngSupport -> libpng != null;
 stdenv.mkDerivation {
   name = "cairo-1.0.2";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/cairo-1.0.2.tar.gz;
-    sha1 = "3a425049499b0b067ed4dc60d94b4d0819c0841b";
+    url = http://cairographics.org/releases/cairo-1.0.4.tar.gz;
+    sha1 = "89e72202e5b51a8914fce60f52f7c51ecdea982a";
   };
   buildInputs = [
     pkgconfig x11 fontconfig freetype
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index bf336f700099..7b53a04fb879 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "expat-1.95.8";
+  name = "expat-2.0.0";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/expat-1.95.8.tar.gz;
-    md5 = "aff487543845a82fe262e6e2922b4c8e";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/expat/expat-2.0.0.tar.gz;
+    md5 = "d945df7f1c0868c5c73cf66ba9596f3f";
   };
 }
diff --git a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
index 6f9df459a5a1..be02af7c10c2 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
@@ -3,10 +3,10 @@
 assert pkgconfig != null && gettext != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "glib-2.8.5";
+  name = "glib-2.8.6";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/glib-2.8.5.tar.bz2;
-    md5 = "334bb6892fb05aa34eae53707cc2726e";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.8/glib-2.8.6.tar.bz2;
+    md5 = "fce6835fd8c99ab4c3e5213bc5bcd0ed";
   };
   buildInputs = [pkgconfig gettext perl];
 }
diff --git a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
index 89acece279dd..190a9d371e9b 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
@@ -8,10 +8,10 @@ assert xineramaSupport -> libXinerama != null;
 
 
 stdenv.mkDerivation {
-  name = "gtk+-2.8.9";
+  name = "gtk+-2.8.17";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.8.9.tar.bz2;
-    md5 = "e7a94132ae6353106c80cd4a1106a368";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.17.tar.bz2;
+    md5 = "6d2deb63a5444808d2aeb7dcfffaa2f4";
   };
   buildInputs = [
     pkgconfig perl libtiff libjpeg libpng cairo
diff --git a/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
index b9fffed10ff1..716f41cbaeeb 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
@@ -3,10 +3,10 @@
 assert x11.buildClientLibs;
 
 stdenv.mkDerivation {
-  name = "pango-1.10.2";
+  name = "pango-1.10.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.10.2.tar.bz2;
-    md5 = "7302220d93ac17d2c44f356d852e81dc";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.8/pango-1.10.4.tar.bz2;
+    md5 = "d7eeb0f995a93534be8e7c687b465a0c";
   };
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [x11 glib cairo];
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 3fa0e6b8582d..f420b961000c 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,10 +3,10 @@
 assert zlib != null;
 
 stdenv.mkDerivation {
-  name = "libpng-1.2.8";
+  name = "libpng-1.2.10";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libpng-1.2.8-config.tar.gz;
-    md5 = "e5a39003eed16103cbbd3b6a8bc6b1f9";
+    url = ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.10.tar.bz2;
+    md5 = "4f23eebd59ddd01a8f91ff8c823dd7d6";
   };
   propagatedBuildInputs = [zlib];
   inherit zlib;
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 61940611603a..3a47356d1de5 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null && libjpeg != null;
 
 stdenv.mkDerivation {
-  name = "libtiff-3.7.4";
+  name = "libtiff-3.8.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/tiff-3.7.4.tar.gz;
-    md5 = "f37a7907bca4e235da85eb0126caa2b0";
+    url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz;
+    md5 = "fbb6f446ea4ed18955e2714934e5b698";
   };
   propagatedBuildInputs = [zlib libjpeg];
   inherit zlib libjpeg;
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index a2232b041590..e72ecd52cdb2 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.22";
+  name = "libxml2-2.6.23";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.22.tar.gz;
-    md5 = "1db8d06b4f49a665a8f47dc6d94450e6";
+    url = ftp://xmlsoft.org/libxml2/libxml2-2.6.23.tar.gz;
+    md5 = "0f37385e3ad73cc94db43d6873f4fc3b";
   };
 
   python = if pythonSupport then python else null;
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 8fb0cc09fa6e..24795bd2cbb2 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -3,9 +3,9 @@
 assert libxml2 != null;
 
 stdenv.mkDerivation {
-  name = "libxslt-1.1.14";
+  name = "libxslt-1.1.15";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.15.tar.gz;
+    url = ftp://xmlsoft.org/libxml2/libxslt-1.1.15.tar.gz;
     md5 = "238de9eda71b570ff7b78aaf65308fc6";
   };
   buildInputs = [libxml2];