* GTK updates.

svn path=/nixpkgs/trunk/; revision=2385

3 files changed, 9 insertions, 9 deletions

diff --git a/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
index 6a86350b60b97..04193db99c975 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
@@ -3,10 +3,10 @@
 assert pkgconfig != null && gettext != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "glib-2.6.2";
+  name = "glib-2.6.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.6.2.tar.bz2;
-    md5 = "31fafaf9b1a96ab804c078fb965eb529";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.3.tar.bz2;
+    md5 = "8f69ad5387197114b356efc64ce88d77";
   };
   buildInputs = [pkgconfig gettext perl];
 }
diff --git a/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
index 9db0354193ab6..b2defd1431c5c 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
@@ -10,10 +10,10 @@ assert x11.buildClientLibs;
 #assert x11 == pango.x11;
 
 stdenv.mkDerivation {
-  name = "gtk+-2.6.2";
+  name = "gtk+-2.6.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.6.2.tar.bz2;
-    md5 = "f5cbbcb82627bc6d0d186063e6109399";
+    url = http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-2.6.4.tar.bz2;
+    md5 = "4749fce7b082b784a71a076aa586dc25";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
   propagatedBuildInputs = [x11 glib atk pango];
diff --git a/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
index 1b4ce494d39ac..096da3059d290 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
@@ -4,10 +4,10 @@ assert pkgconfig != null && x11 != null && glib != null;
 assert x11.buildClientLibs;
 
 stdenv.mkDerivation {
-  name = "pango-1.8.0";
+  name = "pango-1.8.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.8.0.tar.bz2;
-    md5 = "d11f9857df7216321163e14d66d0cab8";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.6/pango-1.8.1.tar.bz2;
+    md5 = "88aa6bf1876766db6864f3b93577887c";
   };
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [x11 glib];