* Move tarballs to catamaran so that we are no longer dependent on a

  gazillion different servers.  Resurrected some 25 missing files.

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

88 files changed, 90 insertions, 90 deletions

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 4bb1cdf8ffb..02d8a98801e 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "SDL-1.2.7";
   src = fetchurl {
-    url = http://www.libsdl.org/release/SDL-1.2.7.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/SDL-1.2.7.tar.gz;
     md5 = "d29b34b6ba3ed213893fc9d8d35e357a";
   };
   buildInputs = [x11];
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index 4a75e11ec30..95dec16587f 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "a52dec-0.7.4";
   src = fetchurl {
-    url = http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/a52dec-0.7.4.tar.gz;
     md5 = "caa9f5bc44232dc8aeea773fea56be80";
   };
 }
diff --git a/pkgs/development/libraries/aterm/default.nix b/pkgs/development/libraries/aterm/default.nix
index 5b863bf1d03..530b68da133 100644
--- a/pkgs/development/libraries/aterm/default.nix
+++ b/pkgs/development/libraries/aterm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   configureFlags = "--with-gcc";
 
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.3.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-2.3.1.tar.gz;
     md5 = "5a2d70acc45a9d301e0dba12fcaf77e7";
   };
 }
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 7dc7b7c6c14..d66b50a5540 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "audiofile-0.2.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.68k.org/~michael/audiofile/audiofile-0.2.5.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/audiofile-0.2.5.tar.gz;
     md5 = "fd07c62a17ceafa317929e55e51e26c5";
   };
 }
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index e72e68968da..68689952c56 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "boehm-gc-6.3";
   src = fetchurl {
-    url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gc6.3.tar.gz;
     md5 = "8b37ee18cbeb1dfd1866958e280db871";
   };
 }
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index 21ea6a49e3f..83551ea1826 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "chmlib-0.33";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://66.93.236.84/~jedwin/projects/chmlib/chmlib-0.33.tbz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/chmlib-0.33.tbz;
     md5 = "8bc84e94f1cea65005e5cb0ab40e2e86";
   };
   buildInputs = [libtool];
diff --git a/pkgs/development/libraries/db4/default.nix b/pkgs/development/libraries/db4/default.nix
index 10a6781dc2e..b4756df9194 100644
--- a/pkgs/development/libraries/db4/default.nix
+++ b/pkgs/development/libraries/db4/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "db4-4.2.52";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.sleepycat.com/update/snapshot/db-4.2.52.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/db-4.2.52.tar.gz;
     md5 = "cbc77517c9278cdb47613ce8cb55779f";
   };
   configureFlags = [
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 556b299e0da..75f2424a5d2 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";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/expat/expat-1.95.8.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/expat-1.95.8.tar.gz;
     md5 = "aff487543845a82fe262e6e2922b4c8e";
   };
 }
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 47a23aff7fa..22aa3ac91d4 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "freetype-2.1.5";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.5.tar.bz2;
+    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";
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 6cd64d2f69a..97eea0e16ae 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -2,7 +2,7 @@
   name = "gettext-0.12.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.12.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gettext-0.12.1.tar.gz;
     md5 = "5d4bddd300072315e668247e5b7d5bdb";
   };
 }
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 4c8e843fa5e..66690277d4e 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -5,11 +5,11 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/glibc/glibc-2.3.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-2.3.3.tar.bz2;
     md5 = "e825807b98042f807799ccc9dd96d31b";
   };
   linuxthreadsSrc = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-linuxthreads-2.3.3.tar.bz2;
     md5 = "8149ea62922e75bd692bc3b92e5e766b";
   };
 
diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix
index 0fb5f047f12..ffdcd4f5498 100644
--- a/pkgs/development/libraries/gnet/default.nix
+++ b/pkgs/development/libraries/gnet/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null;
 stdenv.mkDerivation {
   name = "gnet-2.0.5";
   src = fetchurl {
-    url = http://www.gnetlibrary.org/src/gnet-2.0.5.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnet-2.0.5.tar.gz;
     md5 = "126f140618de34801933d192302ed0b9";
   };
   buildInputs = [pkgconfig glib];
diff --git a/pkgs/development/libraries/gnome/GConf/default.nix b/pkgs/development/libraries/gnome/GConf/default.nix
index fb4d8ef13bc..2b1c4fea8cc 100644
--- a/pkgs/development/libraries/gnome/GConf/default.nix
+++ b/pkgs/development/libraries/gnome/GConf/default.nix
@@ -7,7 +7,7 @@ assert pkgconfig != null && perl != null
 stdenv.mkDerivation {
   name = "GConf-2.4.0.1";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/GConf-2.4.0.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/GConf-2.4.0.1.tar.bz2;
     md5 = "2f7548d0bad24d7c4beba54d0ec98a20";
   };
   # Perl is not `supposed' to be required, but it is.
diff --git a/pkgs/development/libraries/gnome/ORBit2/default.nix b/pkgs/development/libraries/gnome/ORBit2/default.nix
index c6963e6a1d3..adb214929ac 100644
--- a/pkgs/development/libraries/gnome/ORBit2/default.nix
+++ b/pkgs/development/libraries/gnome/ORBit2/default.nix
@@ -6,7 +6,7 @@ assert pkgconfig != null && glib != null && libIDL != null
 stdenv.mkDerivation {
   name = "ORBit2-2.8.3";
   src = fetchurl {
-    url = ftp://ftp.gnome.org/pub/gnome/sources/ORBit2/2.8/ORBit2-2.8.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ORBit2-2.8.3.tar.bz2;
     md5 = "c6c4b63de2f70310e33a52a37257ddaf";
   };
   buildInputs = [pkgconfig libIDL popt];
diff --git a/pkgs/development/libraries/gnome/esound/default.nix b/pkgs/development/libraries/gnome/esound/default.nix
index ce70fe1647c..e6eff85eaf0 100644
--- a/pkgs/development/libraries/gnome/esound/default.nix
+++ b/pkgs/development/libraries/gnome/esound/default.nix
@@ -5,7 +5,7 @@ assert audiofile != null;
 stdenv.mkDerivation {
   name = "esound-0.2.32";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/esound-0.2.32.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/esound-0.2.32.tar.bz2;
     md5 = "b2a5e71ec8220fea1c22cc042f5f6e63";
   };
   propagatedBuildInputs = [audiofile];
diff --git a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix b/pkgs/development/libraries/gnome/gnome-mime-data/default.nix
index 039840e3ee2..4d82b6fec97 100644
--- a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix
+++ b/pkgs/development/libraries/gnome/gnome-mime-data/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && perl != null;
 stdenv.mkDerivation {
   name = "gnome-mime-data-2.4.0";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/gnome-mime-data-2.4.0.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.0.tar.bz2;
     md5 = "b8f1b383a23d734bec8bc33a03cb3690";
   };
   buildInputs = [pkgconfig perl];
diff --git a/pkgs/development/libraries/gnome/gnome-vfs/default.nix b/pkgs/development/libraries/gnome/gnome-vfs/default.nix
index 7470ce704ff..d6efbb40942 100644
--- a/pkgs/development/libraries/gnome/gnome-vfs/default.nix
+++ b/pkgs/development/libraries/gnome/gnome-vfs/default.nix
@@ -8,7 +8,7 @@ assert pkgconfig != null && perl != null && glib != null
 stdenv.mkDerivation {
   name = "gnome-vfs-2.4.2";
   src = fetchurl {
-    url = ftp://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.4/gnome-vfs-2.4.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-vfs-2.4.2.tar.bz2;
     md5 = "a0f0e40739214143bbf3050311ff10cd";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/gnome/libIDL/default.nix b/pkgs/development/libraries/gnome/libIDL/default.nix
index 52470f58a44..9d6ad61621d 100644
--- a/pkgs/development/libraries/gnome/libIDL/default.nix
+++ b/pkgs/development/libraries/gnome/libIDL/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null && lex != null && yacc != null;
 stdenv.mkDerivation {
   name = "libIDL-0.8.2";
   src = fetchurl {
-    url = ftp://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libIDL-0.8.2.tar.bz2;
     md5 = "a75d2dbf3a3c66b567047c94245f8b82";
   };
   buildInputs = [pkgconfig glib lex yacc];
diff --git a/pkgs/development/libraries/gnome/libart_lgpl/default.nix b/pkgs/development/libraries/gnome/libart_lgpl/default.nix
index 8cfb8a687b7..fa388c2d2ff 100644
--- a/pkgs/development/libraries/gnome/libart_lgpl/default.nix
+++ b/pkgs/development/libraries/gnome/libart_lgpl/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libart_lgpl-2.3.16";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libart_lgpl-2.3.16.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libart_lgpl-2.3.16.tar.bz2;
     md5 = "6bb13292b00649d01400a5b29a6c87cb";
   };
 }
diff --git a/pkgs/development/libraries/gnome/libbonobo/default.nix b/pkgs/development/libraries/gnome/libbonobo/default.nix
index de29a699c2b..dee3191f8e3 100644
--- a/pkgs/development/libraries/gnome/libbonobo/default.nix
+++ b/pkgs/development/libraries/gnome/libbonobo/default.nix
@@ -6,7 +6,7 @@ assert pkgconfig != null && perl != null && ORBit2 != null
 stdenv.mkDerivation {
   name = "libbonobo-2.4.2";
   src = fetchurl {
-    url = ftp://ftp.gnome.org/pub/gnome/sources/libbonobo/2.4/libbonobo-2.4.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonobo-2.4.2.tar.bz2;
     md5 = "78200cc6ed588c93f0d29177a5f3e003";
   };
   buildInputs = [pkgconfig perl libxml2 yacc flex];
diff --git a/pkgs/development/libraries/gnome/libbonoboui/default.nix b/pkgs/development/libraries/gnome/libbonoboui/default.nix
index 85167b1a5e3..d74d3a46969 100644
--- a/pkgs/development/libraries/gnome/libbonoboui/default.nix
+++ b/pkgs/development/libraries/gnome/libbonoboui/default.nix
@@ -7,7 +7,7 @@ assert pkgconfig != null && perl != null && libxml2 != null
 stdenv.mkDerivation {
   name = "libbonoboui-2.4.1";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libbonoboui-2.4.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonoboui-2.4.1.tar.bz2;
     md5 = "943a2d0e9fc7b9f0e97ba869de0c5f2a";
   };
   buildInputs = [pkgconfig perl libglade];
diff --git a/pkgs/development/libraries/gnome/libglade/default.nix b/pkgs/development/libraries/gnome/libglade/default.nix
index e7123f711a8..ec4d5bb1cc6 100644
--- a/pkgs/development/libraries/gnome/libglade/default.nix
+++ b/pkgs/development/libraries/gnome/libglade/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gtk != null && libxml2 != null;
 stdenv.mkDerivation {
   name = "libglade-2.0.1";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libglade-2.0.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libglade-2.0.1.tar.bz2;
     md5 = "4d93f6b01510013ae429e91af432cfe2";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/gnome/libgnome/default.nix b/pkgs/development/libraries/gnome/libgnome/default.nix
index 51e8eb40a3a..676a7769052 100644
--- a/pkgs/development/libraries/gnome/libgnome/default.nix
+++ b/pkgs/development/libraries/gnome/libgnome/default.nix
@@ -13,7 +13,7 @@ assert pkgconfig != null && perl != null && glib != null
 stdenv.mkDerivation {
   name = "libgnome-2.0.6";
   src = fetchurl {
-    url = ftp://ftp.gnome.org/pub/gnome/sources/libgnome/2.4/libgnome-2.4.0.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnome-2.4.0.tar.bz2;
     md5 = "caec1e12d64b98a2925a4317ac16429f";
   };
   buildInputs = [pkgconfig perl popt zlib];
diff --git a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix b/pkgs/development/libraries/gnome/libgnomecanvas/default.nix
index c8151b8db3e..9abc721a24a 100644
--- a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix
+++ b/pkgs/development/libraries/gnome/libgnomecanvas/default.nix
@@ -6,7 +6,7 @@ assert pkgconfig != null && gtk != null && libart != null
 stdenv.mkDerivation {
   name = "libgnomecanvas-2.4.0";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libgnomecanvas-2.4.0.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomecanvas-2.4.0.tar.bz2;
     md5 = "c212a7cac06b7f9e68ed2de38df6e54d";
   };
   buildInputs = [pkgconfig libglade];
diff --git a/pkgs/development/libraries/gnome/libgnomeui/default.nix b/pkgs/development/libraries/gnome/libgnomeui/default.nix
index bf10582355e..9cf62c67bdf 100644
--- a/pkgs/development/libraries/gnome/libgnomeui/default.nix
+++ b/pkgs/development/libraries/gnome/libgnomeui/default.nix
@@ -6,7 +6,7 @@ assert pkgconfig != null && libgnome != null && libgnomecanvas != null
 stdenv.mkDerivation {
   name = "libgnomeui-2.4.0.1";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libgnomeui-2.4.0.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeui-2.4.0.1.tar.bz2;
     md5 = "196f4a3f1f4a531ff57acaa879e98dd2";
   };
   buildInputs = [pkgconfig libglade];
diff --git a/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
index d8d354962e9..5dc8eed02d9 100644
--- a/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "gdk-pixbuf-0.22.0";
 
   src = fetchurl {
-    url = ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/gdk-pixbuf-0.22.0.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gdk-pixbuf-0.22.0.tar.bz2;
     md5 = "05fcb68ceaa338614ab650c775efc2f2";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
index 8aa5005b617..78e9ed62199 100644
--- a/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "glib-1.2.10";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-1.2.10.tar.gz;
     md5 = "6fe30dad87c77b91b632def29dd69ef9";
   };
   # Patch for gcc 3.4 compatibility.  Based on
diff --git a/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
index 7762ee57b77..f8d52f96283 100644
--- a/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-1.2.10.tar.gz;
     md5 = "4d5cb2fc7fb7830e4af9747a36bfce20";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix
index 1089f571099..73f336066eb 100644
--- a/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null && perl != null;
 stdenv.mkDerivation {
   name = "atk-1.2.4";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/atk-1.2.4.tar.bz2;
     md5 = "2d6d50df31abe0e8892b5d3e7676a02d";
   };
   buildInputs = [pkgconfig perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix
index 22d01d0d86f..51bbf4fbbda 100644
--- a/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.2.3";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.2.3.tar.bz2;
     md5 = "aa214a10d873b68ddd67cd9de2ccae55";
   };
   buildInputs = [pkgconfig gettext perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix
index e1eef805803..546d5ee2cbd 100644
--- a/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix
@@ -12,7 +12,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "gtk+-2.2.4";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.2.4.tar.bz2;
     md5 = "605332199533e73bc6eec481fb4f1671";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
diff --git a/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix
index 5d5e5184dda..bc82e2da609 100644
--- a/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix
@@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "pango-1.2.5";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.2.5.tar.bz2;
     md5 = "df00fe3e71cd297010f24f439b6c8ee6";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
index 095ff32b2aa..727d27aab68 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null && perl != null;
 stdenv.mkDerivation {
   name = "atk-1.6.1";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.4/atk-1.6.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/atk-1.6.1.tar.bz2;
     md5 = "f77be7e128c957bd3056c2e270b5f283";
   };
   buildInputs = [pkgconfig perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
index 58f91b3f83c..a2f7df49082 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.4.7";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.7.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.4.7.tar.bz2;
     md5 = "eff6fec89455addf8b0dee5a19e343be";
   };
   buildInputs = [pkgconfig gettext perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
index 56a6e41e731..439722b9933 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
@@ -12,7 +12,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "gtk+-2.4.13";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-2.4.13.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.4.13.tar.bz2;
     md5 = "3a438e1010704b11acaf060c9ba0fd7b";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
diff --git a/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
index 986891b98b9..21299d2d063 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
@@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "pango-1.4.1";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.4.1.tar.bz2;
     md5 = "39868e0da250fd4c00b2970e4eb84389";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/java/aterm/default.nix b/pkgs/development/libraries/java/aterm/default.nix
index c6315faadd1..893f2a608ed 100644
--- a/pkgs/development/libraries/java/aterm/default.nix
+++ b/pkgs/development/libraries/java/aterm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "aterm-java-1.6";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/aterm-java/aterm-java-1.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-java-1.6.tar.gz;
     md5 = "abf475dae2f5efca865fcdff871feb5e";
   };
   buildInputs = [stdenv j2sdk sharedobjects jjtraveler];
diff --git a/pkgs/development/libraries/java/jjtraveler/default.nix b/pkgs/development/libraries/java/jjtraveler/default.nix
index b1032d66af4..d5baf65d5ff 100644
--- a/pkgs/development/libraries/java/jjtraveler/default.nix
+++ b/pkgs/development/libraries/java/jjtraveler/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "jjtraveler-0.4.3.tar.gz";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/jjtraveler/JJTraveler-0.4.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/JJTraveler-0.4.3.tar.gz;
     md5 = "35bf801ee61f042513ae88247fe1bf1d";
   };
   buildInputs = [stdenv j2sdk];
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index cab9fafdf8d..3e5596e58b2 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "saxon-6.5.3";
   builder = ./unzip-builder.sh;
   src = fetchurl {
-    url = http://belnet.dl.sourceforge.net/sourceforge/saxon/saxon6_5_3.zip;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/saxon6_5_3.zip;
     md5 = "7b8c7c187473c04d2abdb40d8ddab5c6";
   };
 
diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix
index 0ca251026ce..e0487da3a90 100644
--- a/pkgs/development/libraries/java/saxon/default8.nix
+++ b/pkgs/development/libraries/java/saxon/default8.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "saxonb-8.0";
   builder = ./unzip-builder.sh;
   src = fetchurl {
-    url = http://belnet.dl.sourceforge.net/sourceforge/saxon/saxonb8-0.zip;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/saxonb8-0.zip;
     md5 = "d05fbd398847ef27b2d1d875bb5136ea";
   };
 
diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix
index 5a207d42794..d855f299d9e 100644
--- a/pkgs/development/libraries/java/shared-objects/default.nix
+++ b/pkgs/development/libraries/java/shared-objects/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "shared-objects-1.4";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/shared-objects-1.4.tar.gz;
     md5 = "c1f2c58bd1a07be32da8a6b89354a11f";
   };
   buildInputs = [stdenv j2sdk];
diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix
index 10d3b056346..705d7267c51 100644
--- a/pkgs/development/libraries/libcdaudio/default.nix
+++ b/pkgs/development/libraries/libcdaudio/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libcdaudio-0.99.12";
   src = fetchurl {
-    url = http://optusnet.dl.sourceforge.net/sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libcdaudio-0.99.12.tar.gz;
     md5 = "63b49cf14d53eed31e7a87cca17a3963" ;
   };
 }
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index c2634472964..1cf01d6e997 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libdvdcss-1.2.8";
   src = fetchurl {
-    url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdcss-1.2.8.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libdvdcss-1.2.8.tar.gz;
     md5 = "e35e4240b6ca0b66a0218065dffe6adb";
   };
 }
diff --git a/pkgs/development/libraries/libdvdplay/default.nix b/pkgs/development/libraries/libdvdplay/default.nix
index 09a7f785be3..1b7ed9656fa 100644
--- a/pkgs/development/libraries/libdvdplay/default.nix
+++ b/pkgs/development/libraries/libdvdplay/default.nix
@@ -5,7 +5,7 @@ assert libdvdread != null;
 stdenv.mkDerivation {
   name = "libdvdplay-1.0.1";
   src = fetchurl {
-    url = http://www.videolan.org/pub/libdvdplay/1.0.1/libdvdplay-1.0.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libdvdplay-1.0.1.tar.bz2;
     md5 = "602bca4ef78d79aa87e5e8920d958a78";
   };
   buildInputs = [libdvdread];
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index de6fc15368c..809a6a3f7e5 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "libdvdread-20030812";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdread-20030812.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libdvdread-20030812.tar.bz2;
     md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274";
   };
   buildInputs = libdvdcss;
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 8b6d44e1c9d..c614311ca9e 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -2,7 +2,7 @@
   name = "libjpeg-6b";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jpegsrc.v6b.tar.gz;
     md5 = "dbd5f3b47ed13132f04c685d608a7547";
   };
 }
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 7e5a93f229a..66a2169e587 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libmad-0.15.0b";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/mad/libmad-0.15.0b.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libmad-0.15.0b.tar.gz;
     md5 = "2e4487cdf922a6da2546bad74f643205";
   };
 }
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 52b2d48f4a6..05811638bf4 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libogg-1.1.2";
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/ogg/libogg-1.1.2.tar.gz ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libogg-1.1.2.tar.gz;
     md5 = "4d82996517bf33bb912c97e9d0b635c4" ;
   };
 }
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 2b52760e0a1..d93cf294ad9 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "libpng-1.2.7";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/png-mng/libpng-1.2.7.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libpng-1.2.7.tar.bz2;
     md5 = "21030102f99f81c37276403e5956d198";
   };
   propagatedBuildInputs = [zlib];
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 67ecfb7abc4..2416e1e0ed2 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libsigsegv-2.1";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-2.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libsigsegv-2.1.tar.gz;
     md5 = "6d75ca3fede5fbfd72a78bc918d9e174";
   };
 }
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index fd0eaa825df..0cda3e4b71a 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "libtiff-3.6.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.6.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tiff-v3.6.1.tar.gz;
     md5 = "b3f0ee7617593c2703755672fb1bfed3";
   };
   propagatedBuildInputs = [zlib libjpeg];
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index b5eeb18ffeb..1cb26577162 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libvorbis-1.1.0";
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.1.0.tar.gz ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libvorbis-1.1.0.tar.gz;
     md5 = "bb764aeabde613d1a424a29b1f15e7e6" ;
   };
 
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index ee706c858af..d1e90e3507c 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2-2.6.13.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libxml2-2.6.13.tar.gz;
     md5 = "23e9a2cfcd700fd4ff70996fd7c632c0";
   };
 
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 4ca1f57d6cb..f85e80f36e1 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -5,7 +5,7 @@ assert libxml2 != null;
 stdenv.mkDerivation {
   name = "libxslt-1.1.10";
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxslt-1.1.10.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libxslt-1.1.10.tar.gz;
     md5 = "9839e6a309c7c97ffd260c8a2aa03cf5";
   };
   buildInputs = [libxml2];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 7f0fc6b6875..833d47bd7ca 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation {
   name = "mesa-6.0.1";
   srcs = [
     (fetchurl {
-      url = http://heanet.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.0.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/MesaLib-6.0.1.tar.bz2;
       md5 = "b7f14088c5c2f14490d2739a91102112";
     })
     (fetchurl {
-      url = http://heanet.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.0.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/MesaDemos-6.0.1.tar.bz2;
       md5 = "dd6aadfd9ca8e1cfa90c6ee492bc6f43";
     })
   ];
diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix
index bc31f0731de..cca12fb9f81 100644
--- a/pkgs/development/libraries/mpeg2dec/default.nix
+++ b/pkgs/development/libraries/mpeg2dec/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mpeg2dec-0.4.0b";
   src = fetchurl {
-    url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0b.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mpeg2dec-0.4.0b.tar.gz;
     md5 = "52d10ea80595ec83d8557ba7ac6dc8e6";
   };
 }
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 894b688bbee..0625d726e28 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ncurses-5.4";
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ncurses-5.4.tar.gz;
     md5 = "069c8880072060373290a4fefff43520";
   };
   configureFlags = "--with-shared";
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 4ca67d3f5d4..b1758235329 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -2,7 +2,7 @@
   name = "openssl-0.9.7d";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.openssl.org/source/openssl-0.9.7d.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/openssl-0.9.7d.tar.gz;
     md5 = "1b49e90fc8a75c3a507c0a624529aca5";
   };
   inherit perl;
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index ca95ddafc94..ca0683c575b 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "pcre-4.5";
   src = fetchurl {
-    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-4.5.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pcre-4.5.tar.bz2;
     md5 = "c51bd34197008b128046f0799d2242e4";
   };
 }
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 4383b8486ef..43ad631187f 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "popt-1.7";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz;
     md5 = "5988e7aeb0ae4dac8d83561265984cc9";
   };
   gettext = gettext;
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 7f29396cf61..70c692978a6 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://sunsite.rediris.es/mirror/Qt/source/qt-x11-free-3.3.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.3.tar.bz2;
     md5 = "3e0a0c8429b0a974b39b5f535ddff01c";
   };
 
diff --git a/pkgs/development/libraries/readline/default.nix b/pkgs/development/libraries/readline/default.nix
index 58c5bd6591c..00e58d81b43 100644
--- a/pkgs/development/libraries/readline/default.nix
+++ b/pkgs/development/libraries/readline/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "readline-5.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.cwru.edu/pub/bash/readline-5.0.tar.gz ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/readline-5.0.tar.gz;
     md5 = "9a39d15f1ed592883f8c6671e8c13120";
   };
   inherit ncurses;
diff --git a/pkgs/development/libraries/rte/default.nix b/pkgs/development/libraries/rte/default.nix
index de51b874ff1..2f478a6b4d6 100644
--- a/pkgs/development/libraries/rte/default.nix
+++ b/pkgs/development/libraries/rte/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rte-0.5.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/rte-0.5.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/rte-0.5.2.tar.bz2;
     md5 = "152d5d81169f0c9a543078543e354ebe";
   };
 }
diff --git a/pkgs/development/libraries/scrollkeeper/default.nix b/pkgs/development/libraries/scrollkeeper/default.nix
index 1ad98c06f3c..6ffd1d6c453 100644
--- a/pkgs/development/libraries/scrollkeeper/default.nix
+++ b/pkgs/development/libraries/scrollkeeper/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "scrollkeeper-0.3.14";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/scrollkeeper/scrollkeeper-0.3.14.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/scrollkeeper-0.3.14.tar.gz;
     md5 = "161eb3f29e30e7b24f84eb93ac696155";
   };
   buildInputs = [perl libxml2 libxslt];
diff --git a/pkgs/development/libraries/wxGTK-2.5/default.nix b/pkgs/development/libraries/wxGTK-2.5/default.nix
index 6c6134b8698..16d321bb874 100644
--- a/pkgs/development/libraries/wxGTK-2.5/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.5/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "wxGTK-2.5.2";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-2.5.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wxGTK-2.5.2.tar.bz2;
     md5 = "b45874428b0164bfa5bd1a5a11b3eb4a";
   };
 
diff --git a/pkgs/development/libraries/wxGTK/default.nix b/pkgs/development/libraries/wxGTK/default.nix
index 9b33f5acd43..31c8910342f 100644
--- a/pkgs/development/libraries/wxGTK/default.nix
+++ b/pkgs/development/libraries/wxGTK/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "wxGTK-2.4.2";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-2.4.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wxGTK-2.4.2.tar.bz2;
     md5 = "cdadfe82fc93f8a65a2ae18a95b0b0e3";
   };
 
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 2eec46bb2dd..f678e0c14ac 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   name = "xine-lib-1.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xine-lib-1.0.tar.gz;
     md5 = "96e5195c366064e7778af44c3e71f43a";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/xlibs/fontconfig/default.nix b/pkgs/development/libraries/xlibs/fontconfig/default.nix
index 962ab317df4..a522570a069 100644
--- a/pkgs/development/libraries/xlibs/fontconfig/default.nix
+++ b/pkgs/development/libraries/xlibs/fontconfig/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "fontconfig-2.2.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://freedesktop.org/~fontconfig/release/fontconfig-2.2.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/fontconfig-2.2.3.tar.gz;
     md5 = "2466a797d645cda5eb466080fdaec416";
   };
   buildInputs = [freetype];
diff --git a/pkgs/development/libraries/xlibs/libICE/default.nix b/pkgs/development/libraries/xlibs/libICE/default.nix
index abc3a657df1..7d3fb7fa5b6 100644
--- a/pkgs/development/libraries/xlibs/libICE/default.nix
+++ b/pkgs/development/libraries/xlibs/libICE/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libICE-6.3.3";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libICE-6.3.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libICE-6.3.3.tar.bz2;
     md5 = "e67d98bebfabf884e58501e44b7efd35";
   };
   buildInputs = [pkgconfig libX11];
diff --git a/pkgs/development/libraries/xlibs/libSM/default.nix b/pkgs/development/libraries/xlibs/libSM/default.nix
index e82e910aee7..81f831a9fd3 100644
--- a/pkgs/development/libraries/xlibs/libSM/default.nix
+++ b/pkgs/development/libraries/xlibs/libSM/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libSM-6.0.3";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libSM-6.0.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libSM-6.0.3.tar.bz2;
     md5 = "e01ec6568ad17c5df8f56828e34a0b2b";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libX11/default.nix b/pkgs/development/libraries/xlibs/libX11/default.nix
index b1b4512557a..469e9a9f9d4 100644
--- a/pkgs/development/libraries/xlibs/libX11/default.nix
+++ b/pkgs/development/libraries/xlibs/libX11/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libX11-6.2.1";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libX11-6.2.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libX11-6.2.1.tar.bz2;
     md5 = "59b6fa7cd6fe7ee1da92fd1b56d1cee3";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXau/default.nix b/pkgs/development/libraries/xlibs/libXau/default.nix
index 1742ed793fe..d7510d1ea8e 100644
--- a/pkgs/development/libraries/xlibs/libXau/default.nix
+++ b/pkgs/development/libraries/xlibs/libXau/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXau-0.1.1";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXau-0.1.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXau-0.1.1.tar.bz2;
     md5 = "3d747ada4a7d17538fa21c62d5608656";
   };
   buildInputs = [pkgconfig xproto];
diff --git a/pkgs/development/libraries/xlibs/libXaw/default.nix b/pkgs/development/libraries/xlibs/libXaw/default.nix
index d803ae8bcdf..8b1912ba8d2 100644
--- a/pkgs/development/libraries/xlibs/libXaw/default.nix
+++ b/pkgs/development/libraries/xlibs/libXaw/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXaw-7.0.2";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libXaw-7.0.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXaw-7.0.2.tar.bz2;
     md5 = "30d569f9560c1daac184d5be8085ce37";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXext/default.nix b/pkgs/development/libraries/xlibs/libXext/default.nix
index 5014126c7bf..66ec8d784c9 100644
--- a/pkgs/development/libraries/xlibs/libXext/default.nix
+++ b/pkgs/development/libraries/xlibs/libXext/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXext-6.4.3";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libXext-6.4.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXext-6.4.3.tar.bz2;
     md5 = "b7117194e69867905da9701dff56f3ee";
   };
   buildInputs = [pkgconfig xproto xextensions libX11];
diff --git a/pkgs/development/libraries/xlibs/libXft/default.nix b/pkgs/development/libraries/xlibs/libXft/default.nix
index 0b4cf606865..c9c2bb3758a 100644
--- a/pkgs/development/libraries/xlibs/libXft/default.nix
+++ b/pkgs/development/libraries/xlibs/libXft/default.nix
@@ -6,7 +6,7 @@
 (stdenv.mkDerivation {
   name = "libXft-2.1.6";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libXft-2.1.6.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXft-2.1.6.tar.bz2;
     md5 = "ba10c9c3f4758f304f04f8d48e2f81a4";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXi/default.nix b/pkgs/development/libraries/xlibs/libXi/default.nix
index 8a111d9ae3c..799f441eb28 100644
--- a/pkgs/development/libraries/xlibs/libXi/default.nix
+++ b/pkgs/development/libraries/xlibs/libXi/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXi-6.0.1";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libXi-6.0.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXi-6.0.1.tar.bz2;
     md5 = "7e935a42428d63a387b3c048be0f2756";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXinerama/default.nix b/pkgs/development/libraries/xlibs/libXinerama/default.nix
index b40669378cc..f97d37931b0 100644
--- a/pkgs/development/libraries/xlibs/libXinerama/default.nix
+++ b/pkgs/development/libraries/xlibs/libXinerama/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXinerama-1.0.2";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libXinerama-1.0.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXinerama-1.0.2.tar.bz2;
     md5 = "637b2c5758d2de558670428d33178174";
   };
   buildInputs = [pkgconfig panoramixext];
diff --git a/pkgs/development/libraries/xlibs/libXmu/default.nix b/pkgs/development/libraries/xlibs/libXmu/default.nix
index aa583a5fd32..da243f20449 100644
--- a/pkgs/development/libraries/xlibs/libXmu/default.nix
+++ b/pkgs/development/libraries/xlibs/libXmu/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXmu-6.2.3";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libXmu-6.2.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXmu-6.2.3.tar.bz2;
     md5 = "7671745bd8a1b0595847541479a327d6";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXpm/default.nix b/pkgs/development/libraries/xlibs/libXpm/default.nix
index 49cdeab89f9..e0897621c5d 100644
--- a/pkgs/development/libraries/xlibs/libXpm/default.nix
+++ b/pkgs/development/libraries/xlibs/libXpm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXpm-3.5.1";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libXpm-3.5.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXpm-3.5.1.tar.bz2;
     md5 = "733e20a60c3343531b50bcc48348fd3e";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXrender/default.nix b/pkgs/development/libraries/xlibs/libXrender/default.nix
index 28d8ae6a5aa..e82d4c4ef8a 100644
--- a/pkgs/development/libraries/xlibs/libXrender/default.nix
+++ b/pkgs/development/libraries/xlibs/libXrender/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXrender-0.8.4";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXrender-0.8.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXrender-0.8.4.tar.bz2;
     md5 = "c745339dbe5f05cff8950b71a739e34c";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXtrans/default.nix b/pkgs/development/libraries/xlibs/libXtrans/default.nix
index a3e03d5c432..a4839f3e699 100644
--- a/pkgs/development/libraries/xlibs/libXtrans/default.nix
+++ b/pkgs/development/libraries/xlibs/libXtrans/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXtrans-0.1";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXtrans-0.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXtrans-0.1.tar.bz2;
     md5 = "a5ae4c7a75f930053b8327f7bd0c1361";
   };
 }
diff --git a/pkgs/development/libraries/xlibs/libXv/default.nix b/pkgs/development/libraries/xlibs/libXv/default.nix
index 4927b978346..bfaada1198d 100644
--- a/pkgs/development/libraries/xlibs/libXv/default.nix
+++ b/pkgs/development/libraries/xlibs/libXv/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXv-2.2.2";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/libXv-2.2.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXv-2.2.2.tar.bz2;
     md5 = "cdd6a79bac8807da83c008dac42fdddb";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/panoramixext/default.nix b/pkgs/development/libraries/xlibs/panoramixext/default.nix
index fd2472b3cfe..538a92096b2 100644
--- a/pkgs/development/libraries/xlibs/panoramixext/default.nix
+++ b/pkgs/development/libraries/xlibs/panoramixext/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "panoramixext-1.1";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/panoramixext-1.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/panoramixext-1.1.tar.bz2;
     md5 = "129f8623dc4f70188a015e3cbd7eae82";
   };
 }
diff --git a/pkgs/development/libraries/xlibs/renderext/default.nix b/pkgs/development/libraries/xlibs/renderext/default.nix
index ba2ece31974..11dfb25cce8 100644
--- a/pkgs/development/libraries/xlibs/renderext/default.nix
+++ b/pkgs/development/libraries/xlibs/renderext/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "renderext-0.8";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/xlibs-1.0/renderext-0.8.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/renderext-0.8.tar.bz2;
     md5 = "b00a97b00bf93ab2ac6442ea13ea9c0b";
   };
 }
diff --git a/pkgs/development/libraries/xlibs/xextensions/default.nix b/pkgs/development/libraries/xlibs/xextensions/default.nix
index cd309ddb49d..b7e77f6bd64 100644
--- a/pkgs/development/libraries/xlibs/xextensions/default.nix
+++ b/pkgs/development/libraries/xlibs/xextensions/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xextensions-1.0.1";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xextensions-1.0.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xextensions-1.0.1.tar.bz2;
     md5 = "e61bca2a4757b736c9557dc8a7df2217";
   };
 }
diff --git a/pkgs/development/libraries/xlibs/xproto/default.nix b/pkgs/development/libraries/xlibs/xproto/default.nix
index 8793a663fbc..f2ac6ea2580 100644
--- a/pkgs/development/libraries/xlibs/xproto/default.nix
+++ b/pkgs/development/libraries/xlibs/xproto/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xproto-6.6.1";
   src = fetchurl {
-    url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xproto-6.6.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xproto-6.6.1.tar.bz2;
     md5 = "8a7546a607dcd61b2ee595c763fd7f85";
   };
 }
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 43b6fcb28e7..91cd2660c08 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "zlib-1.2.1";
   src = fetchurl {
-    url = http://www.gzip.org/zlib/zlib-1.2.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zlib-1.2.1.tar.gz;
     md5 = "ef1cb003448b4a53517b8f25adb12452";
   };
   configureFlags = "--shared";
diff --git a/pkgs/development/libraries/zvbi/default.nix b/pkgs/development/libraries/zvbi/default.nix
index a02e0adea26..58ca60e57e6 100644
--- a/pkgs/development/libraries/zvbi/default.nix
+++ b/pkgs/development/libraries/zvbi/default.nix
@@ -7,7 +7,7 @@ assert pngSupport -> libpng != null;
 stdenv.mkDerivation {
   name = "zvbi-0.2.8";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.8.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zvbi-0.2.8.tar.bz2;
     md5 = "8701d3e4387cd896ff8b68831b57d814";
   };
   buildInputs = [x11 (if pngSupport then libpng else null)];