summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2005-02-15 14:44:19 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2005-02-15 14:44:19 +0000
commite42507d1825b1536f6c6bb486ec8c17f80da4d01 (patch)
tree25fce0d5f602a29525cca5e344de5d8fd3223715
parente5c1afb9c19aa1df33f8ff77660356df8c40bdd7 (diff)
downloadnixpkgs-e42507d1825b1536f6c6bb486ec8c17f80da4d01.tar
nixpkgs-e42507d1825b1536f6c6bb486ec8c17f80da4d01.tar.gz
nixpkgs-e42507d1825b1536f6c6bb486ec8c17f80da4d01.tar.bz2
nixpkgs-e42507d1825b1536f6c6bb486ec8c17f80da4d01.tar.lz
nixpkgs-e42507d1825b1536f6c6bb486ec8c17f80da4d01.tar.xz
nixpkgs-e42507d1825b1536f6c6bb486ec8c17f80da4d01.tar.zst
nixpkgs-e42507d1825b1536f6c6bb486ec8c17f80da4d01.zip
* 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
-rw-r--r--pkgs/applications/audio/cdparanoia/default.nix2
-rw-r--r--pkgs/applications/audio/flac/default.nix2
-rw-r--r--pkgs/applications/audio/lame/default.nix2
-rw-r--r--pkgs/applications/editors/eclipse/default.nix2
-rw-r--r--pkgs/applications/editors/emacs/default.nix2
-rw-r--r--pkgs/applications/editors/emacs/modes/cua/default.nix2
-rw-r--r--pkgs/applications/editors/emacs/modes/haskell/default.nix2
-rw-r--r--pkgs/applications/editors/emacs/modes/nxml/default.nix2
-rw-r--r--pkgs/applications/editors/nano/default.nix2
-rw-r--r--pkgs/applications/editors/vim/default.nix2
-rw-r--r--pkgs/applications/graphics/gqview/default.nix2
-rw-r--r--pkgs/applications/misc/acrobat-reader/default.nix2
-rw-r--r--pkgs/applications/misc/hello/ex-1/default.nix2
-rw-r--r--pkgs/applications/misc/hello/ex-2/default.nix2
-rw-r--r--pkgs/applications/misc/xchm/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/firefox/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/lynx/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/sylpheed/default.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird/default.nix2
-rw-r--r--pkgs/applications/networking/newsreaders/pan/default.nix2
-rw-r--r--pkgs/applications/version-management/rcs/default.nix2
-rw-r--r--pkgs/applications/version-management/subversion-1.0.x/default.nix2
-rw-r--r--pkgs/applications/version-management/subversion-1.1.x/default.nix2
-rw-r--r--pkgs/applications/video/MPlayer/default.nix4
-rw-r--r--pkgs/applications/video/MPlayer/win32codecs/default.nix2
-rw-r--r--pkgs/applications/video/mythtv/default.nix2
-rw-r--r--pkgs/applications/video/vlc/default.nix2
-rw-r--r--pkgs/applications/video/xine-ui/default.nix2
-rw-r--r--pkgs/applications/video/zapping/default.nix2
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix2
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix2
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh3
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix2
-rw-r--r--pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix2
-rw-r--r--pkgs/development/compilers/blackdown/blackdown-i686.nix2
-rw-r--r--pkgs/development/compilers/gcc-2.95/default.nix2
-rw-r--r--pkgs/development/compilers/gcc-3.3/default.nix2
-rw-r--r--pkgs/development/compilers/gcc-3.4/default.nix2
-rw-r--r--pkgs/development/compilers/gcc-static-3.4/default.nix2
-rw-r--r--pkgs/development/compilers/ghc/boot.nix2
-rw-r--r--pkgs/development/compilers/ghc/default.nix2
-rw-r--r--pkgs/development/compilers/gwydion-dylan/binary.nix2
-rw-r--r--pkgs/development/compilers/gwydion-dylan/default.nix2
-rw-r--r--pkgs/development/compilers/nasm/default.nix2
-rw-r--r--pkgs/development/compilers/ocaml/default.nix2
-rw-r--r--pkgs/development/interpreters/clisp/default.nix2
-rw-r--r--pkgs/development/interpreters/kaffe/default.nix2
-rw-r--r--pkgs/development/interpreters/octave/default.nix2
-rw-r--r--pkgs/development/interpreters/python/default.nix2
-rw-r--r--pkgs/development/libraries/SDL/default.nix2
-rw-r--r--pkgs/development/libraries/a52dec/default.nix2
-rw-r--r--pkgs/development/libraries/aterm/default.nix2
-rw-r--r--pkgs/development/libraries/audiofile/default.nix2
-rw-r--r--pkgs/development/libraries/boehm-gc/default.nix2
-rw-r--r--pkgs/development/libraries/chmlib/default.nix2
-rw-r--r--pkgs/development/libraries/db4/default.nix2
-rw-r--r--pkgs/development/libraries/expat/default.nix2
-rw-r--r--pkgs/development/libraries/freetype/default.nix2
-rw-r--r--pkgs/development/libraries/gettext/default.nix2
-rw-r--r--pkgs/development/libraries/glibc/default.nix4
-rw-r--r--pkgs/development/libraries/gnet/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/GConf/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/ORBit2/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/esound/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/gnome-mime-data/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/gnome-vfs/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/libIDL/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/libart_lgpl/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/libbonobo/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/libbonoboui/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/libglade/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/libgnome/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/libgnomecanvas/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/libgnomeui/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-1.x/glib/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.2/atk/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.2/glib/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.2/pango/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.4/atk/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.4/glib/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.4/pango/default.nix2
-rw-r--r--pkgs/development/libraries/java/aterm/default.nix2
-rw-r--r--pkgs/development/libraries/java/jjtraveler/default.nix2
-rw-r--r--pkgs/development/libraries/java/saxon/default.nix2
-rw-r--r--pkgs/development/libraries/java/saxon/default8.nix2
-rw-r--r--pkgs/development/libraries/java/shared-objects/default.nix2
-rw-r--r--pkgs/development/libraries/libcdaudio/default.nix2
-rw-r--r--pkgs/development/libraries/libdvdcss/default.nix2
-rw-r--r--pkgs/development/libraries/libdvdplay/default.nix2
-rw-r--r--pkgs/development/libraries/libdvdread/default.nix2
-rw-r--r--pkgs/development/libraries/libjpeg/default.nix2
-rw-r--r--pkgs/development/libraries/libmad/default.nix2
-rw-r--r--pkgs/development/libraries/libogg/default.nix2
-rw-r--r--pkgs/development/libraries/libpng/default.nix2
-rw-r--r--pkgs/development/libraries/libsigsegv/default.nix2
-rw-r--r--pkgs/development/libraries/libtiff/default.nix2
-rw-r--r--pkgs/development/libraries/libvorbis/default.nix2
-rw-r--r--pkgs/development/libraries/libxml2/default.nix2
-rw-r--r--pkgs/development/libraries/libxslt/default.nix2
-rw-r--r--pkgs/development/libraries/mesa/default.nix4
-rw-r--r--pkgs/development/libraries/mpeg2dec/default.nix2
-rw-r--r--pkgs/development/libraries/ncurses/default.nix2
-rw-r--r--pkgs/development/libraries/openssl/default.nix2
-rw-r--r--pkgs/development/libraries/pcre/default.nix2
-rw-r--r--pkgs/development/libraries/popt/default.nix2
-rw-r--r--pkgs/development/libraries/qt-3/default.nix2
-rw-r--r--pkgs/development/libraries/readline/default.nix2
-rw-r--r--pkgs/development/libraries/rte/default.nix2
-rw-r--r--pkgs/development/libraries/scrollkeeper/default.nix2
-rw-r--r--pkgs/development/libraries/wxGTK-2.5/default.nix2
-rw-r--r--pkgs/development/libraries/wxGTK/default.nix2
-rw-r--r--pkgs/development/libraries/xine-lib/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/fontconfig/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libICE/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libSM/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libX11/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXau/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXaw/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXext/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXft/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXi/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXinerama/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXmu/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXpm/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXrender/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXtrans/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXv/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/panoramixext/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/renderext/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/xextensions/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/xproto/default.nix2
-rw-r--r--pkgs/development/libraries/zlib/default.nix2
-rw-r--r--pkgs/development/libraries/zvbi/default.nix2
-rw-r--r--pkgs/development/perl-modules/XML-Parser/default.nix2
-rw-r--r--pkgs/development/python-modules/wxPython-2.5/default.nix2
-rw-r--r--pkgs/development/python-modules/wxPython/default.nix2
-rw-r--r--pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix2
-rw-r--r--pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix2
-rw-r--r--pkgs/development/tools/build-managers/gnumake/default.nix2
-rw-r--r--pkgs/development/tools/documentation/xdoc/default.nix2
-rw-r--r--pkgs/development/tools/java/jclasslib/default.nix2
-rw-r--r--pkgs/development/tools/misc/autoconf/default.nix2
-rw-r--r--pkgs/development/tools/misc/automake/automake-1.7.9.nix2
-rw-r--r--pkgs/development/tools/misc/automake/automake-1.9.4.nix2
-rw-r--r--pkgs/development/tools/misc/binutils/default.nix2
-rw-r--r--pkgs/development/tools/misc/gnum4/default.nix2
-rw-r--r--pkgs/development/tools/misc/gperf/default.nix2
-rw-r--r--pkgs/development/tools/misc/libtool/default.nix2
-rw-r--r--pkgs/development/tools/misc/pkgconfig/default.nix2
-rw-r--r--pkgs/development/tools/misc/strace/default.nix2
-rw-r--r--pkgs/development/tools/misc/swig/default.nix2
-rw-r--r--pkgs/development/tools/misc/texinfo/default.nix2
-rw-r--r--pkgs/development/tools/misc/valgrind/default.nix2
-rw-r--r--pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix2
-rw-r--r--pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix2
-rw-r--r--pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix2
-rw-r--r--pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix2
-rw-r--r--pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix2
-rw-r--r--pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix2
-rw-r--r--pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix2
-rw-r--r--pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix2
-rw-r--r--pkgs/development/tools/parsing/bison/bison-new.nix2
-rw-r--r--pkgs/development/tools/parsing/bison/default.nix2
-rw-r--r--pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix2
-rw-r--r--pkgs/development/tools/parsing/error-support/error-support-0.1.nix2
-rw-r--r--pkgs/development/tools/parsing/flex/default.nix2
-rw-r--r--pkgs/development/tools/parsing/flex/flex-new.nix2
-rw-r--r--pkgs/development/tools/parsing/happy/default.nix2
-rw-r--r--pkgs/development/tools/parsing/pgen/pgen-2.0.nix2
-rw-r--r--pkgs/development/tools/parsing/pgen/pgen-2.1.nix2
-rw-r--r--pkgs/development/tools/parsing/pgen/pgen-2.2.nix2
-rw-r--r--pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix2
-rw-r--r--pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix2
-rw-r--r--pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix2
-rw-r--r--pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix2
-rw-r--r--pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix2
-rw-r--r--pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix2
-rw-r--r--pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix2
-rw-r--r--pkgs/development/tools/parsing/sglr/sglr-3.11.nix2
-rw-r--r--pkgs/development/tools/parsing/sglr/sglr-3.12.nix2
-rw-r--r--pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix2
-rw-r--r--pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix2
-rw-r--r--pkgs/games/generator/default.nix2
-rw-r--r--pkgs/games/zoom/default.nix2
-rw-r--r--pkgs/misc/uml-utilities/default.nix2
-rw-r--r--pkgs/misc/uml/default.nix4
-rw-r--r--pkgs/os-specific/linux/alsa/library/default.nix2
-rw-r--r--pkgs/os-specific/linux/e2fsprogs/default.nix2
-rw-r--r--pkgs/os-specific/linux/iputils/default.nix2
-rw-r--r--pkgs/os-specific/linux/kernel-headers/default.nix2
-rw-r--r--pkgs/os-specific/linux/net-tools/default.nix2
-rw-r--r--pkgs/os-specific/linux/procps/default.nix2
-rw-r--r--pkgs/os-specific/linux/shadow/default.nix2
-rw-r--r--pkgs/os-specific/linux/sysvinit/default.nix2
-rw-r--r--pkgs/os-specific/linux/util-linux/default.nix2
-rw-r--r--pkgs/servers/http/apache-httpd/default.nix2
-rw-r--r--pkgs/servers/http/jetty/default.nix2
-rw-r--r--pkgs/servers/http/tomcat/default.nix2
-rw-r--r--pkgs/servers/sql/mysql/default.nix2
-rw-r--r--pkgs/servers/sql/postgresql/default.nix2
-rw-r--r--pkgs/servers/x11/xfree86/default.nix6
-rw-r--r--pkgs/shells/bash/default.nix2
-rw-r--r--pkgs/system/all-packages-generic.nix18
-rw-r--r--pkgs/tools/archivers/gnutar/default.nix2
-rw-r--r--pkgs/tools/archivers/unzip/default.nix2
-rw-r--r--pkgs/tools/archivers/zip/default.nix2
-rw-r--r--pkgs/tools/compression/bsdiff/default.nix2
-rw-r--r--pkgs/tools/compression/bzip2/default.nix2
-rw-r--r--pkgs/tools/compression/gzip/default.nix2
-rw-r--r--pkgs/tools/compression/zdelta/default.nix2
-rw-r--r--pkgs/tools/graphics/graphviz/default.nix4
-rw-r--r--pkgs/tools/misc/coreutils/default.nix2
-rw-r--r--pkgs/tools/misc/findutils/default.nix2
-rw-r--r--pkgs/tools/misc/getopt/default.nix2
-rw-r--r--pkgs/tools/misc/less/default.nix2
-rw-r--r--pkgs/tools/misc/screen/default.nix2
-rw-r--r--pkgs/tools/misc/xmltv/default.nix2
-rw-r--r--pkgs/tools/misc/xsel/default.nix2
-rw-r--r--pkgs/tools/networking/bittorrent/default.nix2
-rw-r--r--pkgs/tools/networking/cksfv/default.nix2
-rw-r--r--pkgs/tools/networking/openssh/default.nix2
-rw-r--r--pkgs/tools/networking/par2cmdline/default.nix2
-rw-r--r--pkgs/tools/networking/wget/default.nix2
-rw-r--r--pkgs/tools/security/mktemp/default.nix2
-rw-r--r--pkgs/tools/security/nmap/default.nix2
-rw-r--r--pkgs/tools/system/which/default.nix2
-rw-r--r--pkgs/tools/text/diffutils/default.nix2
-rw-r--r--pkgs/tools/text/ed/default.nix2
-rw-r--r--pkgs/tools/text/enscript/default.nix2
-rw-r--r--pkgs/tools/text/gawk/default.nix2
-rw-r--r--pkgs/tools/text/gnupatch/default.nix2
-rw-r--r--pkgs/tools/text/gnused/default.nix2
-rw-r--r--pkgs/tools/text/xml/jing/default.nix2
-rw-r--r--pkgs/tools/typesetting/hevea/default.nix2
240 files changed, 254 insertions, 257 deletions
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 0d741899cdf..298e790fe2e 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "cdparanoia-III-alpha9.8";
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cdparanoia-III-alpha9.8.src.tgz;
     md5 = "7218e778b5970a86c958e597f952f193" ;
   };
   
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 707b44be8a6..8238d3b9e55 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "flac-1.1.1";
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/flac/flac-1.1.1.tar.gz ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flac-1.1.1.tar.gz;
     md5 = "c6ccddccf8ad344065698047c2fc7280" ;
   };
 
diff --git a/pkgs/applications/audio/lame/default.nix b/pkgs/applications/audio/lame/default.nix
index d995dc8222e..be615308391 100644
--- a/pkgs/applications/audio/lame/default.nix
+++ b/pkgs/applications/audio/lame/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "lame-3.96.1";
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/lame/lame-3.96.1.tar.gz ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lame-3.96.1.tar.gz;
     md5 = "e1206c46a5e276feca11a7149e2fc6ac" ;
   };
 }
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 86570d90a31..cee38c18e54 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -11,7 +11,7 @@ let {
 
   bindist = 
     fetchurl {
-      url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/R-3.0.1-200409161125/eclipse-SDK-3.0.1-linux-gtk.zip;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/eclipse-SDK-3.0.1-linux-gtk.zip;
       md5 = "d0f743c972adf13e71a43b2dc6c9c55b";
     };
 }
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 0c4fefcba0d..08e46ea5b16 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "emacs-21.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/emacs/emacs-21.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/emacs-21.3.tar.gz;
     md5 = "a0bab457cbf5b4f8eb99d1d0a3ada420";
   };
   patches = [./patchfile];
diff --git a/pkgs/applications/editors/emacs/modes/cua/default.nix b/pkgs/applications/editors/emacs/modes/cua/default.nix
index f68a5cea2ec..fa6a3f66b56 100644
--- a/pkgs/applications/editors/emacs/modes/cua/default.nix
+++ b/pkgs/applications/editors/emacs/modes/cua/default.nix
@@ -2,7 +2,7 @@
   name = "cua-mode-2.10";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cua.dk/cua.el;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
     md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
   };
 }
diff --git a/pkgs/applications/editors/emacs/modes/haskell/default.nix b/pkgs/applications/editors/emacs/modes/haskell/default.nix
index 33a29ae7dde..c75c1caf133 100644
--- a/pkgs/applications/editors/emacs/modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs/modes/haskell/default.nix
@@ -2,7 +2,7 @@
   name = "haskell-mode-1.45";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.haskell.org/haskell-mode/haskell-mode-1.45.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
     md5 = "c609998580cdb9ca8888c7d47d22ca3b";
   };
 }
diff --git a/pkgs/applications/editors/emacs/modes/nxml/default.nix b/pkgs/applications/editors/emacs/modes/nxml/default.nix
index 5bb8e0da12f..c807cd21e4d 100644
--- a/pkgs/applications/editors/emacs/modes/nxml/default.nix
+++ b/pkgs/applications/editors/emacs/modes/nxml/default.nix
@@ -2,7 +2,7 @@
   name = "nxml-mode-20041004";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.thaiopensource.com/download/nxml-mode-20041004.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
     md5 = "ac137024cf337d6f11d8ab278d39b4db";
   };
 }
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index da63babb60e..0a7eb76477f 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "nano-1.2.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.nano-editor.org/dist/v1.2/nano-1.2.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nano-1.2.4.tar.gz;
     md5 = "2c513310ec5e8b63abaecaf48670ac7a";
   };
 
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index c0c8b61125b..0eace652a74 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
  
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.vim.org/mirror/vim/unix/vim-6.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/vim-6.3.tar.bz2;
     md5 = "821fda8f14d674346b87e3ef9cb96389";
   };
  
diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index 3bc1331b6ac..31a33878455 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "gqview-1.4.5";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.4.5.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-1.4.5.tar.gz;
     md5 = "b196935767c2d3dc61243d9ed0801c2e";
   };
 
diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix
index ea4ea30a472..cba6c08f207 100644
--- a/pkgs/applications/misc/acrobat-reader/default.nix
+++ b/pkgs/applications/misc/acrobat-reader/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "acrobat-reader-5.0.9";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ardownload.adobe.com/pub/adobe/acrobatreader/unix/5.x/linux-509.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-509.tar.gz;
     md5 = "53b7ca0fc83ab81214ba82050ce89c64";
   };
   buildInputs = [patchelf];
diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix
index ac127af6ce5..de2454cf1e3 100644
--- a/pkgs/applications/misc/hello/ex-1/default.nix
+++ b/pkgs/applications/misc/hello/ex-1/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "hello-2.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
   inherit perl;
diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix
index 017ccf617ed..48931d8654c 100644
--- a/pkgs/applications/misc/hello/ex-2/default.nix
+++ b/pkgs/applications/misc/hello/ex-2/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "hello-2.1.1";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
   buildInputs = [perl];
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 5681acba13a..3a791647f9f 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xchm-0.9.1";
   src = fetchurl {
-    url = http://belnet.dl.sourceforge.net/sourceforge/xchm/xchm-0.9.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xchm-0.9.1.tar.gz;
     md5 = "5ba671e09e4c3ac46ffb5ce9d2c985eb";
   };
   buildInputs = [wxGTK chmlib];
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index c89240d4254..a8533cfee4a 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -7,7 +7,7 @@
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/firefox/releases/1.0/source/firefox-1.0-source.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/firefox-1.0-source.tar.bz2;
     md5 = "49c16a71f4de014ea471be81e46b1da8";
   };
 
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index f98ff83682f..2df161bfe13 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "lynx-2.8.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://lynx.isc.org/release/lynx2.8.5.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lynx2.8.5.tar.bz2;
     md5 = "d1e5134e5d175f913c16cb6768bc30eb";
   };
   inherit ncurses;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index f2f88430aaa..2412cbdc1c3 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/install_flash_player_7_linux.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz;
     md5 = "79c59a5ea29347e01c8e6575dd054cd1";
   };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index 11a47e4d0a4..94ed76abcd5 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-2.70.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mplayerplug-in-2.70.tar.gz;
     md5 = "90784c7ccb40037b446053f0c1d1c2b4";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index cada3132e05..7095f086e09 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://sylpheed.good-day.net/sylpheed/sylpheed-1.0.0.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sylpheed-1.0.0.tar.bz2;
     md5 = "864c4fc581a5ab1c7af5e06153c76769";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 92b821f5229..59bdf29174b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.artfiles.org/mozilla.org/thunderbird/releases/0.8/thunderbird-source-0.8.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/thunderbird-source-0.8.tar.bz2;
     md5 = "76de1827d66ac482cfc4dd32e7b1e257";
   };
 
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index de3c9de6bd6..191fb8fb490 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "pan-0.14.2.91";
 
   src = fetchurl {
-    url = http://pan.rebelbase.com/download/releases/0.14.2.91/SOURCE/pan-0.14.2.91.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pan-0.14.2.91.tar.bz2;
     md5 = "4770d899a1c1ba968ce96bc5aeb07b62";
   };
 
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index 3689a783ed0..36469ce3036 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rcs-5.7";
   # builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.cs.purdue.edu/pub/RCS/rcs-5.7.tar;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/rcs-5.7.tar;
     md5 = "f7b3f106bf87ff6344df38490f6a02c5";
   };
 }
diff --git a/pkgs/applications/version-management/subversion-1.0.x/default.nix b/pkgs/applications/version-management/subversion-1.0.x/default.nix
index ee1a25d4ca0..dcf5abb159a 100644
--- a/pkgs/applications/version-management/subversion-1.0.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.0.x/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/tarballs/subversion-1.0.9.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.0.9.tar.bz2;
     md5 = "d6b4c240f5e2a589a694e64e4ad27feb";
   };
 
diff --git a/pkgs/applications/version-management/subversion-1.1.x/default.nix b/pkgs/applications/version-management/subversion-1.1.x/default.nix
index f1a2202b2f9..a047e00402c 100644
--- a/pkgs/applications/version-management/subversion-1.1.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.1.x/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/tarballs/subversion-1.1.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.1.2.tar.bz2;
     md5 = "b93a792b6bc610dc6c1c254591979a8c";
   };
 
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index b086504ff52..c3118cbf482 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre6a.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/MPlayer-1.0pre6a.tar.bz2;
     md5 = "a812d945b884c2e2fa7f90c57cd76bff";
   };
   fonts = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/font-arial-iso-8859-1.tar.bz2;
     md5 = "1ecd31d17b51f16332b1fcc7da36b312";
   };
 
diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.nix b/pkgs/applications/video/MPlayer/win32codecs/default.nix
index b9b892b1015..cc5ab3199df 100644
--- a/pkgs/applications/video/MPlayer/win32codecs/default.nix
+++ b/pkgs/applications/video/MPlayer/win32codecs/default.nix
@@ -2,7 +2,7 @@
   name = "MPlayer-codecs-essential-20050115";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www1.mplayerhq.hu/MPlayer/releases/codecs/essential-20050115.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/essential-20050115.tar.bz2;
     md5 = "b627e5710c6f2bf38fc2a6ef81c13be8";
   };
 }
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index d494df00b38..9cbd58b1fc4 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.mythtv.org/mc/mythtv-0.16.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mythtv-0.16.tar.bz2;
     md5 = "0eba17cf64c96ea3ead23e7e15419cc0";
   };
 
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index a9d32dddca8..4ea0636c139 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "vlc-0.7.2";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/0.7.2/vlc-0.7.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/vlc-0.7.2.tar.gz;
     md5 = "25dfcc804cb92f46c0b64ce1466515cc";
   };
 
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index c1f376f4dc1..0d66a14ba2e 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xine-ui-0.99.3";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xine-ui-0.99.3.tar.gz;
     md5 = "aa7805a93e511e3d67dc1bf09a71fcdd";
   };
   buildInputs = [x11 xineLib libpng];
diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix
index 4840e5300ac..e5e68d6d557 100644
--- a/pkgs/applications/video/zapping/default.nix
+++ b/pkgs/applications/video/zapping/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zapping-0.7.tar.bz2;
     md5 = "dd7b3d920509709692c41c9c6c767746";
   };
 
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
index c3bd87a6d2f..8b76ea38ba7 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "docbook-xml-4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xml-4.2.zip;
     md5 = "73fe50dfe74ca631c1602f558ed8961f";
   };
   buildInputs = [unzip];
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
index 93b5165724e..3ceef6e2823 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "docbook-xml-4.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xml-4.3.zip;
     md5 = "ab200202b9e136a144db1e0864c45074";
   };
   buildInputs = [unzip];
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh
index f7396c0624a..c806d1d33fe 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh
@@ -2,7 +2,6 @@
 
 mkdir -p $out/xml/dtd/docbook-ebnf
 cd $out/xml/dtd/docbook-ebnf
-stripHash $dtd
-cp -p $dtd $strippedName
+cp -p $dtd dbebnf.dtd
 stripHash $catalog
 cp -p $catalog $strippedName
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
index 5d5a622ba42..eeda6b0b6cd 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "docbook-xml-ebnf-1.2b1";
   builder = ./builder.sh;
   dtd = fetchurl {
-    url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/dbebnf-1.2b1.dtd;
     md5 = "e50f7d38caf4285965c7a247e026fa7c";
   };
   catalog = ./docbook-ebnf.cat;
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
index b53cda07332..b5306b6448e 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "docbook-xsl-1.65.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.65.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xsl-1.65.1.tar.gz;
     md5 = "2f7d446de5523ec34a19ccbe8caf387f";
   };
 }
diff --git a/pkgs/development/compilers/blackdown/blackdown-i686.nix b/pkgs/development/compilers/blackdown/blackdown-i686.nix
index ac597cab615..b190be8334c 100644
--- a/pkgs/development/compilers/blackdown/blackdown-i686.nix
+++ b/pkgs/development/compilers/blackdown/blackdown-i686.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   dirname = "j2sdk1.4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/os/Linux/java/jdk/JDK-1.4.2/i386/rc1/j2sdk-1.4.2-rc1-linux-i586-gcc3.2.bin;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/j2sdk-1.4.2-rc1-linux-i586-gcc3.2.bin;
     md5 = "52ff3a059845ee8487faeaa7b0c157c8";
   };
 }
diff --git a/pkgs/development/compilers/gcc-2.95/default.nix b/pkgs/development/compilers/gcc-2.95/default.nix
index c95a9027758..ce5c56487fb 100644
--- a/pkgs/development/compilers/gcc-2.95/default.nix
+++ b/pkgs/development/compilers/gcc-2.95/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "gcc-2.95.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.gnu.org/pub/gnu/gcc/gcc-2.95.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gcc-2.95.3.tar.gz;
     md5 = "f3ad4f32c2296fad758ed051b5ac8e28";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/gcc-3.3/default.nix b/pkgs/development/compilers/gcc-3.3/default.nix
index 46b6a2d863e..18bae3528ed 100644
--- a/pkgs/development/compilers/gcc-3.3/default.nix
+++ b/pkgs/development/compilers/gcc-3.3/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "gcc-3.3.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gcc-3.3.3.tar.bz2;
     md5 = "3c6cfd9fcd180481063b4058cf6faff2";
   };
   inherit noSysDirs langC langCC langF77;
diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix
index 16a27a37525..0d9df73a423 100644
--- a/pkgs/development/compilers/gcc-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-3.4/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "gcc-3.4.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.4.3/gcc-3.4.3.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gcc-3.4.3.tar.bz2;
     md5 = "e744b30c834360fccac41eb7269a3011";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/gcc-static-3.4/default.nix b/pkgs/development/compilers/gcc-static-3.4/default.nix
index 9699b521e67..4809e593fea 100644
--- a/pkgs/development/compilers/gcc-static-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-static-3.4/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gcc-static-3.4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.4.2/gcc-3.4.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gcc-3.4.2.tar.bz2;
     md5 = "2fada3a3effd2fd791df09df1f1534b3";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix
index 956486390f2..8ba747bbf22 100644
--- a/pkgs/development/compilers/ghc/boot.nix
+++ b/pkgs/development/compilers/ghc/boot.nix
@@ -7,7 +7,7 @@ assert stdenv.system == "i686-linux";
 stdenv.mkDerivation {
   name = "ghc-6.2.1";
   src = fetchurl {
-    url = http://www.haskell.org/ghc/dist/6.2.1/ghc-6.2.1-i386-unknown-linux.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ghc-6.2.1-i386-unknown-linux.tar.bz2;
     md5 = "48d9d6b9f7bf1f15d69e8bd732ee254c";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix
index c5f9ab7fb14..e23f98f47ea 100644
--- a/pkgs/development/compilers/ghc/default.nix
+++ b/pkgs/development/compilers/ghc/default.nix
@@ -5,7 +5,7 @@ assert perl != null && ghc != null && m4 != null;
 stdenv.mkDerivation {
   name = "ghc-6.2.1";
   src = fetchurl {
-    url = http://www.haskell.org/ghc/dist/6.2.1/ghc-6.2.1-src.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ghc-6.2.1-src.tar.bz2;
     md5 = "fa9f90fd6b8852679c5fc16509e94d7a";
   };
   buildInputs = [perl ghc m4];
diff --git a/pkgs/development/compilers/gwydion-dylan/binary.nix b/pkgs/development/compilers/gwydion-dylan/binary.nix
index 0ac942d14b8..6e606c1abd1 100644
--- a/pkgs/development/compilers/gwydion-dylan/binary.nix
+++ b/pkgs/development/compilers/gwydion-dylan/binary.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "binary-gwydion-dylan-2.4.0";
   builder = ./binary-builder.sh;
   src = fetchurl {
-    url = http://www.gwydiondylan.org/downloads/binaries/linux/x86/tar/gwydion-dylan-2.4.0-x86-linux.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gwydion-dylan-2.4.0-x86-linux.tar.gz;
     md5 = "52643ad51a455d21fd4d5bf82d98914c";
   };
 }
diff --git a/pkgs/development/compilers/gwydion-dylan/default.nix b/pkgs/development/compilers/gwydion-dylan/default.nix
index 7c00e65d7cc..7d9feba592b 100644
--- a/pkgs/development/compilers/gwydion-dylan/default.nix
+++ b/pkgs/development/compilers/gwydion-dylan/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gwydion-dylan-2.4.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.gwydiondylan.org/downloads/src/tar/gwydion-dylan-2.4.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gwydion-dylan-2.4.0.tar.gz;
     md5 = "7ed180bf4ef11e8e8da3bd78b45477a8";
   };
 
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index a68db7c6ef5..9415c36dfc0 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "nasm-0.98.38";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/nasm/nasm-0.98.38.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nasm-0.98.38.tar.bz2;
     md5 = "9f682490c132b070d54e395cb6ee145e";
   };
 }
diff --git a/pkgs/development/compilers/ocaml/default.nix b/pkgs/development/compilers/ocaml/default.nix
index 448825720e0..f2850b7647b 100644
--- a/pkgs/development/compilers/ocaml/default.nix
+++ b/pkgs/development/compilers/ocaml/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ocaml-3.08.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ocaml-3.08.0.tar.gz;
     md5 = "c6ef478362295c150101cdd2efcd38e0";
   };
   configureScript = ./configure;
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 5a76d045dd4..051b0aa5523 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "clisp-2.33.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://belnet.dl.sourceforge.net/sourceforge/clisp/clisp-2.33.2.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/clisp-2.33.2.tar.bz2;
     md5 = "ee4ea316db1e843dcb16094bf500012f";
   };
 
diff --git a/pkgs/development/interpreters/kaffe/default.nix b/pkgs/development/interpreters/kaffe/default.nix
index 6f7ba6c18e9..d4e5bf4e109 100644
--- a/pkgs/development/interpreters/kaffe/default.nix
+++ b/pkgs/development/interpreters/kaffe/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "kaffe-1.1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/kaffe-1.1.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/kaffe-1.1.4.tar.gz;
     md5 = "94d6e7035ba68c2221dce68bb5b3f6e9";
   };
   inherit jikes alsaLib;
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index a026d7b843b..2a891b4dbab 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -6,7 +6,7 @@ assert g77.langF77;
 stdenv.mkDerivation {
   name = "octave-2.1.64";
   src = fetchurl {
-    url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.1.64.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/octave-2.1.64.tar.bz2;
     md5 = "01ec8b13bd850123b190129be93adc1f";
   };
   buildInputs = [g77 readline ncurses perl];
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 9e6236892b5..f8035598247 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null;
 stdenv.mkDerivation {
   name = "python-2.3.4";
   src = fetchurl {
-    url = http://www.python.org/ftp/python/2.3.4/Python-2.3.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/Python-2.3.4.tar.bz2;
     md5 = "a2c089faa2726c142419c03472fc4063";
   };
   buildInputs = [
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)];
diff --git a/pkgs/development/perl-modules/XML-Parser/default.nix b/pkgs/development/perl-modules/XML-Parser/default.nix
index 3f41b632703..7d8a4bbb7c4 100644
--- a/pkgs/development/perl-modules/XML-Parser/default.nix
+++ b/pkgs/development/perl-modules/XML-Parser/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "perl-XML-Parser-2.34";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.34.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-Parser-2.34.tar.gz;
     md5 = "84d9e0001fe01c14867256c3fe115899";
   };
   perl = perl;
diff --git a/pkgs/development/python-modules/wxPython-2.5/default.nix b/pkgs/development/python-modules/wxPython-2.5/default.nix
index acc67e2a053..dce3aa56741 100644
--- a/pkgs/development/python-modules/wxPython-2.5/default.nix
+++ b/pkgs/development/python-modules/wxPython-2.5/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "wxPython-2.5.2.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.5.2.8.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wxPythonSrc-2.5.2.8.tar.gz;
     md5 = "573fd376fd39b66ad5fbf44b487aa0b2";
   };
   buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
diff --git a/pkgs/development/python-modules/wxPython/default.nix b/pkgs/development/python-modules/wxPython/default.nix
index c4844568a3f..5382d0a766e 100644
--- a/pkgs/development/python-modules/wxPython/default.nix
+++ b/pkgs/development/python-modules/wxPython/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "wxPython-2.4.2.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.2.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wxPythonSrc-2.4.2.4.tar.gz;
     md5 = "ea4eb68e10a0c2a9be643b35dcb78e41";
   };
   buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
index 070cc4071ad..33c81878d26 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   builder = ./core-builder.sh;
   src = fetchurl {
-    url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.1-bin.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/apache-ant-1.6.1-bin.tar.bz2;
     md5 = "703d0265d05b98afd95be0bc21b98420";
   };
 }
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
index a5fec1fdfd0..1fd0810ede4 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   builder = ./core-builder.sh;
   src = fetchurl {
-    url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.2-bin.tar.bz2 ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/apache-ant-1.6.2-bin.tar.bz2;
     md5 = "a568c7271c3f168771c0313926d060fa";
   };
 }
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 16347e39fd1..0826092439c 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnumake-3.80";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/make/make-3.80.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/make-3.80.tar.bz2;
     md5 = "0bbd1df101bc0294d440471e50feca71";
   };
   patches = [./log.diff];
diff --git a/pkgs/development/tools/documentation/xdoc/default.nix b/pkgs/development/tools/documentation/xdoc/default.nix
index cc56d7e133e..571bce45352 100644
--- a/pkgs/development/tools/documentation/xdoc/default.nix
+++ b/pkgs/development/tools/documentation/xdoc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xdoc-0.1";
   src = fetchurl {
-    url = http://machina.nl/xdoc/xdoc-0.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xdoc-0.1.tar.gz;
     md5 = "6f601254013d5fe3d2fdbd33b827001a";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/tools/java/jclasslib/default.nix b/pkgs/development/tools/java/jclasslib/default.nix
index 9aa08d2ce69..a81c8f6032e 100644
--- a/pkgs/development/tools/java/jclasslib/default.nix
+++ b/pkgs/development/tools/java/jclasslib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jclasslib-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://belnet.dl.sourceforge.net/sourceforge/jclasslib/jclasslib_unix_2_0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jclasslib_unix_2_0.tar.gz;
     md5 = "31d91bb03fee23410689d2f1c4c439b1";
   };
 
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 7af57fb703a..9e189a4af7a 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "autoconf-2.58";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.58.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/autoconf-2.58.tar.bz2;
     md5 = "db3fa3069c6554b3505799c7e1022e2b";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/misc/automake/automake-1.7.9.nix b/pkgs/development/tools/misc/automake/automake-1.7.9.nix
index e8c23bfa80e..13b1b738086 100644
--- a/pkgs/development/tools/misc/automake/automake-1.7.9.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.7.9.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/automake/automake-1.7.9.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/automake-1.7.9.tar.bz2;
     md5 = "571fd0b0598eb2a27dcf68adcfddfacb";
   };
   buildInputs = [perl autoconf];
diff --git a/pkgs/development/tools/misc/automake/automake-1.9.4.nix b/pkgs/development/tools/misc/automake/automake-1.9.4.nix
index 7d0f58cc550..e5bcd4fc680 100644
--- a/pkgs/development/tools/misc/automake/automake-1.9.4.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.9.4.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/automake/automake-1.9.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/automake-1.9.4.tar.gz;
     md5 = "5b46bde56e321a7bab7832168cf0b9b8";
   };
   buildInputs = [perl autoconf];
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 21d03b19c5a..307de63c7fc 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "binutils-2.15";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/binutils/binutils-2.15.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/binutils-2.15.tar.bz2;
     md5 = "624e6b74983ac6b2960edaf2d522ca58";
   };
   patches = [./no-lex.patch];
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 408c97a3563..788c32cf6b8 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "gnum4-1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/m4/m4-1.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/m4-1.4.tar.gz;
     md5 = "9eb2dd07740b2d2f3c7adb3e8d299bda";
   };
 }
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index ded80edca83..0ded5fe27b5 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gperf-2.7.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/gperf/gperf-2.7.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gperf-2.7.2.tar.gz;
     md5 = "e501acc2e18eed2c8f25ca0ac2330d68";
   };
 }
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 9bf3574fec6..c59b26f613f 100644
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libtool-1.5.2";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libtool-1.5.2.tar.gz;
     md5 = "db66ba05502f533ad0cfd84dc0e03bd5";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 0dae1094666..b15f04264aa 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pkgconfig-0.15.0.tar.gz;
     md5 = "a7e4f60a6657dbc434334deb594cc242";
   };
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 2463420540c..111ff74f575 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/strace/strace-4.5.6.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/strace-4.5.6.tar.bz2;
     md5 = "2dd9d23430957a7ee0221efb28c66d1e";
   };
 }
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index e8ba2d23f98..6c043e3025b 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/swig/swig-1.3.19.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/swig-1.3.19.tar.gz;
     md5 = "a733455544426b31868dd87fc162e750";
   };
 
diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix
index d97f8ffbbe1..b48f4695c2a 100644
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ b/pkgs/development/tools/misc/texinfo/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "texinfo-4.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/texinfo-4.6.tar.gz;
     md5 = "5730c8c0c7484494cca7a7e2d7459c64";
   };
   inherit ncurses;
diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix
index 8c3ff3e8a13..c98c2fe0756 100644
--- a/pkgs/development/tools/misc/valgrind/default.nix
+++ b/pkgs/development/tools/misc/valgrind/default.nix
@@ -8,7 +8,7 @@
 stdenv.mkDerivation {
   name = "valgrind-2.2.0";
   src = fetchurl {
-    url = http://developer.kde.org/~sewardj/valgrind-2.2.0.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/valgrind-2.2.0.tar.bz2;
     md5 = "30dc51f6fc94751b90b04af9c2e2c656";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix b/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
index b12b4af1c86..7ecdbbf6041 100644
--- a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asc-support-1.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asc-support/asc-support-1.8.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asc-support-1.8.tar.gz;
     md5 = "e85a790c6004dfb974d79fc9699f69f4";
   };
   inherit stdenv aterm ptsupport toolbuslib asfsupport;
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix b/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
index a7710ea952b..ebc4f64ca39 100644
--- a/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asc-support-1.9";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asc-support/asc-support-1.9.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asc-support-1.9.tar.gz;
     md5 = "0c395efec4d3b582af016ab03306ed0a";
   };
   inherit stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix b/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
index 9559bf75d7a..666ab439778 100644
--- a/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asc-support-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asc-support/asc-support-2.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asc-support-2.0.tar.gz;
     md5 = "34368ca79e524157bf6e89281371cb5a";
   };
   inherit stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix b/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
index d31e3c6e059..6232a5bbe5a 100644
--- a/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
+++ b/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "asf-library-1.0";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-library/asf-library-1.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-library-1.0.tar.gz;
     md5 = "e531f78941e2d2dab1b87a56522e9fb5";
   };
 }
diff --git a/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix b/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
index 5722012b89c..31162b7b2d5 100644
--- a/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
+++ b/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "asf-library-1.1";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-library/asf-library-1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-library-1.1.tar.gz;
     md5 = "09b2ccbd115434cedb180e5575d0fa98";
   };
 }
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
index eb97ad9cf0e..49ad29229d7 100644
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asf-support-1.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-support/asf-support-1.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-support-1.2.tar.gz;
     md5 = "f32de4c97e62486b67e0af4408585980";
   };
   inherit stdenv aterm ptsupport;
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
index cc9056e9ee0..b970a9483dd 100644
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asf-support-1.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-support/asf-support-1.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-support-1.3.tar.gz;
     md5 = "23539387ff9b0423c1c1933a8ff75d27";
   };
   inherit stdenv aterm ptsupport errorsupport;
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
index 5cfea08dbf7..c6043a289bb 100644
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asf-support-1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-support/asf-support-1.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-support-1.4.tar.gz;
     md5 = "520ea7d73094346d3010187f22927870";
   };
   inherit stdenv aterm ptsupport errorsupport;
diff --git a/pkgs/development/tools/parsing/bison/bison-new.nix b/pkgs/development/tools/parsing/bison/bison-new.nix
index e0791b4ab41..00a7f87e776 100644
--- a/pkgs/development/tools/parsing/bison/bison-new.nix
+++ b/pkgs/development/tools/parsing/bison/bison-new.nix
@@ -5,7 +5,7 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-1.875d";
   src = fetchurl {
-    url = ftp://alpha.gnu.org/pub/gnu/bison/bison-1.875d.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bison-1.875d.tar.gz;
     md5 = "faaa4a271ca722fb6c769d72e18ade0b";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 7c08550b87f..ba3926878c4 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -5,7 +5,7 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-1.875";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/bison/bison-1.875.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2;
     md5 = "b7f8027b249ebd4dd0cc948943a71af0";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix b/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
index fb24c55a2b9..a55892155f5 100644
--- a/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
+++ b/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "error-support-0.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/error-support/error-support-0.1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/error-support-0.1.1.tar.gz;
     md5 = "ebd0965e29ee22508a189477b1dae12b";
   };
   inherit aterm toolbuslib;
diff --git a/pkgs/development/tools/parsing/error-support/error-support-0.1.nix b/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
index 58d0c9e03fa..d84b641a6ad 100644
--- a/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
+++ b/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "error-support-0.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/error-support/error-support-0.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/error-support-0.1.tar.gz;
     md5 = "906389fd8b44bf2847d8281450d5a701";
   };
   inherit aterm toolbuslib;
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index efaed6e459f..c386c2be476 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -5,7 +5,7 @@ assert yacc != null;
 stdenv.mkDerivation {
   name = "flex-2.5.4a";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/non-gnu/flex/flex-2.5.4a.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flex-2.5.4a.tar.gz;
     md5 = "bd8753d0b22e1f4ec87a553a73021adf";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/flex/flex-new.nix b/pkgs/development/tools/parsing/flex/flex-new.nix
index e102a1d0793..fddd8eaa6cd 100644
--- a/pkgs/development/tools/parsing/flex/flex-new.nix
+++ b/pkgs/development/tools/parsing/flex/flex-new.nix
@@ -8,7 +8,7 @@ assert yacc != null && m4 != null;
 stdenv.mkDerivation {
   name = "flex-2.5.31";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/lex/flex-2.5.31.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flex-2.5.31.tar.bz2;
     md5 = "363dcc4afc917dc51306eb9d3de0152f";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/happy/default.nix b/pkgs/development/tools/parsing/happy/default.nix
index ac3fb088bba..2bfc703deb7 100644
--- a/pkgs/development/tools/parsing/happy/default.nix
+++ b/pkgs/development/tools/parsing/happy/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "happy-1.14";
   src = fetchurl {
-    url = http://www.haskell.org/happy/dist/1.14/happy-1.14-src.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/happy-1.14-src.tar.gz;
     md5 = "501b5b63533b2e2838de18085e8c4492";
   };
   buildInputs = [ghc perl];
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix b/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
index 8eea83cea0a..1e0d80eab0d 100644
--- a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgen-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pgen/pgen-2.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pgen-2.0.tar.gz;
     md5 = "368cd8abeed29591a35660d8cea79975";
   };
   inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr;
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.1.nix b/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
index de6132881a2..5758dfb9a16 100644
--- a/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgen-2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pgen/pgen-2.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pgen-2.1.tar.gz;
     md5 = "3fd46ae1ddc891a488f74350d7b477f9";
   };
   inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.2.nix b/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
index 731b981b1a3..70d4fd0fc83 100644
--- a/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgen-2.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pgen/pgen-2.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pgen-2.2.tar.gz;
     md5 = "e23323a96d7b1f72a0e10673fa93ef7c";
   };
   inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
index ed8bde95c0e..39b0c203183 100644
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pt-support-1.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pt-support/pt-support-1.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pt-support-1.0.tar.gz;
     md5 = "cc96dc2bfbaf3f218dfe9a0b8bb4d801";
   };
   inherit aterm toolbuslib;
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
index 9058917f05f..6ba2bf7450d 100644
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pt-support-1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pt-support/pt-support-1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pt-support-1.1.tar.gz;
     md5 = "51bad46427c7cf95d029c33f079581ff";
   };
   inherit aterm toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
index fb7de5d3844..b86a615a4a7 100644
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pt-support-1.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pt-support/pt-support-1.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pt-support-1.2.tar.gz;
     md5 = "2ba2fa388130b11b9b91970ebe20c1c7";
   };
   inherit aterm toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
index 4b314887a91..167db88a5f2 100644
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sdf-support-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sdf-support/sdf-support-2.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sdf-support-2.0.tar.gz;
     md5 = "2987b89ed1d73e34e128b895ff44264c";
   };
   inherit stdenv aterm ptsupport toolbuslib;
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
index 5a2eb7bcfea..33d9c6da380 100644
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sdf-support-2.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sdf-support/sdf-support-2.1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sdf-support-2.1.1.tar.gz;
     md5 = "28b2c044ee711d6c5f22772b7dfafb76";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
index 61746eb099b..e0c1b697cc0 100644
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sdf-support-2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sdf-support/sdf-support-2.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sdf-support-2.1.tar.gz;
     md5 = "dbb1d3c51a82dadfaaf5319dba5cc9ef";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix b/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
index 5a464ad40e5..6bc56630770 100644
--- a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sglr-3.10.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sglr/sglr-3.10.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sglr-3.10.2.tar.gz;
     md5 = "39aa609be84115d7ddc56a6c74b792b7";
   };
   inherit stdenv aterm ptsupport toolbuslib;
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.11.nix b/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
index 9e3b9563508..181387bf621 100644
--- a/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sglr-3.11";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sglr/sglr-3.11.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sglr-3.11.tar.gz;
     md5 = "c60536c7e967e93d1ec2cd9c8ae0a4ae";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.12.nix b/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
index 0ecfa5d42db..dc6dfa8ee7a 100644
--- a/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sglr-3.12";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sglr/sglr-3.12.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sglr-3.12.tar.gz;
     md5 = "053753e419adfc337c4776412e3787ab";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
index 4b93aa24baf..e14be3815ee 100644
--- a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
+++ b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "toolbuslib-0.5.1";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.5.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/toolbuslib-0.5.1.tar.gz;
     md5 = "1c7c7cce870f813bef60bbffdf061c90";
   };
   buildInputs = [aterm];
diff --git a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
index c49ac9f0663..22b37a0d58a 100644
--- a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
+++ b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "toolbuslib-0.6";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/toolbuslib-0.6.tar.gz;
     md5 = "e117c574b428408ad172b1ad904ff430";
   };
   buildInputs = [aterm];
diff --git a/pkgs/games/generator/default.nix b/pkgs/games/generator/default.nix
index aa2322ee935..36ab9e035d2 100644
--- a/pkgs/games/generator/default.nix
+++ b/pkgs/games/generator/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "generator-0.35-cbiere";
   src = fetchurl {
-    url = http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/generator-0.35-cbiere.tar.bz2;
     md5 = "6ec4379d8c6c794ec59b9d61e73fb73d";
   };
   configureFlags = "--with-gtk --with-raze --with-sdl-audio";
diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix
index eb3e5eb6230..bdf4554eb31 100644
--- a/pkgs/games/zoom/default.nix
+++ b/pkgs/games/zoom/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation {
   name = "zoom-1.0.2alpha1";
   src = fetchurl {
-    url = http://www.logicalshift.demon.co.uk/unix/zoom/zoom-1.0.2alpha1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zoom-1.0.2alpha1.tar.gz;
     md5 = "91b2fe444028178aa3b23bd0e3ae1a61";
   };
   buildInputs = [perl expat xlibs freetype];
diff --git a/pkgs/misc/uml-utilities/default.nix b/pkgs/misc/uml-utilities/default.nix
index b6c6d7ea98f..452c498d6c7 100644
--- a/pkgs/misc/uml-utilities/default.nix
+++ b/pkgs/misc/uml-utilities/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "uml-utilities-20040114";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://unc.dl.sourceforge.net/sourceforge/user-mode-linux/uml_utilities_20040114.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/uml_utilities_20040114.tar.bz2;
     md5 = "1fd5b791ef32c6a3ed4ae42c4a53a316";
   };
 }
diff --git a/pkgs/misc/uml/default.nix b/pkgs/misc/uml/default.nix
index 7f4b0e6d8f1..2b763a6b24b 100644
--- a/pkgs/misc/uml/default.nix
+++ b/pkgs/misc/uml/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation {
   name = "uml-2.4.27-1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.27.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-2.4.27.tar.bz2;
     md5 = "59a2e6fde1d110e2ffa20351ac8b4d9e";
   };
   umlPatch = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/user-mode-linux/uml-patch-2.4.27-1.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/uml-patch-2.4.27-1.bz2;
     md5 = "63178bbd3a383a1005738f4628ff583e";
   };
   noAioPatch = ./no-aio.patch;
diff --git a/pkgs/os-specific/linux/alsa/library/default.nix b/pkgs/os-specific/linux/alsa/library/default.nix
index ffbc9b4089c..07c6b07fcf5 100644
--- a/pkgs/os-specific/linux/alsa/library/default.nix
+++ b/pkgs/os-specific/linux/alsa/library/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "alsa-lib-1.0.3b";
   src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.3b.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/alsa-lib-1.0.3b.tar.bz2;
     md5 = "8ade68f0e9d44a039a741052985a8635";
   };
 }
diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix
index 9d4e6f24734..23ec7be5b3d 100644
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "e2fsprogs-1.34";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.34.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/e2fsprogs-1.34.tar.gz;
     md5 = "9be9375224f0970a55e39ebebf2a0ce5";
   };
   inherit gettext;
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 34029bdddd6..0e253f68e20 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "iputils";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.tux.org/pub/net/ip-routing/iputils-ss021109-try.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/iputils-ss021109-try.tar.bz2;
     md5 = "dd10ef3d76480990a2174d2bb0daddaf";
   };
 
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 11084510cd5..2981ccb0cef 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "linux-headers-2.4.25-i386";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.de.kernel.org/pub/linux/kernel/v2.4/linux-2.4.25.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-2.4.25.tar.bz2;
     md5 = "5fc8e9f43fa44ac29ddf9a9980af57d8";
   };
 }
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index d93870c1b25..3fb269943fc 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "net-tools-1.60";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/net-tools-1.60.tar.bz2;
     md5 = "888774accab40217dde927e21979c165";
   };
   config = ./config.h;
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index 7d4be912f3d..64658f29aa3 100644
--- a/pkgs/os-specific/linux/procps/default.nix
+++ b/pkgs/os-specific/linux/procps/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "procps-3.2.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://procps.sourceforge.net/procps-3.2.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/procps-3.2.4.tar.gz;
     md5 = "1bec6740b385b3f73800827437f14f85";
   };
   patches = [./makefile.patch];
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 3c61962ba6e..59c81079884 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
    
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.pld.org.pl/software/shadow/shadow-4.0.6.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/shadow-4.0.6.tar.bz2;
     md5 = "3ca79b02c0aaa82128f4c32cb68ffe4f";
   };
    
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 37036d24a1d..0f8cf21b26e 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sysvinit-2.85";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.85.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sysvinit-2.85.tar.gz;
     md5 = "8a2d8f1ed5a2909da04132fefa44905e";
   };
   srcPatch = ./patch;
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index fb624cba0fe..f2c0fcb245f 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "util-linux-2.12";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.cwi.nl/aeb/util-linux/util-linux-2.12.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/util-linux-2.12.tar.gz;
     md5 = "997adf78b98d9d1c5db4f37ea982acff";
   };
   mconfigPatch = ./MCONFIG.patch;
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index f0aff0c8058..89e61553ec2 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://archive.apache.org/dist/httpd/httpd-2.0.52.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/httpd-2.0.52.tar.bz2;
     md5 = "0e1b47c53921a1fc8fb006effdb3bf1c";
   };
 
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 20cc2b22332..b561b56b351 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   builder = ./bin-builder.sh;
 
   src = fetchurl {
-    url = http://belnet.dl.sourceforge.net/sourceforge/jetty/jetty-4.2.22.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jetty-4.2.22.tar.gz;
     md5 = "e89c582d1846cd7d31e402abaf801e17";
   };
 }
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 4ea86930bc8..16ab4bb5d17 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://apache.essentkabel.com/jakarta/tomcat-5/v5.0.27/bin/jakarta-tomcat-5.0.27.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jakarta-tomcat-5.0.27.tar.gz;
     md5 = "b802ee042677e284bcf65738c7bdc3b6";
   };
 
diff --git a/pkgs/servers/sql/mysql/default.nix b/pkgs/servers/sql/mysql/default.nix
index 40d9500d1fb..b13675bea44 100644
--- a/pkgs/servers/sql/mysql/default.nix
+++ b/pkgs/servers/sql/mysql/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 #  builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/mysql-4.1.9.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mysql-4.1.9.tar.gz;
     md5 = "7bc44befe155d619c4e4705f68874278";
   };
 
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index c3f80fce61d..e587ca7a957 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://ftp2.nl.postgresql.org/mirror/postgresql/src/7.4.5/postgresql-7.4.5.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/postgresql-7.4.5.tar.bz2;
     md5 = "97e750c8e69c208b75b6efedc5a36efb";
   };
 
diff --git a/pkgs/servers/x11/xfree86/default.nix b/pkgs/servers/x11/xfree86/default.nix
index 63eff2baf02..67a26d41a4b 100644
--- a/pkgs/servers/x11/xfree86/default.nix
+++ b/pkgs/servers/x11/xfree86/default.nix
@@ -12,15 +12,15 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   hostdef = ./host.def;
   src1 = fetchurl {
-    url = ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-1.tgz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/X430src-1.tgz;
     md5 = "4f241a4f867363f40efa2b00dca292af";
   };
   src2 = fetchurl {
-    url = ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-2.tgz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/X430src-2.tgz;
     md5 = "844c2ee908d21dbf8911fd13115bf8b4";
   };
   src3 = fetchurl {
-    url = ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-3.tgz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/X430src-3.tgz;
     md5 = "b82a0443e1b7bf860e4343e6b6766cb6";
   };
 
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index f112bd78b0f..84d2270c092 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bash-3.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/bash/bash-3.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bash-3.0.tar.gz;
     md5 = "26c4d642e29b3533d8d754995bc277b3";
   };
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index fc87926313c..dde45d50578 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -711,7 +711,7 @@ rec {
   perlXMLTwig = import ../development/perl-modules/generic perl {
     name = "XML-Twig-3.15";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/M/MI/MIROD/XML-Twig-3.15.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-Twig-3.15.tar.gz;
       md5 = "b26886b8bd19761fff37b23e4964b499";
     };
     propagatedBuildInputs = [perlXMLParser];
@@ -720,7 +720,7 @@ rec {
   perlXMLWriter = import ../development/perl-modules/generic perl {
     name = "XML-Writer-0.520";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/J/JO/JOSEPHW/XML-Writer-0.520.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-Writer-0.520.tar.gz;
       md5 = "0a194acc70c906c0be32f4b2b7a9f689";
     };
   };
@@ -728,7 +728,7 @@ rec {
   perlTermReadKey = import ../development/perl-modules/generic perl {
     name = "TermReadKey-2.30";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/J/JS/JSTOWE/TermReadKey-2.30.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/TermReadKey-2.30.tar.gz;
       md5 = "f0ef2cea8acfbcc58d865c05b0c7e1ff";
     };
   };
@@ -736,7 +736,7 @@ rec {
   perlDateManip = import ../development/perl-modules/generic perl {
     name = "DateManip-5.42a";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/DateManip-5.42a.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/DateManip-5.42a.tar.gz;
       md5 = "648386bbf46d021ae283811f75b07bdf";
     };
   };
@@ -744,7 +744,7 @@ rec {
   perlHTMLTree = import ../development/perl-modules/generic perl {
     name = "HTML-Tree-3.18";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/S/SB/SBURKE/HTML-Tree-3.18.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/HTML-Tree-3.18.tar.gz;
       md5 = "6a9e4e565648c9772e7d8ec6d4392497";
     };
   };
@@ -752,7 +752,7 @@ rec {
   perlHTMLParser = import ../development/perl-modules/generic perl {
     name = "HTML-Parser-3.45";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.45.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/HTML-Parser-3.45.tar.gz;
       md5 = "c2ac1379ac5848dd32e24347cd679391";
     };
   };
@@ -760,7 +760,7 @@ rec {
   perlHTMLTagset = import ../development/perl-modules/generic perl {
     name = "HTML-Tagset-3.04";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/S/SB/SBURKE/HTML-Tagset-3.04.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/HTML-Tagset-3.04.tar.gz;
       md5 = "b82e0f08c1ececefe98b891f30dd56a6";
     };
   };
@@ -768,7 +768,7 @@ rec {
   perlURI = import ../development/perl-modules/generic perl {
     name = "URI-1.35";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.35.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/URI-1.35.tar.gz;
       md5 = "1a933b1114c41a25587ee59ba8376f7c";
     };
   };
@@ -776,7 +776,7 @@ rec {
   perlLWP = import ../development/perl-modules/generic perl {
     name = "libwww-perl-5.803";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.803.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libwww-perl-5.803.tar.gz;
       md5 = "3345d5f15a4f42350847254141725c8f";
     };
     propagatedBuildInputs = [perlURI perlHTMLParser];
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index e901dcb0f04..e8aeb929f71 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnutar-1.14";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/tar/tar-1.14.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tar-1.14.tar.bz2;
     md5 = "f1932e0fbd4641885bfdcc75495c91b7";
   };
 }
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index c871c7755d6..8f68baa2e7d 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "unzip-5.50";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/unzip550.tar.gz;
     md5 = "798592d62e37f92571184236947122ed";
   };
 }
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index d5f8f910a7e..055ea5f4b60 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -2,7 +2,7 @@
   name = "zip-2.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.info-zip.org/pub/infozip/src/zip23.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zip23.tar.gz;
     md5 = "5206a99541f3b0ab90f1baa167392c4f";
   };
 }
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
index 9f1c3ecf8bc..2e761e6bcd3 100644
--- a/pkgs/tools/compression/bsdiff/default.nix
+++ b/pkgs/tools/compression/bsdiff/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bsdiff-4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.daemonology.net/bsdiff/bsdiff-4.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bsdiff-4.2.tar.gz;
     md5 = "9f582a77eb76d116d82d1ad268ef48fa";
   };
   patches = [./makefile.patch];
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index afe2a620377..128a5d71a2c 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bzip2-1.0.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bzip2-1.0.2.tar.gz;
     md5 = "ee76864958d568677f03db8afad92beb";
   };
 }
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 7e324fc9127..fded4d785a6 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gzip-1.3.3";
   src = fetchurl {
-    url = http://www.gzip.org/gzip-1.3.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gzip-1.3.3.tar.gz;
     md5 = "52eaf713673507d21f7abefee98ba662";
   };
 }
diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix
index 8bd6d8a0e16..466b3b4191b 100644
--- a/pkgs/tools/compression/zdelta/default.nix
+++ b/pkgs/tools/compression/zdelta/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "zdelta-2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://cis.poly.edu/zdelta/downloads/zdelta-2.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zdelta-2.1.tar.gz;
     md5 = "c69583a64f42f69a39e297d0d27d77e5";
   };
 }
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 8e03439e32e..e29554c78ac 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -6,9 +6,7 @@ stdenv.mkDerivation {
   name = "graphviz-1.12";
 
   src = fetchurl {
-#    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz;
-#    md5 = "e1402531abff68d146bf94e72b44dc2a";
-    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/graphviz-1.12.tar.gz;
     md5 = "a5c004c42f58c957f772060d0889059c";
   };
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 01b5044fbeb..4e5b6f17f75 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "coreutils-5.2.1";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-5.2.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/coreutils-5.2.1.tar.bz2;
     md5 = "172ee3c315af93d3385ddfbeb843c53f";
   };
 }
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index ea209910629..6210f5e3fc5 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "findutils-4.1.20";
   src = fetchurl {
-    url = ftp://alpha.gnu.org/pub/gnu/findutils/findutils-4.1.20.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/findutils-4.1.20.tar.gz;
     md5 = "e90ce7222daadeb8616b8db461e17cbc";
   };
 }
diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix
index b02648e8c93..bac1293004c 100644
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/pkgs/tools/misc/getopt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "getopt-1.1.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://huizen.dds.nl/~frodol/getopt-1.1.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/getopt-1.1.3.tar.gz;
     md5 = "7b7637dcb0ac531f1af29f4d6b018e86";
   };
 }
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index db5a1180914..9b9d382a575 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
  
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/less/less-382.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/less-382.tar.gz;
     md5 = "103fe4aef6297b93f0f73f38cc3b1bd7";
   };
  
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 4fffe641333..44528e08855 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "screen-4.0.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/screen/screen-4.0.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/screen-4.0.2.tar.gz;
     md5 = "ed68ea9b43d9fba0972cb017a24940a1";
   };
 
diff --git a/pkgs/tools/misc/xmltv/default.nix b/pkgs/tools/misc/xmltv/default.nix
index be5e85cc20f..cd50e7c9301 100644
--- a/pkgs/tools/misc/xmltv/default.nix
+++ b/pkgs/tools/misc/xmltv/default.nix
@@ -6,7 +6,7 @@
 import ../../../development/perl-modules/generic perl {
   name = "xmltv-0.5.37";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/xmltv/xmltv-0.5.37.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xmltv-0.5.37.tar.bz2;
     md5 = "40b7675cc1b7632065ebbd1e0ecf860f";
   };
   makeMakerFlags = "-components tv_grab_nl";
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index 5c8d6f37c7c..283edf2ea67 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/pkgs/tools/misc/xsel/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xsel-0.9.6";
   src = fetchurl {
-    url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-0.9.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xsel-0.9.6.tar.gz;
     md5 = "cec2fb09a4101b7f2beab8094234e2f4";
   };
 
diff --git a/pkgs/tools/networking/bittorrent/default.nix b/pkgs/tools/networking/bittorrent/default.nix
index c4b19c9f807..f516ea4225a 100644
--- a/pkgs/tools/networking/bittorrent/default.nix
+++ b/pkgs/tools/networking/bittorrent/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "bittorrent-3.4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/bittorrent/BitTorrent-3.4.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/BitTorrent-3.4.2.tar.gz;
     md5 = "b854f25a33289565bcaeaded04955c1a";
   };
   inherit wxPython;
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index 643355eb5d2..70c48c4be13 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/pkgs/tools/networking/cksfv/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cksfv-1.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.fodder.org/cksfv/cksfv-1.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cksfv-1.3.tar.gz;
     md5 = "e00cf6a80a566539eb6f3432f2282c38";
   };
 }
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index f5ca543f70b..0afb683a647 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
  
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.bit.nl/mirror/openssh/openssh-3.8.1p1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/openssh-3.8.1p1.tar.gz;
     md5 = "1dbfd40ae683f822ae917eebf171ca42";
   };
  
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index 3c669d20c68..005eb46da2e 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -2,7 +2,7 @@
   name = "par2cmdline-0.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/parchive/par2cmdline-0.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/par2cmdline-0.3.tar.gz;
     md5 = "705c97bc41b862d281dd41c219a60849";
   };
 }
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 95f59ca1238..9429a181b60 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "wget-1.9.1";
   src = fetchurl {
-    url = ftp://ftp.nl.net/pub/gnu/wget/wget-1.9.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wget-1.9.1.tar.gz;
     md5 = "e6051f1e1487ec0ebfdbda72bedc70ad";
   };
 }
diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix
index 279448baded..33e9580cead 100644
--- a/pkgs/tools/security/mktemp/default.nix
+++ b/pkgs/tools/security/mktemp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.5.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mktemp-1.5.tar.gz;
     md5 = "9a35c59502a228c6ce2be025fc6e3ff2";
   };
   
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 0e32a8f6dc0..6230ea978ec 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://download.insecure.org/nmap/dist/nmap-3.55.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nmap-3.55.tar.bz2;
     md5 = "88b5f010f43b0e2ee0c2cfb468796aa9";
   };
   
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix
index 0c9f6b6a776..6cfe25183b9 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/pkgs/tools/system/which/default.nix
@@ -2,7 +2,7 @@
   name = "which-2.16";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/which/which-2.16.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/which-2.16.tar.gz;
     md5 = "830b83af48347a9a3520f561e47cbc9b";
   };
 }
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 783bf5d06f7..847c494c3d2 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "diffutils-2.8.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/diffutils-2.8.1.tar.gz;
     md5 = "71f9c5ae19b60608f6c7f162da86a428";
   };
   /* If no explicit coreutils is given, use the one from stdenv. */
diff --git a/pkgs/tools/text/ed/default.nix b/pkgs/tools/text/ed/default.nix
index dbbd944e05e..f25f62d04d1 100644
--- a/pkgs/tools/text/ed/default.nix
+++ b/pkgs/tools/text/ed/default.nix
@@ -2,7 +2,7 @@
   name = "ed-0.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.gnu.org/pub/gnu/ed/ed-0.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ed-0.2.tar.gz;
     md5 = "ddd57463774cae9b50e70cd51221281b";
   };
 }
diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix
index 67dc4302d03..a84c6eb5178 100644
--- a/pkgs/tools/text/enscript/default.nix
+++ b/pkgs/tools/text/enscript/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "enscript-1.6.4";
   src = fetchurl {
-    url = http://www.iki.fi/mtr/genscript/enscript-1.6.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/enscript-1.6.4.tar.gz;
     md5 = "b5174b59e4a050fb462af5dbf28ebba3";
   };
 }
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index be599115e67..34db9ba3afa 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gawk-3.1.4";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gawk/gawk-3.1.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gawk-3.1.4.tar.bz2;
     md5 = "b8b532beaf02350e69d2d5dc98cb1e37";
   };
 }
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index e5e02730e6d..c11afc38eeb 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -2,7 +2,7 @@
   name = "gnupatch-2.5.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/patch/patch-2.5.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/patch-2.5.4.tar.gz;
     md5 = "ee5ae84d115f051d87fcaaef3b4ae782";
   };
 }
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index da970828cbe..c88c339aa59 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnused-4.1.2";
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/sed/sed-4.1.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sed-4.1.2.tar.gz;
     md5 = "928f0e06422f414091917401f1a834d0";
   };
 }
diff --git a/pkgs/tools/text/xml/jing/default.nix b/pkgs/tools/text/xml/jing/default.nix
index 5b7c0803fc8..3e261d9e618 100644
--- a/pkgs/tools/text/xml/jing/default.nix
+++ b/pkgs/tools/text/xml/jing/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./unzip-builder.sh;
 
   src = fetchurl {
-    url = http://www.thaiopensource.com/download/jing-20030619.zip;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jing-20030619.zip;
     md5 = "f9b0775d8740f16ab3df82ad3707a093";
   };
 
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index dfa8a43974a..aa44e64af7a 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -2,7 +2,7 @@
   name = "hevea-1.07";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://pauillac.inria.fr/~maranget/hevea/distri/hevea-1.07.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hevea-1.07.tar.gz;
     md5 = "561d7a2c10ea9e6a5b352c24d9b65998";
   };
   buildInputs = [ocaml];