* Lots of updates, especially GTK and X libraries.

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

pkgs/development/interpreters/python/default.nix

@@ -3,10 +3,10 @@
 assert zlibSupport -> zlib != null;
 
 stdenv.mkDerivation {
-  name = "python-2.3.4";
+  name = "python-2.4.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/Python-2.3.4.tar.bz2;
-    md5 = "a2c089faa2726c142419c03472fc4063";
+    url = http://www.python.org/ftp/python/2.4.1/Python-2.4.1.tar.bz2;
+    md5 = "de3e9a8836fab6df7c7ce545331afeb3";
   };
   buildInputs = [
     (if zlibSupport then zlib else null)

pkgs/development/libraries/freetype/default.nix

@@ -1,9 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "freetype-2.1.5";
+  name = "freetype-2.1.10";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/freetype-2.1.5.tar.bz2;
-    md5 = "54537b518b84d04190a1eccd393a29df";
-#    url = http://cesnet.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.7.tar.bz2;
-#    md5 = "d71723948d7c0e44c401b5733c50857e";
+    url = http://heanet.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.10.tar.bz2;
+    md5 = "a4012e7d1f6400df44a16743b11b8423";
   };
 }

pkgs/development/libraries/gettext/default.nix

@@ -1,8 +1,8 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "gettext-0.14";
+  name = "gettext-0.14.5";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gettext-0.14.tar.gz;
-    md5 = "e715be150bbe32439ae68fab32df0299";
+    url = ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.14.5.tar.gz;
+    md5 = "e2f6581626a22a0de66dce1d81d00de3";
   };
   configureFlags = "--disable-csharp";
 }

pkgs/development/libraries/glibc/default.nix

@@ -1,18 +1,18 @@
 {stdenv, fetchurl, kernelHeaders, installLocales ? true}:
 
 stdenv.mkDerivation {
-  name = "glibc-2.3.4";
+  name = "glibc-2.3.5";
   builder = ./builder.sh;
   substitute = ../../../build-support/substitute/substitute.sh;
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-2.3.4.tar.bz2;
-    md5 = "174ac5ed4f2851fcc866a3bac1e4a6a5";
+    url = http://ftp.gnu.org/gnu/glibc/glibc-2.3.5.tar.bz2;
+    md5 = "93d9c51850e0513aa4846ac0ddcef639";
   };
 
   linuxthreadsSrc = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-linuxthreads-2.3.4.tar.bz2;
-    md5 = "7a199cd4965eb5622163756ae64358fe";
+    url = http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.3.5.tar.bz2;
+    md5 = "77011b0898393c56b799bc011a0f37bf";
   };
 
   patches = [ ./glibc-pwd.patch ];

pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix

@@ -82,7 +82,7 @@
   };
 
   libIDL = {
-    name = "libIDL-0.8.5.tar.bz2";
+    name = "libIDL-0.8.5";
     src = fetchurl {
       url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libIDL-0.8.5.tar.bz2;
       md5 = "c63f6513dc7789d0575bea02d62d58d7";
@@ -177,4 +177,4 @@
     };
   };
   
-}
+}

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.4";
+  name = "glib-2.6.5";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.6.4.tar.bz2;
-    md5 = "af7eeb8aae764ff763418471ed6eb93d";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.5.tar.bz2;
+    md5 = "777d2e34a60edad28319207b576cda91";
   };
   buildInputs = [pkgconfig gettext perl];
 }

pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix

@@ -12,8 +12,8 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "gtk+-2.6.6";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.6.6.tar.bz2;
-    md5 = "6bf5a71a7ea6a02821fd0c9edab25904";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-2.6.8.tar.bz2;
+    md5 = "535fa4b62d219445b99953f679b5cf8e";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
   propagatedBuildInputs = [x11 glib atk pango];

pkgs/development/libraries/libxml2/default.nix

@@ -4,12 +4,12 @@ assert zlib != null;
 assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
-  name = "libxml2-2.6.17";
+  name = "libxml2-2.6.19";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libxml2-2.6.17.tar.gz;
-    md5 = "a678d37e68d98788ef51b6f913cdc868";
+    url = ftp://xmlsoft.org/libxml2-2.6.19.tar.gz;
+    md5 = "61587d43389a414fc2f5223b428e325e";
   };
 
   python = if pythonSupport then python else null;

pkgs/development/libraries/libxslt/default.nix

@@ -3,10 +3,10 @@
 assert libxml2 != null;
 
 stdenv.mkDerivation {
-  name = "libxslt-1.1.12";
+  name = "libxslt-1.1.14";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libxslt-1.1.12.tar.gz;
-    md5 = "cf82a767c016ff1668d1c295c47ae700";
+    url = ftp://xmlsoft.org/libxslt-1.1.14.tar.gz;
+    md5 = "db71660bb7d01ccd4e6be990af8d813b";
   };
   buildInputs = [libxml2];
 }

pkgs/development/libraries/pcre/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "pcre-4.5";
+  name = "pcre-6.0";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pcre-4.5.tar.bz2;
-    md5 = "c51bd34197008b128046f0799d2242e4";
+    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.0.tar.bz2;
+    md5 = "9352eb6d2be5ad9d8360d2377d3cafac";
   };
 }

pkgs/development/libraries/xlibs/fontconfig/default.nix

@@ -3,11 +3,11 @@
 assert freetype != null && expat != null;
 
 stdenv.mkDerivation {
-  name = "fontconfig-2.2.3";
+  name = "fontconfig-2.3.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/fontconfig-2.2.3.tar.gz;
-    md5 = "2466a797d645cda5eb466080fdaec416";
+    url = http://www.fontconfig.org/release/fontconfig-2.3.2.tar.gz;
+    md5 = "7354f9f125ea78a8f2851cb9c31d4866";
   };
   buildInputs = [freetype];
   propagatedBuildInputs = [expat]; # !!! shouldn't be necessary, but otherwise pango breaks

pkgs/development/libraries/xlibs/libXft/default.nix

@@ -4,10 +4,10 @@
 # assert freetype == fontconfig.freetype;
 
 (stdenv.mkDerivation {
-  name = "libXft-2.1.6";
+  name = "libXft-2.1.7";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXft-2.1.6.tar.bz2;
-    md5 = "ba10c9c3f4758f304f04f8d48e2f81a4";
+    url =http://xlibs.freedesktop.org/release/libXft-2.1.7.tar.bz2 ;
+    md5 = "3e311b4095283d59488b95c8bd772521";
   };
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [libX11 libXrender freetype fontconfig];

pkgs/development/libraries/xlibs/libXrender/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, libX11, renderext}:
 
 stdenv.mkDerivation {
-  name = "libXrender-0.8.4";
+  name = "libXrender-0.9.0";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXrender-0.8.4.tar.bz2;
-    md5 = "c745339dbe5f05cff8950b71a739e34c";
+    url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2;
+    md5 = "ce7cda009aa0b10a73637941d44ae789";
   };
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [libX11 renderext];

pkgs/development/libraries/xlibs/libXt/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, libX11, libSM}:
 
 stdenv.mkDerivation {
-  name = "libXt-0.1.4-cvs";
+  name = "libXt-0.1.5";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXt-0.1.4-cvs.tar.bz2;
-    md5 = "65fd5ad321e846417845e80f44131ea5";
+    url = http://xlibs.freedesktop.org/release/libXt-0.1.5.tar.bz2;
+    md5 = "8ff20498eeedebe2fb72f93c2d7beab1";
   };
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [libX11 libSM];

pkgs/development/libraries/xlibs/renderext/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "renderext-0.8";
+  name = "renderext-0.9";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/renderext-0.8.tar.bz2;
-    md5 = "b00a97b00bf93ab2ac6442ea13ea9c0b";
+    url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2;
+    md5 = "d43c2afc69937655d13c02588c9ff974";
   };
 }

pkgs/development/libraries/xlibs/xproto/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "xproto-6.6.1";
+  name = "xproto-6.6.2";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xproto-6.6.1.tar.bz2;
-    md5 = "8a7546a607dcd61b2ee595c763fd7f85";
+    url = http://xlibs.freedesktop.org/release/xproto-6.6.2.tar.bz2;
+    md5 = "fc419f3028cc2959b979a7e7464105f9";
   };
 }