summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/audio/xmms/default.nix2
-rw-r--r--pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix2
-rw-r--r--pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix2
-rw-r--r--pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix2
-rw-r--r--pkgs/applications/editors/eclipse/plugins/spoofax/default.nix2
-rw-r--r--pkgs/applications/editors/emacs/default.nix2
-rw-r--r--pkgs/applications/editors/nedit/default.nix2
-rw-r--r--pkgs/applications/graphics/gimp/default.nix2
-rw-r--r--pkgs/applications/graphics/gqview/default.nix2
-rw-r--r--pkgs/applications/graphics/inkscape/default.nix2
-rw-r--r--pkgs/applications/misc/cdrtools/default.nix2
-rw-r--r--pkgs/applications/misc/pinfo/default.nix2
-rw-r--r--pkgs/applications/misc/xchm/default.nix2
-rw-r--r--pkgs/applications/misc/xpdf/default.nix2
-rw-r--r--pkgs/applications/misc/xterm/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/firefox/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/links/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/mozilla/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/w3m/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/gaim/default.nix2
-rw-r--r--pkgs/applications/networking/irc/xchat/default.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/sylpheed/default.nix2
-rw-r--r--pkgs/applications/networking/p2p/valknut/default.nix2
-rw-r--r--pkgs/applications/networking/sniffers/ethereal/default.nix2
-rw-r--r--pkgs/applications/networking/sync/rsync/default.nix2
-rw-r--r--pkgs/applications/office/openoffice/default.nix2
-rw-r--r--pkgs/applications/version-management/cvs/default.nix2
-rw-r--r--pkgs/applications/version-management/darcs/default.nix2
-rw-r--r--pkgs/applications/version-management/subversion-1.2.x/default.nix2
-rw-r--r--pkgs/applications/version-management/subversion-1.3.x/default.nix2
-rw-r--r--pkgs/applications/video/MPlayer/default.nix2
-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/xawtv/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/docbook-ng/default.nix12
-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-3.3/default.nix2
-rw-r--r--pkgs/development/compilers/gcc-3.4-arm/default.nix2
-rw-r--r--pkgs/development/compilers/gcc-3.4/default.nix2
-rw-r--r--pkgs/development/compilers/gcc-4.0-cross/default.nix2
-rw-r--r--pkgs/development/compilers/gcc-4.0/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/jikes/default.nix2
-rw-r--r--pkgs/development/compilers/nasm/default.nix2
-rw-r--r--pkgs/development/compilers/opencxx/default.nix2
-rw-r--r--pkgs/development/compilers/transformers/transformers-0.4.nix2
-rw-r--r--pkgs/development/eclipse/ecj/default.nix2
-rw-r--r--pkgs/development/eclipse/jdt-sdk/default.nix2
-rw-r--r--pkgs/development/interpreters/jre/jre-sun-linux.nix2
-rw-r--r--pkgs/development/interpreters/php/default.nix2
-rw-r--r--pkgs/development/interpreters/python/default.nix2
-rw-r--r--pkgs/development/interpreters/ruby/default.nix2
-rw-r--r--pkgs/development/interpreters/tcl/default.nix2
-rw-r--r--pkgs/development/libraries/SDL/default.nix2
-rw-r--r--pkgs/development/libraries/Xaw3d/default.nix2
-rw-r--r--pkgs/development/libraries/aalib/default.nix2
-rw-r--r--pkgs/development/libraries/aterm/aterm-2.4.nix2
-rw-r--r--pkgs/development/libraries/beecrypt/default.nix2
-rw-r--r--pkgs/development/libraries/boehm-gc/default.nix2
-rw-r--r--pkgs/development/libraries/cairo/default.nix2
-rw-r--r--pkgs/development/libraries/chmlib/default.nix2
-rw-r--r--pkgs/development/libraries/cil/default.nix2
-rw-r--r--pkgs/development/libraries/cracklib/default.nix4
-rw-r--r--pkgs/development/libraries/db4/default.nix2
-rw-r--r--pkgs/development/libraries/dclib/default.nix2
-rw-r--r--pkgs/development/libraries/fontconfig/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/gnome/src-gnome-desktop-2.10.1.nix138
-rw-r--r--pkgs/development/libraries/gnome/src-gnome-platform-2.10.1.nix54
-rw-r--r--pkgs/development/libraries/gpgme/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.6/glib/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.6/pango/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.8/atk/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.8/glib/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-libs-2.8/pango/default.nix2
-rw-r--r--pkgs/development/libraries/java/cup/default.nix2
-rw-r--r--pkgs/development/libraries/java/httpunit/default.nix2
-rw-r--r--pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix2
-rw-r--r--pkgs/development/libraries/java/jdom/default.nix2
-rw-r--r--pkgs/development/libraries/java/jflex/default.nix2
-rw-r--r--pkgs/development/libraries/java/junit/default.nix2
-rw-r--r--pkgs/development/libraries/java/lucene/default.nix2
-rw-r--r--pkgs/development/libraries/java/mockobjects/default.nix2
-rw-r--r--pkgs/development/libraries/java/swt/default.nix2
-rw-r--r--pkgs/development/libraries/kde/kdelibs/default.nix2
-rw-r--r--pkgs/development/libraries/lesstif/default.nix2
-rw-r--r--pkgs/development/libraries/libcaca/default.nix2
-rw-r--r--pkgs/development/libraries/libdrm/default.nix2
-rw-r--r--pkgs/development/libraries/libgpg-error/default.nix2
-rw-r--r--pkgs/development/libraries/libgsf/default.nix2
-rw-r--r--pkgs/development/libraries/libmspack/default.nix2
-rw-r--r--pkgs/development/libraries/libpcap/default.nix2
-rw-r--r--pkgs/development/libraries/libpng/default.nix2
-rw-r--r--pkgs/development/libraries/libsigcxx/default.nix2
-rw-r--r--pkgs/development/libraries/libsndfile/default.nix2
-rw-r--r--pkgs/development/libraries/libtiff/default.nix2
-rw-r--r--pkgs/development/libraries/libusb/default.nix2
-rw-r--r--pkgs/development/libraries/libwpd/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.nix6
-rw-r--r--pkgs/development/libraries/neon/default.nix2
-rw-r--r--pkgs/development/libraries/neon/neon-0.24.7.nix2
-rw-r--r--pkgs/development/libraries/nss/default.nix4
-rw-r--r--pkgs/development/libraries/openal/default.nix2
-rw-r--r--pkgs/development/libraries/openexr/default.nix2
-rw-r--r--pkgs/development/libraries/openssl-0.9.8/default.nix2
-rw-r--r--pkgs/development/libraries/openssl/default.nix2
-rw-r--r--pkgs/development/libraries/pangoxsl/default.nix2
-rw-r--r--pkgs/development/libraries/pciutils/default.nix2
-rw-r--r--pkgs/development/libraries/pcre/default.nix2
-rw-r--r--pkgs/development/libraries/qt-3/default.nix2
-rw-r--r--pkgs/development/libraries/readline/readline4.nix2
-rw-r--r--pkgs/development/libraries/rte/default.nix2
-rw-r--r--pkgs/development/libraries/slang/default.nix2
-rw-r--r--pkgs/development/libraries/speex/default.nix2
-rw-r--r--pkgs/development/libraries/stlport/default.nix2
-rw-r--r--pkgs/development/libraries/t1lib/default.nix2
-rw-r--r--pkgs/development/libraries/wxGTK-2.6/default.nix2
-rw-r--r--pkgs/development/libraries/xine-lib/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXrender/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/libXt/default.nix2
-rw-r--r--pkgs/development/libraries/xlibs/renderext/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/python-modules/pygtk/default.nix2
-rw-r--r--pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix2
-rw-r--r--pkgs/development/tools/misc/automake/automake-1.9.x.nix2
-rw-r--r--pkgs/development/tools/misc/binutils-cross/default.nix2
-rw-r--r--pkgs/development/tools/misc/binutils/default.nix2
-rw-r--r--pkgs/development/tools/misc/callgrind/default.nix2
-rw-r--r--pkgs/development/tools/misc/ctags/default.nix2
-rw-r--r--pkgs/development/tools/misc/gnum4/default.nix2
-rw-r--r--pkgs/development/tools/misc/help2man/default.nix2
-rw-r--r--pkgs/development/tools/misc/kcachegrind/default.nix2
-rw-r--r--pkgs/development/tools/misc/libtool/default.nix2
-rw-r--r--pkgs/development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix2
-rw-r--r--pkgs/development/tools/misc/strace/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/bison/bison-2.1.nix2
-rw-r--r--pkgs/development/uclibc/default.nix2
-rw-r--r--pkgs/games/quake3/game/default.nix35
-rw-r--r--pkgs/misc/cups/default.nix2
-rw-r--r--pkgs/misc/emulators/dosbox/default.nix2
-rw-r--r--pkgs/misc/emulators/generator/default.nix2
-rw-r--r--pkgs/misc/ghostscript/default.nix4
-rw-r--r--pkgs/misc/sane-backends/default.nix2
-rw-r--r--pkgs/misc/screensavers/rss-glx/default.nix2
-rw-r--r--pkgs/misc/tex/lazylist/default.nix2
-rw-r--r--pkgs/misc/tex/polytable/default.nix2
-rw-r--r--pkgs/misc/tex/tetex/default.nix4
-rw-r--r--pkgs/os-specific/linux/alsa/library/default.nix2
-rw-r--r--pkgs/os-specific/linux/alsa/utils/default.nix2
-rw-r--r--pkgs/os-specific/linux/dietlibc/default.nix2
-rw-r--r--pkgs/os-specific/linux/e2fsprogs/default.nix2
-rw-r--r--pkgs/os-specific/linux/eject/default.nix2
-rw-r--r--pkgs/os-specific/linux/fuse/default.nix2
-rw-r--r--pkgs/os-specific/linux/hotplug/default.nix2
-rw-r--r--pkgs/os-specific/linux/hwdata/default.nix2
-rw-r--r--pkgs/os-specific/linux/iputils/default.nix2
-rw-r--r--pkgs/os-specific/linux/kernel-headers-cross/default.nix2
-rw-r--r--pkgs/os-specific/linux/kernel-headers/default.nix2
-rw-r--r--pkgs/os-specific/linux/kernel/default.nix2
-rw-r--r--pkgs/os-specific/linux/klibc/default.nix2
-rw-r--r--pkgs/os-specific/linux/mingetty/default.nix2
-rw-r--r--pkgs/os-specific/linux/module-init-tools-static/default.nix2
-rw-r--r--pkgs/os-specific/linux/module-init-tools/default.nix2
-rw-r--r--pkgs/os-specific/linux/ov511/default.nix2
-rw-r--r--pkgs/os-specific/linux/pam/default.nix2
-rw-r--r--pkgs/os-specific/linux/procps/default.nix2
-rw-r--r--pkgs/os-specific/linux/qc-usb/default.nix2
-rw-r--r--pkgs/os-specific/linux/sysklogd/default.nix2
-rw-r--r--pkgs/os-specific/linux/syslinux/default.nix2
-rw-r--r--pkgs/os-specific/linux/udev/default.nix2
-rw-r--r--pkgs/os-specific/linux/usbutils/default.nix2
-rw-r--r--pkgs/os-specific/linux/util-linux-static/default.nix2
-rw-r--r--pkgs/os-specific/linux/util-linux/default.nix2
-rw-r--r--pkgs/servers/ftp/vsftpd/default.nix2
-rw-r--r--pkgs/servers/http/apache-modules/mod_python/default.nix2
-rw-r--r--pkgs/servers/http/jetty/default.nix2
-rw-r--r--pkgs/servers/mail/dovecot/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/sql/postgresql/jdbc/default.nix2
-rw-r--r--pkgs/servers/x11/xorg/default.nix574
-rw-r--r--pkgs/shells/tcsh/default.nix2
-rw-r--r--pkgs/system/all-packages-generic.nix2
-rw-r--r--pkgs/tools/archivers/cpio/default.nix2
-rw-r--r--pkgs/tools/archivers/gnutar-diet/default.nix2
-rw-r--r--pkgs/tools/archivers/gnutar/default.nix2
-rw-r--r--pkgs/tools/archivers/zip/default.nix2
-rw-r--r--pkgs/tools/compression/bzip2-static/default.nix2
-rw-r--r--pkgs/tools/compression/bzip2/default.nix2
-rw-r--r--pkgs/tools/graphics/gnuplot/default.nix2
-rw-r--r--pkgs/tools/graphics/graphviz/default.nix2
-rw-r--r--pkgs/tools/misc/bc/default.nix2
-rw-r--r--pkgs/tools/misc/coreutils/default.nix2
-rw-r--r--pkgs/tools/misc/findutils-static/default.nix2
-rw-r--r--pkgs/tools/misc/findutils/default.nix2
-rw-r--r--pkgs/tools/misc/grub/default.nix2
-rw-r--r--pkgs/tools/misc/jdiskreport/default.nix2
-rw-r--r--pkgs/tools/misc/man/default.nix2
-rw-r--r--pkgs/tools/misc/parted/default.nix2
-rw-r--r--pkgs/tools/misc/qtparted/default.nix2
-rw-r--r--pkgs/tools/networking/azureus/default.nix2
-rw-r--r--pkgs/tools/networking/bittorrent/default.nix2
-rw-r--r--pkgs/tools/networking/curl-diet/default.nix2
-rw-r--r--pkgs/tools/networking/curl/default.nix2
-rw-r--r--pkgs/tools/networking/dhcp/default.nix2
-rw-r--r--pkgs/tools/networking/par2cmdline/default.nix2
-rw-r--r--pkgs/tools/security/gnupg/default.nix2
-rw-r--r--pkgs/tools/text/gawk/default.nix2
-rw-r--r--pkgs/tools/text/gnugrep/default.nix2
-rw-r--r--pkgs/tools/text/gnused-diet/default.nix2
-rw-r--r--pkgs/tools/text/gnused/default.nix2
-rw-r--r--pkgs/tools/text/groff/default.nix2
-rw-r--r--pkgs/tools/text/xml/sablotron/default.nix2
-rw-r--r--pkgs/tools/typesetting/lhs2tex/default.nix2
-rw-r--r--pkgs/tools/typesetting/xmlroff/default.nix2
233 files changed, 624 insertions, 659 deletions
diff --git a/pkgs/applications/audio/xmms/default.nix b/pkgs/applications/audio/xmms/default.nix
index a7743b861eb..06a6a5e5f2d 100644
--- a/pkgs/applications/audio/xmms/default.nix
+++ b/pkgs/applications/audio/xmms/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xmms-1.2.10";
   src = fetchurl {
-    url = http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/xmms-1.2.10.tar.bz2;
     md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c" ;
   };
 
diff --git a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix
index 8c1558daf25..4fdc8f394e5 100644
--- a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix
+++ b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix
@@ -12,7 +12,7 @@ let {
 
   bindist = 
     fetchurl {
-      url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-linux-gtk.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/eclipse-SDK-3.1.1-linux-gtk.tar.gz;
       md5 = "a2ae61431657e2ed247867b9a9948290";
     };
 }
diff --git a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
index 0627d5d13e8..bfceaa15770 100644
--- a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
+++ b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
@@ -12,7 +12,7 @@ let {
 
   bindist = 
     fetchurl {
-      url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1-200506271435/eclipse-SDK-3.1-linux-gtk.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/eclipse-SDK-3.1-linux-gtk.tar.gz;
       md5 = "0441c11cc5af1e84ed3be322929899e8";
     };
 }
diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix
index 3d61fbbe809..abca499a715 100644
--- a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix
+++ b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
 fetchurl {
-  url = http://www.ii.uib.no/~karltk/spoofax/plugins/org.spoofax.editor_0.3.0.jar;
+  url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.0.jar;
   md5 = "ff66d229c774f840ec8285f64c0f95bc";
 }
diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix
index b8de074d5f4..4c782525ec7 100644
--- a/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix
+++ b/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
 fetchurl {
-  url = http://www.ii.uib.no/~karltk/spoofax/plugins/org.spoofax.editor_0.3.10.jar;
+  url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.10.jar;
   md5 = "ff77853e750e19a9b8d380c17ea27f3d";
 }
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 5a11e156e58..f900d8dd9dc 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "emacs-21.4a";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/emacs/emacs-21.4a.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/emacs-21.4a.tar.gz;
     md5 = "8f9d97cbd126121bd5d97e5e31168a87";
   };
   patches = [./crt.patch];
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index 2a1fcb90489..35c495a7eb2 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/nedit-5.5-src.tar.bz2;
     md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe";
   };
   patches = [./dynamic.patch];
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index f32842e3235..2f4f17da764 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gimp-2.3.6";
   src = fetchurl {
-    url = http://gnu.kookel.org/ftp/gimp/v2.3/gimp-2.3.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gimp-2.3.6.tar.bz2;
     md5 = "ce8ad77f4eb47abb868e6b4eb1f97943" ;
   };
   
diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index fb55ae889de..15a1d169fb6 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "gqview-2.1.1";
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/gqview/gqview-2.1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gqview-2.1.1.tar.gz;
     md5 = "2cd110305cfe4c530fcd6e34bb52e1f2";
   };
 
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index d425727ef19..50adda6eec7 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   name = "inkscape-0.42.2";
 
   src = fetchurl {
-    url = http://easynews.dl.sourceforge.net/sourceforge/inkscape/inkscape-0.42.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/inkscape-0.42.2.tar.bz2;
     md5 = "a27172087018e850e92e97e52b5dad08";
   };
 
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index 4c00e13c59b..5354fbeede4 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cdrtools-2.01";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/cdrtools-2.01.tar.bz2;
     md5 = "d44a81460e97ae02931c31188fe8d3fd";
   };
   patches = [./cdrtools-2.01-install.patch];
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix
index b44cca5ff2c..9647349af5a 100644
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/pkgs/applications/misc/pinfo/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "pinfo-0.6.8";
   src = fetchurl {
-    url = http://dione.cc/~pborys/software/pinfo/pinfo-0.6.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pinfo-0.6.8.tar.gz;
     md5 = "55feb4ebaa709b52bd00a15ed0fb52fb";
   };
   buildInputs = [ncurses];
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index e725124638f..12b9bfb2f94 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xchm-1.2";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/xchm/xchm-1.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xchm-1.2.tar.gz;
     md5 = "17f2cda873f61470636dbfeebb4a531d";
   };
   buildInputs = [wxGTK chmlib];
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 5ec7cba94b5..d7a5cc1b830 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.01.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xpdf-3.01.tar.gz;
     md5 = "e004c69c7dddef165d768b1362b44268";
   };
   
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index c14ceb84e87..6bf84d4f966 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xterm-208";
   src = fetchurl {
-    url = ftp://invisible-island.net/xterm/xterm.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xterm.tar.gz;
     md5 = "a062d0b398918015d07c31ecdcc5111a";
   };
   buildInputs = [libXaw xproto libXt libX11 libSM libICE ncurses];
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 2e58508ae64..df620036d83 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.5/source/firefox-1.5-source.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/firefox-1.5-source.tar.bz2;
     md5 = "fa915ddcadecda30ed3e13694f26a779";
   };
 
diff --git a/pkgs/applications/networking/browsers/links/default.nix b/pkgs/applications/networking/browsers/links/default.nix
index 6bbd0fc800c..ce1ee2d2c92 100644
--- a/pkgs/applications/networking/browsers/links/default.nix
+++ b/pkgs/applications/networking/browsers/links/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "links-1.00pre15";
   src = fetchurl {
-    url = http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-1.00pre15.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/links-1.00pre15.tar.gz;
     md5 = "f64823b9a1ac2d79df578a991dfae8b8";
   };
 }
diff --git a/pkgs/applications/networking/browsers/mozilla/default.nix b/pkgs/applications/networking/browsers/mozilla/default.nix
index cb7573eb8a1..67d7726e680 100644
--- a/pkgs/applications/networking/browsers/mozilla/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.12/source/mozilla-1.7.12-source.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/mozilla-1.7.12-source.tar.bz2;
     md5 = "f1ad6adbbc0510eb76d352c94c801fac";
   };
 
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 675fe5fe00c..3a8b60950db 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "w3m-0.5.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/w3m/w3m-0.5.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/w3m-0.5.1.tar.gz;
     md5 = "0678b72e07e69c41709d71ef0fe5da13";
   };
   inherit openssl boehmgc;
diff --git a/pkgs/applications/networking/instant-messengers/gaim/default.nix b/pkgs/applications/networking/instant-messengers/gaim/default.nix
index a70ab9efbf7..1e867f66109 100644
--- a/pkgs/applications/networking/instant-messengers/gaim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gaim/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   name = "gaim-1.5.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/gaim/gaim-1.5.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gaim-1.5.0.tar.gz;
     md5 = "dd984bd3116d8146545a492d314b0dae";
   };
 
diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix
index 5a867322854..e7eed29f42b 100644
--- a/pkgs/applications/networking/irc/xchat/default.nix
+++ b/pkgs/applications/networking/irc/xchat/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xchat-2.6.0";
   src = fetchurl {
-    url = http://www.xchat.org/files/source/2.6/xchat-2.6.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/xchat-2.6.0.tar.bz2;
     md5 = "0c827bf6df0572231cbbb1e25965fb61";
   };
   buildInputs = [glib pkgconfig tcl gtk];
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 8244f7c6324..381ba10ed84 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "sylpheed-2.1.9";
 
   src = fetchurl {
-    url = http://sylpheed.good-day.net/sylpheed/v2.1/sylpheed-2.1.9.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/sylpheed-2.1.9.tar.bz2;
     md5 = "fe05714e5037d56ccdcf4b36fe4e9346";
   };
 
diff --git a/pkgs/applications/networking/p2p/valknut/default.nix b/pkgs/applications/networking/p2p/valknut/default.nix
index 994f6b44f94..5dc1bdf5ed9 100644
--- a/pkgs/applications/networking/p2p/valknut/default.nix
+++ b/pkgs/applications/networking/p2p/valknut/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://download.berlios.de/dcgui/valknut-0.3.7.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/valknut-0.3.7.tar.bz2;
     md5 = "848f9b3f25af15c3f1837133ac4b9415";
   };
 
diff --git a/pkgs/applications/networking/sniffers/ethereal/default.nix b/pkgs/applications/networking/sniffers/ethereal/default.nix
index 7f473d8c240..40e0a8e7772 100644
--- a/pkgs/applications/networking/sniffers/ethereal/default.nix
+++ b/pkgs/applications/networking/sniffers/ethereal/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ethereal-0.10.14";
   src = fetchurl {
-    url = ftp://ftp.sunet.se/pub/network/monitoring/ethereal/ethereal-0.10.14.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ethereal-0.10.14.tar.bz2;
     md5 = "297f678c037f88429250830e924b8fa0";
   };
   buildInputs = [perl pkgconfig glib libpcap];
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index f9bbca8ddfa..8204e6dcbdf 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "rsync-2.6.6";
   src = fetchurl {
-    url = http://rsync.samba.org/ftp/rsync/rsync-2.6.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/rsync-2.6.6.tar.gz;
     md5 = "30c4e2849cbeae93f55548453865c2f2";
   };
 }
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index 11d8dfd6d04..05bf67b0a6f 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "openoffice.org-2.0.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/office/openoffice/stable/2.0.0/OOo_2.0.0_src.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/OOo_2.0.0_src.tar.gz;
     md5 = "a68933afc2bf432d11b2043ac99ba0aa";
   };
   buildInputs = [pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack getopt file];
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index cb6a4dbf6f8..5460cc11b62 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cvs-1.12.13";
 
   src = fetchurl {
-    url = http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/cvs-1.12.13.tar.bz2;
     md5 = "956ab476ce276c2d19d583e227dbdbea";
   };
   buildInputs = [vim];
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index b14793f867f..32e1955f097 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "darcs-1.0.5";
   src = fetchurl {
-    url = http://abridgegame.org/darcs/darcs-1.0.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/darcs-1.0.5.tar.gz;
     md5 = "9a9a4f84ed5b6258f7ab321713adf20b";
   };
   buildInputs = [ghc zlib ncurses curl];
diff --git a/pkgs/applications/version-management/subversion-1.2.x/default.nix b/pkgs/applications/version-management/subversion-1.2.x/default.nix
index e6932d481f1..495cbbbacdd 100644
--- a/pkgs/applications/version-management/subversion-1.2.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.2.x/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/downloads/subversion-1.2.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/subversion-1.2.3.tar.bz2;
     md5 = "a14bc6590241b6e5c2ff2b354cc184a1";
   };
 
diff --git a/pkgs/applications/version-management/subversion-1.3.x/default.nix b/pkgs/applications/version-management/subversion-1.3.x/default.nix
index c124fd2baa2..ac96e045611 100644
--- a/pkgs/applications/version-management/subversion-1.3.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.3.x/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/downloads/subversion-1.3.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/subversion-1.3.0.tar.gz;
     sha1 = "98cb017844750d4ed26e2a811c581a644e3ad585";
   };
 
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 57627f628f4..5c7d50cd63d 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre7try2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/MPlayer-1.0pre7try2.tar.bz2;
     md5 = "aaca4fd327176c1afb463f0f047ef6f4";
   };
   fonts = fetchurl {
diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.nix b/pkgs/applications/video/MPlayer/win32codecs/default.nix
index 48dbbc0fb36..fe5803a4dd9 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-20050412";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20050412.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/essential-20050412.tar.bz2;
     md5 = "5fe89bb095bdf9b4f9cda5479dbde906";
   };
 }
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index e6780722566..9b6068a3953 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.18.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/mythtv-0.18.1.tar.bz2;
     md5 = "e6cabf88feeaf6ae8f830d3fdf7b113d";
   };
 
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix
index aaa83ccc144..48721d3467c 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/pkgs/applications/video/xawtv/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xawtv-3.95";
   src = fetchurl {
-    url = http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xawtv-3.95.tar.gz;
     md5 = "ad25e03f7e128b318e392cb09f52207d";
   };
   buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE perl xextproto];
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 5a1df58ca74..5795f98aa65 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.4";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xine-ui-0.99.4.tar.gz;
     md5 = "90ea1f76747e9788a30a73e7f4a76cf6";
   };
   buildInputs = [
diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix
index 444cd974f8f..6eae79ddbe1 100644
--- a/pkgs/applications/video/zapping/default.nix
+++ b/pkgs/applications/video/zapping/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.9.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.9.6.tar.bz2;
     md5 = "8306775c6a11de4d72345b5eee970ea6";
   };
 
diff --git a/pkgs/data/sgml+xml/schemas/docbook-ng/default.nix b/pkgs/data/sgml+xml/schemas/docbook-ng/default.nix
index 5396b4c5ff7..2b2e22e67ed 100644
--- a/pkgs/data/sgml+xml/schemas/docbook-ng/default.nix
+++ b/pkgs/data/sgml+xml/schemas/docbook-ng/default.nix
@@ -8,32 +8,32 @@ stdenv.mkDerivation {
   buildInputs = [unzip];
 
   rng = fetchurl {
-    url = http://www.docbook.org/docbook-ng/pto/docbook.rng;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbook.rng;
     md5 = "508a56c9602e0321f64df4b5032f4a05";
   };
 
   rnc = fetchurl {
-    url = http://www.docbook.org/docbook-ng/pto/docbook.rnc;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbook.rnc;
     md5 = "046e583f912fb38c28035cbdec055fc7";
   };
 
   xirng = fetchurl {
-    url = http://www.docbook.org/docbook-ng/pto/docbookxi.rng;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbookxi.rng;
     md5 = "e377fb2d80d96f098e367003ad51a983";
   };
 
   xirnc = fetchurl {
-    url = http://www.docbook.org/docbook-ng/pto/docbookxi.rnc;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbookxi.rnc;
     md5 = "e8a233600fc58a1eab04451f530d4455";
   };
 
   dtd = fetchurl {
-    url = http://www.docbook.org/docbook-ng/pto/docbook.dtd;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbook.dtd;
     md5 = "65f04909e0f9f64c18f0c5267d95bf70";
   };
 
   xidtd = fetchurl {
-    url = http://www.docbook.org/docbook-ng/pto/docbookxi.dtd;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbookxi.dtd;
     md5 = "37168ed996c5271d818eb258f1509834";
   };
 }
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
index 3b0eaca1a29..b713a197de1 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.69.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.69.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbook-xsl-1.69.1.tar.gz;
     md5 = "6f2478faea86bd55abb36ddb57291347";
   };
 }
diff --git a/pkgs/development/compilers/blackdown/blackdown-i686.nix b/pkgs/development/compilers/blackdown/blackdown-i686.nix
index 9e4bce399cb..35ff176bb7b 100644
--- a/pkgs/development/compilers/blackdown/blackdown-i686.nix
+++ b/pkgs/development/compilers/blackdown/blackdown-i686.nix
@@ -7,7 +7,7 @@ assert stdenv.system == "i686-linux";
   dirname = "j2sdk1.4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://sunsite.dk/mirrors/java-linux/JDK-1.4.2/i386/02/j2sdk-1.4.2-02-linux-i586.bin;
+    url = http://nix.cs.uu.nl/dist/tarballs/j2sdk-1.4.2-02-linux-i586.bin;
     md5 = "a65733528562794b7838407084cabd9a";
   };
 }) // {mozillaPlugin = "/jre/plugin/i386/mozilla";}
diff --git a/pkgs/development/compilers/gcc-3.3/default.nix b/pkgs/development/compilers/gcc-3.3/default.nix
index 843c8df2877..6f69e34f6ba 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.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-3.3.6.tar.bz2;
     md5 = "6936616a967da5a0b46f1e7424a06414";
   };
   inherit noSysDirs langC langCC langF77;
diff --git a/pkgs/development/compilers/gcc-3.4-arm/default.nix b/pkgs/development/compilers/gcc-3.4-arm/default.nix
index 7a701cc236f..4b671e78c99 100644
--- a/pkgs/development/compilers/gcc-3.4-arm/default.nix
+++ b/pkgs/development/compilers/gcc-3.4-arm/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "gcc-3.4.4-arm";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/gcc/gcc-3.4.4/gcc-3.4.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-3.4.4.tar.bz2;
     md5 = "b594ff4ea4fbef4ba9220887de713dfe";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix
index b12112f9008..7567f9a0a69 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.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/gcc/gcc-3.4.5/gcc-3.4.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-3.4.5.tar.bz2;
     md5 = "7c3c3c3e764dcee5eb771432062d69e1";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/gcc-4.0-cross/default.nix b/pkgs/development/compilers/gcc-4.0-cross/default.nix
index 70931820e52..a31353e2d23 100644
--- a/pkgs/development/compilers/gcc-4.0-cross/default.nix
+++ b/pkgs/development/compilers/gcc-4.0-cross/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   src = fetchurl {
     #url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2;
-    url = ftp://ftp.gnu.org/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-core-4.0.2.tar.bz2;
     md5 = "f7781398ada62ba255486673e6274b26";
     #url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-4.0.2.tar.bz2;
     #md5 = "a659b8388cac9db2b13e056e574ceeb0";
diff --git a/pkgs/development/compilers/gcc-4.0/default.nix b/pkgs/development/compilers/gcc-4.0/default.nix
index a744c1c504c..bed212e964b 100644
--- a/pkgs/development/compilers/gcc-4.0/default.nix
+++ b/pkgs/development/compilers/gcc-4.0/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "gcc-4.0.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.0.2/gcc-4.0.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-4.0.2.tar.bz2;
     md5 = "a659b8388cac9db2b13e056e574ceeb0";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix
index 54b32ece938..7ab762fbc50 100644
--- a/pkgs/development/compilers/ghc/boot.nix
+++ b/pkgs/development/compilers/ghc/boot.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "ghc-6.4.1";
   builder = ./boot.sh;
   src = fetchurl {
-    url = http://www.haskell.org/ghc/dist/6.4.1/ghc-6.4.1-i386-unknown-linux.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.1-i386-unknown-linux.tar.bz2;
     md5 = "9cd18a8e946da91b373b8ec855cd842e";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix
index cac79fd92bb..1fdeef20c19 100644
--- a/pkgs/development/compilers/ghc/default.nix
+++ b/pkgs/development/compilers/ghc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ghc-6.4.1";
   src = fetchurl {
-    url = http://www.haskell.org/ghc/dist/6.4.1/ghc-6.4.1-src.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.1-src.tar.bz2;
     md5 = "fd289bc7c3afa272ff831a71a50b5b00";
   };
   buildInputs = [perl ghc m4];
diff --git a/pkgs/development/compilers/jikes/default.nix b/pkgs/development/compilers/jikes/default.nix
index 21bd4167113..30efc0083d6 100644
--- a/pkgs/development/compilers/jikes/default.nix
+++ b/pkgs/development/compilers/jikes/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "jikes-1.22";
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/jikes/jikes-1.22.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/jikes-1.22.tar.bz2;
     md5 = "cda958c7fef6b43b803e1d1ef9afcb85";
   };
 }
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index caf1133072c..752819fa253 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.39";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/nasm/nasm-0.98.39.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/nasm-0.98.39.tar.bz2;
     md5 = "2032ad44c7359f7a9a166a40a633e772";
   };
 }
diff --git a/pkgs/development/compilers/opencxx/default.nix b/pkgs/development/compilers/opencxx/default.nix
index 55d06ade75b..8aabb10fdc3 100644
--- a/pkgs/development/compilers/opencxx/default.nix
+++ b/pkgs/development/compilers/opencxx/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "opencxx-2.8";
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/opencxx/opencxx-2.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/opencxx-2.8.tar.gz;
     md5 = "0f71df82751fe8aba5122d6e0541c98a";
   };
 
diff --git a/pkgs/development/compilers/transformers/transformers-0.4.nix b/pkgs/development/compilers/transformers/transformers-0.4.nix
index 557406cadca..f4d0049af95 100644
--- a/pkgs/development/compilers/transformers/transformers-0.4.nix
+++ b/pkgs/development/compilers/transformers/transformers-0.4.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "transformers-0.4";
 
   src = fetchurl {
-    url = http://www.lrde.epita.fr/dload/transformers/transformers-0.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/transformers-0.4.tar.bz2;
     md5 = "19f5b752aec5f4d09cf45cc199fd5bfb";
   };
 
diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix
index 44e2a1edd0d..c331db328c1 100644
--- a/pkgs/development/eclipse/ecj/default.nix
+++ b/pkgs/development/eclipse/ecj/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ecj-3.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/R-3.1-200506271435/eclipse-sourceBuild-srcIncluded-3.1.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/eclipse-sourceBuild-srcIncluded-3.1.zip;
     md5 = "19ad65d52005da5eaa1d3687b3a50de2";
   };
 
diff --git a/pkgs/development/eclipse/jdt-sdk/default.nix b/pkgs/development/eclipse/jdt-sdk/default.nix
index 4734522b5f4..c46ee781ab0 100644
--- a/pkgs/development/eclipse/jdt-sdk/default.nix
+++ b/pkgs/development/eclipse/jdt-sdk/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "eclipse-jdt-sdk-3.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1-200506271435/eclipse-JDT-SDK-3.1.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/eclipse-JDT-SDK-3.1.zip;
     md5 = "665b51beaa718b2fec6b0155ed369f76";
   };
 
diff --git a/pkgs/development/interpreters/jre/jre-sun-linux.nix b/pkgs/development/interpreters/jre/jre-sun-linux.nix
index b4d072107cb..abab0cff7be 100644
--- a/pkgs/development/interpreters/jre/jre-sun-linux.nix
+++ b/pkgs/development/interpreters/jre/jre-sun-linux.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   version = "jre1.5.0_02";
   builder = ./builder.sh;
   src = fetchurl {
-      url = http://jdl.sun.com/webapps/download/AutoDL?BundleId=9986;
+      url = http://nix.cs.uu.nl/dist/tarballs/AutoDL?BundleId=9986;
       md5 = "1c9b3bb9670df5ebb5587d2bcba73b3c";
     };
 }
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index b107e96b7c3..c81d253741f 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -5,7 +5,7 @@ assert libxml2 != null;
 stdenv.mkDerivation {
   name = "php-5.0.4";
   src = fetchurl {
-    url = http://de.php.net/distributions/php-5.0.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/php-5.0.4.tar.bz2;
     md5 = "fb1aac107870f897d26563a9cc5053c0";
   };
   
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 996da509952..82b290f9eb3 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.4.2";
   src = fetchurl {
-    url = http://www.python.org/ftp/python/2.4.2/Python-2.4.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/Python-2.4.2.tar.bz2;
     md5 = "98db1465629693fc434d4dc52db93838";
   };
   buildInputs = [
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index fa537529785..f8e7af8ab6e 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ruby-1.8.4";
   src = fetchurl {
-    url = ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/ruby-1.8.4.tar.gz;
     md5 = "bd8c2e593e1fa4b01fd98eaf016329bb";
   };
 }
diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
index 8bc92f60aae..5de7bc90584 100644
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "tcl-8.4.11";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/tcl/tcl8.4.11-src.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/tcl8.4.11-src.tar.gz;
     md5 = "629dfea34e4087eb4683f834060abb63";
   };
 }
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 7e085a69397..0d41b13eaea 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -5,7 +5,7 @@ assert openglSupport -> mesa != null;
 stdenv.mkDerivation {
   name = "SDL-1.2.9";
   src = fetchurl {
-    url = http://www.libsdl.org/release/SDL-1.2.9.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/SDL-1.2.9.tar.gz;
     md5 = "80919ef556425ff82a8555ff40a579a0";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index f4af1ec13a8..3245ec7eccb 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "Xaw3d-1.5E";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://freshmeat.net/redir/xaw3d/11835/url_tgz/Xaw3d-1.5E.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/Xaw3d-1.5E.tar.gz;
     md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
   };
   patches = [./config.patch];
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index 5f138ef729a..b06db7eb39d 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "aalib-1.4rc4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/aa-project/aalib-1.4rc4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/aalib-1.4rc4.tar.gz;
     md5 = "d5aa8e9eae07b7441298b5c30490f6a6";
   };
   buildInputs = [ncurses];
diff --git a/pkgs/development/libraries/aterm/aterm-2.4.nix b/pkgs/development/libraries/aterm/aterm-2.4.nix
index 6dc59908a60..a4a802471fe 100644
--- a/pkgs/development/libraries/aterm/aterm-2.4.nix
+++ b/pkgs/development/libraries/aterm/aterm-2.4.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "aterm-2.4.2";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.4.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/aterm-2.4.2.tar.gz;
     md5 = "18617081dd112d85e6c4b1b552628114";
   };
 }
diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix
index 6d8e776ce80..d6fa6227285 100644
--- a/pkgs/development/libraries/beecrypt/default.nix
+++ b/pkgs/development/libraries/beecrypt/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "beecrypt-4.1.2";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/beecrypt/beecrypt-4.1.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/beecrypt-4.1.2.tar.gz;
     md5 = "820d26437843ab0a6a8a5151a73a657c";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index d3e12096457..8ae23f44d56 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.5";
   src = fetchurl {
-    url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gc6.5.tar.gz;
     md5 = "00bf95cdcbedfa7321d14e0133b31cdb";
   };
 }
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index f4ea4c5e699..22ef287901b 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -11,7 +11,7 @@ assert pngSupport -> libpng != null;
 stdenv.mkDerivation {
   name = "cairo-1.0.2";
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.0.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cairo-1.0.2.tar.gz;
     sha1 = "3a425049499b0b067ed4dc60d94b4d0819c0841b";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index 3cf75aba9ed..5d211278749 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "chmlib-0.36";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://66.93.236.84/%7Ejedwin/projects/chmlib/chmlib-0.36.tbz;
+    url = http://nix.cs.uu.nl/dist/tarballs/chmlib-0.36.tbz;
     md5 = "8fa5e9a1af13084ca465d9ee09e1946e";
   };
   buildInputs = [libtool];
diff --git a/pkgs/development/libraries/cil/default.nix b/pkgs/development/libraries/cil/default.nix
index ecbb0c19412..084d5adf206 100644
--- a/pkgs/development/libraries/cil/default.nix
+++ b/pkgs/development/libraries/cil/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ocaml, perl}: stdenv.mkDerivation {
   name = "cil-1.3.2";
   src = fetchurl {
-    url = http://manju.cs.berkeley.edu/cil/distrib/cil-1.3.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cil-1.3.2.tar.gz;
     md5 = "aba80dd700fcb1411598670cc36a9573";
   };
   buildInputs = [ocaml perl];
diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 674384bf938..7811fe083f0 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation {
   name = "cracklib-2.8.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/cracklib/cracklib-2.8.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cracklib-2.8.5.tar.gz;
     md5 = "68674db41be7569099b7aa287719b248";
   };
   dicts = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/cracklib/cracklib-words.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cracklib-words.gz;
     md5 = "d18e670e5df560a8745e1b4dede8f84f";
   };
 }
diff --git a/pkgs/development/libraries/db4/default.nix b/pkgs/development/libraries/db4/default.nix
index 169e1e1e564..4a4ab1f7133 100644
--- a/pkgs/development/libraries/db4/default.nix
+++ b/pkgs/development/libraries/db4/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "db4-4.4.16";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://downloads.sleepycat.com/db-4.4.16.NC.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/db-4.4.16.NC.tar.gz;
     md5 = "1466026e67b5c3eb60c8c16b7f472c17";
   };
   configureFlags = [
diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix
index 0cc4f25c48e..a0cd9660d7c 100644
--- a/pkgs/development/libraries/dclib/default.nix
+++ b/pkgs/development/libraries/dclib/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://download.berlios.de/dcgui/dclib-0.3.7.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/dclib-0.3.7.tar.bz2;
     md5 = "d35833414534bcac8ce2c8a62ce903a4";
   };
 
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 689355e56e0..9f8c1231ad9 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "fontconfig-2.3.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.fontconfig.org/release/fontconfig-2.3.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/fontconfig-2.3.2.tar.gz;
     md5 = "7354f9f125ea78a8f2851cb9c31d4866";
   };
   buildInputs = [freetype];
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index f23461dc0fc..a678169851d 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.10";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.10.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/freetype-2.1.10.tar.bz2;
     md5 = "a4012e7d1f6400df44a16743b11b8423";
   };
 }
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 0ac2104f58d..2b09a73542c 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "gettext-0.14.5";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.14.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gettext-0.14.5.tar.gz;
     md5 = "e2f6581626a22a0de66dce1d81d00de3";
   };
   configureFlags = "--disable-csharp";
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index cec777acbb3..96dd1b6c959 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation {
   substitute = ../../../build-support/substitute/substitute.sh;
 
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/glibc/glibc-2.3.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glibc-2.3.6.tar.bz2;
     md5 = "bfdce99f82d6dbcb64b7f11c05d6bc96";
   };
 
   linuxthreadsSrc = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glibc-linuxthreads-2.3.6.tar.bz2;
     md5 = "d4eeda37472666a15cc1f407e9c987a9";
   };
 
diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.10.1.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.10.1.nix
index bcfefc425de..5d0abbb8829 100644
--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.10.1.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-desktop-2.10.1.nix
@@ -4,483 +4,483 @@
   bugbuddy = {
     name = "bug-buddy-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/bug-buddy-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/bug-buddy-2.10.0.tar.bz2;
       md5 = "c821a933f3d7be64071c7bfcb07ee1ac";
     };
   };
   controlcenter = {
     name = "control-center-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/control-center-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/control-center-2.10.1.tar.bz2;
       md5 = "d95a5746aa349536dc0f59c61cdaf19f";
     };
   };
   dasher = {
     name = "dasher-3.2.15";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/dasher-3.2.15.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/dasher-3.2.15.tar.bz2;
       md5 = "a3fa85e32c94c69476e12ecba7d257e7";
     };
   };
   eel = {
     name = "eel-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/eel-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/eel-2.10.1.tar.bz2;
       md5 = "2978fae17565dfb6e2d7ca129e738b9d";
     };
   };
   eog = {
     name = "eog-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/eog-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/eog-2.10.0.tar.bz2;
       md5 = "45c345a0aed600c7ab17c5af750b7c8c";
     };
   };
   epiphany = {
     name = "epiphany-1.6.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/epiphany-1.6.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/epiphany-1.6.2.tar.bz2;
       md5 = "3161495ac4af4a7435918a98896b05e9";
     };
   };
   evolution = {
     name = "evolution-2.2.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/evolution-2.2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/evolution-2.2.2.tar.bz2;
       md5 = "9b49942c8bdd1dc21f2d28792b12f400";
     };
   };
   evolutiondataserver = {
     name = "evolution-data-server-1.2.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/evolution-data-server-1.2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/evolution-data-server-1.2.2.tar.bz2;
       md5 = "2b15cba799e4594926472dca3e1747bb";
     };
   };
   evolutionwebcal = {
     name = "evolution-webcal-2.2.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/evolution-webcal-2.2.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/evolution-webcal-2.2.1.tar.bz2;
       md5 = "36c667bb50a2ae89be457780081dfd39";
     };
   };
   fileroller = {
     name = "file-roller-2.10.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/file-roller-2.10.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/file-roller-2.10.2.tar.bz2;
       md5 = "56f2c0e79f6ddfb4796acdab91dcd58f";
     };
   };
   gal = {
     name = "gal-2.4.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gal-2.4.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gal-2.4.2.tar.bz2;
       md5 = "70e07fde659f0553ba56caeae4f51908";
     };
   };
   gcalctool = {
     name = "gcalctool-5.5.42";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gcalctool-5.5.42.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gcalctool-5.5.42.tar.bz2;
       md5 = "0f42e6e437f64c844b7b30e3255b02aa";
     };
   };
   gconfeditor = {
     name = "gconf-editor-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gconf-editor-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gconf-editor-2.10.0.tar.bz2;
       md5 = "651a18f7eb5af91761521aa4f04ccc07";
     };
   };
   gdm = {
     name = "gdm-2.6.0.9";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gdm-2.6.0.9.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gdm-2.6.0.9.tar.bz2;
       md5 = "d845fe205412bb101d4c66d1e88a317d";
     };
   };
   gedit = {
     name = "gedit-2.10.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gedit-2.10.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gedit-2.10.2.tar.bz2;
       md5 = "e3cf99b9233377583a69c4ad235e8494";
     };
   };
   ggv = {
     name = "ggv-2.8.4";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/ggv-2.8.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/ggv-2.8.4.tar.bz2;
       md5 = "7a465dcc795ebab69daa0ed658d2e978";
     };
   };
   gnome2userdocs = {
     name = "gnome2-user-docs-2.8.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome2-user-docs-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome2-user-docs-2.8.1.tar.bz2;
       md5 = "90bdd21ea3e3e794f641dd805216f275";
     };
   };
   gnomeapplets = {
     name = "gnome-applets-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-applets-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-applets-2.10.1.tar.bz2;
       md5 = "da9cd75f77972c96eec9551d41878a7f";
     };
   };
   gnomebackgrounds = {
     name = "gnome-backgrounds-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-backgrounds-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-backgrounds-2.10.1.tar.bz2;
       md5 = "2a4ec2862c6a1a2bf3ad330c830edae4";
     };
   };
   gnomedesktop = {
     name = "gnome-desktop-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-desktop-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-desktop-2.10.1.tar.bz2;
       md5 = "5d6d21e4b5d66975c9c2c04add7da6e2";
     };
   };
   gnomedocutils = {
     name = "gnome-doc-utils-0.2.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-doc-utils-0.2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-doc-utils-0.2.0.tar.bz2;
       md5 = "c72f2a974e4f05210d2736e92399c58e";
     };
   };
   gnomegames = {
     name = "gnome-games-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-games-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-games-2.10.1.tar.bz2;
       md5 = "b7d21e5e12de80c50266e8735e04577c";
     };
   };
   gnomeicontheme = {
     name = "gnome-icon-theme-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-icon-theme-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-icon-theme-2.10.1.tar.bz2;
       md5 = "680a57ed3cecb9a16824570f7002879e";
     };
   };
   gnomekeyring = {
     name = "gnome-keyring-0.4.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-keyring-0.4.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-keyring-0.4.2.tar.bz2;
       md5 = "220930f6685780089cc5c769dd4ad561";
     };
   };
   gnomemag = {
     name = "gnome-mag-0.12.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-mag-0.12.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-mag-0.12.0.tar.bz2;
       md5 = "42446a5e12bbb5cb0d0baba30b324545";
     };
   };
   gnomemedia = {
     name = "gnome-media-2.10.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-media-2.10.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-media-2.10.2.tar.bz2;
       md5 = "3d73cd40cfa52c5eef882302f92c60d6";
     };
   };
   gnomemeeting = {
     name = "gnomemeeting-1.2.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnomemeeting-1.2.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnomemeeting-1.2.1.tar.bz2;
       md5 = "e765914ed1eb547d4a15d211e2ae9f57";
     };
   };
   gnomemenus = {
     name = "gnome-menus-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-menus-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-menus-2.10.1.tar.bz2;
       md5 = "83d9695a35ed2215620e8773ee918b8a";
     };
   };
   gnomenetstatus = {
     name = "gnome-netstatus-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-netstatus-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-netstatus-2.10.0.tar.bz2;
       md5 = "b1a044cfbe3299e00d514d966d4766e8";
     };
   };
   gnomenettool = {
     name = "gnome-nettool-1.2.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-nettool-1.2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-nettool-1.2.0.tar.bz2;
       md5 = "277338cf5d54ae9941260dd993a14f7a";
     };
   };
   gnomepanel = {
     name = "gnome-panel-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-panel-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-panel-2.10.1.tar.bz2;
       md5 = "a2719f5c79a9e48bca086f08a77a6889";
     };
   };
   gnomesession = {
     name = "gnome-session-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-session-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-session-2.10.0.tar.bz2;
       md5 = "cbeb2db49dac11bf8088e6b025265fff";
     };
   };
   gnomespeech = {
     name = "gnome-speech-0.3.6";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-speech-0.3.6.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-speech-0.3.6.tar.bz2;
       md5 = "1c5cf16b6ad38b9e8d46c824b464c5b8";
     };
   };
   gnomesystemmonitor = {
     name = "gnome-system-monitor-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-system-monitor-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-system-monitor-2.10.1.tar.bz2;
       md5 = "22acb1699193f8bd2ced656d44f57377";
     };
   };
   gnomesystemtools = {
     name = "gnome-system-tools-1.2.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-system-tools-1.2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-system-tools-1.2.0.tar.bz2;
       md5 = "fbcf8866ecea8b330cbe53cf8b0df55e";
     };
   };
   gnometerminal = {
     name = "gnome-terminal-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-terminal-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-terminal-2.10.0.tar.bz2;
       md5 = "062744daca0c7f708b8c52f47b5db0d1";
     };
   };
   gnomethemes = {
     name = "gnome-themes-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-themes-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-themes-2.10.1.tar.bz2;
       md5 = "f365c73ccfbe35640e17fe8d877273fe";
     };
   };
   gnomeutils = {
     name = "gnome-utils-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-utils-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-utils-2.10.1.tar.bz2;
       md5 = "78c0afdc112757b13d203fe1ad9c04ad";
     };
   };
   gnomevolumemanager = {
     name = "gnome-volume-manager-1.2.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnome-volume-manager-1.2.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-volume-manager-1.2.1.tar.bz2;
       md5 = "241ff5501441387e31372089ca4b4390";
     };
   };
   gnopernicus = {
     name = "gnopernicus-0.10.6";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gnopernicus-0.10.6.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnopernicus-0.10.6.tar.bz2;
       md5 = "324b53371920ba156923e86be34a32c7";
     };
   };
   gok = {
     name = "gok-1.0.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gok-1.0.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gok-1.0.3.tar.bz2;
       md5 = "3e5e856d5c4cdb8777d92218eecc0a8b";
     };
   };
   gpdf = {
     name = "gpdf-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gpdf-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gpdf-2.10.0.tar.bz2;
       md5 = "9278cd3b9d06e3b1d364452f0e512fa9";
     };
   };
   gstplugins = {
     name = "gst-plugins-0.8.8";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gst-plugins-0.8.8.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gst-plugins-0.8.8.tar.bz2;
       md5 = "4f6e7e730fa674ecd6ec713f937b8acb";
     };
   };
   gstreamer = {
     name = "gstreamer-0.8.9";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gstreamer-0.8.9.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gstreamer-0.8.9.tar.bz2;
       md5 = "6769de224de8457ed0dc09016287883a";
     };
   };
   gtkengines = {
     name = "gtk-engines-2.6.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gtk-engines-2.6.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtk-engines-2.6.3.tar.bz2;
       md5 = "ba5975f8ab390fa43fc0bf94f4a3b023";
     };
   };
   gtkhtml = {
     name = "gtkhtml-3.5.7";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gtkhtml-3.5.7.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtkhtml-3.5.7.tar.bz2;
       md5 = "218f9ddbd4b95d16f8f60369422cd79c";
     };
   };
   gtksourceview = {
     name = "gtksourceview-1.2.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gtksourceview-1.2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtksourceview-1.2.0.tar.bz2;
       md5 = "0a9f68a3faf982599b64276487c37c6d";
     };
   };
   gucharmap = {
     name = "gucharmap-1.4.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/gucharmap-1.4.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gucharmap-1.4.3.tar.bz2;
       md5 = "9003427becd6fae9b2df5ddf1a6c390b";
     };
   };
   libgailgnome = {
     name = "libgail-gnome-1.1.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/libgail-gnome-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgail-gnome-1.1.0.tar.bz2;
       md5 = "61541d3f04741b8a9f42f89776ea1fac";
     };
   };
   libgtkhtml = {
     name = "libgtkhtml-2.6.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/libgtkhtml-2.6.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgtkhtml-2.6.3.tar.bz2;
       md5 = "c77789241d725e189ffc0391eda94361";
     };
   };
   libgtop = {
     name = "libgtop-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/libgtop-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgtop-2.10.1.tar.bz2;
       md5 = "b006baa3bd486005411a03534b45708e";
     };
   };
   librsvg = {
     name = "librsvg-2.9.5";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/librsvg-2.9.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/librsvg-2.9.5.tar.bz2;
       md5 = "44799d75e940eb4150acdae4f63cbe2a";
     };
   };
   libsoup = {
     name = "libsoup-2.2.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/libsoup-2.2.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libsoup-2.2.3.tar.bz2;
       md5 = "2591f32e036a5869f7e2bd0d95e6f14b";
     };
   };
   libwnck = {
     name = "libwnck-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/libwnck-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libwnck-2.10.0.tar.bz2;
       md5 = "c04c79f1e8576bc930c79d2e7bb8190a";
     };
   };
   libxklavier = {
     name = "libxklavier-2.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/libxklavier-2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxklavier-2.0.tar.bz2;
       md5 = "8da1a1a2ba934e94288bef8a4e4ca62d";
     };
   };
   metacity = {
     name = "metacity-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/metacity-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/metacity-2.10.1.tar.bz2;
       md5 = "c326eb1aed8742057e9ad94b9ccae877";
     };
   };
   nautilus = {
     name = "nautilus-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/nautilus-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/nautilus-2.10.1.tar.bz2;
       md5 = "976d725db15e901bc881dfb8c50145c1";
     };
   };
   nautiluscdburner = {
     name = "nautilus-cd-burner-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/nautilus-cd-burner-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/nautilus-cd-burner-2.10.1.tar.bz2;
       md5 = "ce2b3bd588ca77190976e2487badc17d";
     };
   };
   nautilusmedia = {
     name = "nautilus-media-0.8.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/nautilus-media-0.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/nautilus-media-0.8.1.tar.bz2;
       md5 = "4ad604430b213a899c1217f5f4633887";
     };
   };
   scrollkeeper = {
     name = "scrollkeeper-0.3.14";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/scrollkeeper-0.3.14.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/scrollkeeper-0.3.14.tar.bz2;
       md5 = "b175e582a6cec3e50a9de73a5bb7455a";
     };
   };
   soundjuicer = {
     name = "sound-juicer-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/sound-juicer-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/sound-juicer-2.10.1.tar.bz2;
       md5 = "59a5e142cf39152bcbc1467d02e4494a";
     };
   };
   startupnotification = {
     name = "startup-notification-0.8";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/startup-notification-0.8.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/startup-notification-0.8.tar.bz2;
       md5 = "d9b2e9fba18843314ae42334ceb4336d";
     };
   };
   systemtoolsbackends = {
     name = "system-tools-backends-1.2.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/system-tools-backends-1.2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/system-tools-backends-1.2.0.tar.bz2;
       md5 = "96b00eb0f800c1b5346be2f71d4dc3b2";
     };
   };
   totem = {
     name = "totem-1.0.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/totem-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/totem-1.0.1.tar.bz2;
       md5 = "e924188ae5b43e7b66ef55584578b8bb";
     };
   };
   vino = {
     name = "vino-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/vino-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/vino-2.10.0.tar.bz2;
       md5 = "a9b5c811807e01e7fb420f52820f0150";
     };
   };
   vte = {
     name = "vte-0.11.13";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/vte-0.11.13.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/vte-0.11.13.tar.bz2;
       md5 = "5eb73c7de433fb6e53ac4378df9d23b5";
     };
   };
   ximianconnector = {
     name = "ximian-connector-2.2.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/ximian-connector-2.2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/ximian-connector-2.2.2.tar.bz2;
       md5 = "2cee47bdf6030d30a5ac82e5028b58ed";
     };
   };
   yelp = {
     name = "yelp-2.6.5";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/yelp-2.6.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/yelp-2.6.5.tar.bz2;
       md5 = "9bd94af344ee6a0bf69aa6f9cbd6b7e9";
     };
   };
   zenity = {
     name = "zenity-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.1/sources/zenity-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/zenity-2.10.0.tar.bz2;
       md5 = "2e501bba72b6e7d4f951080b9e5f675b";
     };
   };
diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.10.1.nix b/pkgs/development/libraries/gnome/src-gnome-platform-2.10.1.nix
index 5a8672c26c4..c0f55d3f7fd 100644
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.10.1.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-platform-2.10.1.nix
@@ -4,189 +4,189 @@
   atk = {
     name = "atk-1.9.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/atk-1.9.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/atk-1.9.1.tar.bz2;
       md5 = "689eb6a77215858eb804f6dcc90058be";
     };
   };
   atspi = {
     name = "at-spi-1.6.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/at-spi-1.6.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/at-spi-1.6.3.tar.bz2;
       md5 = "e8d9c4b88e110a15cbf784b320fa0ad9";
     };
   };
   audiofile = {
     name = "audiofile-0.2.6";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/audiofile-0.2.6.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/audiofile-0.2.6.tar.bz2;
       md5 = "3d01302834660850b6141cac1e6f5501";
     };
   };
   esound = {
     name = "esound-0.2.35";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/esound-0.2.35.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/esound-0.2.35.tar.bz2;
       md5 = "1566344f80a8909b5e6e4d6b6520c2c1";
     };
   };
   gail = {
     name = "gail-1.8.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/gail-1.8.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gail-1.8.3.tar.bz2;
       md5 = "9e5db197dea8f92eec1f07984f12542a";
     };
   };
   GConf = {
     name = "GConf-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/GConf-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/GConf-2.10.0.tar.bz2;
       md5 = "a7cd37be4e317195a6668a086fc72033";
     };
   };
   glib = {
     name = "glib-2.6.4";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/glib-2.6.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/glib-2.6.4.tar.bz2;
       md5 = "af7eeb8aae764ff763418471ed6eb93d";
     };
   };
   gnomemimedata = {
     name = "gnome-mime-data-2.4.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/gnome-mime-data-2.4.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.2.tar.bz2;
       md5 = "37242776b08625fa10c73c18b790e552";
     };
   };
   gnomevfs = {
     name = "gnome-vfs-2.10.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/gnome-vfs-2.10.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-vfs-2.10.1.tar.bz2;
       md5 = "88b520e5de748a310a2aef62fc095c8b";
     };
   };
   gtk = {
     name = "gtk+-2.6.7";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/gtk+-2.6.7.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.6.7.tar.bz2;
       md5 = "b89bf892a0dee943f98b4caa12f773c8";
     };
   };
   gtkdoc = {
     name = "gtk-doc-1.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/gtk-doc-1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtk-doc-1.3.tar.bz2;
       md5 = "d105d5b28e7e023ab1b7e85fb65e45c3";
     };
   };
   intltool = {
     name = "intltool-0.33";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/intltool-0.33.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/intltool-0.33.tar.bz2;
       md5 = "7d3b6d421b0fb9beee7faf97daab45e6";
     };
   };
   libart_lgpl = {
     name = "libart_lgpl-2.3.17";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libart_lgpl-2.3.17.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libart_lgpl-2.3.17.tar.bz2;
       md5 = "dfca42529393c8a8f59dc4dc10675a46";
     };
   };
   libbonobo = {
     name = "libbonobo-2.8.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libbonobo-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libbonobo-2.8.1.tar.bz2;
       md5 = "54f863c20016cf8a2cf25056f6c7cda7";
     };
   };
   libbonoboui = {
     name = "libbonoboui-2.8.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libbonoboui-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libbonoboui-2.8.1.tar.bz2;
       md5 = "b23daafa8344a88696d497f20285ef55";
     };
   };
   libglade = {
     name = "libglade-2.5.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libglade-2.5.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libglade-2.5.1.tar.bz2;
       md5 = "e4734a59f1f2308d7714dc0ebf8163f1";
     };
   };
   libgnome = {
     name = "libgnome-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libgnome-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnome-2.10.0.tar.bz2;
       md5 = "f8e1225d96126f5139232821a6723d15";
     };
   };
   libgnomecanvas = {
     name = "libgnomecanvas-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libgnomecanvas-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomecanvas-2.10.0.tar.bz2;
       md5 = "88aac06c8dfd24671db3fe3bf881b5fc";
     };
   };
   libgnomeprint = {
     name = "libgnomeprint-2.10.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libgnomeprint-2.10.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprint-2.10.3.tar.bz2;
       md5 = "9052dc919ad038b1a9e4d5301148588e";
     };
   };
   libgnomeprintui = {
     name = "libgnomeprintui-2.10.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libgnomeprintui-2.10.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprintui-2.10.2.tar.bz2;
       md5 = "01fce7918f4e106e00ee8b5447783e4c";
     };
   };
   libgnomeui = {
     name = "libgnomeui-2.10.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libgnomeui-2.10.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeui-2.10.0.tar.bz2;
       md5 = "e17c0d97e5f240513ac2d36268d696ed";
     };
   };
   libIDL = {
     name = "libIDL-0.8.5";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libIDL-0.8.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libIDL-0.8.5.tar.bz2;
       md5 = "c63f6513dc7789d0575bea02d62d58d7";
     };
   };
   libxml2 = {
     name = "libxml2-2.6.19";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libxml2-2.6.19.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.19.tar.bz2;
       md5 = "ed581732d586f86324ec46e572526ede";
     };
   };
   libxslt = {
     name = "libxslt-1.1.14";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/libxslt-1.1.14.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.14.tar.bz2;
       md5 = "1fe60d57b8fcff7462fb1d9fac6c2ae8";
     };
   };
   ORBit2 = {
     name = "ORBit2-2.12.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/ORBit2-2.12.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/ORBit2-2.12.2.tar.bz2;
       md5 = "7f963dcd0d84e6854460449383cc8c70";
     };
   };
   pango = {
     name = "pango-1.8.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/pango-1.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/pango-1.8.1.tar.bz2;
       md5 = "88aa6bf1876766db6864f3b93577887c";
     };
   };
   pkgconfig = {
     name = "pkgconfig-0.17.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/pkgconfig-0.17.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/pkgconfig-0.17.2.tar.bz2;
       md5 = "eab15aecff99e98bcc5d01331452e583";
     };
   };
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index e96eb9c57f4..1eff12646d3 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gpgme-1.0.3";
   src = fetchurl {
-    url = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gpgme-1.0.3.tar.gz;
     md5 = "4d33cbdf844fcee1c724e4cf2a32dd11";
   };
   buildInputs = [libgpgerror gnupg];
diff --git a/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
index 1dc3407a76e..5857fa185f3 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.6.6";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glib-2.6.6.tar.bz2;
     md5 = "6e22b0639d314536f23ee118f29b43de";
   };
   buildInputs = [pkgconfig gettext perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix b/pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix
index 957c596fc7b..5669a13172d 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "glibmm-2.6.4";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-2.6.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glibmm-2.6.1.tar.bz2;
     md5 = "e37da352bf581503c5866f0231fd4a74";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
index 06e37f070da..a76303a758b 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
@@ -12,7 +12,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "gtk+-2.6.10";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-2.6.10.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.6.10.tar.bz2;
     md5 = "520090ef291e35ba93397060e20f5025";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
diff --git a/pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix
index ebc1e881c47..7df2339f4ae 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gtkmm-2.6.4";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.6/gtkmm-2.6.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtkmm-2.6.4.tar.bz2;
     md5 = "f71d1c4a89c4f9e054400f12a82dec5f";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
index 6b9391e0a0b..837f9ad86af 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
@@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "pango-1.8.2";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.6/pango-1.8.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.8.2.tar.bz2;
     md5 = "f5b5da7a173f0566d8217ec112fde993";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/gtk-libs-2.8/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.8/atk/default.nix
index 07537567520..a3c80d6d301 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/atk/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/atk/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null && perl != null;
 stdenv.mkDerivation {
   name = "atk-1.10.3";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.8/atk-1.10.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/atk-1.10.3.tar.bz2;
     md5 = "c84a01fea567b365c0d44b227fead948";
   };
   buildInputs = [pkgconfig perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
index 71fa047f042..6f9df459a5a 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.8.5";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.8/glib-2.8.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glib-2.8.5.tar.bz2;
     md5 = "334bb6892fb05aa34eae53707cc2726e";
   };
   buildInputs = [pkgconfig gettext perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix b/pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix
index 957c596fc7b..5669a13172d 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "glibmm-2.6.4";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-2.6.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glibmm-2.6.1.tar.bz2;
     md5 = "e37da352bf581503c5866f0231fd4a74";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
index 9f9252c7daf..89acece279d 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
@@ -10,7 +10,7 @@ assert xineramaSupport -> libXinerama != null;
 stdenv.mkDerivation {
   name = "gtk+-2.8.9";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.9.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.8.9.tar.bz2;
     md5 = "e7a94132ae6353106c80cd4a1106a368";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix
index ebc1e881c47..7df2339f4ae 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gtkmm-2.6.4";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.6/gtkmm-2.6.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtkmm-2.6.4.tar.bz2;
     md5 = "f71d1c4a89c4f9e054400f12a82dec5f";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
index 22bf8b194db..b9fffed10ff 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
@@ -5,7 +5,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "pango-1.10.2";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.8/pango-1.10.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.10.2.tar.bz2;
     md5 = "7302220d93ac17d2c44f356d852e81dc";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix
index 1181cef074e..adee415651b 100644
--- a/pkgs/development/libraries/java/cup/default.nix
+++ b/pkgs/development/libraries/java/cup/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/java_cup_v10k.tar.gz;
     md5 = "8b11edfec13c590ea443d0f0ae0da479";
   };
 
diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix
index 67baff53d42..55f0483720a 100644
--- a/pkgs/development/libraries/java/httpunit/default.nix
+++ b/pkgs/development/libraries/java/httpunit/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/httpunit/httpunit-1.6.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/httpunit-1.6.zip;
     md5 = "e94b53b9f4d7bdb706e4baac95b6e424";
   };
 
diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
index a609532f282..4f6f2a7109e 100644
--- a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
+++ b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://archive.apache.org/dist/jakarta/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/commons-fileupload-1.0.tar.gz;
     md5 = "5618b26b1a5c006d7236fb4465e907b6";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix
index bca165bb324..8b09a9d6ab1 100644
--- a/pkgs/development/libraries/java/jdom/default.nix
+++ b/pkgs/development/libraries/java/jdom/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/jdom-1.0.tar.gz;
     md5 = "ce29ecc05d63fdb419737fd00c04c281";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix
index 4d0eda22c5b..bfb8b3f7a03 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://jflex.de/jflex-1.4.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/jflex-1.4.1.tar.gz;
     md5 = "9e4be6e826e6b344e84c0434d6fd4b46";
   };
 }
diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index 84004f973b6..ed7969bb311 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/junit3.8.1.zip;
     md5 = "5110326e4b7f7497dfa60ede4b626751";
   };
 
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index 9380591636c..40ee2c64fc9 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://cvs.apache.org/dist/jakarta/lucene/v1.4.1/lucene-1.4.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/lucene-1.4.1.tar.gz;
     md5 = "656a6f40f5b8f7d2e19453436848bfe8";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix
index 5315cc63f1c..ef1970f74e8 100644
--- a/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/pkgs/development/libraries/java/mockobjects/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/mockobjects/mockobjects-bin-0.09.tar;
+    url = http://nix.cs.uu.nl/dist/tarballs/mockobjects-bin-0.09.tar;
     md5 = "a0e11423bd5fcbb6ea65753643ea8852";
   };
 }
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index f06f9ff5be9..196237e15db 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   # releases of SWT.  So we just grab a binary release and extract
   # "src.zip" from that.
   src = fetchurl {
-    url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.1-200509290840/swt-3.1.1-gtk-linux-x86.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/swt-3.1.1-gtk-linux-x86.zip;
     md5 = "23dfe5a4a566439c5f526d9ea3b3db1c";
   };
   
diff --git a/pkgs/development/libraries/kde/kdelibs/default.nix b/pkgs/development/libraries/kde/kdelibs/default.nix
index 546a50fad9b..b6e4a876007 100644
--- a/pkgs/development/libraries/kde/kdelibs/default.nix
+++ b/pkgs/development/libraries/kde/kdelibs/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "kdelibs-3.4.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.tiscali.nl/pub/mirrors/kde/stable/3.4.3/src/kdelibs-3.4.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/kdelibs-3.4.3.tar.bz2;
     md5 = "0cd7c0c8a81e5d11b91b407a4aaaf3ff";
   };
 
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 8da6090e356..23ccc6479b8 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "lesstif-0.94.4";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/lesstif/lesstif-0.94.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/lesstif-0.94.4.tar.bz2;
     md5 = "3096ca456c0bc299d895974d307c82d8";
   };
   buildInputs = [x11];
diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index 118a02a94e6..1377cb74232 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libcaca-0.9";
   src = fetchurl {
-    url = http://sam.zoy.org/libcaca/libcaca-0.9.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libcaca-0.9.tar.bz2;
     md5 = "c7d5c46206091a9203fcb214abb25e4a";
   };
   configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 532990ba6f6..7a3a2ce9aaf 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libdrm-2.0";
   src = fetchurl {
-    url = http://dri.freedesktop.org/libdrm/libdrm-2.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libdrm-2.0.tar.gz;
     md5 = "9d1aab104eb757ceeb2c1a6d38d57411";
   };
 }
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 797002d2c81..ea37b987f03 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libgpg-error-1.0";
   src = fetchurl {
-    url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libgpg-error-1.0.tar.gz;
     md5 = "ff409db977e4a4897aa09ea420a28a2f";
   };
 }
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 8e06322b653..72928576e5a 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libgsf-1.13.2";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.13/libgsf-1.13.2.tar.bz2 ;
+    url = http://nix.cs.uu.nl/dist/tarballs/libgsf-1.13.2.tar.bz2;
     md5 = "0894afd88f9e43eada27e52cb22cd0f1";
   };
   buildInputs = [perl perlXMLParser pkgconfig libxml2 glib];
diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index 1d34b07b2a4..271cc47cda6 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libmspack-0.0.20040308alpha";
   src = fetchurl {
-    url = http://www.kyz.uklinux.net/downloads/libmspack-0.0.20040308alpha.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libmspack-0.0.20040308alpha.tar.gz;
     md5 = "4d8e967649df0f6ade83df7da4b7511c";
   };
 }
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 608faf01259..b9075db83dd 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libpcap-0.9.4";
   src = fetchurl {
-      url = http://www.tcpdump.org/release/libpcap-0.9.4.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/libpcap-0.9.4.tar.gz;
       md5 = "79025766e8027df154cb1f32de8a7974";
   };
   buildInputs = [flex bison];
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index d9f2c37a9b3..3fa0e6b8582 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -5,7 +5,7 @@ assert zlib != null;
 stdenv.mkDerivation {
   name = "libpng-1.2.8";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.8-config.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libpng-1.2.8-config.tar.gz;
     md5 = "e5a39003eed16103cbbd3b6a8bc6b1f9";
   };
   propagatedBuildInputs = [zlib];
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index ba24763ea18..1300893ecc4 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libsigc++-2.0.16";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-2.0.16.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libsigc++-2.0.16.tar.gz;
     md5 = "49b8c091b1be84d9f9801c4c81cd98b8";
   };
 
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 7998606a2fa..4d004c1e306 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libsndfile-1.0.12";
   src = fetchurl {
-    url = http://www.mega-nerd.com/libsndfile/libsndfile-1.0.12.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libsndfile-1.0.12.tar.gz;
     md5 = "03718b7b225b298f41c19620b8906108";
   };
 }
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index dec4fa43c33..61940611603 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "libtiff-3.7.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.remotesensing.org/pub/libtiff/old/tiff-3.7.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/tiff-3.7.4.tar.gz;
     md5 = "f37a7907bca4e235da85eb0126caa2b0";
   };
   propagatedBuildInputs = [zlib libjpeg];
diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix
index 432c1f46b03..b0cc8ed39fc 100644
--- a/pkgs/development/libraries/libusb/default.nix
+++ b/pkgs/development/libraries/libusb/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libusb-0.1.10a";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/libusb/libusb-0.1.10a.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libusb-0.1.10a.tar.gz;
     md5 = "c6062b29acd2cef414bcc34e0decbdd1";
   };
 }
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 553e70d386c..9e26da369b8 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libwpd-0.8.3";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/libwpd/libwpd-0.8.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libwpd-0.8.3.tar.gz;
     md5 = "f34404f8dc6123aca156d203c37e3e5d";
   };
   buildInputs = [pkgconfig glib libgsf libxml2];
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 24cbafbcbbb..a2232b04159 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.22.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.22.tar.gz;
     md5 = "1db8d06b4f49a665a8f47dc6d94450e6";
   };
 
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 3794a104495..8fb0cc09fa6 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.14";
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxslt-1.1.15.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.15.tar.gz;
     md5 = "238de9eda71b570ff7b78aaf65308fc6";
   };
   buildInputs = [libxml2];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f9e501ea5a9..8fd6c162653 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -6,15 +6,15 @@ stdenv.mkDerivation {
   name = "mesa-6.4";
   srcs = [
     (fetchurl {
-      url = http://surfnet.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/MesaLib-6.4.tar.bz2;
       md5 = "85a84e47a3f718f752f306b9e0954ef6";
     })
 /*    (fetchurl {
-      url = http://surfnet.dl.sourceforge.net/sourceforge/mesa3d/MesaGLUT-6.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2;
       md5 = "1a8c4d4fc699233f5fdb902b8753099e";
     })
     (fetchurl {
-      url = http://surfnet.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/MesaDemos-6.4.tar.bz2;
       md5 = "1a8c4d4fc699233f5fdb902b8753099e";
     }) */
   ];
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index d69b2b397d0..2d95762e121 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "neon-0.25.4";
   src = fetchurl {
-    url = http://www.webdav.org/neon/neon-0.25.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/neon-0.25.4.tar.gz;
     md5 = "4448c3a91e80429ea733aec8ce300009";
   };
   buildInputs = [libxml2];
diff --git a/pkgs/development/libraries/neon/neon-0.24.7.nix b/pkgs/development/libraries/neon/neon-0.24.7.nix
index 053ffe12896..24e35e736a2 100644
--- a/pkgs/development/libraries/neon/neon-0.24.7.nix
+++ b/pkgs/development/libraries/neon/neon-0.24.7.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "neon-0.24.7";
   src = fetchurl {
-    url = http://www.webdav.org/neon/neon-0.24.7.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/neon-0.24.7.tar.gz;
     md5 = "5108bcbe41de4afe2e19cc58500fb9f2";
   };
   buildInputs = [libxml2];
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index cd966cc1121..9528197adf6 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,12 +5,12 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   nsssrc = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_10_RTM/src/nss-3.10.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/nss-3.10.tar.gz;
     md5 = "f0d75d52aff21f88d9c055bdb78f54f8";
   };
 
   nsprsrc =  fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.6/src/nspr-4.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/nspr-4.6.tar.gz;
     md5 = "a37c3cde875502e05576429312452465";
   };
 
diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix
index 887a668b4e6..2afdd9714bf 100644
--- a/pkgs/development/libraries/openal/default.nix
+++ b/pkgs/development/libraries/openal/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "openal-0.0.8";
   src = fetchurl {
-    url = http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/openal-0.0.8.tar.gz;
     md5 = "0379bd39fc84454491ef38434a2e6e8d";
   };
   # Note: the autoconf/automake dependency can go once the Automake
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 17acebe7489..421f7d2331a 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "openexr-1.2.2";
   src = fetchurl {
-    url = http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/OpenEXR-1.2.2.tar.gz;
     md5 = "a2e56af78dc47c7294ff188c8f78394b";
   };
   buildInputs = [zlib];
diff --git a/pkgs/development/libraries/openssl-0.9.8/default.nix b/pkgs/development/libraries/openssl-0.9.8/default.nix
index 44778a98128..f39b4fb8f63 100644
--- a/pkgs/development/libraries/openssl-0.9.8/default.nix
+++ b/pkgs/development/libraries/openssl-0.9.8/default.nix
@@ -2,7 +2,7 @@
   name = "openssl-0.9.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.openssl.org/source/openssl-0.9.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/openssl-0.9.8.tar.gz;
     md5 = "9da21071596a124acde6080552deac16";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 23fd99295c7..aae5113f445 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -2,7 +2,7 @@
   name = "openssl-0.9.7i";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.openssl.org/source/openssl-0.9.7i.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/openssl-0.9.7i.tar.gz;
     sha1 = "4c23925744d43272fa19615454da44e01465eb06";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix
index f0b669da4da..9badda85929 100644
--- a/pkgs/development/libraries/pangoxsl/default.nix
+++ b/pkgs/development/libraries/pangoxsl/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "pangoxsl-1.6.0.1";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/pangopdf/pangoxsl-1.6.0.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pangoxsl-1.6.0.1.tar.gz;
     md5 = "3c2b9b3b77c9b725a2914db90f61f24b";
   };
 
diff --git a/pkgs/development/libraries/pciutils/default.nix b/pkgs/development/libraries/pciutils/default.nix
index 25424fd8efb..67605200170 100644
--- a/pkgs/development/libraries/pciutils/default.nix
+++ b/pkgs/development/libraries/pciutils/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pciutils-2.2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-2.2.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pciutils-2.2.1.tar.bz2;
     md5 = "483a08dc864ec42497ad95310bb1a8ee";
   };
   patches = [./pciutils-path.patch ./pciutils-devicetype.patch];
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 1b3a7ed104b..7fe191f0603 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "pcre-6.4";
   src = fetchurl {
-    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pcre-6.4.tar.bz2;
     md5 = "c5c73e8767479e8a7751324b0aa32291";
   };
 }
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 180ab7f267a..1ad77006df5 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   substitute = ../../../build-support/substitute/substitute.sh;
   hook = ./setup-hook.sh;  
   src = fetchurl {
-    url = http://wftp.tu-chemnitz.de/pub/Qt/qt/source/qt-x11-free-3.3.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.5.tar.bz2;
     md5 = "05d04688c0c0230ed54e89102d689ca4";
   };
 
diff --git a/pkgs/development/libraries/readline/readline4.nix b/pkgs/development/libraries/readline/readline4.nix
index 74944fdf6b8..c2e589bfacc 100644
--- a/pkgs/development/libraries/readline/readline4.nix
+++ b/pkgs/development/libraries/readline/readline4.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "readline-4.3";
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/readline/readline-4.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/readline-4.3.tar.gz;
     md5 = "f86f7cb717ab321fe15f1bbcb058c11e";
   };
   inherit ncurses;
diff --git a/pkgs/development/libraries/rte/default.nix b/pkgs/development/libraries/rte/default.nix
index 94067f71fd0..07d0a7649a1 100644
--- a/pkgs/development/libraries/rte/default.nix
+++ b/pkgs/development/libraries/rte/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "rte-0.5.6";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/rte-0.5.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/rte-0.5.6.tar.bz2;
     md5 = "6259cdff255af71c23a4576e7c5664a0";
   };
 }
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index 4b221a18583..b6e67ae5c99 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "slang-2.0.5";
   src = fetchurl {
-    url = ftp://space.mit.edu/pub/davis/slang/v2.0/slang-2.0.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/slang-2.0.5.tar.bz2;
     md5 = "8b6afa085f76b1be29825f0c470b6cad";
   };
   buildInputs = [pcre libpng];
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 47e404db1f0..9733c9f76d4 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "speex-1.0.5";
   src = fetchurl {
-    url = http://downloads.us.xiph.org/releases/speex/speex-1.0.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/speex-1.0.5.tar.gz;
     md5 = "01d6a2de0a88a861304bf517615dea79";
   };
 }
diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix
index 58b7c13edee..5fa157e8896 100644
--- a/pkgs/development/libraries/stlport/default.nix
+++ b/pkgs/development/libraries/stlport/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/stlport/STLport-5.0.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/STLport-5.0.0.tar.bz2;
     md5 = "5aefcbb0c30a91d50bb2d6c7b30e8393";
   };
 }
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 8fe560ab829..99450754c4f 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "t1lib-5.1.0";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/t1lib-5.1.0.tar.gz;
     md5 = "a05bed4aa63637052e60690ccde70421";
   };
   buildInputs = [x11 libXaw];
diff --git a/pkgs/development/libraries/wxGTK-2.6/default.nix b/pkgs/development/libraries/wxGTK-2.6/default.nix
index 4d0650c539d..61639c87a42 100644
--- a/pkgs/development/libraries/wxGTK-2.6/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.6/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "wxGTK-2.6.2";
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-2.6.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/wxGTK-2.6.2.tar.bz2;
     md5 = "ba2afe7bd028062c5fff6d5ef3249c67";
   };
 
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 9ea675dbc71..46c6728eb80 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -15,7 +15,7 @@ assert alsaSupport -> alsaLib != null;
   name = "xine-lib-1.1.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.1.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xine-lib-1.1.0.tar.gz;
     md5 = "3537cfd58d253b4be20a4975e7086e38";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/xlibs/libXrender/default.nix b/pkgs/development/libraries/xlibs/libXrender/default.nix
index 8daea27318a..2cb31b2498b 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.9.0";
   src = fetchurl {
-    url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXrender-0.9.0.tar.bz2;
     md5 = "ce7cda009aa0b10a73637941d44ae789";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXt/default.nix b/pkgs/development/libraries/xlibs/libXt/default.nix
index 448d6740bcd..5836b139b7d 100644
--- a/pkgs/development/libraries/xlibs/libXt/default.nix
+++ b/pkgs/development/libraries/xlibs/libXt/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXt-0.1.5";
   src = fetchurl {
-    url = http://xlibs.freedesktop.org/release/libXt-0.1.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXt-0.1.5.tar.bz2;
     md5 = "8ff20498eeedebe2fb72f93c2d7beab1";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/renderext/default.nix b/pkgs/development/libraries/xlibs/renderext/default.nix
index e225d640bd2..dc1a90892f4 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.9";
   src = fetchurl {
-    url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/renderext-0.9.tar.bz2;
     md5 = "d43c2afc69937655d13c02588c9ff974";
   };
 }
diff --git a/pkgs/development/libraries/xlibs/xproto/default.nix b/pkgs/development/libraries/xlibs/xproto/default.nix
index fb3bb2cd268..992ff12939e 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.2";
   src = fetchurl {
-    url = http://xlibs.freedesktop.org/release/xproto-6.6.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/xproto-6.6.2.tar.bz2;
     md5 = "fc419f3028cc2959b979a7e7464105f9";
   };
 }
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 8aded3940cd..190da7a98f4 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.3";
   src = fetchurl {
-    url = http://www.zlib.net/zlib-1.2.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/zlib-1.2.3.tar.gz;
     md5 = "debc62758716a169df9f62e6ab2bc634";
   };
   configureFlags = "--shared";
diff --git a/pkgs/development/libraries/zvbi/default.nix b/pkgs/development/libraries/zvbi/default.nix
index 3a235fdc97f..5fd83073fd9 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.16";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.16.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/zvbi-0.2.16.tar.bz2;
     md5 = "6ed822ae5d0766129bfa1508394b6ac0";
   };
   buildInputs = [x11 (if pngSupport then libpng else null)];
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index d6f40050fa3..53dbbd1ffaa 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pygtk-2.6.1";
 #  builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.6/pygtk-2.6.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pygtk-2.6.1.tar.bz2;
     md5 = "b4610829e4f57b5538dfa3b8f1fbe026";
   };
   buildInputs = [python pkgconfig glib gtk];
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 668a6c4d6b5..aed7ebd66d3 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://apache.surfnet.nl/ant/binaries/apache-ant-1.6.5-bin.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/apache-ant-1.6.5-bin.tar.bz2;
     md5 = "26031ee1a2fd248ad0cc2e7f17c44c39";
   };
 }
diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
index 745964accaf..d6e76d48530 100644
--- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/automake-1.9.6.tar.gz;
     md5 = "c60f77a42f103606981d456f1615f5b4";
   };
   buildInputs = [perl autoconf];
diff --git a/pkgs/development/tools/misc/binutils-cross/default.nix b/pkgs/development/tools/misc/binutils-cross/default.nix
index 7d77baced37..b3949e43f5c 100644
--- a/pkgs/development/tools/misc/binutils-cross/default.nix
+++ b/pkgs/development/tools/misc/binutils-cross/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "binutils-2.16.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.16.1.tar.bz2;
     md5 = "6a9d529efb285071dad10e1f3d2b2967";
   };
   inherit noSysDirs;
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 010bf87f16b..4875ba10f1b 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.16.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/binutils/binutils-2.16.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.16.1.tar.bz2;
     md5 = "6a9d529efb285071dad10e1f3d2b2967";
   };
   inherit noSysDirs;
diff --git a/pkgs/development/tools/misc/callgrind/default.nix b/pkgs/development/tools/misc/callgrind/default.nix
index df99a61d7b2..a69a4aaa703 100644
--- a/pkgs/development/tools/misc/callgrind/default.nix
+++ b/pkgs/development/tools/misc/callgrind/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   valgrindsrc = fetchurl {
-    url = http://valgrind.org/downloads/valgrind-3.0.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/valgrind-3.0.1.tar.bz2;
     md5 = "c29efdb7d1a93440f5644a6769054681";
   };
 
diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix
index a8f4a821a20..2957710a34f 100644
--- a/pkgs/development/tools/misc/ctags/default.nix
+++ b/pkgs/development/tools/misc/ctags/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ctags-5.5.4";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/ctags/ctags-5.5.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/ctags-5.5.4.tar.gz;
     md5 = "a84124caadd4103270e0b84596ecfe83";
   };
 }
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 993653fc922..a0e231bf60a 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation {
   name = "gnum4-1.4.3";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/m4/m4-1.4.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/m4-1.4.3.tar.bz2;
     md5 = "1f7d7eba70a0525c44c2edc3998925c7";
   };
 }
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 986c3c1f201..fc1583496b4 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "help2man-1.35.1";
 
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/help2man/help2man-1.35.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/help2man-1.35.1.tar.gz;
     md5 = "e3c9e846dd163eb7f1d1661e2d0baa07";
   };
 
diff --git a/pkgs/development/tools/misc/kcachegrind/default.nix b/pkgs/development/tools/misc/kcachegrind/default.nix
index 63ba8391483..e15dcdea3ae 100644
--- a/pkgs/development/tools/misc/kcachegrind/default.nix
+++ b/pkgs/development/tools/misc/kcachegrind/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://kcachegrind.sourceforge.net/kcachegrind-0.4.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/kcachegrind-0.4.6.tar.gz;
     md5 = "4ed60028dcefd6bf626635d5f2f50273";
   };
 
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 51163100907..8612c5a3f76 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.20";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.20.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libtool-1.5.20.tar.gz;
     md5 = "fc3b564700aebcb19de841c1c2d66e99";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix
index 4f04a3093d0..ec2fef768c4 100644
--- a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix
+++ b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://pkgconfig.freedesktop.org/releases/pkgconfig-0.17.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pkgconfig-0.17.2.tar.gz;
     md5 = "a0829ae71b586e027183b2a1cfe0ce88";
   };
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 831a0a06a35..fcee32ae79c 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://surfnet.dl.sourceforge.net/sourceforge/strace/strace-4.5.12.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/strace-4.5.12.tar.bz2;
     md5 = "c9dc77b9bd7f144f317e8289e0f6d40b";
   };
 }
diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix
index e10bc71a553..d15b15adf8d 100644
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ b/pkgs/development/tools/misc/texinfo/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "texinfo-4.8";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/texinfo/texinfo-4.8.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/texinfo-4.8.tar.bz2;
     md5 = "6ba369bbfe4afaa56122e65b3ee3a68c";
   };
   buildInputs = [ncurses];
diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix
index 0152d041059..a9e2c509ecc 100644
--- a/pkgs/development/tools/misc/valgrind/default.nix
+++ b/pkgs/development/tools/misc/valgrind/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "valgrind-3.0.1";
   src = fetchurl {
-    url = http://valgrind.org/downloads/valgrind-3.0.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/valgrind-3.0.1.tar.bz2;
     md5 = "c29efdb7d1a93440f5644a6769054681";
   };
 }
diff --git a/pkgs/development/tools/parsing/bison/bison-2.1.nix b/pkgs/development/tools/parsing/bison/bison-2.1.nix
index cfeb6f53afd..e28d16dc79c 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.1.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.1.nix
@@ -5,7 +5,7 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-2.1";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/bison/bison-2.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/bison-2.1.tar.bz2;
     md5 = "ef3110077462b1140b2ae612626e8486";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/uclibc/default.nix b/pkgs/development/uclibc/default.nix
index f59dd9f7ab4..0af014adabd 100644
--- a/pkgs/development/uclibc/default.nix
+++ b/pkgs/development/uclibc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   name = "uClibc-0.9.28";
   src = fetchurl {
-    url = http://www.uclibc.org/downloads/snapshots/uClibc-20051001.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/uClibc-20051001.tar.bz2;
     md5 = "5442033ed956d506f9a810cf70dc3744";
     #url = http://www.uclibc.org/downloads/uClibc-0.9.28.tar.bz2;
     #md5 = "1ada58d919a82561061e4741fb6abd29";
diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix
index 9117e26b37b..222ccefee54 100644
--- a/pkgs/games/quake3/game/default.nix
+++ b/pkgs/games/quake3/game/default.nix
@@ -1,40 +1,5 @@
 {stdenv, fetchurl, x11, SDL, mesa, openal}:
 
-# To run: ./ioquake3.i386 +set r_allowSoftwareGL 1
-
-/* To get hardware acceleration of NVidia cards:
-
-[eelco@hagbard:/nix/store/l28zjkflzlydmdqwh32a81krj7vn3xgh-quake3-icculus-1.33pre526]$ ls -l
-total 3080
-drwxr-xr-x  2 eelco users    4096 2006-01-26 15:10 baseq3
--rw-r--r--  1 eelco users    5529 2006-01-26 15:36 botlib.log
--rwxr-xr-x  1 eelco users  685640 2006-01-26 15:09 ioq3ded.i386
--rwxr-xr-x  1 eelco users 1342232 2006-01-26 15:09 ioquake3.i386
-lrwxrwxrwx  1 eelco users      19 2006-01-26 15:18 libGL.so.1 -> /usr/lib/libGL.so.1
-lrwxrwxrwx  1 eelco users      23 2006-01-26 15:19 libGLcore.so.1 -> /usr/lib/libGLcore.so.1
-lrwxrwxrwx  1 eelco users      30 2006-01-26 15:24 libXcursor.so.1 -> /usr/X11R6/lib/libXcursor.so.1
-lrwxrwxrwx  1 eelco users      27 2006-01-26 15:34 libnvidia-tls.so.1 -> /usr/lib/libnvidia-tls.so.1
--rw-r--r--  1 eelco users 1093352 2006-01-26 15:21 log
-drwxr-xr-x  2 eelco users    4096 2006-01-26 15:09 missionpack
-
-Then do: LD_LIBRARY_PATH=. ./ioquake3.i386
-
-Need to put this in a wrapper.
-
-Idem for adding the various *.pak files.
-
-On i915:
-
-LD_LIBRARY_PATH=/usr/X11R6/lib/modules/:/nix/store/9gy5fj9x7yvs72y31bm8db7mkl43br8w-libX11-1.0.0/lib:/nix/store/kcbq0frclmskk6mslzcc2qll2ky9l3y0-libXext-1.0.0/lib:/nix/store/54l9jk6l7papbh42z7sjdy1x84m255la-libXp-1.0.0/lib:. ./result/ioquake3.i386 +set fs_basepath ./x
-
-With symlinks for: libexpat.so.0 libGL.so.1 libXxf86vm.so.1
-
-Note that the libGL.so.1 for i915 dynamically loads
-/usr/X11R6/lib/modules/dri/i915_dri.so (which depends on
-libexpat.so).
-
-*/
-
 stdenv.mkDerivation {
   name = "quake3-icculus-1.33pre526";
   src = fetchurl {
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 5cb516167d8..e074837adf2 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cups-1.1.23";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/1.1.23/cups-1.1.23-source.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/cups-1.1.23-source.tar.bz2;
     md5 = "4ce09b1dce09b6b9398af0daae9adf63";
   };
   patches = [./cups-rc.d.patch];
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix
index 9f4e2787e7e..83fce8df6ca 100644
--- a/pkgs/misc/emulators/dosbox/default.nix
+++ b/pkgs/misc/emulators/dosbox/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation { 
   name = "dosbox-0.63";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/dosbox/dosbox-0.63.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/dosbox-0.63.tar.gz;
     md5 = "629413e41224ae9cdd115fdafd55cbdc";
   };
   buildInputs = [SDL];
diff --git a/pkgs/misc/emulators/generator/default.nix b/pkgs/misc/emulators/generator/default.nix
index aaf8d0d77e4..15318de6e48 100644
--- a/pkgs/misc/emulators/generator/default.nix
+++ b/pkgs/misc/emulators/generator/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation { 
   name = "generator-0.35-cbiere-r2";
   src = fetchurl {
-    url = http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere-r2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/generator-0.35-cbiere-r2.tar.bz2;
     md5 = "2076c20e0ad1b20d9ac15cab8cb12ad5";
   };
   configureFlags = "--with-gtk --with-raze --with-sdl-audio";
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 4183654aebc..74b10471c78 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -9,13 +9,13 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/ghostscript/ghostscript-8.15.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ghostscript-8.15.tar.bz2;
     md5 = "ab8502f30629b730e0c9ca56b88a6b9d";
   };
 
   fonts = [
     (fetchurl {
-      url = http://heanet.dl.sourceforge.net/sourceforge/ghostscript/ghostscript-fonts-std-8.11.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/ghostscript-fonts-std-8.11.tar.gz;
       md5 = "6865682b095f8c4500c54b285ff05ef6";
     })
     # ... add other fonts here
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index dca6da31cd0..425a6e93e52 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "sane-backends-1.0.17";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp3.sane-project.org/pub/sane/sane-backends-1.0.17/sane-backends-1.0.17.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sane-backends-1.0.17.tar.gz;
     md5 = "b51c10da8a81a04e1bae88c9e6556df2";
   };
   inherit (if hotplugSupport then hotplug else null);
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix
index d3c0911ba17..16fd0d58917 100644
--- a/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/pkgs/misc/screensavers/rss-glx/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/rss-glx/rss-glx_0.8.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/rss-glx_0.8.0.tar.bz2;
     md5 = "d04e909521626a27f9f6d9b5f8a24d6c";
   };
 
diff --git a/pkgs/misc/tex/lazylist/default.nix b/pkgs/misc/tex/lazylist/default.nix
index 19637793b00..bd5983efa73 100644
--- a/pkgs/misc/tex/lazylist/default.nix
+++ b/pkgs/misc/tex/lazylist/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://www.iai.uni-bonn.de/~loeh/lhs2tex/lazylist-1.0a.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/lazylist-1.0a.tar.bz2;
     md5 = "8ef357df5845bd8d6075fca6e1f214ab";
   };
 
diff --git a/pkgs/misc/tex/polytable/default.nix b/pkgs/misc/tex/polytable/default.nix
index 639656342e2..26fc475eafe 100644
--- a/pkgs/misc/tex/polytable/default.nix
+++ b/pkgs/misc/tex/polytable/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://www.iai.uni-bonn.de/~loeh/polytable-0.8.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/polytable-0.8.2.tar.gz;
     md5 = "c59edf035ae6e19b64b1ae920fea28e7";
   };
 
diff --git a/pkgs/misc/tex/tetex/default.nix b/pkgs/misc/tex/tetex/default.nix
index 4e786b1a978..bfd58cda8ba 100644
--- a/pkgs/misc/tex/tetex/default.nix
+++ b/pkgs/misc/tex/tetex/default.nix
@@ -5,12 +5,12 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-3.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/tetex-src-3.0.tar.gz;
     md5 = "944a4641e79e61043fdaf8f38ecbb4b3";
   };
 
   texmf = fetchurl {
-    url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-3.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/tetex-texmf-3.0.tar.gz;
     md5 = "11aa15c8d3e28ee7815e0d5fcdf43fd4";
   };
 
diff --git a/pkgs/os-specific/linux/alsa/library/default.nix b/pkgs/os-specific/linux/alsa/library/default.nix
index 43bb70f7c37..72284e02aa3 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.10";
   src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.10.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/alsa-lib-1.0.10.tar.bz2;
     md5 = "b1a4e15c9ff81798507de470a92fcc43";
   };
 }
diff --git a/pkgs/os-specific/linux/alsa/utils/default.nix b/pkgs/os-specific/linux/alsa/utils/default.nix
index 09ee5b95425..6a3560ff30d 100644
--- a/pkgs/os-specific/linux/alsa/utils/default.nix
+++ b/pkgs/os-specific/linux/alsa/utils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "alsa-utils-1.0.9a";
   src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.9a.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/alsa-utils-1.0.9a.tar.bz2;
     md5 = "d4b77e9fe0311772293e402fdd634ad2";
   };
   buildInputs = [alsaLib ncurses gettext];
diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix
index 434aabe0193..32d2446d9a4 100644
--- a/pkgs/os-specific/linux/dietlibc/default.nix
+++ b/pkgs/os-specific/linux/dietlibc/default.nix
@@ -5,7 +5,7 @@ assert stdenv.system == "i686-linux";
 stdenv.mkDerivation {
   name = "dietlibc-0.29";
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/libs/dietlibc/dietlibc-0.29.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/dietlibc-0.29.tar.bz2;
     md5 = "16d31dd7b5f9124e8ea8280c3f646e13";
   };
   patches = [./dietlibc-install.patch];
diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix
index ca8490bc7b9..cc1145a1bd1 100644
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   src = fetchurl {
     #url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.36.tar.gz;
-    url = http://surfnet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.38.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.38.tar.gz;
     md5 = "d774d4412bfb80d12cf3a4fdfd59de5a";
   };
   configureFlags = "--enable-dynamic-e2fsck --enable-elf-shlibs";
diff --git a/pkgs/os-specific/linux/eject/default.nix b/pkgs/os-specific/linux/eject/default.nix
index 8d20d90758b..5a5b0006f97 100644
--- a/pkgs/os-specific/linux/eject/default.nix
+++ b/pkgs/os-specific/linux/eject/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "eject-2.1.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.ibiblio.org/pub/Linux/utils/disk-management/eject-2.1.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/eject-2.1.0.tar.gz;
     md5 = "82e3a7a4d7e3323018c6938015ff25f7";
   };
   buildInputs = [gettext];
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index d30196fc835..6342a64b2f4 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "fuse-2.4.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/fuse/fuse-2.4.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/fuse-2.4.1.tar.gz;
     md5 = "553bd9c5a4f3cd27f3e2b93844711e4c";
   };
   configureFlags = [ "--disable-kernel-module" ];
diff --git a/pkgs/os-specific/linux/hotplug/default.nix b/pkgs/os-specific/linux/hotplug/default.nix
index e60cfe25509..318ddf0637c 100644
--- a/pkgs/os-specific/linux/hotplug/default.nix
+++ b/pkgs/os-specific/linux/hotplug/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "hotplug-2004_03_29";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/linux-hotplug/hotplug-2004_03_29.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/hotplug-2004_03_29.tar.gz;
     md5 = "167bd479a1ca30243c51ca088e0942b3";
   };
   patches = [./hotplug-install-path.patch ./hotplug-install.patch ./hotplug-2004_03_29.patch];
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 4c0a46f460c..a624afd0d6f 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "hwdata-0.172";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/h/hwdata/hwdata_0.172.orig.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/hwdata_0.172.orig.tar.gz;
     md5 = "1c6b7f4dfe489f881702176c5f8e5a2e";
   };
 }
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 7e69d92e84a..39df4dd8cfe 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 = ftp://ftp.nl.debian.org/debian/pool/main/i/iputils/iputils_20020927.orig.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/iputils_20020927.orig.tar.gz;
     md5 = "b5493f7a2997130a4f86c486c9993b86";
   };
 
diff --git a/pkgs/os-specific/linux/kernel-headers-cross/default.nix b/pkgs/os-specific/linux/kernel-headers-cross/default.nix
index efe6ba383f4..a20dbabc4c4 100644
--- a/pkgs/os-specific/linux/kernel-headers-cross/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers-cross/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "linux-headers-2.6.14.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.14.5.tar.bz2;
     md5 = "9f057e3bd31c50dc48553def01bc8037";
   };
   inherit cross;
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 934848ef64f..9d311201a19 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.6.14.3-i386";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.14.3.tar.bz2;
     md5 = "982717a9cb246e3c427cc45e3fc86097";
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/default.nix b/pkgs/os-specific/linux/kernel/default.nix
index a2cf3204d05..73a39a46d0f 100644
--- a/pkgs/os-specific/linux/kernel/default.nix
+++ b/pkgs/os-specific/linux/kernel/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "linux-2.6.11.12";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/os/Linux/system/kernel/v2.6/linux-2.6.11.12.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.11.12.tar.bz2;
     md5 = "7e3b6e630bb05c1a8c1ba46e010dbe44";
   };
   config = ./config;
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 97d5996f389..b86fdd0290b 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "klibc-1.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.kernel.org/pub/linux/libs/klibc/klibc-1.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/klibc-1.0.tar.bz2;
     md5 = "daaa233fb7905cbe110896fcad9bec7f";
   };
   inherit kernel;
diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix
index efb8240fdde..f824c3f4aa9 100644
--- a/pkgs/os-specific/linux/mingetty/default.nix
+++ b/pkgs/os-specific/linux/mingetty/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "mingetty-1.07";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/m/mingetty/mingetty_1.07.orig.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mingetty_1.07.orig.tar.gz;
     md5 = "491dedf1ceff0e0f5f7bb9f55bf5213e";
   };
   patches = [./makefile.patch];
diff --git a/pkgs/os-specific/linux/module-init-tools-static/default.nix b/pkgs/os-specific/linux/module-init-tools-static/default.nix
index 51e5498af5b..b99e1b85ce8 100644
--- a/pkgs/os-specific/linux/module-init-tools-static/default.nix
+++ b/pkgs/os-specific/linux/module-init-tools-static/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "module-init-tools-3.2.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.2.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/module-init-tools-3.2.2.tar.bz2;
     md5 = "a1ad0a09d3231673f70d631f3f5040e9";
   };
   patches = [./module-init-tools-static.patch];
diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix
index 96c145ff7a8..eb0364ccdda 100644
--- a/pkgs/os-specific/linux/module-init-tools/default.nix
+++ b/pkgs/os-specific/linux/module-init-tools/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "module-init-tools-3.2.2";
   src = fetchurl {
-    url = ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.2.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/module-init-tools-3.2.2.tar.bz2;
     md5 = "a1ad0a09d3231673f70d631f3f5040e9";
   };
 }
diff --git a/pkgs/os-specific/linux/ov511/default.nix b/pkgs/os-specific/linux/ov511/default.nix
index 79f954b0411..3a6483bd07d 100644
--- a/pkgs/os-specific/linux/ov511/default.nix
+++ b/pkgs/os-specific/linux/ov511/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ov511-2.30";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://alpha.dyndns.org/ov511/download/2.xx/distros/ov511-2.30.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ov511-2.30.tar.bz2;
     md5 = "9eacf9e54f2f54a59ddbf14221a53f2a";
   };
   patches = [./ov511-kernel.patch];
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index a281452a397..9b81e0189d4 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pam-0.80";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.nl.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-0.80.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/Linux-PAM-0.80.tar.bz2;
     md5 = "ccff87fe639efdfc22b1ba4a0f08ec57";
   };
   patches = [./pam-pwd.patch ./pam-cracklib.patch ./pam-modules.patch];
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index 5bd8e6de460..90b0f5966f3 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.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://procps.sourceforge.net/procps-3.2.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/procps-3.2.6.tar.gz;
     md5 = "7ce39ea27d7b3da0e8ad74dd41d06783";
   };
   patches = [./makefile.patch ./procps-build.patch];
diff --git a/pkgs/os-specific/linux/qc-usb/default.nix b/pkgs/os-specific/linux/qc-usb/default.nix
index 9d875a21674..420e8f72ab0 100644
--- a/pkgs/os-specific/linux/qc-usb/default.nix
+++ b/pkgs/os-specific/linux/qc-usb/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "qc-usb-0.6.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/qce-ga/qc-usb-0.6.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/qc-usb-0.6.3.tar.gz;
     md5 = "3d33380a29a7f92c4eef1f82d61b4ee0";
   };
   inherit kernel;
diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix
index ee9efc72ce8..4cb65b02294 100644
--- a/pkgs/os-specific/linux/sysklogd/default.nix
+++ b/pkgs/os-specific/linux/sysklogd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sysklogd-1.4.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.4.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sysklogd-1.4.1.tar.gz;
     md5 = "d214aa40beabf7bdb0c9b3c64432c774";
   };
   patches = [./sysklogd-1.4.1-cvs-20050525.diff ./sysklogd-1.4.1-asm.patch];
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index c72b6b9a21a..e6b908c440f 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "syslinux-3.09";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.09.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/syslinux-3.09.tar.bz2;
     md5 = "dd403b15ef18bb0e5d78d3f552f822a5";
   };
  buildInputs = [nasm perl];
diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index a2ef643cd75..52011df02dc 100644
--- a/pkgs/os-specific/linux/udev/default.nix
+++ b/pkgs/os-specific/linux/udev/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "udev-068";
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-068.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/udev-068.tar.bz2;
     md5 = "fd9db7375dae81e8aa634414b5ede0d6";
   };
   patches = [./udev-installpath.patch];
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 34d6749eb89..ef6559a8001 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "usbutils-0.71";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/linux-usb/usbutils-0.71.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/usbutils-0.71.tar.gz;
     md5 = "479d7c7098ef44cc95e7978fd71c712c";
   };
   buildInputs = [libusb];
diff --git a/pkgs/os-specific/linux/util-linux-static/default.nix b/pkgs/os-specific/linux/util-linux-static/default.nix
index 134260defef..ec50916ec19 100644
--- a/pkgs/os-specific/linux/util-linux-static/default.nix
+++ b/pkgs/os-specific/linux/util-linux-static/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "util-linux-2.12r";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/utils/util-linux/util-linux-2.12r.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/util-linux-2.12r.tar.bz2;
     md5 = "af9d9e03038481fbf79ea3ac33f116f9";
   };
   patches = [./MCONFIG.patch];
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 134260defef..ec50916ec19 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.12r";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/utils/util-linux/util-linux-2.12r.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/util-linux-2.12r.tar.bz2;
     md5 = "af9d9e03038481fbf79ea3ac33f116f9";
   };
   patches = [./MCONFIG.patch];
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index a6a5afcfd6f..e9b17400d17 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "vsftpd-2.0.3";
   src = fetchurl {
-    url = ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/vsftpd-2.0.3.tar.gz;
     md5 = "74936cbd8e8251deb1cd99c5fb18b6f8" ;
   };
   
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index 3684377cf10..b185afd77fd 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://apache.mirror.intouch.nl/httpd/modpython/mod_python-3.1.4.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mod_python-3.1.4.tgz;
     md5 = "607175958137b06bcda91110414c82a1";
   };
 
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 741432ae12b..54d5a4df5f7 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   buildInputs = [unzip];
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.4.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/jetty-5.1.4.zip;
     md5 = "5d16bb1ea4a62dff93c0b7f7de00430f";
   };
 }
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 449b13ab55b..548c09730e0 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "dovecot-1.0.alpha2";
   src = fetchurl {
-    url = http://www.dovecot.org/releases/dovecot-1.0.alpha2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/dovecot-1.0.alpha2.tar.gz;
     md5 = "ea33ac1bf13a8252d880082ef6811081" ;
   };
   
diff --git a/pkgs/servers/sql/mysql/default.nix b/pkgs/servers/sql/mysql/default.nix
index 20e32d49c05..a30b707c8ed 100644
--- a/pkgs/servers/sql/mysql/default.nix
+++ b/pkgs/servers/sql/mysql/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "mysql-4.1.16";
 
   src = fetchurl {
-    url = http://ftp.snt.utwente.nl/pub/software/mysql/Downloads/MySQL-4.1/mysql-4.1.16.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mysql-4.1.16.tar.gz;
     md5 = "13c5fdd05e28863db3a1261635890b5f";
   };
 
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index b9ed02ffd20..4be9287c0c2 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://ftp2.nl.postgresql.org/mirror/postgresql/source/v8.0.6/postgresql-8.0.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/postgresql-8.0.6.tar.bz2;
     md5 = "f3b27b8171267f9a87592f931c09f0ee";
   };
 
diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix
index 39c3e654759..77c15832075 100644
--- a/pkgs/servers/sql/postgresql/jdbc/default.nix
+++ b/pkgs/servers/sql/postgresql/jdbc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://jdbc.postgresql.org/download/postgresql-jdbc-8.0-311.src.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/postgresql-jdbc-8.0-311.src.tar.gz;
     md5 = "e31b6e68141883e5c89a3a9b0fb95c02";
   };
 
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index bd67f0263f0..42bd629e793 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -9,7 +9,7 @@ rec {
     name = "applewmproto-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/applewmproto-X11R7.0-1.0.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/applewmproto-X11R7.0-1.0.3.tar.bz2;
       md5 = "2acf46c814a27c40acd3e448ed17fee3";
     };
     buildInputs = [pkgconfig ];
@@ -19,7 +19,7 @@ rec {
     name = "appres-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/appres-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/appres-X11R7.0-1.0.0.tar.bz2;
       md5 = "3327357fc851a49e8e5dc44405e7b862";
     };
     buildInputs = [pkgconfig libX11 libXt ];
@@ -29,7 +29,7 @@ rec {
     name = "bdftopcf-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/bdftopcf-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/bdftopcf-X11R7.0-1.0.0.tar.bz2;
       md5 = "f43667fcf613054cae0679f5dc5a1e7a";
     };
     buildInputs = [pkgconfig libXfont ];
@@ -39,7 +39,7 @@ rec {
     name = "beforelight-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/beforelight-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/beforelight-X11R7.0-1.0.1.tar.bz2;
       md5 = "e0326eff9d1bd4e3a1af9e615a0048b3";
     };
     buildInputs = [pkgconfig libX11 libXaw libXScrnSaver libXt ];
@@ -49,7 +49,7 @@ rec {
     name = "bigreqsproto-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/bigreqsproto-X11R7.0-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/bigreqsproto-X11R7.0-1.0.2.tar.bz2;
       md5 = "ec15d17e3f04ddb5870ef7239b4ab367";
     };
     buildInputs = [pkgconfig ];
@@ -59,7 +59,7 @@ rec {
     name = "bitmap-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/bitmap-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/bitmap-X11R7.0-1.0.1.tar.bz2;
       md5 = "bbb3df097821d3edb4d5a4b2ae731de6";
     };
     buildInputs = [pkgconfig libXaw libX11 xbitmaps libXmu libXt ];
@@ -69,7 +69,7 @@ rec {
     name = "compositeproto-0.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/compositeproto-X11R7.0-0.2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/compositeproto-X11R7.0-0.2.2.tar.bz2;
       md5 = "4de13ee64fdfd409134dfee9b184e6a9";
     };
     buildInputs = [pkgconfig ];
@@ -79,7 +79,7 @@ rec {
     name = "damageproto-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/damageproto-X11R7.0-1.0.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/damageproto-X11R7.0-1.0.3.tar.bz2;
       md5 = "b906344d68e09a5639deb0097bd74224";
     };
     buildInputs = [pkgconfig ];
@@ -89,7 +89,7 @@ rec {
     name = "dmxproto-2.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/dmxproto-X11R7.0-2.2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/dmxproto-X11R7.0-2.2.2.tar.bz2;
       md5 = "21c79302beb868a078490549f558cdcf";
     };
     buildInputs = [pkgconfig ];
@@ -99,7 +99,7 @@ rec {
     name = "editres-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/editres-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/editres-X11R7.0-1.0.1.tar.bz2;
       md5 = "a9dc7f3b0cb59f08ab1e6554a5e60721";
     };
     buildInputs = [pkgconfig libXaw libX11 libXmu libXt ];
@@ -109,7 +109,7 @@ rec {
     name = "encodings-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/encodings-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/encodings-X11R7.0-1.0.0.tar.bz2;
       md5 = "385cbd4093b610610ca54c06cbb0f497";
     };
     buildInputs = [pkgconfig ];
@@ -119,7 +119,7 @@ rec {
     name = "evieext-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/evieext-X11R7.0-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/evieext-X11R7.0-1.0.2.tar.bz2;
       md5 = "411c0d4f9eaa7d220a8d13edc790e3de";
     };
     buildInputs = [pkgconfig ];
@@ -129,7 +129,7 @@ rec {
     name = "fixesproto-3.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fixesproto-X11R7.0-3.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/fixesproto-X11R7.0-3.0.2.tar.bz2;
       md5 = "ff8899d2325ed8a5787cde372ca8f80f";
     };
     buildInputs = [pkgconfig ];
@@ -139,7 +139,7 @@ rec {
     name = "font-adobe-100dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-100dpi-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-adobe-100dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "f5de34fa63976de9263f032453348f6c";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -149,7 +149,7 @@ rec {
     name = "font-adobe-75dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-75dpi-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-adobe-75dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "361fc4c9da3c34c5105df4f4688029d0";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -159,7 +159,7 @@ rec {
     name = "font-adobe-utopia-100dpi-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-utopia-100dpi-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-adobe-utopia-100dpi-X11R7.0-1.0.1.tar.bz2;
       md5 = "b720eed8eba0e4c5bcb9fdf6c2003355";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -169,7 +169,7 @@ rec {
     name = "font-adobe-utopia-75dpi-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-utopia-75dpi-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-adobe-utopia-75dpi-X11R7.0-1.0.1.tar.bz2;
       md5 = "a6d5d355b92a7e640698c934b0b79b53";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -179,7 +179,7 @@ rec {
     name = "font-adobe-utopia-type1-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2;
       md5 = "db1cc2f707cffd08a461f093b55ced5e";
     };
     buildInputs = [pkgconfig ];
@@ -189,7 +189,7 @@ rec {
     name = "font-alias-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-alias-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-alias-X11R7.0-1.0.1.tar.bz2;
       md5 = "de7035b15ba7edc36f8685ab3c17a9cf";
     };
     buildInputs = [pkgconfig ];
@@ -199,7 +199,7 @@ rec {
     name = "font-arabic-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-arabic-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-arabic-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "b95dc750ddc7d511e1f570034d9e1b27";
     };
     buildInputs = [pkgconfig ];
@@ -209,7 +209,7 @@ rec {
     name = "font-bh-100dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-100dpi-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bh-100dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "29eeed0ad42653f27b929119581deb3e";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -219,7 +219,7 @@ rec {
     name = "font-bh-75dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-75dpi-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bh-75dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "7546c97560eb325400365adbc426308b";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -229,7 +229,7 @@ rec {
     name = "font-bh-lucidatypewriter-100dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "8a56f4cbea74f4dbbf9bdac95686dca8";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -239,7 +239,7 @@ rec {
     name = "font-bh-lucidatypewriter-75dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-lucidatypewriter-75dpi-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bh-lucidatypewriter-75dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "e5cccf93f4f1f793cd32adfa81cc1b40";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -249,7 +249,7 @@ rec {
     name = "font-bh-ttf-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-ttf-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bh-ttf-X11R7.0-1.0.0.tar.bz2;
       md5 = "53b984889aec3c0c2eb07f8aaa49dba9";
     };
     buildInputs = [pkgconfig ];
@@ -259,7 +259,7 @@ rec {
     name = "font-bh-type1-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-type1-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bh-type1-X11R7.0-1.0.0.tar.bz2;
       md5 = "302111513d1e94303c0ec0139d5ae681";
     };
     buildInputs = [pkgconfig ];
@@ -269,7 +269,7 @@ rec {
     name = "font-bitstream-100dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bitstream-100dpi-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bitstream-100dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "dc595e77074de890974726769f25e123";
     };
     buildInputs = [pkgconfig ];
@@ -279,7 +279,7 @@ rec {
     name = "font-bitstream-75dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bitstream-75dpi-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bitstream-75dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "408515646743d14e1e2e240da4fffdc2";
     };
     buildInputs = [pkgconfig ];
@@ -289,7 +289,7 @@ rec {
     name = "font-bitstream-speedo-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2;
       md5 = "068c78ce48e5e6c4f25e0bba839a6b7a";
     };
     buildInputs = [pkgconfig ];
@@ -299,7 +299,7 @@ rec {
     name = "font-bitstream-type1-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bitstream-type1-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-bitstream-type1-X11R7.0-1.0.0.tar.bz2;
       md5 = "f4881a7e28eaeb7580d5eaf0f09239da";
     };
     buildInputs = [pkgconfig ];
@@ -309,7 +309,7 @@ rec {
     name = "fontcacheproto-0.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fontcacheproto-X11R7.0-0.1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/fontcacheproto-X11R7.0-0.1.2.tar.bz2;
       md5 = "116997d63cf6f65b75593ff5ae7afecb";
     };
     buildInputs = [pkgconfig ];
@@ -319,7 +319,7 @@ rec {
     name = "font-cronyx-cyrillic-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-cronyx-cyrillic-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-cronyx-cyrillic-X11R7.0-1.0.0.tar.bz2;
       md5 = "447163fff74b57968fc5139d8b2ad988";
     };
     buildInputs = [pkgconfig ];
@@ -329,7 +329,7 @@ rec {
     name = "font-cursor-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-cursor-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-cursor-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "82e89de0e1b9c95f32b0fc12f5131d2c";
     };
     buildInputs = [pkgconfig ];
@@ -339,7 +339,7 @@ rec {
     name = "font-daewoo-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-daewoo-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-daewoo-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "2fd7e6c8c21990ad906872efd02f3873";
     };
     buildInputs = [pkgconfig ];
@@ -349,7 +349,7 @@ rec {
     name = "font-dec-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-dec-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-dec-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "7ff9aba4c65aa226bda7528294c7998c";
     };
     buildInputs = [pkgconfig ];
@@ -359,7 +359,7 @@ rec {
     name = "font-ibm-type1-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-ibm-type1-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-ibm-type1-X11R7.0-1.0.0.tar.bz2;
       md5 = "fab2c49cb0f9fcee0bc0ac77e510d4e5";
     };
     buildInputs = [pkgconfig ];
@@ -369,7 +369,7 @@ rec {
     name = "font-isas-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-isas-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-isas-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "c0981507c9276c22956c7bfe932223d9";
     };
     buildInputs = [pkgconfig ];
@@ -379,7 +379,7 @@ rec {
     name = "font-jis-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-jis-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-jis-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "3732ca6c34d03e44c73f0c103512ef26";
     };
     buildInputs = [pkgconfig ];
@@ -389,7 +389,7 @@ rec {
     name = "font-micro-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-micro-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-micro-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "eb0050d73145c5b9fb6b9035305edeb6";
     };
     buildInputs = [pkgconfig ];
@@ -399,7 +399,7 @@ rec {
     name = "font-misc-cyrillic-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-misc-cyrillic-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-misc-cyrillic-X11R7.0-1.0.0.tar.bz2;
       md5 = "58d31311e8e51efbe16517adaf1a239d";
     };
     buildInputs = [pkgconfig ];
@@ -409,7 +409,7 @@ rec {
     name = "font-misc-ethiopic-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2;
       md5 = "190738980705826a27fbf4685650d3b9";
     };
     buildInputs = [pkgconfig ];
@@ -419,7 +419,7 @@ rec {
     name = "font-misc-meltho-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-misc-meltho-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-misc-meltho-X11R7.0-1.0.0.tar.bz2;
       md5 = "8812c57220bcd139b4ba6266eafbd712";
     };
     buildInputs = [pkgconfig ];
@@ -429,7 +429,7 @@ rec {
     name = "font-misc-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-misc-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-misc-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "4a5a7987183a9e1ea232c8391ae4c244";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -439,7 +439,7 @@ rec {
     name = "font-mutt-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-mutt-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-mutt-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "139b368edecf8185d16a33b4a7c09657";
     };
     buildInputs = [pkgconfig ];
@@ -449,7 +449,7 @@ rec {
     name = "font-schumacher-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-schumacher-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-schumacher-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "d51808138ef63b84363f7d82ed8bb681";
     };
     buildInputs = [pkgconfig fontutil ];
@@ -459,7 +459,7 @@ rec {
     name = "font-screen-cyrillic-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-screen-cyrillic-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-screen-cyrillic-X11R7.0-1.0.0.tar.bz2;
       md5 = "c08da585feb173e1b27c3fbf8f90ba45";
     };
     buildInputs = [pkgconfig ];
@@ -469,7 +469,7 @@ rec {
     name = "font-sony-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-sony-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-sony-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "014725f97635da9e5e9b303ab796817e";
     };
     buildInputs = [pkgconfig ];
@@ -479,7 +479,7 @@ rec {
     name = "fontsproto-2.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fontsproto-X11R7.0-2.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/fontsproto-X11R7.0-2.0.2.tar.bz2;
       md5 = "e2ca22df3a20177f060f04f15b8ce19b";
     };
     buildInputs = [pkgconfig ];
@@ -489,7 +489,7 @@ rec {
     name = "font-sun-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-sun-misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-sun-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "0259436c430034f24f3b239113c9630e";
     };
     buildInputs = [pkgconfig ];
@@ -499,7 +499,7 @@ rec {
     name = "fonttosfnt-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fonttosfnt-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/fonttosfnt-X11R7.0-1.0.1.tar.bz2;
       md5 = "89b65e010acaa3c5d370e1cc0ea9fce9";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto ];
@@ -509,7 +509,7 @@ rec {
     name = "font-util-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-util-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-util-X11R7.0-1.0.0.tar.bz2;
       md5 = "73cc445cb20a658037ad3a7ac571f525";
     };
     buildInputs = [pkgconfig ];
@@ -519,7 +519,7 @@ rec {
     name = "font-winitzki-cyrillic-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-winitzki-cyrillic-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-winitzki-cyrillic-X11R7.0-1.0.0.tar.bz2;
       md5 = "6dc447609609e4e2454ad7da29873501";
     };
     buildInputs = [pkgconfig ];
@@ -529,7 +529,7 @@ rec {
     name = "font-xfree86-type1-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-xfree86-type1-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-xfree86-type1-X11R7.0-1.0.0.tar.bz2;
       md5 = "27a6bbf5c8bbe998ff7e8537929ccbc8";
     };
     buildInputs = [pkgconfig ];
@@ -539,7 +539,7 @@ rec {
     name = "fslsfonts-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fslsfonts-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/fslsfonts-X11R7.0-1.0.1.tar.bz2;
       md5 = "c500b96cfec485e362204a8fc0bdfd44";
     };
     buildInputs = [pkgconfig libFS libX11 ];
@@ -549,7 +549,7 @@ rec {
     name = "fstobdf-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fstobdf-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/fstobdf-X11R7.0-1.0.1.tar.bz2;
       md5 = "233615dca862b64c69bc212090a22b4c";
     };
     buildInputs = [pkgconfig libFS libX11 ];
@@ -559,7 +559,7 @@ rec {
     name = "gccmakedep-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/gccmakedep-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gccmakedep-X11R7.0-1.0.1.tar.bz2;
       md5 = "328eea864d27b2d3a88ceb2fa66eca6d";
     };
     buildInputs = [pkgconfig ];
@@ -569,7 +569,7 @@ rec {
     name = "glproto-1.4.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/glproto-X11R7.0-1.4.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/glproto-X11R7.0-1.4.3.tar.bz2;
       md5 = "0ecb98487d7457f0592298fe9b8688f0";
     };
     buildInputs = [pkgconfig ];
@@ -579,7 +579,7 @@ rec {
     name = "iceauth-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/iceauth-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/iceauth-X11R7.0-1.0.1.tar.bz2;
       md5 = "92035bd69b4c9aba47607ba0efcc8530";
     };
     buildInputs = [pkgconfig libICE xproto ];
@@ -589,7 +589,7 @@ rec {
     name = "ico-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/ico-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/ico-X11R7.0-1.0.1.tar.bz2;
       md5 = "9c63d68a779819ba79e45d9b15d26b1f";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -599,7 +599,7 @@ rec {
     name = "imake-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/imake-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/imake-X11R7.0-1.0.1.tar.bz2;
       md5 = "487b4b86b2bd0c09e6d220a85d94efae";
     };
     buildInputs = [pkgconfig xproto ]; inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; 
@@ -609,7 +609,7 @@ rec {
     name = "inputproto-1.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/inputproto-X11R7.0-1.3.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/inputproto-X11R7.0-1.3.2.tar.bz2;
       md5 = "0da271f396bede5b8d09a61f6d1c4484";
     };
     buildInputs = [pkgconfig ];
@@ -619,7 +619,7 @@ rec {
     name = "kbproto-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/kbproto-X11R7.0-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/kbproto-X11R7.0-1.0.2.tar.bz2;
       md5 = "403f56d717b3fefe465ddd03d9c7bc81";
     };
     buildInputs = [pkgconfig ];
@@ -629,7 +629,7 @@ rec {
     name = "lbxproxy-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/lbxproxy-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/lbxproxy-X11R7.0-1.0.1.tar.bz2;
       md5 = "d9c05283660eae742a77dcbc0091841a";
     };
     buildInputs = [pkgconfig bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans zlib ];
@@ -639,7 +639,7 @@ rec {
     name = "libAppleWM-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libAppleWM-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libAppleWM-X11R7.0-1.0.0.tar.bz2;
       md5 = "8af30932ebc278835375fca34a2790f5";
     };
     buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
@@ -649,7 +649,7 @@ rec {
     name = "libFS-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libFS-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libFS-X11R7.0-1.0.0.tar.bz2;
       md5 = "12d2d89e7eb6ab0eb5823c3296f4e7a5";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
@@ -659,7 +659,7 @@ rec {
     name = "libICE-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libICE-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libICE-X11R7.0-1.0.0.tar.bz2;
       md5 = "c778084b135311726da8dc74a16b3555";
     };
     buildInputs = [pkgconfig xproto xtrans ];
@@ -669,7 +669,7 @@ rec {
     name = "libSM-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libSM-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libSM-X11R7.0-1.0.0.tar.bz2;
       md5 = "8a4eec299e8f14e26200718af7b2dcfc";
     };
     buildInputs = [pkgconfig libICE xproto xtrans ];
@@ -679,7 +679,7 @@ rec {
     name = "libWindowsWM-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libWindowsWM-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libWindowsWM-X11R7.0-1.0.0.tar.bz2;
       md5 = "d94f0389cd655b50e2987d5b988b82a5";
     };
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
@@ -689,7 +689,7 @@ rec {
     name = "libX11-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libX11-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libX11-X11R7.0-1.0.0.tar.bz2;
       md5 = "dcf59f148c978816ebbe3fbc5c9ef0e1";
     };
     buildInputs = [pkgconfig bigreqsproto inputproto kbproto libXau xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ];
@@ -699,7 +699,7 @@ rec {
     name = "libXScrnSaver-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXScrnSaver-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXScrnSaver-X11R7.0-1.0.1.tar.bz2;
       md5 = "b9deb6ac3194aeab15d8f6220481af6d";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
@@ -709,7 +709,7 @@ rec {
     name = "libXTrap-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXTrap-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXTrap-X11R7.0-1.0.0.tar.bz2;
       md5 = "8f2f1cc3b35f005e9030e162d89e2bdd";
     };
     buildInputs = [pkgconfig trapproto libX11 libXext xextproto libXt ];
@@ -719,7 +719,7 @@ rec {
     name = "libXau-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXau-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXau-X11R7.0-1.0.0.tar.bz2;
       md5 = "51ceac78ae0eaf40ffb77b3cccc028cc";
     };
     buildInputs = [pkgconfig xproto ];
@@ -729,7 +729,7 @@ rec {
     name = "libXaw-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXaw-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXaw-X11R7.0-1.0.1.tar.bz2;
       md5 = "ded3c7ed6d6ca2c5e257f60079a1a824";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
@@ -739,7 +739,7 @@ rec {
     name = "libXcomposite-0.2.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXcomposite-X11R7.0-0.2.2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXcomposite-X11R7.0-0.2.2.2.tar.bz2;
       md5 = "5773fe74d0f44b7264bd37c874efc7b1";
     };
     buildInputs = [pkgconfig compositeproto ];
@@ -749,7 +749,7 @@ rec {
     name = "libXcursor-1.1.5.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXcursor-X11R7.0-1.1.5.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXcursor-X11R7.0-1.1.5.2.tar.bz2;
       md5 = "048e15b725d8e081ac520e021af9a62c";
     };
     buildInputs = [pkgconfig fixesproto libX11 libXfixes libXrender ];
@@ -759,7 +759,7 @@ rec {
     name = "libXdamage-1.0.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXdamage-X11R7.0-1.0.2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXdamage-X11R7.0-1.0.2.2.tar.bz2;
       md5 = "e98c6cc1075db5f6e7e6c8aef303c562";
     };
     buildInputs = [pkgconfig damageproto libX11 ];
@@ -769,7 +769,7 @@ rec {
     name = "libXdmcp-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXdmcp-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXdmcp-X11R7.0-1.0.0.tar.bz2;
       md5 = "509390dc46af61e3a6d07656fc5ad0ec";
     };
     buildInputs = [pkgconfig xproto ];
@@ -779,7 +779,7 @@ rec {
     name = "libXevie-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXevie-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXevie-X11R7.0-1.0.0.tar.bz2;
       md5 = "70b1787315d8d5f961edac05fef95fd6";
     };
     buildInputs = [pkgconfig evieext libX11 libXext xextproto xproto ];
@@ -789,7 +789,7 @@ rec {
     name = "libXext-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXext-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXext-X11R7.0-1.0.0.tar.bz2;
       md5 = "9e47f574ac747446ac58ff9f6f402ceb";
     };
     buildInputs = [pkgconfig libX11 libXau xextproto xproto ];
@@ -799,7 +799,7 @@ rec {
     name = "libXfixes-3.0.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXfixes-X11R7.0-3.0.1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXfixes-X11R7.0-3.0.1.2.tar.bz2;
       md5 = "5a027e5959dae32b69dce42118938544";
     };
     buildInputs = [pkgconfig fixesproto libX11 xproto ];
@@ -809,7 +809,7 @@ rec {
     name = "libXfont-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXfont-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXfont-X11R7.0-1.0.0.tar.bz2;
       md5 = "955c41694772c9fd214e3e206f5d2178";
     };
     buildInputs = [pkgconfig fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ];
@@ -819,7 +819,7 @@ rec {
     name = "libXfontcache-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXfontcache-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXfontcache-X11R7.0-1.0.1.tar.bz2;
       md5 = "1e3c7718ffaf4f617d3f67ada5a7601e";
     };
     buildInputs = [pkgconfig fontcacheproto libX11 libXext xextproto ];
@@ -829,7 +829,7 @@ rec {
     name = "libXft-2.1.8.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXft-X11R7.0-2.1.8.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXft-X11R7.0-2.1.8.2.tar.bz2;
       md5 = "c42292b35325a9eeb24eb0f8d3a6ec52";
     };
     buildInputs = [pkgconfig fontconfig freetype libXrender ];
@@ -839,7 +839,7 @@ rec {
     name = "libXi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXi-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXi-X11R7.0-1.0.0.tar.bz2;
       md5 = "99503799b4d52ec0cac8e203341bb7b3";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ];
@@ -849,7 +849,7 @@ rec {
     name = "libXinerama-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXinerama-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXinerama-X11R7.0-1.0.1.tar.bz2;
       md5 = "1a1be870bb106193a4acc73c8c584dbc";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
@@ -859,7 +859,7 @@ rec {
     name = "libXmu-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXmu-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXmu-X11R7.0-1.0.0.tar.bz2;
       md5 = "df62f44da82c6780f07dc475a68dd9fa";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXt ];
@@ -869,7 +869,7 @@ rec {
     name = "libXp-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXp-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXp-X11R7.0-1.0.0.tar.bz2;
       md5 = "63c3048e06da4f6a033c5ce25217b0c3";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
@@ -879,7 +879,7 @@ rec {
     name = "libXpm-3.5.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXpm-X11R7.0-3.5.4.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXpm-X11R7.0-3.5.4.2.tar.bz2;
       md5 = "f3b3b6e687f567bbff7688d60edc81ba";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
@@ -889,7 +889,7 @@ rec {
     name = "libXprintAppUtil-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXprintAppUtil-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXprintAppUtil-X11R7.0-1.0.1.tar.bz2;
       md5 = "6d3f5d8d1f6c2c380bfc739128f41909";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXp libXprintUtil ];
@@ -899,7 +899,7 @@ rec {
     name = "libXprintUtil-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXprintUtil-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXprintUtil-X11R7.0-1.0.1.tar.bz2;
       md5 = "47f1863042a53a48b40c2fb0aa55a8f7";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXp libXt ];
@@ -909,7 +909,7 @@ rec {
     name = "libXrandr-1.1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXrandr-X11R7.0-1.1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXrandr-X11R7.0-1.1.0.2.tar.bz2;
       md5 = "e10aed44c2e1e5d9e6848a62ff2c90c7";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto libXrender ];
@@ -919,7 +919,7 @@ rec {
     name = "libXrender-0.9.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXrender-X11R7.0-0.9.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXrender-X11R7.0-0.9.0.2.tar.bz2;
       md5 = "3f0fa590dd84df07568631c91fbe68ab";
     };
     buildInputs = [pkgconfig renderproto libX11 ];
@@ -929,7 +929,7 @@ rec {
     name = "libXres-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXres-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXres-X11R7.0-1.0.0.tar.bz2;
       md5 = "cc5c4f130c9305e5bd973fbb7c56a254";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto ];
@@ -939,7 +939,7 @@ rec {
     name = "libXt-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXt-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXt-X11R7.0-1.0.0.tar.bz2;
       md5 = "d9c1c161f086a4d6c7510a924ee35c94";
     };
     buildInputs = [pkgconfig kbproto libSM libX11 xproto ];
@@ -949,7 +949,7 @@ rec {
     name = "libXtst-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXtst-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXtst-X11R7.0-1.0.1.tar.bz2;
       md5 = "3a3a3b88b4bc2a82f0b6de8ff526cc8c";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto ];
@@ -959,7 +959,7 @@ rec {
     name = "libXv-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXv-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXv-X11R7.0-1.0.1.tar.bz2;
       md5 = "9f0075619fc8d8df460be8aaa9d9ab5d";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto ];
@@ -969,7 +969,7 @@ rec {
     name = "libXvMC-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXvMC-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXvMC-X11R7.0-1.0.1.tar.bz2;
       md5 = "c3eb4f526f08862489355a99e3eda1bd";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto libXv ];
@@ -979,7 +979,7 @@ rec {
     name = "libXxf86dga-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXxf86dga-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXxf86dga-X11R7.0-1.0.0.tar.bz2;
       md5 = "d2154a588953d8db4ae6252ebc7db439";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
@@ -989,7 +989,7 @@ rec {
     name = "libXxf86misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXxf86misc-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXxf86misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "338568c9ca48b801f314c89c97327397";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
@@ -999,7 +999,7 @@ rec {
     name = "libXxf86vm-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXxf86vm-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXxf86vm-X11R7.0-1.0.0.tar.bz2;
       md5 = "ed59db622581b33ec2a62e12b2f9c274";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
@@ -1009,7 +1009,7 @@ rec {
     name = "libdmx-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libdmx-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libdmx-X11R7.0-1.0.1.tar.bz2;
       md5 = "ae6b3c48f1349fc5dfa7d7c4b9cf4718";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
@@ -1019,7 +1019,7 @@ rec {
     name = "libfontenc-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libfontenc-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libfontenc-X11R7.0-1.0.1.tar.bz2;
       md5 = "d7971cbb2d1000737bba86a4bd70b900";
     };
     buildInputs = [pkgconfig xproto zlib ];
@@ -1029,7 +1029,7 @@ rec {
     name = "liblbxutil-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/liblbxutil-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/liblbxutil-X11R7.0-1.0.0.tar.bz2;
       md5 = "1bcffde85723f78243d1ba60e1ebaef6";
     };
     buildInputs = [pkgconfig xextproto xproto zlib ];
@@ -1039,7 +1039,7 @@ rec {
     name = "liboldX-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/liboldX-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/liboldX-X11R7.0-1.0.1.tar.bz2;
       md5 = "a443a2dc15aa96a3d18340a1617d1bae";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -1049,7 +1049,7 @@ rec {
     name = "libxkbfile-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libxkbfile-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxkbfile-X11R7.0-1.0.1.tar.bz2;
       md5 = "0b1bb70a1df474c26dd83feab52e733d";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
@@ -1059,7 +1059,7 @@ rec {
     name = "libxkbui-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libxkbui-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxkbui-X11R7.0-1.0.1.tar.bz2;
       md5 = "1992547d377b510517fc7681207eead5";
     };
     buildInputs = [pkgconfig libX11 libxkbfile libXt ];
@@ -1069,7 +1069,7 @@ rec {
     name = "listres-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/listres-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/listres-X11R7.0-1.0.1.tar.bz2;
       md5 = "2eeb802272a7910bb8a52b308bf0d5f6";
     };
     buildInputs = [pkgconfig libXaw libX11 libXmu libXt ];
@@ -1079,7 +1079,7 @@ rec {
     name = "lndir-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/lndir-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/lndir-X11R7.0-1.0.1.tar.bz2;
       md5 = "aa3616b9795e2445c85b2c79b0f94f7b";
     };
     buildInputs = [pkgconfig xproto ];
@@ -1089,7 +1089,7 @@ rec {
     name = "luit-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/luit-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/luit-X11R7.0-1.0.1.tar.bz2;
       md5 = "30428b8ff783a0cfd61dab05a17cfaa7";
     };
     buildInputs = [pkgconfig libfontenc libX11 zlib ];
@@ -1099,7 +1099,7 @@ rec {
     name = "makedepend-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/makedepend-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/makedepend-X11R7.0-1.0.0.tar.bz2;
       md5 = "7494c7ff65d8c31ef8db13661487b54c";
     };
     buildInputs = [pkgconfig xproto ];
@@ -1109,7 +1109,7 @@ rec {
     name = "mkcfm-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/mkcfm-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/mkcfm-X11R7.0-1.0.1.tar.bz2;
       md5 = "912e6305998441c26852309403742bec";
     };
     buildInputs = [pkgconfig libfontenc libFS libX11 libXfont ];
@@ -1119,7 +1119,7 @@ rec {
     name = "mkfontdir-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/mkfontdir-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/mkfontdir-X11R7.0-1.0.1.tar.bz2;
       md5 = "29e6e5e8e7a29ed49abf33af192693cb";
     };
     buildInputs = [pkgconfig ];
@@ -1129,7 +1129,7 @@ rec {
     name = "mkfontscale-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/mkfontscale-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/mkfontscale-X11R7.0-1.0.1.tar.bz2;
       md5 = "75bbd1dc425849e415a60afd9e74d2ff";
     };
     buildInputs = [pkgconfig libfontenc freetype libX11 zlib ];
@@ -1139,7 +1139,7 @@ rec {
     name = "oclock-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/oclock-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/oclock-X11R7.0-1.0.1.tar.bz2;
       md5 = "e35af9699c49f0b77fad45a3b942c3b1";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu libXt ];
@@ -1149,7 +1149,7 @@ rec {
     name = "printproto-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/printproto-X11R7.0-1.0.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/printproto-X11R7.0-1.0.3.tar.bz2;
       md5 = "15c629a109b074d669886b1c6b7b319e";
     };
     buildInputs = [pkgconfig ];
@@ -1159,7 +1159,7 @@ rec {
     name = "proxymngr-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/proxymngr-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/proxymngr-X11R7.0-1.0.1.tar.bz2;
       md5 = "0d2ca6876d84302f966fd105a3b69a8e";
     };
     buildInputs = [pkgconfig libICE libX11 xproxymanagementprotocol libXt ];
@@ -1169,7 +1169,7 @@ rec {
     name = "randrproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/randrproto-X11R7.0-1.1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/randrproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "bcf36d524f6f50aa16ee8e183350f7b8";
     };
     buildInputs = [pkgconfig ];
@@ -1179,7 +1179,7 @@ rec {
     name = "recordproto-1.13.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/recordproto-X11R7.0-1.13.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/recordproto-X11R7.0-1.13.2.tar.bz2;
       md5 = "6f41a40e8cf4452f1c1725d46b08eb2e";
     };
     buildInputs = [pkgconfig ];
@@ -1189,7 +1189,7 @@ rec {
     name = "renderproto-0.9.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/renderproto-X11R7.0-0.9.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/renderproto-X11R7.0-0.9.2.tar.bz2;
       md5 = "a7f3be0960c92ecb6a06a1022fe957df";
     };
     buildInputs = [pkgconfig ];
@@ -1199,7 +1199,7 @@ rec {
     name = "resourceproto-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/resourceproto-X11R7.0-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/resourceproto-X11R7.0-1.0.2.tar.bz2;
       md5 = "e13d7b0aa5c591224f073bbbd9d1b038";
     };
     buildInputs = [pkgconfig ];
@@ -1209,7 +1209,7 @@ rec {
     name = "rgb-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/rgb-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/rgb-X11R7.0-1.0.0.tar.bz2;
       md5 = "675e72f221714c3db8730daf0b50f69f";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -1219,7 +1219,7 @@ rec {
     name = "rstart-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/rstart-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/rstart-X11R7.0-1.0.1.tar.bz2;
       md5 = "6f33a1bd8e99372b7544ddfcad456369";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -1229,7 +1229,7 @@ rec {
     name = "scripts-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/scripts-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/scripts-X11R7.0-1.0.1.tar.bz2;
       md5 = "b5b43aa53372b78f1d67c86301e3dc02";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -1239,7 +1239,7 @@ rec {
     name = "scrnsaverproto-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/scrnsaverproto-X11R7.0-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/scrnsaverproto-X11R7.0-1.0.2.tar.bz2;
       md5 = "3185971597710d8843d986da3271b83f";
     };
     buildInputs = [pkgconfig ];
@@ -1249,7 +1249,7 @@ rec {
     name = "sessreg-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/sessreg-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/sessreg-X11R7.0-1.0.0.tar.bz2;
       md5 = "8289a5b947165449c23bdfad9af02b4c";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -1259,7 +1259,7 @@ rec {
     name = "setxkbmap-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/setxkbmap-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/setxkbmap-X11R7.0-1.0.1.tar.bz2;
       md5 = "28b141ab0b1c44a5e90d31ad73bd1078";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
@@ -1269,7 +1269,7 @@ rec {
     name = "showfont-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/showfont-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/showfont-X11R7.0-1.0.1.tar.bz2;
       md5 = "334cb5133960108ac2c24ee27e16bb8e";
     };
     buildInputs = [pkgconfig libFS ];
@@ -1279,7 +1279,7 @@ rec {
     name = "smproxy-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/smproxy-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/smproxy-X11R7.0-1.0.1.tar.bz2;
       md5 = "60f54881b6fb27a8ba238629e4097c4d";
     };
     buildInputs = [pkgconfig libXmu libXt ];
@@ -1289,7 +1289,7 @@ rec {
     name = "trapproto-3.4.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/trapproto-X11R7.0-3.4.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/trapproto-X11R7.0-3.4.3.tar.bz2;
       md5 = "84ab290758d2c177df5924e10bff4835";
     };
     buildInputs = [pkgconfig ];
@@ -1299,7 +1299,7 @@ rec {
     name = "twm-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/twm-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/twm-X11R7.0-1.0.1.tar.bz2;
       md5 = "cd525ca3ac5e29d21a61deebc1e0c376";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu libXt ];
@@ -1309,7 +1309,7 @@ rec {
     name = "util-macros-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/util-macros-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/util-macros-X11R7.0-1.0.1.tar.bz2;
       md5 = "bc6be634532d4936eb753de54e1663d3";
     };
     buildInputs = [pkgconfig ];
@@ -1319,7 +1319,7 @@ rec {
     name = "videoproto-2.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/videoproto-X11R7.0-2.2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/videoproto-X11R7.0-2.2.2.tar.bz2;
       md5 = "de9e16a8a464531a54a36211d2f983bd";
     };
     buildInputs = [pkgconfig ];
@@ -1329,7 +1329,7 @@ rec {
     name = "viewres-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/viewres-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/viewres-X11R7.0-1.0.1.tar.bz2;
       md5 = "004bf8dd4646aca86faf5aa22b0c3f2f";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -1339,7 +1339,7 @@ rec {
     name = "windowswmproto-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/windowswmproto-X11R7.0-1.0.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/windowswmproto-X11R7.0-1.0.3.tar.bz2;
       md5 = "ea2f71075f68371fec22eb98a6af8074";
     };
     buildInputs = [pkgconfig ];
@@ -1349,7 +1349,7 @@ rec {
     name = "x11perf-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/x11perf-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/x11perf-X11R7.0-1.0.1.tar.bz2;
       md5 = "9986b20301c6a37bb144cb9733bf35a0";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -1359,7 +1359,7 @@ rec {
     name = "xauth-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xauth-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xauth-X11R7.0-1.0.1.tar.bz2;
       md5 = "ef2359ddaaea6ffaf9072fa342d6eb09";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu ];
@@ -1369,7 +1369,7 @@ rec {
     name = "xbiff-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xbiff-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xbiff-X11R7.0-1.0.1.tar.bz2;
       md5 = "c4eb71a3187586d02365a67fc1445e54";
     };
     buildInputs = [pkgconfig libXaw xbitmaps libXext ];
@@ -1379,7 +1379,7 @@ rec {
     name = "xbitmaps-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xbitmaps-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xbitmaps-X11R7.0-1.0.1.tar.bz2;
       md5 = "22c6f4a17220cd6b41d9799905f8e357";
     };
     buildInputs = [pkgconfig ];
@@ -1389,7 +1389,7 @@ rec {
     name = "xcalc-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcalc-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xcalc-X11R7.0-1.0.1.tar.bz2;
       md5 = "c1ecea85be15f746a59931e288768bdb";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -1399,7 +1399,7 @@ rec {
     name = "xclipboard-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xclipboard-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xclipboard-X11R7.0-1.0.1.tar.bz2;
       md5 = "a661b0f922cbdc62514bfd3e700d00fd";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -1409,7 +1409,7 @@ rec {
     name = "xclock-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xclock-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xclock-X11R7.0-1.0.1.tar.bz2;
       md5 = "00444fed4bf5cd51624476ee11dd1fab";
     };
     buildInputs = [pkgconfig libXaw libX11 libXft libxkbfile libXrender libXt ];
@@ -1419,7 +1419,7 @@ rec {
     name = "xcmiscproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcmiscproto-X11R7.0-1.1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xcmiscproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "77f3ba0cbef119e0230d235507a1d916";
     };
     buildInputs = [pkgconfig ];
@@ -1429,7 +1429,7 @@ rec {
     name = "xcmsdb-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcmsdb-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xcmsdb-X11R7.0-1.0.1.tar.bz2;
       md5 = "1c8396ed5c416e3a6658394ff6c415ad";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -1439,7 +1439,7 @@ rec {
     name = "xconsole-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xconsole-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xconsole-X11R7.0-1.0.1.tar.bz2;
       md5 = "f983b589ba9de198d90abee220a80f81";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -1449,7 +1449,7 @@ rec {
     name = "xcursorgen-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcursorgen-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xcursorgen-X11R7.0-1.0.0.tar.bz2;
       md5 = "4d7b26dbb4442e89ec65c4147b31a5f7";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
@@ -1459,7 +1459,7 @@ rec {
     name = "xcursor-themes-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcursor-themes-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xcursor-themes-X11R7.0-1.0.1.tar.bz2;
       md5 = "c39afeae55a7d330297b2fec3d113634";
     };
     buildInputs = [pkgconfig libXcursor ];
@@ -1469,7 +1469,7 @@ rec {
     name = "xdbedizzy-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xdbedizzy-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xdbedizzy-X11R7.0-1.0.1.tar.bz2;
       md5 = "ceaccde801650ffbffc1e5b0657960d2";
     };
     buildInputs = [pkgconfig libXau libXext libXp libXprintUtil ];
@@ -1479,7 +1479,7 @@ rec {
     name = "xditview-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xditview-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xditview-X11R7.0-1.0.1.tar.bz2;
       md5 = "21887fe4ec1965d637e82b7840650a6f";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -1489,7 +1489,7 @@ rec {
     name = "xdm-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xdm-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xdm-X11R7.0-1.0.1.tar.bz2;
       md5 = "9ac363721dbb8cd39aa1064b260624a6";
     };
     buildInputs = [pkgconfig libXaw libX11 libXau libXdmcp libXext libXinerama libXmu libXpm libXt ];
@@ -1499,7 +1499,7 @@ rec {
     name = "xdpyinfo-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xdpyinfo-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xdpyinfo-X11R7.0-1.0.1.tar.bz2;
       md5 = "2b08e9ca783e3aa91d7fb84fdd716e93";
     };
     buildInputs = [pkgconfig libdmx libX11 libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
@@ -1509,7 +1509,7 @@ rec {
     name = "xdriinfo-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xdriinfo-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xdriinfo-X11R7.0-1.0.0.tar.bz2;
       md5 = "75b8b53e29bb295f7fbae7909e0e9770";
     };
     buildInputs = [pkgconfig glproto libX11 ];
@@ -1519,7 +1519,7 @@ rec {
     name = "xedit-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xedit-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xedit-X11R7.0-1.0.1.tar.bz2;
       md5 = "19f607d033f62fb1ee5965f4236b19d4";
     };
     buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ];
@@ -1529,7 +1529,7 @@ rec {
     name = "xev-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xev-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xev-X11R7.0-1.0.1.tar.bz2;
       md5 = "5d0d3c13b03e9516eafe536e6bd756c7";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -1539,7 +1539,7 @@ rec {
     name = "xextproto-7.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xextproto-X11R7.0-7.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xextproto-X11R7.0-7.0.2.tar.bz2;
       md5 = "c0e88fc3483d90a7fea6a399298d90ea";
     };
     buildInputs = [pkgconfig ];
@@ -1549,7 +1549,7 @@ rec {
     name = "xeyes-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xeyes-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xeyes-X11R7.0-1.0.1.tar.bz2;
       md5 = "3ffafa7f222ea799bcd9fcd85c60ab98";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu libXt ];
@@ -1559,7 +1559,7 @@ rec {
     name = "xf86bigfontproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86bigfontproto-X11R7.0-1.1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86bigfontproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "5509d420a2bc898ca7d817cd8bf1b2a7";
     };
     buildInputs = [pkgconfig ];
@@ -1569,7 +1569,7 @@ rec {
     name = "xf86dga-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86dga-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86dga-X11R7.0-1.0.1.tar.bz2;
       md5 = "f518fd7ebef3d9e8dbaa57e50a3e2631";
     };
     buildInputs = [pkgconfig libX11 libXaw libXmu libXt libXxf86dga ];
@@ -1579,7 +1579,7 @@ rec {
     name = "xf86dgaproto-2.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86dgaproto-X11R7.0-2.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86dgaproto-X11R7.0-2.0.2.tar.bz2;
       md5 = "48ddcc6b764dba7e711f8e25596abdb0";
     };
     buildInputs = [pkgconfig ];
@@ -1589,7 +1589,7 @@ rec {
     name = "xf86driproto-2.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86driproto-X11R7.0-2.0.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86driproto-X11R7.0-2.0.3.tar.bz2;
       md5 = "839a70dfb8d5b02bcfc24996ab99a618";
     };
     buildInputs = [pkgconfig ];
@@ -1599,7 +1599,7 @@ rec {
     name = "xf86-input-acecad-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-acecad-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-acecad-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "b35b1756579ebe296801622bdf063ab1";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1609,7 +1609,7 @@ rec {
     name = "xf86-input-aiptek-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-aiptek-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-aiptek-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "9ee5109ef33e281ce0784ad077f26cee";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1619,7 +1619,7 @@ rec {
     name = "xf86-input-calcomp-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-calcomp-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-calcomp-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "f4199b5df063701462d5a8c84aadd190";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1629,7 +1629,7 @@ rec {
     name = "xf86-input-citron-2.1.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-citron-X11R7.0-2.1.1.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-citron-X11R7.0-2.1.1.5.tar.bz2;
       md5 = "62b5405d337bc055bc9345565cc0da8c";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1639,7 +1639,7 @@ rec {
     name = "xf86-input-digitaledge-1.0.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-digitaledge-X11R7.0-1.0.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-digitaledge-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "8342f3a0dcdaa1120af01dd25dabf0d7";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1649,7 +1649,7 @@ rec {
     name = "xf86-input-dmc-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-dmc-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-dmc-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "fdf127a2d419f7c2e02bec27273091d3";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1659,7 +1659,7 @@ rec {
     name = "xf86-input-dynapro-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-dynapro-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-dynapro-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "89dbb839ab4c5fca3dbc3c2805a7efb9";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1669,7 +1669,7 @@ rec {
     name = "xf86-input-elo2300-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-elo2300-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-elo2300-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "6009a17f13a37bfde8b60c2fba5b0e5b";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1679,7 +1679,7 @@ rec {
     name = "xf86-input-elographics-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-elographics-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-elographics-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "24c33f833bb2db72a07c3d28bfc0aae9";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1689,7 +1689,7 @@ rec {
     name = "xf86-input-evdev-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "d982c6f185f4c75a4b65703ceed7be06";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1699,7 +1699,7 @@ rec {
     name = "xf86-input-fpit-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-fpit-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-fpit-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "fc0e11fefc322623914a2d819d5b6d51";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1709,7 +1709,7 @@ rec {
     name = "xf86-input-hyperpen-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-hyperpen-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-hyperpen-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "0c4f2a6390e3045e4c48a48b47b6332c";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1719,7 +1719,7 @@ rec {
     name = "xf86-input-jamstudio-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-jamstudio-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-jamstudio-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "49de35ca024be2cb785832ae37ec30d0";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1729,7 +1729,7 @@ rec {
     name = "xf86-input-joystick-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-joystick-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-joystick-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "9e3ba60836f4c1d2e4cebc63a28321b4";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1739,7 +1739,7 @@ rec {
     name = "xf86-input-keyboard-1.0.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-keyboard-X11R7.0-1.0.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-keyboard-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "8fb8a30fd9d7f152a1aef4eb8ef32b3f";
     };
     buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ];
@@ -1749,7 +1749,7 @@ rec {
     name = "xf86-input-magellan-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-magellan-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-magellan-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "fd7367f467dc3302604274cee59a7c7b";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1759,7 +1759,7 @@ rec {
     name = "xf86-input-magictouch-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-magictouch-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-magictouch-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "a51d84792b8c0079d7c8d13eb17acf31";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1769,7 +1769,7 @@ rec {
     name = "xf86-input-microtouch-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-microtouch-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-microtouch-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "0c25e0340b6483fb2a600b0e885724a2";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1779,7 +1779,7 @@ rec {
     name = "xf86-input-mouse-1.0.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-mouse-X11R7.0-1.0.3.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-mouse-X11R7.0-1.0.3.1.tar.bz2;
       md5 = "12a908e5a97b1b03e8717abf167f4f27";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1789,7 +1789,7 @@ rec {
     name = "xf86-input-mutouch-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-mutouch-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-mutouch-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "4758e667bfbba517df2a58d51270cfe2";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1799,7 +1799,7 @@ rec {
     name = "xf86-input-palmax-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-palmax-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-palmax-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "d138024a20298304af883631d23c5338";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1809,7 +1809,7 @@ rec {
     name = "xf86-input-penmount-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-penmount-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-penmount-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "065b1cf862864741aebcfefcc7c09539";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1819,7 +1819,7 @@ rec {
     name = "xf86-input-spaceorb-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-spaceorb-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-spaceorb-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "193ca7b1e87c3995b86f15a01b63b297";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1829,7 +1829,7 @@ rec {
     name = "xf86-input-summa-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-summa-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-summa-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "61d780857e5dc139081718c075e74a01";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1839,7 +1839,7 @@ rec {
     name = "xf86-input-tek4957-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-tek4957-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-tek4957-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "df633403c91a48c6a316c6a5f48e53e2";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1849,7 +1849,7 @@ rec {
     name = "xf86-input-ur98-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-ur98-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-ur98-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "9b1530b3dcbb77690ad0e61f60489899";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1859,7 +1859,7 @@ rec {
     name = "xf86-input-void-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-void-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-void-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "c7ae53dee1f3e95fa5ce9659b34d8446";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1869,7 +1869,7 @@ rec {
     name = "xf86miscproto-0.9.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86miscproto-X11R7.0-0.9.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86miscproto-X11R7.0-0.9.2.tar.bz2;
       md5 = "1cc082d8a6da5177ede354bedbacd4ed";
     };
     buildInputs = [pkgconfig ];
@@ -1879,7 +1879,7 @@ rec {
     name = "xf86rushproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86rushproto-X11R7.0-1.1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86rushproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "1a6b258d72c3c3baccfd695d278e847c";
     };
     buildInputs = [pkgconfig ];
@@ -1889,7 +1889,7 @@ rec {
     name = "xf86-video-apm-1.0.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-apm-X11R7.0-1.0.1.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-apm-X11R7.0-1.0.1.5.tar.bz2;
       md5 = "323911ab16a6147d3cabceff9336a3d2";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -1899,7 +1899,7 @@ rec {
     name = "xf86-video-ark-0.5.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-ark-X11R7.0-0.5.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-ark-X11R7.0-0.5.0.5.tar.bz2;
       md5 = "342937e275dbc92f437417a3186a8222";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
@@ -1909,7 +1909,7 @@ rec {
     name = "xf86-video-ati-6.5.7.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-ati-X11R7.0-6.5.7.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-ati-X11R7.0-6.5.7.3.tar.bz2;
       md5 = "92525195a7a36f5ffbffcb4e6a564e50";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
@@ -1919,7 +1919,7 @@ rec {
     name = "xf86-video-chips-1.0.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-chips-X11R7.0-1.0.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-chips-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "90f23505faceac30d3f46ab94f7293e1";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -1929,7 +1929,7 @@ rec {
     name = "xf86-video-cirrus-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-cirrus-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-cirrus-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "7708693ad9d73cd76d4caef7c644a46f";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -1939,7 +1939,7 @@ rec {
     name = "xf86-video-cyrix-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-cyrix-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-cyrix-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "14f868d16554b19fef4f30398a7b9cf1";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
@@ -1949,7 +1949,7 @@ rec {
     name = "xf86-video-dummy-0.1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-dummy-X11R7.0-0.1.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-dummy-X11R7.0-0.1.0.5.tar.bz2;
       md5 = "462654f9be7e3022f97147e3390db97a";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
@@ -1959,7 +1959,7 @@ rec {
     name = "xf86-video-fbdev-0.1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-fbdev-X11R7.0-0.1.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-fbdev-X11R7.0-0.1.0.5.tar.bz2;
       md5 = "1cf374eeb9151ac16a7ec2cd38048737";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
@@ -1969,7 +1969,7 @@ rec {
     name = "xf86-video-glint-1.0.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-glint-X11R7.0-1.0.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-glint-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "f14c2f1696c05760207adcaac856e5e5";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ];
@@ -1979,7 +1979,7 @@ rec {
     name = "xf86-video-i128-1.1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-i128-X11R7.0-1.1.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-i128-X11R7.0-1.1.0.5.tar.bz2;
       md5 = "078eed8c3673488ee618dfc7a3ef101b";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -1989,7 +1989,7 @@ rec {
     name = "xf86-video-i740-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-i740-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-i740-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "625448b13ebe2a13b7defad1efec05c4";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -1999,7 +1999,7 @@ rec {
     name = "xf86-video-i810-1.4.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-i810-X11R7.0-1.4.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-i810-X11R7.0-1.4.1.3.tar.bz2;
       md5 = "fe6bec726fc1657b537508bbe8c2005b";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm mesa randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ];
@@ -2009,7 +2009,7 @@ rec {
     name = "xf86-video-imstt-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-imstt-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-imstt-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "cc949688918b78f830d78a9613e6896b";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2019,7 +2019,7 @@ rec {
     name = "xf86-video-mga-1.2.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-mga-X11R7.0-1.2.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-mga-X11R7.0-1.2.1.3.tar.bz2;
       md5 = "cb0409782020b5cc7edc273624ffdd17";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
@@ -2029,7 +2029,7 @@ rec {
     name = "xf86-video-neomagic-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-neomagic-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-neomagic-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "ffe9015678a41e97bdbd2825066bb47b";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2039,7 +2039,7 @@ rec {
     name = "xf86-video-newport-0.1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-newport-X11R7.0-0.1.4.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-newport-X11R7.0-0.1.4.1.tar.bz2;
       md5 = "d74d9896d57c3caf224ba3472630d874";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
@@ -2049,7 +2049,7 @@ rec {
     name = "xf86-video-nsc-2.7.6.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-nsc-X11R7.0-2.7.6.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-nsc-X11R7.0-2.7.6.5.tar.bz2;
       md5 = "ab16611b3ec7d21503b16b0a31addae0";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2059,7 +2059,7 @@ rec {
     name = "xf86-video-nv-1.0.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-nv-X11R7.0-1.0.1.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-nv-X11R7.0-1.0.1.5.tar.bz2;
       md5 = "9a88547fe550e20edcc5a938d31e22b1";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2069,7 +2069,7 @@ rec {
     name = "xf86-video-rendition-4.0.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-rendition-X11R7.0-4.0.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-rendition-X11R7.0-4.0.1.3.tar.bz2;
       md5 = "f1a25db74a148dea45115e813027b932";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
@@ -2079,7 +2079,7 @@ rec {
     name = "xf86-video-s3-0.3.5.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-s3-X11R7.0-0.3.5.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-s3-X11R7.0-0.3.5.5.tar.bz2;
       md5 = "83b9e8a9b8fc1c49bda2811358e5007c";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2089,7 +2089,7 @@ rec {
     name = "xf86-video-s3virge-1.8.6.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-s3virge-X11R7.0-1.8.6.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-s3virge-X11R7.0-1.8.6.5.tar.bz2;
       md5 = "d0164c37749ab5f565db9813487e1900";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2099,7 +2099,7 @@ rec {
     name = "xf86-video-savage-2.0.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-savage-X11R7.0-2.0.2.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-savage-X11R7.0-2.0.2.3.tar.bz2;
       md5 = "6b638dd500d10dba1822d3ea5061fc65";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
@@ -2109,7 +2109,7 @@ rec {
     name = "xf86-video-siliconmotion-1.3.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-siliconmotion-X11R7.0-1.3.1.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-siliconmotion-X11R7.0-1.3.1.5.tar.bz2;
       md5 = "957de4e2a3c687dbb2e9e18582397804";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2119,7 +2119,7 @@ rec {
     name = "xf86-video-sis-0.8.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sis-X11R7.0-0.8.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sis-X11R7.0-0.8.1.3.tar.bz2;
       md5 = "e3bac5a208b8bacfbec236b5a5b0ef40";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
@@ -2129,7 +2129,7 @@ rec {
     name = "xf86-video-sisusb-0.7.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sisusb-X11R7.0-0.7.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sisusb-X11R7.0-0.7.1.3.tar.bz2;
       md5 = "781d726a0ca54b65521e383ab99043c8";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ];
@@ -2139,7 +2139,7 @@ rec {
     name = "xf86-video-sunbw2-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sunbw2-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sunbw2-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "0cdda1ab939ea1190c142aa8aabfaf83";
     };
     buildInputs = [pkgconfig randrproto xorgserver xproto ];
@@ -2149,7 +2149,7 @@ rec {
     name = "xf86-video-suncg14-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-suncg14-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-suncg14-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "8f3a734d02ae716415f9c6344fa661bd";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2159,7 +2159,7 @@ rec {
     name = "xf86-video-suncg3-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-suncg3-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-suncg3-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "799a54cef1f4435e00fa94a1d97d056f";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2169,7 +2169,7 @@ rec {
     name = "xf86-video-suncg6-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-suncg6-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-suncg6-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "2227f3fb86b02148f347e002662e53c8";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2179,7 +2179,7 @@ rec {
     name = "xf86-video-sunffb-1.0.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sunffb-X11R7.0-1.0.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sunffb-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "bb5182e3b74b3baa6fee245ac8bbf09a";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto xextproto xf86driproto xorgserver xproto ];
@@ -2189,7 +2189,7 @@ rec {
     name = "xf86-video-sunleo-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sunleo-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sunleo-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "deb17a74ba68ee9593ac774206bd3612";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2199,7 +2199,7 @@ rec {
     name = "xf86-video-suntcx-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-suntcx-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-suntcx-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "74d6ba5e55afdfebff84db08b6589e26";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2209,7 +2209,7 @@ rec {
     name = "xf86-video-tdfx-1.1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-tdfx-X11R7.0-1.1.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-tdfx-X11R7.0-1.1.1.3.tar.bz2;
       md5 = "0201415230bf0454384c3bad099520d2";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
@@ -2219,7 +2219,7 @@ rec {
     name = "xf86-video-tga-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-tga-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-tga-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "fa67bf34454888d38e15708395cfed87";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2229,7 +2229,7 @@ rec {
     name = "xf86-video-trident-1.0.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-trident-X11R7.0-1.0.1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-trident-X11R7.0-1.0.1.2.tar.bz2;
       md5 = "69f28afc7b585d01bb06b1e2f872f8ea";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2239,7 +2239,7 @@ rec {
     name = "xf86-video-tseng-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-tseng-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-tseng-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "981f46914c1e54742418f0444ea2e092";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2249,7 +2249,7 @@ rec {
     name = "xf86-video-v4l-0.0.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-v4l-X11R7.0-0.0.1.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-v4l-X11R7.0-0.0.1.5.tar.bz2;
       md5 = "e422c63bc83717ecd0686aef2036802b";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
@@ -2259,7 +2259,7 @@ rec {
     name = "xf86-video-vesa-1.0.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "049ada4df1abb5aa2b6633ba90353e78";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
@@ -2269,7 +2269,7 @@ rec {
     name = "xf86-video-vga-4.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-vga-X11R7.0-4.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-vga-X11R7.0-4.0.0.5.tar.bz2;
       md5 = "24437857707acc337cab331cc56f64e2";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
@@ -2279,7 +2279,7 @@ rec {
     name = "xf86-video-via-0.1.33.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-via-X11R7.0-0.1.33.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-via-X11R7.0-0.1.33.2.tar.bz2;
       md5 = "4d3268d226a40f580ab105796bfed1f5";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ];
@@ -2289,7 +2289,7 @@ rec {
     name = "xf86-video-vmware-10.11.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2;
       md5 = "4df79349e26add4c23f6be8bec347ad4";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
@@ -2299,7 +2299,7 @@ rec {
     name = "xf86-video-voodoo-1.0.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-voodoo-X11R7.0-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-voodoo-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "e00cc814ebdb3f3067e075bc93b26199";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2309,7 +2309,7 @@ rec {
     name = "xf86vidmodeproto-2.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2;
       md5 = "475f19a2ffbfab9a0886791c5f89c978";
     };
     buildInputs = [pkgconfig ];
@@ -2319,7 +2319,7 @@ rec {
     name = "xfd-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfd-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xfd-X11R7.0-1.0.1.tar.bz2;
       md5 = "26c83a6fe245906cc05055abf877d0f2";
     };
     buildInputs = [pkgconfig fontconfig freetype libXaw libXft libXt ];
@@ -2329,7 +2329,7 @@ rec {
     name = "xfindproxy-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfindproxy-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xfindproxy-X11R7.0-1.0.1.tar.bz2;
       md5 = "5ef22b8876bb452f670e0fc425a12504";
     };
     buildInputs = [pkgconfig libICE libX11 xproxymanagementprotocol libXt ];
@@ -2339,7 +2339,7 @@ rec {
     name = "xfontsel-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfontsel-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xfontsel-X11R7.0-1.0.1.tar.bz2;
       md5 = "d1df7b8622b7f8ebca4b2463118d7073";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -2349,7 +2349,7 @@ rec {
     name = "xfs-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfs-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xfs-X11R7.0-1.0.1.tar.bz2;
       md5 = "a297da3d906110e9c29ec56c5ea578a8";
     };
     buildInputs = [pkgconfig libFS libXfont xtrans ];
@@ -2359,7 +2359,7 @@ rec {
     name = "xfsinfo-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfsinfo-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xfsinfo-X11R7.0-1.0.1.tar.bz2;
       md5 = "55ca0cfd09b1c1555d492d6961d9af46";
     };
     buildInputs = [pkgconfig libFS libX11 ];
@@ -2369,7 +2369,7 @@ rec {
     name = "xfwp-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfwp-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xfwp-X11R7.0-1.0.1.tar.bz2;
       md5 = "e1ef3fef10d1f7fbd936794982a8f0be";
     };
     buildInputs = [pkgconfig libICE libX11 xproxymanagementprotocol ];
@@ -2379,7 +2379,7 @@ rec {
     name = "xgamma-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xgamma-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xgamma-X11R7.0-1.0.1.tar.bz2;
       md5 = "07167da3f6b21985e27174ec70f213c0";
     };
     buildInputs = [pkgconfig libX11 libXxf86vm ];
@@ -2389,7 +2389,7 @@ rec {
     name = "xgc-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xgc-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xgc-X11R7.0-1.0.1.tar.bz2;
       md5 = "8cd01cf558c3eed738115abcf720277d";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -2399,7 +2399,7 @@ rec {
     name = "xhost-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xhost-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xhost-X11R7.0-1.0.0.tar.bz2;
       md5 = "76c44e84aaf4ad8e97cf15f4dbe4a24a";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu ];
@@ -2409,7 +2409,7 @@ rec {
     name = "xineramaproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xineramaproto-X11R7.0-1.1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xineramaproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "80516ad305063f4e6c6c3ccf42ea2142";
     };
     buildInputs = [pkgconfig ];
@@ -2419,7 +2419,7 @@ rec {
     name = "xinit-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xinit-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xinit-X11R7.0-1.0.1.tar.bz2;
       md5 = "6d2df59fa328cbc99c0de98bc2e14597";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -2429,7 +2429,7 @@ rec {
     name = "xkbcomp-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbcomp-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xkbcomp-X11R7.0-1.0.1.tar.bz2;
       md5 = "46d1e015897200d4dfed64990abaa8b9";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
@@ -2439,7 +2439,7 @@ rec {
     name = "xkbdata-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbdata-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xkbdata-X11R7.0-1.0.1.tar.bz2;
       md5 = "1f706f92334ee65818512b3b45d7be65";
     };
     buildInputs = [pkgconfig ];
@@ -2449,7 +2449,7 @@ rec {
     name = "xkbevd-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbevd-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xkbevd-X11R7.0-1.0.1.tar.bz2;
       md5 = "7ba0496f079552d1918d73bd09bde9b2";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
@@ -2459,7 +2459,7 @@ rec {
     name = "xkbprint-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbprint-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xkbprint-X11R7.0-1.0.1.tar.bz2;
       md5 = "6235c39690968d0a9a4c1b1c16c8905a";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
@@ -2469,7 +2469,7 @@ rec {
     name = "xkbutils-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbutils-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xkbutils-X11R7.0-1.0.1.tar.bz2;
       md5 = "798502eca0c6c3e8c02d76fabb910532";
     };
     buildInputs = [pkgconfig libXaw libX11 libxkbfile ];
@@ -2479,7 +2479,7 @@ rec {
     name = "xkill-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkill-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xkill-X11R7.0-1.0.1.tar.bz2;
       md5 = "35f47fd58d75c1ea5f414b21a10bdbf3";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2489,7 +2489,7 @@ rec {
     name = "xload-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xload-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xload-X11R7.0-1.0.1.tar.bz2;
       md5 = "11080456822146ebc0118b15f4b911d9";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -2499,7 +2499,7 @@ rec {
     name = "xlogo-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xlogo-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xlogo-X11R7.0-1.0.1.tar.bz2;
       md5 = "0314b2f5173da64957031400638fa5f8";
     };
     buildInputs = [pkgconfig libXaw libXext libXft libXp libXprintUtil libXrender libXt ];
@@ -2509,7 +2509,7 @@ rec {
     name = "xlsatoms-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xlsatoms-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xlsatoms-X11R7.0-1.0.1.tar.bz2;
       md5 = "737b4d7893aa886e8e4181c94380a421";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2519,7 +2519,7 @@ rec {
     name = "xlsclients-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xlsclients-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xlsclients-X11R7.0-1.0.1.tar.bz2;
       md5 = "cc0d64e90eab0b90b38355e841824588";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2529,7 +2529,7 @@ rec {
     name = "xlsfonts-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xlsfonts-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xlsfonts-X11R7.0-1.0.1.tar.bz2;
       md5 = "e8681e5671e7f01922ce6c8f2327e602";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -2539,7 +2539,7 @@ rec {
     name = "xmag-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmag-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xmag-X11R7.0-1.0.1.tar.bz2;
       md5 = "38ac487ac1b75be0253fe7f973947386";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -2549,7 +2549,7 @@ rec {
     name = "xman-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xman-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xman-X11R7.0-1.0.1.tar.bz2;
       md5 = "a4f21547120952aeb8e5663ebd72e843";
     };
     buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ];
@@ -2559,7 +2559,7 @@ rec {
     name = "xmessage-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmessage-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xmessage-X11R7.0-1.0.1.tar.bz2;
       md5 = "5a17607184fd348c2b36b5499ae9d2e6";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -2569,7 +2569,7 @@ rec {
     name = "xmh-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmh-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xmh-X11R7.0-1.0.1.tar.bz2;
       md5 = "53af2f87dc096d84f11ca6fbd6748b34";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -2579,7 +2579,7 @@ rec {
     name = "xmodmap-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmodmap-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xmodmap-X11R7.0-1.0.0.tar.bz2;
       md5 = "240ed53111925e005d2f138ea98ef5e1";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -2589,7 +2589,7 @@ rec {
     name = "xmore-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmore-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xmore-X11R7.0-1.0.1.tar.bz2;
       md5 = "99a48c50d486b7c9098b4f5598782cac";
     };
     buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ];
@@ -2599,7 +2599,7 @@ rec {
     name = "xorg-cf-files-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xorg-cf-files-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xorg-cf-files-X11R7.0-1.0.1.tar.bz2;
       md5 = "f2dd453c37386293fb207431b4a073dd";
     };
     buildInputs = [pkgconfig ];
@@ -2609,7 +2609,7 @@ rec {
     name = "xorg-docs-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xorg-docs-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xorg-docs-X11R7.0-1.0.1.tar.bz2;
       md5 = "ac0d76afa46ef5da9e1cf33558f4b303";
     };
     buildInputs = [pkgconfig ];
@@ -2619,7 +2619,7 @@ rec {
     name = "xorg-server-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xorg-server-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xorg-server-X11R7.0-1.0.1.tar.bz2;
       md5 = "0e7527480fb845a3c2e333bd0f47ff50";
     };
     buildInputs = [pkgconfig bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto glproto inputproto liblbxutil libdrm mesa perl printproto randrproto recordproto renderproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ];
@@ -2629,7 +2629,7 @@ rec {
     name = "xorg-sgml-doctools-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xorg-sgml-doctools-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xorg-sgml-doctools-X11R7.0-1.0.1.tar.bz2;
       md5 = "d08d4fd10ac46d8b4636efe4d8c0de74";
     };
     buildInputs = [pkgconfig ];
@@ -2639,7 +2639,7 @@ rec {
     name = "xphelloworld-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xphelloworld-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xphelloworld-X11R7.0-1.0.1.tar.bz2;
       md5 = "80c9a23c7efb72b9674d7af6b7346992";
     };
     buildInputs = [pkgconfig libX11 libXaw libXp libXprintAppUtil libXprintUtil libXt ];
@@ -2649,7 +2649,7 @@ rec {
     name = "xplsprinters-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xplsprinters-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xplsprinters-X11R7.0-1.0.1.tar.bz2;
       md5 = "1d0a68dada5e14ab07d7660abd4d03e3";
     };
     buildInputs = [pkgconfig libX11 libXp libXprintUtil ];
@@ -2659,7 +2659,7 @@ rec {
     name = "xpr-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xpr-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xpr-X11R7.0-1.0.1.tar.bz2;
       md5 = "487b5ab96b373acb80808758ce23eb49";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2669,7 +2669,7 @@ rec {
     name = "xprehashprinterlist-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xprehashprinterlist-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xprehashprinterlist-X11R7.0-1.0.1.tar.bz2;
       md5 = "3907bce78d304dedb2a5dd6944bd2ed5";
     };
     buildInputs = [pkgconfig libX11 libXp ];
@@ -2679,7 +2679,7 @@ rec {
     name = "xprop-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xprop-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xprop-X11R7.0-1.0.1.tar.bz2;
       md5 = "6730f0fbad6969825580de46e66b44dd";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2689,7 +2689,7 @@ rec {
     name = "xproto-7.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xproto-X11R7.0-7.0.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xproto-X11R7.0-7.0.4.tar.bz2;
       md5 = "643259d00e02db8e9a6f4c047281b5d9";
     };
     buildInputs = [pkgconfig ];
@@ -2699,7 +2699,7 @@ rec {
     name = "xproxymanagementprotocol-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2;
       md5 = "977ee3fd1525418aaa8bfc55ffbf6fc9";
     };
     buildInputs = [pkgconfig ];
@@ -2709,7 +2709,7 @@ rec {
     name = "xrandr-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xrandr-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xrandr-X11R7.0-1.0.1.tar.bz2;
       md5 = "e433ccca3c4f9ab8609dfd1c9c8e36ea";
     };
     buildInputs = [pkgconfig libX11 libXrandr libXrender ];
@@ -2719,7 +2719,7 @@ rec {
     name = "xrdb-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xrdb-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xrdb-X11R7.0-1.0.1.tar.bz2;
       md5 = "a3c1fd6f5391de7f810239a912d39fa5";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2729,7 +2729,7 @@ rec {
     name = "xrefresh-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xrefresh-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xrefresh-X11R7.0-1.0.1.tar.bz2;
       md5 = "5a46d5fb82aeeb4d6aac58c9cc367439";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -2739,7 +2739,7 @@ rec {
     name = "xrx-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xrx-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xrx-X11R7.0-1.0.1.tar.bz2;
       md5 = "9de3b04392c98df59c79a34fd51c385f";
     };
     buildInputs = [pkgconfig libXaw libX11 libXau libXext xproxymanagementprotocol libXt xtrans ];
@@ -2749,7 +2749,7 @@ rec {
     name = "xset-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xset-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xset-X11R7.0-1.0.1.tar.bz2;
       md5 = "a0350e334a215829166266e2ce504b1c";
     };
     buildInputs = [pkgconfig libX11 libXext libXfontcache libXmu libXp libXxf86misc ];
@@ -2759,7 +2759,7 @@ rec {
     name = "xsetmode-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xsetmode-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xsetmode-X11R7.0-1.0.0.tar.bz2;
       md5 = "d83d6ef0b73762feab724aab95d9a4a2";
     };
     buildInputs = [pkgconfig libX11 libXi ];
@@ -2769,7 +2769,7 @@ rec {
     name = "xsetpointer-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xsetpointer-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xsetpointer-X11R7.0-1.0.0.tar.bz2;
       md5 = "195614431e2431508e07a42a3b6d4568";
     };
     buildInputs = [pkgconfig libX11 libXi ];
@@ -2779,7 +2779,7 @@ rec {
     name = "xsetroot-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xsetroot-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xsetroot-X11R7.0-1.0.1.tar.bz2;
       md5 = "e2831b39cd395d6f6f4824b0e25f55ed";
     };
     buildInputs = [pkgconfig libX11 xbitmaps libXmu ];
@@ -2789,7 +2789,7 @@ rec {
     name = "xsm-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xsm-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xsm-X11R7.0-1.0.1.tar.bz2;
       md5 = "e3588272ce3b7dc21d42ead683135a8a";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -2799,7 +2799,7 @@ rec {
     name = "xstdcmap-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xstdcmap-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xstdcmap-X11R7.0-1.0.1.tar.bz2;
       md5 = "e276aa02d44dcacf5ac13aa0cabd404d";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2809,7 +2809,7 @@ rec {
     name = "xtrans-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xtrans-X11R7.0-1.0.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xtrans-X11R7.0-1.0.0.tar.bz2;
       md5 = "153642136a003871a9093c8103d6ac5a";
     };
     buildInputs = [pkgconfig ];
@@ -2819,7 +2819,7 @@ rec {
     name = "xtrap-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xtrap-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xtrap-X11R7.0-1.0.1.tar.bz2;
       md5 = "6d56946322d2875eb33f25f5e5f621a3";
     };
     buildInputs = [pkgconfig libX11 libXTrap ];
@@ -2829,7 +2829,7 @@ rec {
     name = "xvidtune-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xvidtune-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xvidtune-X11R7.0-1.0.1.tar.bz2;
       md5 = "a12e27fb732cb115b6adc4c724c44c5d";
     };
     buildInputs = [pkgconfig libXaw libXt libXxf86vm ];
@@ -2839,7 +2839,7 @@ rec {
     name = "xvinfo-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xvinfo-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xvinfo-X11R7.0-1.0.1.tar.bz2;
       md5 = "39d79590345bed51da6df838f6490cbf";
     };
     buildInputs = [pkgconfig libX11 libXv ];
@@ -2849,7 +2849,7 @@ rec {
     name = "xwd-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xwd-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xwd-X11R7.0-1.0.1.tar.bz2;
       md5 = "596c443465ab9ab67c59c794261d4571";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2859,7 +2859,7 @@ rec {
     name = "xwininfo-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xwininfo-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xwininfo-X11R7.0-1.0.1.tar.bz2;
       md5 = "3ec67e4e1b9f5a1fe7e56b56ab931893";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu ];
@@ -2869,7 +2869,7 @@ rec {
     name = "xwud-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xwud-X11R7.0-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xwud-X11R7.0-1.0.1.tar.bz2;
       md5 = "e08d2ee04abb89a6348f47c84a1ff3ed";
     };
     buildInputs = [pkgconfig libX11 ];
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index cd374289d54..30a2bc350ac 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "tcsh-6.14.00";
   src = fetchurl {
-    url = ftp://ftp.gw.com/pub/unix/tcsh/tcsh-6.14.00.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/tcsh-6.14.00.tar.gz;
     md5 = "353d1bb7d2741bf8de602c7b6f0efd79";
   };
   buildInputs = [ncurses];
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 752198fd726..362c6e49ad6 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1417,7 +1417,7 @@ rec {
   perlLocaleGettext = import ../development/perl-modules/generic perl {
     name = "LocaleGettext-1.04";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.04.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/gettext-1.04.tar.gz;
       md5 = "578dd0c76f8673943be043435b0fbde4";
     };
   };
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index bfe216978c0..a8f3ff3dd9a 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "cpio-2.6";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/pub/gnu/cpio/cpio-2.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/cpio-2.6.tar.bz2;
     md5 = "25e0e8725bc60ed3460c9cde92752674";
   };
 }
diff --git a/pkgs/tools/archivers/gnutar-diet/default.nix b/pkgs/tools/archivers/gnutar-diet/default.nix
index 32d0dc5aef4..d6c3dd2f19c 100644
--- a/pkgs/tools/archivers/gnutar-diet/default.nix
+++ b/pkgs/tools/archivers/gnutar-diet/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnutar-1.15.1";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/tar/tar-1.15.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/tar-1.15.1.tar.bz2;
     md5 = "57da3c38f8e06589699548a34d5a5d07";
   };
   NIX_GCC = dietgcc;
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index c8f5644b7f8..841280d5730 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnutar-1.15.1";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/tar/tar-1.15.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/tar-1.15.1.tar.bz2;
     md5 = "57da3c38f8e06589699548a34d5a5d07";
   };
 }
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index d0907b5175e..ca810111933 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -2,7 +2,7 @@
   name = "zip-2.31";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/zip231.tar.gz;
     md5 = "6bfc076664416251d7624ab3538d1cb9";
   };
 }
diff --git a/pkgs/tools/compression/bzip2-static/default.nix b/pkgs/tools/compression/bzip2-static/default.nix
index 56b646f59f8..f5c14266d0a 100644
--- a/pkgs/tools/compression/bzip2-static/default.nix
+++ b/pkgs/tools/compression/bzip2-static/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bzip2-1.0.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz;
     md5 = "8a716bebecb6e647d2e8a29ea5d8447f";
   };
   patches = [./bzip2-1.0.3-static.patch];
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 1fc13013672..eb4935684b2 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.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz;
     md5 = "8a716bebecb6e647d2e8a29ea5d8447f";
   };
 }
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index ea97a1c8e54..a0b290878ba 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
 #  builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/gnuplot/gnuplot-4.0.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gnuplot-4.0.0.tar.gz;
     md5 = "66258443d9f93cc4f46b147dac33e63a";
   };
 
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index e5d29e414ed..1de8e9a9e8f 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/graphviz-2.4.tar.gz;
     md5 = "f1074d38a7eeb5e5b2ebfdb643aebf8a";
   };
 
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index 18d00169729..bdf5a50aa0b 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/pkgs/tools/misc/bc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "bc-1.0.6";
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/bc/bc-1.06.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bc-1.06.tar.gz;
     md5 = "d44b5dddebd8a7a7309aea6c36fda117";
   };
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 02617ed51dd..1adee390473 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "coreutils-5.93";
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/coreutils/coreutils-5.93.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.93.tar.bz2;
     md5 = "955d8abfd3dd8af2ca3af51480f1f9af";
   };
 }
diff --git a/pkgs/tools/misc/findutils-static/default.nix b/pkgs/tools/misc/findutils-static/default.nix
index 1f5702f93f4..4b747e5ce49 100644
--- a/pkgs/tools/misc/findutils-static/default.nix
+++ b/pkgs/tools/misc/findutils-static/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "findutils-4.2.26";
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/findutils/findutils-4.2.26.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/findutils-4.2.26.tar.gz;
     md5 = "9ac4e62937b1fdc4eb643d1d4bf117d3";
   };
   buildInputs = [coreutils];
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index c1bbd78af1b..9e4ef5200f6 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "findutils-4.2.26";
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/findutils/findutils-4.2.26.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/findutils-4.2.26.tar.gz;
     md5 = "9ac4e62937b1fdc4eb643d1d4bf117d3";
   };
   buildInputs = [coreutils];
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 453289f6ae7..ab7951e8e5e 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "grub-0.97";
   src = fetchurl {
-    url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/grub-0.97.tar.gz;
     md5 = "cd3f3eb54446be6003156158d51f4884";
   };
 }
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index 6229ca60d4c..952599e6937 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "jdiskreport-1.2.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_2_3.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/jdiskreport-1_2_3.zip;
     md5 = "4a33c5c1344ed9e0fa531e2cb1875cb8";
   };
   buildInputs = [unzip];
diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man/default.nix
index 4be4dcf3129..a8b38377459 100644
--- a/pkgs/tools/misc/man/default.nix
+++ b/pkgs/tools/misc/man/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "man_db-2.4.3";
   src = fetchurl {
-    url = http://savannah.nongnu.org/download/man-db/man-db-2.4.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/man-db-2.4.3.tar.gz;
     md5 = "30814a47f209f43b152659ba51fc7937";
   };
   buildInputs = [db4 groff];
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 3db2517be77..075584d86b7 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "parted-1.6.23";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/parted/parted-1.6.23.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/parted-1.6.23.tar.gz;
     md5 = "7e46a32def60ea355c193d9225691742";
   };
   buildInputs = [e2fsprogs ncurses readline];
diff --git a/pkgs/tools/misc/qtparted/default.nix b/pkgs/tools/misc/qtparted/default.nix
index 9f56b026f95..cebda2dea05 100644
--- a/pkgs/tools/misc/qtparted/default.nix
+++ b/pkgs/tools/misc/qtparted/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "qtparted-0.4.4";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/qtparted/qtparted-0.4.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/qtparted-0.4.4.tar.bz2;
     md5 = "b8253bf21eaebe1f2c22b50462e8046c";
   };
   buildInputs = [e2fsprogs ncurses readline parted libXext libX11 zlib qt3];
diff --git a/pkgs/tools/networking/azureus/default.nix b/pkgs/tools/networking/azureus/default.nix
index 0e1aa7409f4..69fb60117e9 100644
--- a/pkgs/tools/networking/azureus/default.nix
+++ b/pkgs/tools/networking/azureus/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "azureus-2.3.0.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/azureus/Azureus2.3.0.6.jar;
+    url = http://nix.cs.uu.nl/dist/tarballs/Azureus2.3.0.6.jar;
     md5 = "84f85b144cdc574338c2c84d659ca620";
   };
 #  buildInputs = [unzip];
diff --git a/pkgs/tools/networking/bittorrent/default.nix b/pkgs/tools/networking/bittorrent/default.nix
index 2e249bc63db..df53cf03328 100644
--- a/pkgs/tools/networking/bittorrent/default.nix
+++ b/pkgs/tools/networking/bittorrent/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bittorrent-4.2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.bittorrent.com/dl/BitTorrent-4.2.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/BitTorrent-4.2.1.tar.gz;
     md5 = "0deb2e083e95206a9e601ff6ca35b826";
   };
   buildInputs = [python pygtk];
diff --git a/pkgs/tools/networking/curl-diet/default.nix b/pkgs/tools/networking/curl-diet/default.nix
index 75f089e6f9b..bc55fa322c9 100644
--- a/pkgs/tools/networking/curl-diet/default.nix
+++ b/pkgs/tools/networking/curl-diet/default.nix
@@ -5,7 +5,7 @@ assert sslSupport -> openssl != null;
 stdenv.mkDerivation {
   name = "curl-7.15.1";
   src = fetchurl {
-    url = http://curl.haxx.se/download/curl-7.15.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.1.tar.bz2;
     md5 = "d330d48580bfade58c82d4f295f171f0";
   };
   buildInputs = [zlib (if sslSupport then openssl else null)];
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index d50c15319db..abce6fb3a37 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -5,7 +5,7 @@ assert sslSupport -> openssl != null;
 stdenv.mkDerivation {
   name = "curl-7.15.1";
   src = fetchurl {
-    url = http://curl.haxx.se/download/curl-7.15.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.1.tar.bz2;
     md5 = "d330d48580bfade58c82d4f295f171f0";
   };
   buildInputs = [zlib (if sslSupport then openssl else null)];
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 4ad93d6c15d..f5b39a1b220 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "dhcp-3.0.3";
   builder=./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.isc.org/isc/dhcp/dhcp-3.0.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/dhcp-3.0.3.tar.gz;
     md5 = "f91416a0b8ed3fd0601688cf0b7df58f";
   };
   buildInputs = [groff];
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index dd613415c21..c2db6e03157 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "par2cmdline-0.4";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/parchive/par2cmdline-0.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/par2cmdline-0.4.tar.gz;
     md5 = "1551b63e57e3c232254dc62073b723a9";
   };
 }
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 78da80bda30..4b0bb8110e7 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "gnupg-1.4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.surfnet.nl/pub/security/gnupg/gnupg/gnupg-1.4.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gnupg-1.4.2.tar.bz2;
     md5 = "c7afd50c7d01fcfada229326b3958404";
   };
   idea = if ideaSupport then fetchurl {
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 2c495f8c271..ccfeb6466a0 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.5";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/gawk/gawk-3.1.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gawk-3.1.5.tar.bz2;
     md5 = "5703f72d0eea1d463f735aad8222655f";
   };
 }
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 15a7a5ad239..a787fc253a6 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnugrep-2.5.1a";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/grep/grep-2.5.1a.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/grep-2.5.1a.tar.bz2;
     md5 = "52202fe462770fa6be1bb667bd6cf30c";
   };
   buildInputs = [pcre];
diff --git a/pkgs/tools/text/gnused-diet/default.nix b/pkgs/tools/text/gnused-diet/default.nix
index 63c070a06a1..c85d53adf08 100644
--- a/pkgs/tools/text/gnused-diet/default.nix
+++ b/pkgs/tools/text/gnused-diet/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnused-4.1.4";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/sed/sed-4.1.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sed-4.1.4.tar.gz;
     md5 = "2a62ceadcb571d2dac006f81df5ddb48";
   };
   NIX_GCC=dietgcc;
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index b4ebfa03a52..d294fbcda05 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.4";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/sed/sed-4.1.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sed-4.1.4.tar.gz;
     md5 = "2a62ceadcb571d2dac006f81df5ddb48";
   };
 }
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 426426bc64e..9cd856a656a 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "groff-1.19.1";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/groff/groff-1.19.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/groff-1.19.1.tar.gz;
     md5 = "57d155378640c12a80642664dfdfc892";
   };
 }
diff --git a/pkgs/tools/text/xml/sablotron/default.nix b/pkgs/tools/text/xml/sablotron/default.nix
index f7dcbdf5658..f7faf18ec9c 100644
--- a/pkgs/tools/text/xml/sablotron/default.nix
+++ b/pkgs/tools/text/xml/sablotron/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "sablotron-1.0.2";
   src = fetchurl {
-    url = http://download-1.gingerall.cz/download/sablot/Sablot-1.0.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/Sablot-1.0.2.tar.gz;
     md5 = "12243bc21b149cad89e98bc89f9c103e";
   };
   buildInputs = [expat];
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index aff5b68226f..f5a3d20f66d 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://www.iai.uni-bonn.de/~loeh/lhs2tex/lhs2tex-1.10pre.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/lhs2tex-1.10pre.tar.bz2;
     md5 = "4fb875cdc0ba8daacc18b97f76aab4bf";
   };
 
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix
index 4684b0b351d..fc86566b483 100644
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/pkgs/tools/typesetting/xmlroff/default.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation {
   name = "xmlroff-0.3.5";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/xmlroff/xmlroff-0.3.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xmlroff-0.3.5.tar.gz;
     md5 = "4f03dffa0451c28e7c777f6ee1fa38da";
   };