* Merge r2396.

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

13 files changed, 42 insertions, 42 deletions

diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 14e48613d83a6..1cff0d4665e34 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation {
   substitute = ../../../build-support/substitute/substitute.sh;
 
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/glibc/glibc-2.3.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-2.3.4.tar.bz2;
     md5 = "174ac5ed4f2851fcc866a3bac1e4a6a5";
   };
 
   linuxthreadsSrc = fetchurl {
-    url = http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.3.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-linuxthreads-2.3.4.tar.bz2;
     md5 = "7a199cd4965eb5622163756ae64358fe";
   };
 
diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
index d31054681d85b..67fecd88e0c1e 100644
--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
@@ -3,7 +3,7 @@
   gnomeicontheme = {
     name = "gnome-icon-theme-2.8.0";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gnome-icon-theme-2.8.0.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-icon-theme-2.8.0.tar.bz2;
       md5 = "7be016337c44c024fb22f7b94b689d7b";
     };
   };
@@ -11,7 +11,7 @@
   gnomekeyring = {
     name = "gnome-keyring-0.4.1";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gnome-keyring-0.4.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-keyring-0.4.1.tar.bz2;
       md5 = "031901a50273cc5a39b1305924613a1b";
     };
   };
@@ -19,7 +19,7 @@
   gtkhtml = {
     name = "gtkhtml-3.2.5";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gtkhtml-3.2.5.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtkhtml-3.2.5.tar.bz2;
       md5 = "86e1ce32fed536bce5b2d6e8d41b0c65";
     };
   };
@@ -27,7 +27,7 @@
   libgtkhtml = {
     name = "libgtkhtml-2.6.3";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/libgtkhtml-2.6.3.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgtkhtml-2.6.3.tar.bz2;
       md5 = "c77789241d725e189ffc0391eda94361";
     };
   };
@@ -35,7 +35,7 @@
   gtksourceview = {
     name = "gtksourceview-1.1.1";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gtksourceview-1.1.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtksourceview-1.1.1.tar.bz2;
       md5 = "2e59c8748594181d4bf452320c8c3b5c";
     };
   };
@@ -51,7 +51,7 @@
   gnomedesktop = {
     name = "gnome-desktop-2.8.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.8/2.8.3/sources/gnome-desktop-2.8.3.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-desktop-2.8.3.tar.bz2;
       md5 = "607f8689f931336ad9a1f3f41d98a9c7";
     };
   };
@@ -59,7 +59,7 @@
   libwnck = {
     name = "libwnck-2.8.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.8/2.8.3/sources/libwnck-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libwnck-2.8.1.tar.bz2;
       md5 = "c0a5a8478064287e167c15e3ec0e82a1";
     };
   };
@@ -67,7 +67,7 @@
   gnomepanel = {
     name = "gnome-panel-2.8.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.8/2.8.3/sources/gnome-panel-2.8.3.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-panel-2.8.3.tar.bz2;
       md5 = "d76a09c321e02c18e0fdecb86677550d";
     };
   };
diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix b/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
index 90c112ada2eed..beab9af0be0a2 100644
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
@@ -4,7 +4,7 @@
   gconf = {
     name = "GConf-2.8.1";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/GConf-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/GConf-2.8.1.tar.bz2;
       md5 = "b1173cbe33404bcbcc15710ce2a28f67";
     };
   };
@@ -12,7 +12,7 @@
   ORBit2 = {
     name = "ORBit2-2.12.1";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/ORBit2-2.12.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ORBit2-2.12.1.tar.bz2;
       md5 = "30ede62e194f692f2dd3daa09c752196";
     };
   };
@@ -20,7 +20,7 @@
   atk = {
     name = "atk-1.8.0";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/atk-1.8.0.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/atk-1.8.0.tar.bz2;
       md5 = "fc46940febb0e91427b77457e6356f3d";
     };
   };
@@ -28,7 +28,7 @@
   audiofile = {
     name = "audiofile-0.2.6";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/audiofile-0.2.6.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/audiofile-0.2.6.tar.bz2;
       md5 = "3d01302834660850b6141cac1e6f5501";
     };
   };
@@ -36,7 +36,7 @@
   esound = {
     name = "esound-0.2.35";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/esound-0.2.35.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/esound-0.2.35.tar.bz2;
       md5 = "1566344f80a8909b5e6e4d6b6520c2c1";
     };
   };
@@ -44,7 +44,7 @@
   gail = {
     name = "gail-1.8.2";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/gail-1.8.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gail-1.8.2.tar.bz2;
       md5 = "3b8be198ccb8a0d92cfb0c3cdd519c1f";
     };
   };
@@ -52,7 +52,7 @@
   glib = {
     name = "glib-2.4.8";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/glib-2.4.8.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.4.8.tar.bz2;
       md5 = "e160a5feecf46e0fbb36db09c356953c";
     };
   };
@@ -60,7 +60,7 @@
   gnomemimedata = {
     name = "gnome-mime-data-2.4.2";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/gnome-mime-data-2.4.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.2.tar.bz2;
       md5 = "37242776b08625fa10c73c18b790e552";
     };
   };
@@ -68,7 +68,7 @@
   gnomevfs = {
     name = "gnome-vfs-2.8.4";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/gnome-vfs-2.8.4.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-vfs-2.8.4.tar.bz2;
       md5 = "42d3505e9ef9c26a7aae4e511b9b4c34";
     };
   };
@@ -76,7 +76,7 @@
   gtk = {
     name = "gtk+-2.4.14";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/gtk+-2.4.14.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.4.14.tar.bz2;
       md5 = "10470d574933460809e4ac488e579e26";
     };
   };
@@ -84,7 +84,7 @@
   libIDL = {
     name = "libIDL-0.8.5.tar.bz2";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libIDL-0.8.5.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libIDL-0.8.5.tar.bz2;
       md5 = "c63f6513dc7789d0575bea02d62d58d7";
     };
   };
@@ -92,7 +92,7 @@
   libart_lgpl = {
     name = "libart_lgpl-2.3.17";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libart_lgpl-2.3.17.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libart_lgpl-2.3.17.tar.bz2;
       md5 = "dfca42529393c8a8f59dc4dc10675a46";
     };
   };
@@ -100,7 +100,7 @@
   libbonobo = {
     name = "libbonobo-2.8.1";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libbonobo-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonobo-2.8.1.tar.bz2;
       md5 = "54f863c20016cf8a2cf25056f6c7cda7";
     };
   };
@@ -108,7 +108,7 @@
   libbonoboui = {
     name = "libbonoboui-2.8.1";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libbonoboui-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonoboui-2.8.1.tar.bz2;
       md5 = "b23daafa8344a88696d497f20285ef55";
     };
   };
@@ -116,7 +116,7 @@
   libglade = {
     name = "libglade-2.4.2";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libglade-2.4.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libglade-2.4.2.tar.bz2;
       md5 = "83d08f9ab485a10454bd5171d2d53fb0";
     };
   };
@@ -124,7 +124,7 @@
   libgnome = {
     name = "libgnome-2.8.1";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnome-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnome-2.8.1.tar.bz2;
       md5 = "17577198f5086c48f69c361be2f4806c";
     };
   };
@@ -132,7 +132,7 @@
   libgnomecanvas = {
     name = "libgnomecanvas-2.8.0";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnomecanvas-2.8.0.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomecanvas-2.8.0.tar.bz2;
       md5 = "2bf10396a92777e7b64b6052a8a232f1";
     };
   };
@@ -140,7 +140,7 @@
   libgnomeprint = {
     name = "libgnomeprint-2.8.2";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnomeprint-2.8.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeprint-2.8.2.tar.bz2;
       md5 = "8361c4e1bc3d87b91435807d0c06a3e4";
     };
   };
@@ -148,7 +148,7 @@
   libgnomeprintui = {
     name = "libgnomeprintui-2.8.2";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnomeprintui-2.8.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeprintui-2.8.2.tar.bz2;
       md5 = "b38d1f6813dd52879ba4174ddc3f1b1c";
     };
   };
@@ -156,7 +156,7 @@
   libgnomeui = {
     name = "libgnomeui-2.8.1";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnomeui-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeui-2.8.1.tar.bz2;
       md5 = "d46a2b34bdfbc1b36464176fa8bef03c";
     };
   };
@@ -164,7 +164,7 @@
   pango = {
     name = "pango-1.6.0";
     src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/pango-1.6.0.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.6.0.tar.bz2;
       md5 = "6c732bbc5fba5a0f1f8086e8aa4f490d";
     };
   };
@@ -172,7 +172,7 @@
   intltool = {
     name = "intltool-0.33";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.8/2.8.3/sources/intltool-0.33.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/intltool-0.33.tar.bz2;
       md5 = "7d3b6d421b0fb9beee7faf97daab45e6";
     };
   };
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 04193db99c975..c566ad9e12583 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.6.3";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/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 b2defd1431c5c..c408f80cb8def 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
@@ -12,7 +12,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "gtk+-2.6.4";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-2.6.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.6.4.tar.bz2;
     md5 = "4749fce7b082b784a71a076aa586dc25";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
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 096da3059d290..0df6f111f3b96 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
@@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "pango-1.8.1";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.6/pango-1.8.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.8.1.tar.bz2;
     md5 = "88aa6bf1876766db6864f3b93577887c";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix
index 38d71359c2b4d..8604f8ae79c32 100644
--- a/pkgs/development/libraries/gtk-sharp-1/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-1/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.go-mono.com/archive/1.0.6/gtk-sharp-1.0.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk-sharp-1.0.6.tar.gz;
     md5 = "2651d14fe77174ab20b8af53d150ee11";
   };
 
diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix
index e5cbfab5c89f0..388b55360f09c 100644
--- a/pkgs/development/libraries/gtk-sharp-2/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/gtk-sharp/gtk-sharp-1.9.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk-sharp-1.9.2.tar.gz;
     md5 = "b7c5afab5f736ffa4011974302831363";
   };
 
diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix
index b6c4b9c933c7a..b83f53137aa62 100644
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/pkgs/development/libraries/lcms/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lcms-1.14";
 
   src = fetchurl {
-    url = http://www.littlecms.com/lcms-1.14.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lcms-1.14.tar.gz;
     md5 = "5a803460aeb10e762d97e11a37462a69";
   };
 }
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index 42afadc304de0..971597fd6fcd1 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libexif-0.6.11";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/libexif/libexif-0.6.11.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libexif-0.6.11.tar.bz2;
     md5 = "211996a336f1b1a06def5a6d5c94284e";
   };
 
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 5aba35d61bae3..3b41bb6775083 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libgphoto2-2.1.5";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/gphoto/libgphoto2-2.1.5.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgphoto2-2.1.5.tar.gz;
     md5 = "210844f0d88f58842917af6eaff06382";
   };
 }
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index 87e75e55da79d..356235dd545ca 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libtheora-1.0alpha4";
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/theora/libtheora-1.0alpha4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libtheora-1.0alpha4.tar.bz2;
     md5 = "a71ac42ec0f848da327930841a80ff2b";
   };
   propagatedBuildInputs = [libogg libvorbis];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 294ae13b02508..26f9b63157379 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sqlite-2.8.16";
 
   src = fetchurl {
-    url = http://www.sqlite.org/sqlite-2.8.16.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sqlite-2.8.16.tar.gz;
     md5 = "9c79b461ff30240a6f9d70dd67f8faea";
   };
 }