diff --git a/maintainers/scripts/evacuate-urls.sh b/maintainers/scripts/evacuate-urls.sh
index d2d611352d8..8e745f887a8 100755
--- a/maintainers/scripts/evacuate-urls.sh
+++ b/maintainers/scripts/evacuate-urls.sh
@@ -6,26 +6,29 @@ find . -name "*.nix" | while read fn; do
 
         if oldURL=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then
 
-            if ! echo "$oldURL" | grep -q -E "www.cs.uu.nl|nix.cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe"; then
+            if ! echo "$oldURL" | grep -q -E "www.cs.uu.nl|nix.cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix"; then
                 base=$(basename $oldURL)
                 newURL="http://nix.cs.uu.nl/dist/tarballs/$base"
                 newPath="/data/webserver/dist/tarballs/$base"
                 echo "$fn: $oldURL -> $newURL"
 
-#		if test -e "$newPath"; then
-#		    echo "WARNING: $newPath exists!"
-#		else
+		if test -e "$newPath"; then
+		    echo "WARNING: $newPath exists!"
+		else
 
-		    if ! test -e "$newPath"; then
-			curl --fail --location --max-redirs 20 "$oldURL" > "$newPath".tmp
-			mv -f "$newPath".tmp "$newPath"
+		    if test -n "$doMove"; then
+
+			if ! test -e "$newPath"; then
+			    curl --fail --location --max-redirs 20 "$oldURL" > "$newPath".tmp
+			    mv -f "$newPath".tmp "$newPath"
+			fi
+
+			sed "s^$oldURL^$newURL^" < "$fn" > "$fn".tmp
+			mv -f "$fn".tmp "$fn"
 
 		    fi
 
-		    sed "s^$oldURL^$newURL^" < "$fn" > "$fn".tmp
-		    mv -f "$fn".tmp "$fn"
-
-#		fi
+		fi
 
             fi
             
diff --git a/pkgs/applications/audio/GStreamer/default.nix b/pkgs/applications/audio/GStreamer/default.nix
index 607d2e9ce9f..89c6c745f08 100644
--- a/pkgs/applications/audio/GStreamer/default.nix
+++ b/pkgs/applications/audio/GStreamer/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation {
   name = "GStreamer-0.10.10";
   src = fetchurl {
-    url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gstreamer-0.10.10.tar.bz2;
     md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc" ;
   };
 
diff --git a/pkgs/applications/audio/bmp-plugins/musepack/default.nix b/pkgs/applications/audio/bmp-plugins/musepack/default.nix
index 0a23df9f683..b333948b5c6 100644
--- a/pkgs/applications/audio/bmp-plugins/musepack/default.nix
+++ b/pkgs/applications/audio/bmp-plugins/musepack/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bmp-plugin-musepack-1.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://files2.musepack.net/linux/plugins/bmp-musepack-1.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/bmp-musepack-1.2.tar.bz2;
     md5 = "5fe0c9d341ca37d05c780a478f829a5f";
   };
   buildInputs = [pkgconfig bmp glib gtk libmpcdec taglib];
diff --git a/pkgs/applications/audio/bmp/default.nix b/pkgs/applications/audio/bmp/default.nix
index ea65d9d17e1..27c8399c1b3 100644
--- a/pkgs/applications/audio/bmp/default.nix
+++ b/pkgs/applications/audio/bmp/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation {
   name = "bmp-0.9.7.1";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/beepmp/bmp-0.9.7.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bmp-0.9.7.1.tar.gz;
     md5 = "c25d5a8d49cc5851d13d525a20023c4c";
   };
 
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 6d6b07348ff..7e0439d60bf 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "flac-1.1.2";
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/flac/flac-1.1.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/flac-1.1.2.tar.gz;
     md5 = "2bfc127cdda02834d0491ab531a20960" ;
   };
 
diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix
index 649619e487e..d926064a4db 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.11.jar;
+  url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.11.jar;
   md5 = "c36941afcb0e538e16fafd594eae128e";
 }
diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix
index cc6db1c2e8e..33336355326 100644
--- a/pkgs/applications/editors/joe/default.nix
+++ b/pkgs/applications/editors/joe/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
 name = "joe-3.3";
 src = fetchurl {
-         url = http://surfnet.dl.sourceforge.net/sourceforge/joe-editor/joe-3.3.tar.gz;
+         url = http://nix.cs.uu.nl/dist/tarballs/joe-3.3.tar.gz;
          md5 = "02221716679c039c5da00c275d61dbf4";
    };
 }
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 5118b798547..19522f8fc0f 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "nano-1.2.5";
   src = fetchurl {
-    url = http://www.nano-editor.org/dist/v1.2/nano-1.2.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/nano-1.2.5.tar.gz;
     md5 = "f2b3efbf1cf356d736740d531b6b22c4";
   };
   buildInputs = [ncurses gettext];
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 1abc4be3c60..470e3693f27 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
  
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.vim.org/pub/vim/unix/vim-7.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/vim-7.0.tar.bz2;
     md5 = "4ca69757678272f718b1041c810d82d8";
   };
  
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 79a6b5f5b9a..507d0a92ddb 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation {
   name = "gimp-2.3.10";
   src = fetchurl {
-    url = ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-2.3.10.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gimp-2.3.10.tar.bz2;
     md5 = "a46acb413484300583ffca1fa54e0874" ;
   };
   
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 61bff991534..244890fd453 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   name = "inkscape-0.43";
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/inkscape/inkscape-0.43.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/inkscape-0.43.tar.bz2;
     md5 = "97c606182f5e177eef70c1e8a55efc1f";
   };
 
diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix
index 83fac86bf81..fa05e413c4f 100644
--- a/pkgs/applications/graphics/kuickshow/default.nix
+++ b/pkgs/applications/graphics/kuickshow/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/kuickshow/kuickshow-0.8.5.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/kuickshow-0.8.5.tgz;
     md5 = "7a95852a0670b18859a1e6789b256ebd";
   };
 
diff --git a/pkgs/applications/misc/bluez-firmware/default.nix b/pkgs/applications/misc/bluez-firmware/default.nix
index 91b8dbdf8f4..af5dcc00733 100644
--- a/pkgs/applications/misc/bluez-firmware/default.nix
+++ b/pkgs/applications/misc/bluez-firmware/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "bluez-firmware-1.1";
   src = fetchurl {
-    url = http://bluez.sf.net/download/bluez-firmware-1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bluez-firmware-1.1.tar.gz;
     md5 = "2f1c2d939108c865dd07bae3e819c573";
   };
 }
diff --git a/pkgs/applications/misc/bluez-utils/default.nix b/pkgs/applications/misc/bluez-utils/default.nix
index 7cf88851fc3..5705d2ce1ca 100644
--- a/pkgs/applications/misc/bluez-utils/default.nix
+++ b/pkgs/applications/misc/bluez-utils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "bluez-utils-2.25";
   src = fetchurl {
-    url = http://bluez.sf.net/download/bluez-utils-2.25.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bluez-utils-2.25.tar.gz;
     md5 = "ae3729ab5592be06ed01b973d4b3e9fe";
   };
   buildInputs = [bluezLibs];
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 0f4af78213d..c04f7d12c05 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gphoto2-2.2.0";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/gphoto/gphoto2-2.2.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gphoto2-2.2.0.tar.bz2;
     md5 = "f5c1f83185db598b4ca52889964a5e84";
   };
   buildInputs = [pkgconfig libgphoto2 libexif popt];
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 1137a9d8838..338ac1363c5 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xchm-1.9";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/xchm/xchm-1.9.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xchm-1.9.tar.gz;
     md5 = "12e1faf49447c743c5c936636cd8a172";
   };
   buildInputs = [wxGTK chmlib];
diff --git a/pkgs/applications/networking/browsers/firefox-2.0/default.nix b/pkgs/applications/networking/browsers/firefox-2.0/default.nix
index dcfda578f66..12a666481e1 100644
--- a/pkgs/applications/networking/browsers/firefox-2.0/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-2.0/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0rc1/source/firefox-2.0rc1-source.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/firefox-2.0rc1-source.tar.bz2;
     sha1 = "0f6bcab71becb4fb92900fc900b20301434f4e00";
   };
 
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 2e164c08052..8fe658def71 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/1.5.0.7/source/firefox-1.5.0.7-source.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/firefox-1.5.0.7-source.tar.bz2;
     sha1 = "f10d57af87bddc1b929ec5321688ac0efa880960";
   };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index 30606310a38..79302d28127 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
@@ -9,7 +9,7 @@
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-3.31.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mplayerplug-in-3.31.tar.gz;
     md5 = "be26b17cde385c7a34fc634d2c88c5c9";
   };
 
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 39339dfd8f3..02726326df2 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/902/final/en/i386/shared/opera-9.02-20060919.5-shared-qt.i386-en.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/opera-9.02-20060919.5-shared-qt.i386-en.tar.bz2;
     md5 = "327d0bf1f3c4eedd47b444b36c9091f6";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix
index d69121e906d..8c4a9391c80 100644
--- a/pkgs/applications/networking/instant-messengers/amsn/default.nix
+++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "amsn-0.96rc1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/amsn/amsn-0.96rc1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/amsn-0.96rc1.tar.bz2;
     md5 = "1b90fdbb0a51c7646f4d2e6b22f18711";
   };
 
diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index 768e19842c1..61d049f93ce 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   src = fetchurl {
     # Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
-    url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.74-xr.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/chatzilla-0.9.74-xr.zip;
     md5 = "a1eada15b172eab6a771afa5f8670f7a";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 6d16e5f31e2..33a29bdd24c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.7/source/thunderbird-1.5.0.7-source.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/thunderbird-1.5.0.7-source.tar.bz2;
     sha1 = "9e5acff9bd098979dd798c0111805dc8d67479ad";
   };
 
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 7ff4d149eb6..fd36cdcba6e 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "pan-0.106";
 
   src = fetchurl {
-    url = http://pan.rebelbase.com/download/releases/0.106/SOURCE/pan-0.106.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pan-0.106.tar.bz2;
     md5 = "34cdc4b7606f09517f015a2c624044c9";
   };
 
diff --git a/pkgs/applications/networking/sniffers/ethereal/default.nix b/pkgs/applications/networking/sniffers/ethereal/default.nix
index 8f259411564..4303ec1feb3 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.99";
   src = fetchurl {
-    url = ftp://ftp.uni-kl.de/pub/ethereal/ethereal-0.99.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ethereal-0.99.0.tar.bz2;
     md5 = "f9905b9d347acdc05af664a7553f7f76";
   };
   buildInputs = [perl pkgconfig glib libpcap];
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 1863f45162f..d0d49030305 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.8";
   src = fetchurl {
-    url = http://rsync.samba.org/ftp/rsync/rsync-2.6.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/rsync-2.6.8.tar.gz;
     md5 = "082a9dba1f741e6591e5cd748a1233de";
   };
 }
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index ba46033380f..fc78155be6c 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "abiword-2.4.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.abisource.com/downloads/abiword/2.4.5/source/abiword-2.4.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/abiword-2.4.5.tar.gz;
     md5 = "e05f15936535c4b737deaa721adf8d09";
   };
 
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 421cd043858..394cbda2dd5 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.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/subversion-1.3.2.tar.bz2;
     sha1 = "688ab178db1f6acb2ad3bd99f030402621f837b6";
   };
 
diff --git a/pkgs/applications/version-management/subversion-1.4.x/default.nix b/pkgs/applications/version-management/subversion-1.4.x/default.nix
index 0c32a6cb256..0024d0e6d26 100644
--- a/pkgs/applications/version-management/subversion-1.4.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.4.x/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/downloads/subversion-1.4.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/subversion-1.4.0.tar.bz2;
     sha1 = "92671bba140e9b9e300b5ffb526c4a7c59aeb5b1";
   };
 
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 06ec74feb53..fda3200509d 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www4.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre8.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/MPlayer-1.0pre8.tar.bz2;
     md5 = "f82bb2bc51b6cd5e5dd96f88f6f98582";
   };
   fonts = fetchurl {
diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.nix b/pkgs/applications/video/MPlayer/win32codecs/default.nix
index d5d165592ef..13a68aa3661 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-20060611";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www4.mplayerhq.hu/MPlayer/releases/codecs/essential-20060611.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/essential-20060611.tar.bz2;
     md5 = "26ec3f9feed5f89814b2ec5f436e937b";
   };
 }
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 4ceb5726b7b..493d4389ab1 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gnash/0.7.1/gnash-0.7.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gnash-0.7.1.tar.bz2;
     md5 = "d860981aeaac0fc941a28abc3c24223c";
   };
 
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 24023b1cfc3..52bfb76529f 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.20.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/mythtv-0.20.tar.bz2;
     md5 = "52bec1e0fadf7d24d6dcac3f773ddf74";
   };
 
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 4ab74b8227f..58d2b1eca1c 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   name = "vlc-0.8.5";
 
   src = fetchurl {
-    url = http://ftp.snt.utwente.nl/pub/software/videolan/vlc/0.8.5/vlc-0.8.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/vlc-0.8.5.tar.bz2;
     md5 = "16bb5bf87ed94879a8eb7b0ff9b4f16f";
   };
 
diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix
index bae0c643e77..69c4ce51e46 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://surfnet.dl.sourceforge.net/sourceforge/zapping/zapping-0.10cvs6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.10cvs6.tar.bz2;
     md5 = "6aa7614ac3fd5d39c89c2198598ad27b";
   };
 
diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
index 23203447e0f..4f5621e29d8 100644
--- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
+++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.docbook.org/xml/5.0b7/docbook-5.0b7.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbook-5.0b7.tar.gz;
     md5 = "f1e18aaf56b0f0b2b2ab9eaff4bb6a1e";
   };
 }
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
index 5ace3337c13..860d6915a1e 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.71.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.71.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbook-xsl-1.71.0.tar.bz2;
     md5 = "42397442255e3c903b16d896446c3ce1";
   };
 }
diff --git a/pkgs/development/compilers/abc/default.nix b/pkgs/development/compilers/abc/default.nix
index 1a71b808827..46e905edb8f 100644
--- a/pkgs/development/compilers/abc/default.nix
+++ b/pkgs/development/compilers/abc/default.nix
@@ -7,7 +7,7 @@ let {
       builder = ./builder.sh;
 
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz;
+        url = http://nix.cs.uu.nl/dist/tarballs/abc-1.2.0-src.tar.gz;
         md5 = "aef9e8eac860f904f2a841e18770dc47";
       };
 
@@ -39,7 +39,7 @@ let {
       jarname = "jedd.runtime";
       builder = ./builder-binjar.sh;
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/jedd-runtime-snapshot.jar;
+        url = http://nix.cs.uu.nl/dist/tarballs/jedd-runtime-snapshot.jar;
         md5 = "595c5ac2f6384f4c34f1854891b5e422";
       };
     };
@@ -50,7 +50,7 @@ let {
       jarname = "javabdd";
       builder = ./builder-binjar.sh;
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/javabdd_0.6.jar;
+        url = http://nix.cs.uu.nl/dist/tarballs/javabdd_0.6.jar;
         md5 = "6e0246e891b7431f4e7265b5b1471307";
       };
     };
@@ -61,7 +61,7 @@ let {
       jarname = "paddle";
       builder = ./builder-binjar.sh;
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/paddle-snapshot.jar;
+        url = http://nix.cs.uu.nl/dist/tarballs/paddle-snapshot.jar;
         md5 = "a8e032310137945124a2850cd8cfc277";
       };
     };
@@ -72,7 +72,7 @@ let {
       jarname = "xact";
       builder = ./builder-binjar.sh;
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/xact-complete-1.0-1.jar;
+        url = http://nix.cs.uu.nl/dist/tarballs/xact-complete-1.0-1.jar;
         md5 = "9810ad8762101ea691a895f0a6b7a5c3";
       };
     };
diff --git a/pkgs/development/compilers/abc/jasmin/default.nix b/pkgs/development/compilers/abc/jasmin/default.nix
index 0c93e5893a5..76e73b8d5b5 100644
--- a/pkgs/development/compilers/abc/jasmin/default.nix
+++ b/pkgs/development/compilers/abc/jasmin/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/jasmin-dev-20060422015512.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/jasmin-dev-20060422015512.tar.gz;
     md5 = "0e49e532b4658c959582c5d5b5e28bf1";
   };
 
diff --git a/pkgs/development/compilers/abc/polyglot/default.nix b/pkgs/development/compilers/abc/polyglot/default.nix
index 99ca28d0455..568e415cf7b 100644
--- a/pkgs/development/compilers/abc/polyglot/default.nix
+++ b/pkgs/development/compilers/abc/polyglot/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/polyglot-dev-20060422015512.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/polyglot-dev-20060422015512.tar.gz;
     md5 = "6972fe537b4edd41872ed1cf24d24b50";
   };
 
diff --git a/pkgs/development/compilers/abc/soot/default.nix b/pkgs/development/compilers/abc/soot/default.nix
index 818d2bde624..77f465f0a5f 100644
--- a/pkgs/development/compilers/abc/soot/default.nix
+++ b/pkgs/development/compilers/abc/soot/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/soot-dev-20060422015512.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/soot-dev-20060422015512.tar.gz;
     md5 = "20dae3e31215b7ec88e3ff32a107d713";
   };
 
diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix
index 5884c5ea692..72b51242918 100644
--- a/pkgs/development/compilers/aspectj/default.nix
+++ b/pkgs/development/compilers/aspectj/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/aspectj/aspectj-1.5.2.jar;
+    url = http://nix.cs.uu.nl/dist/tarballs/aspectj-1.5.2.jar;
     md5 = "64245d451549325147e3ca1ec4c9e57c";
   };
 
diff --git a/pkgs/development/compilers/gcc-4.0/default.nix b/pkgs/development/compilers/gcc-4.0/default.nix
index 77fa831a514..ce55aa39572 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.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/gcc/gcc-4.0.3/gcc-4.0.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-4.0.3.tar.bz2;
     md5 = "6ff1af12c53cbb3f79b27f2d6a9a3d50";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix
index b01cf247842..63265241f53 100644
--- a/pkgs/development/compilers/gcc-4.1/default.nix
+++ b/pkgs/development/compilers/gcc-4.1/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "gcc-4.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-4.1.1.tar.bz2;
     md5 = "ad9f97a4d04982ccf4fd67cb464879f3";
   };
   patches =
diff --git a/pkgs/development/compilers/gcc-apple/default.nix b/pkgs/development/compilers/gcc-apple/default.nix
index 6044a93a70f..47d81c6e6ac 100644
--- a/pkgs/development/compilers/gcc-apple/default.nix
+++ b/pkgs/development/compilers/gcc-apple/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "gcc-4.0.1-apple-5341";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5341.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-5341.tar.gz;
     md5 = "a135f107ddc55b773b40dfff4f049640";
   };
   patches =
diff --git a/pkgs/development/compilers/gcc-static-3.4/default.nix b/pkgs/development/compilers/gcc-static-3.4/default.nix
index 1f46a2f2922..4b2ea23e78f 100644
--- a/pkgs/development/compilers/gcc-static-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-static-3.4/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gcc-static-3.4.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-3.4.6.tar.bz2;
     md5 = "4a21ac777d4b5617283ce488b808da7b";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix
index 0ec63442ccf..c1297ca814f 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.2";
   builder = ./boot.sh;
   src = fetchurl {
-    url = http://www.haskell.org/ghc/dist/6.4.2/ghc-6.4.2-i386-unknown-linux.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
     md5 = "092fe2e25dab22b926babe97cc77db1f";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix
index 44a8dcbc03d..eea9f4de8c0 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.2";
   src = fetchurl {
-    url = http://www.haskell.org/ghc/dist/6.4.2/ghc-6.4.2-src.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-src.tar.bz2;
     md5 = "a394bf14e94c3bca5507d568fcc03375";
   };
   buildInputs = [perl ghc m4];
diff --git a/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix b/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix
index afb074b9c28..5080fb5326c 100644
--- a/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix
+++ b/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ocaml-3.09.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/ocaml-3.09.1.tar.gz;
     md5 = "c73f4b093e27ba5bf13d62923f89befc";
   };
   configureScript = ./configure-3.09.1;
diff --git a/pkgs/development/compilers/qcmm/default.nix b/pkgs/development/compilers/qcmm/default.nix
index 09807f22a97..508221aeaef 100644
--- a/pkgs/development/compilers/qcmm/default.nix
+++ b/pkgs/development/compilers/qcmm/default.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation {
   name = "qcmm-2006-01-31";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~cddouma/dist/qc--20060131.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/qc--20060131.tar.gz;
     md5 = "9097830775bcf22c9bad54f389f5db23";
   };
   buildInputs = [ mk ocaml noweb groff ];
diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix
index 9502a9a0860..ceec2678ece 100644
--- a/pkgs/development/interpreters/lua-4/default.nix
+++ b/pkgs/development/interpreters/lua-4/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "lua-4.0.1";
   src = fetchurl {
-    url = http://www.lua.org/ftp/lua-4.0.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/lua-4.0.1.tar.gz;
     md5 = "a31d963dbdf727f9b34eee1e0d29132c";
   };
   builder= ./builder.sh;
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 73270637eed..4659ca6a3a6 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "lua-5.0.2";
   src = fetchurl {
-    url = http://www.lua.org/ftp/lua-5.0.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/lua-5.0.2.tar.gz;
     md5 = "dea74646b7e5c621fef7174df83c34b1";
   };
   builder= ./builder.sh;
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 787682f1e2c..6b85a1edfdc 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -6,7 +6,7 @@ assert g77.langF77;
 stdenv.mkDerivation {
   name = "octave-2.9.6";
   src = fetchurl {
-    url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/octave-2.9.6.tar.bz2;
     md5 = "10f07dbc0951a7318502a9f1e51e6388";
   };
   buildInputs = [g77 readline ncurses perl flex];
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 3114866b31f..9ec6d468ecd 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.3";
   src = fetchurl {
-    url = http://www.python.org/ftp/python/2.4.3/Python-2.4.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/Python-2.4.3.tar.bz2;
     md5 = "141c683447d5e76be1d2bd4829574f02";
   };
   buildInputs = [
diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
index d6e6b9df71b..6e7d7810395 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.13";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/tcl/tcl8.4.13-src.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/tcl8.4.13-src.tar.gz;
     md5 = "c6b655ad5db095ee73227113220c0523";
   };
 }
diff --git a/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix b/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix
index eb32a93b4bc..5acc1f780bc 100644
--- a/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix
+++ b/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
    name = "toolbus-1.2.2";
    builder = ./builder.sh;
    src = fetchurl {
-            url = http://www.cwi.nl/projects/MetaEnv/toolbus/toolbus-1.2.2.tar.gz;
+            url = http://nix.cs.uu.nl/dist/tarballs/toolbus-1.2.2.tar.gz;
             md5 = "887349b097006c0883e1948797349a50";
          };
    java = if javaAdapter then true else false;
diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix
index ee1c87b5936..7ba94943947 100644
--- a/pkgs/development/interpreters/xulrunner/default.nix
+++ b/pkgs/development/interpreters/xulrunner/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.8.0.4/source/xulrunner-1.8.0.4-source.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/xulrunner-1.8.0.4-source.tar.bz2;
     md5 = "4dc09831aa4e94fda5182a4897ed08e9";
   };
 
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index a74a1590113..fe6820ba149 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -8,7 +8,7 @@ assert alsaSupport -> alsaLib != null;
 stdenv.mkDerivation {
   name = "SDL-1.2.11";
   src = fetchurl {
-    url = http://www.libsdl.org/release/SDL-1.2.11.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/SDL-1.2.11.tar.gz;
     md5 = "418b42956b7cd103bfab1b9077ccc149";
   };
   propagatedBuildInputs = [x11 libXrandr];
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index 14b8359c70a..f60d188886b 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "SDL_mixer-1.2.7";
   src = fetchurl {
-    url = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.7.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/SDL_mixer-1.2.7.tar.gz;
     md5 = "7959b89c8f8f1564ca90968f6c88fa1e";
   };
   buildInputs = [SDL libogg libvorbis];
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 7f2ce3e3882..5dd4292bcaf 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -7,7 +7,7 @@ assert bdbSupport -> db4 != null;
 (stdenv.mkDerivation {
   name = "apr-util-1.2.7";
   src = fetchurl {
-    url = http://archive.apache.org/dist/apr/apr-util-1.2.7.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/apr-util-1.2.7.tar.bz2;
     md5 = "a4c527f08ae2298e62a88472291bf066";
   };
   configureFlags = "
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index a42699063c5..976774b91f9 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "apr-1.2.7";
   src = fetchurl {
-    url = http://archive.apache.org/dist/apr/apr-1.2.7.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/apr-1.2.7.tar.bz2;
     md5 = "e77887dbafc515c63feac84686bcb3bc";
   };
 }
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 79da04d486a..69a097b0c8b 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://oss.sgi.com/projects/xfs/download/download/cmd_tars/attr_2.4.32-1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/attr_2.4.32-1.tar.gz;
     md5 = "092739e9b944815aecc1f5d8379d5ea5";
   };
 
diff --git a/pkgs/development/libraries/bluez-libs/default.nix b/pkgs/development/libraries/bluez-libs/default.nix
index 20cfa41f365..f5e51ed8b79 100644
--- a/pkgs/development/libraries/bluez-libs/default.nix
+++ b/pkgs/development/libraries/bluez-libs/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "bluez-libs-2.25";
   src = fetchurl {
-    url = http://bluez.sf.net/download/bluez-libs-2.25.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bluez-libs-2.25.tar.gz;
     md5 = "ebc8408c9a74c785786a2ef7185fe628";
   };
 }
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index d46b1fe7016..67ec05241db 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.8";
   src = fetchurl {
-    url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gc6.8.tar.gz;
     md5 = "418d38bd9c66398386a372ec0435250e";
   };
 }
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index c48977ec013..798f8f2a1ce 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.2.4";
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.2.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cairo-1.2.4.tar.gz;
     sha1 = "5520b771c8b85acea78fa56fc4c39b4dca6bcc7c";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix
index c640cb3f297..1a4c157482d 100644
--- a/pkgs/development/libraries/clearsilver/default.nix
+++ b/pkgs/development/libraries/clearsilver/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name="clearsilver-0.10.3";
   src = fetchurl {
-    url = "http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz";
+    url = http://nix.cs.uu.nl/dist/tarballs/clearsilver-0.10.3.tar.gz;
     md5 = "ff4104b0e58bca1b61d528edbd902769";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/libraries/coredumper/default.nix b/pkgs/development/libraries/coredumper/default.nix
index 9c73b62cb7e..973de918ff4 100644
--- a/pkgs/development/libraries/coredumper/default.nix
+++ b/pkgs/development/libraries/coredumper/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "coredumper-0.2";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/goog-coredumper/coredumper-0.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/coredumper-0.2.tar.gz;
     md5 = "024f8e4afe73c4cc4f4a0b0ef585e9b7";
   };
 }
diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 8d00ac29352..45e2dd359d9 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cracklib-2.8.9";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/cracklib/cracklib-2.8.9.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cracklib-2.8.9.tar.gz;
     md5 = "9a8c9eb26b48787c84024ac779f64bb2";
   };
   dicts = fetchurl {
diff --git a/pkgs/development/libraries/db4/db4-4.5.20.nix b/pkgs/development/libraries/db4/db4-4.5.20.nix
index 1b8e760886c..5c20b2f451f 100644
--- a/pkgs/development/libraries/db4/db4-4.5.20.nix
+++ b/pkgs/development/libraries/db4/db4-4.5.20.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation ({
   name = "db4-4.5.20";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://download.oracle.com/berkeley-db/db-4.5.20.NC.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/db-4.5.20.NC.tar.gz;
     md5 = "1bfa6256f8d546b97bef1f448ab09875";
   };
   configureFlags = [
diff --git a/pkgs/development/libraries/db4/default.nix b/pkgs/development/libraries/db4/default.nix
index ee7e974e71d..2b4246ff461 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.20";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://downloads.sleepycat.com/db-4.4.20.NC.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/db-4.4.20.NC.tar.gz;
     md5 = "afd9243ea353bbaa04421488d3b37900";
   };
   configureFlags = [
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 7b53a04fb87..947da2c5505 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "expat-2.0.0";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/expat/expat-2.0.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/expat-2.0.0.tar.gz;
     md5 = "d945df7f1c0868c5c73cf66ba9596f3f";
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 6aec8ecbb06..8d6a5fdad31 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ffmpeg-20051126";
   src = fetchurl {
-    url = http://downloads.videolan.org/pub/videolan/vlc/0.8.4a/contrib/ffmpeg-20051126.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ffmpeg-20051126.tar.bz2;
     md5 = "f9e50bf9ee1dd248a276bf9bd4d606e0";
   };
   # !!! Hm, what are the legal consequences of --enable-gpl?
diff --git a/pkgs/development/libraries/freetype/freetype-2.2.1.nix b/pkgs/development/libraries/freetype/freetype-2.2.1.nix
index 2c54f0a5986..134f97cb197 100644
--- a/pkgs/development/libraries/freetype/freetype-2.2.1.nix
+++ b/pkgs/development/libraries/freetype/freetype-2.2.1.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "freetype-2.2.1";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/freetype/freetype-2.2.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/freetype-2.2.1.tar.bz2;
     md5 = "5b2f827082c544392a7701f7423f0781";
   };
 }
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index a9394e00da4..b55b89912ca 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "fribidi-0.10.7";
   src = fetchurl {
-    url = http://fribidi.org/download/fribidi-0.10.7.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/fribidi-0.10.7.tar.gz;
     md5 = "0f602ed32869dbc551dc6bc83d8a3d28";
   };
 }
diff --git a/pkgs/development/libraries/gettext/gettext-0.14.6.nix b/pkgs/development/libraries/gettext/gettext-0.14.6.nix
index 21961673aaa..9feadd615bb 100644
--- a/pkgs/development/libraries/gettext/gettext-0.14.6.nix
+++ b/pkgs/development/libraries/gettext/gettext-0.14.6.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "gettext-0.14.6";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.14.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gettext-0.14.6.tar.gz;
     md5 = "c26fc7f0a493c5c7c39bbc4e7ed42790";
   };
   configureFlags = "--disable-csharp";
diff --git a/pkgs/development/libraries/gettext/gettext-0.15.nix b/pkgs/development/libraries/gettext/gettext-0.15.nix
index dfa95a164a2..9db6eeba563 100644
--- a/pkgs/development/libraries/gettext/gettext-0.15.nix
+++ b/pkgs/development/libraries/gettext/gettext-0.15.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "gettext-0.15";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.15.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gettext-0.15.tar.gz;
     md5 = "16bc6e4d37ac3d07495f737a2349a22b";
   };
   configureFlags = "--disable-csharp";
diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index 22facd2ccfc..3c53862c5d7 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gmime-2.2.1";
   src = fetchurl {
-    url = http://spruce.sourceforge.net/gmime/sources/v2.2/gmime-2.2.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gmime-2.2.1.tar.gz;
     md5 = "b05e4d6344c8465fb74386e5f1fed45c";
   };
   buildInputs = [pkgconfig glib zlib];
diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix
index f294889dd32..3be9a0a2573 100644
--- a/pkgs/development/libraries/gnet/default.nix
+++ b/pkgs/development/libraries/gnet/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null;
 stdenv.mkDerivation {
   name = "gnet-2.0.7";
   src = fetchurl {
-    url = http://www.gnetlibrary.org/src/gnet-2.0.7.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gnet-2.0.7.tar.gz;
     md5 = "3a7a40411775688fe4c42141ab007048";
   };
   buildInputs = [pkgconfig glib];
diff --git a/pkgs/development/libraries/gnome/imlib/default.nix b/pkgs/development/libraries/gnome/imlib/default.nix
index 96fb397f55b..c42ccbce167 100644
--- a/pkgs/development/libraries/gnome/imlib/default.nix
+++ b/pkgs/development/libraries/gnome/imlib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "imlib-1.9.15";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-1.9.15.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/imlib-1.9.15.tar.gz;
     md5 = "2a5561457e7f8b2e04d88f73508fd13a";
   };
 
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
deleted file mode 100644
index 5d0abbb8829..00000000000
--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.10.1.nix
+++ /dev/null
@@ -1,487 +0,0 @@
-# Note: this file was generated automatically by make-listing.sh!
-
-{fetchurl} : {
-  bugbuddy = {
-    name = "bug-buddy-2.10.0";
-    src = fetchurl {
-      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://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://nix.cs.uu.nl/dist/tarballs/dasher-3.2.15.tar.bz2;
-      md5 = "a3fa85e32c94c69476e12ecba7d257e7";
-    };
-  };
-  eel = {
-    name = "eel-2.10.1";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/eog-2.10.0.tar.bz2;
-      md5 = "45c345a0aed600c7ab17c5af750b7c8c";
-    };
-  };
-  epiphany = {
-    name = "epiphany-1.6.2";
-    src = fetchurl {
-      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://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://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://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://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://nix.cs.uu.nl/dist/tarballs/gal-2.4.2.tar.bz2;
-      md5 = "70e07fde659f0553ba56caeae4f51908";
-    };
-  };
-  gcalctool = {
-    name = "gcalctool-5.5.42";
-    src = fetchurl {
-      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://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://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://nix.cs.uu.nl/dist/tarballs/gedit-2.10.2.tar.bz2;
-      md5 = "e3cf99b9233377583a69c4ad235e8494";
-    };
-  };
-  ggv = {
-    name = "ggv-2.8.4";
-    src = fetchurl {
-      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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://nix.cs.uu.nl/dist/tarballs/gnopernicus-0.10.6.tar.bz2;
-      md5 = "324b53371920ba156923e86be34a32c7";
-    };
-  };
-  gok = {
-    name = "gok-1.0.3";
-    src = fetchurl {
-      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://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://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://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://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://nix.cs.uu.nl/dist/tarballs/gtkhtml-3.5.7.tar.bz2;
-      md5 = "218f9ddbd4b95d16f8f60369422cd79c";
-    };
-  };
-  gtksourceview = {
-    name = "gtksourceview-1.2.0";
-    src = fetchurl {
-      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://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://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://nix.cs.uu.nl/dist/tarballs/libgtkhtml-2.6.3.tar.bz2;
-      md5 = "c77789241d725e189ffc0391eda94361";
-    };
-  };
-  libgtop = {
-    name = "libgtop-2.10.1";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/librsvg-2.9.5.tar.bz2;
-      md5 = "44799d75e940eb4150acdae4f63cbe2a";
-    };
-  };
-  libsoup = {
-    name = "libsoup-2.2.3";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/libwnck-2.10.0.tar.bz2;
-      md5 = "c04c79f1e8576bc930c79d2e7bb8190a";
-    };
-  };
-  libxklavier = {
-    name = "libxklavier-2.0";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/metacity-2.10.1.tar.bz2;
-      md5 = "c326eb1aed8742057e9ad94b9ccae877";
-    };
-  };
-  nautilus = {
-    name = "nautilus-2.10.1";
-    src = fetchurl {
-      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://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://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://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://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://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://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://nix.cs.uu.nl/dist/tarballs/totem-1.0.1.tar.bz2;
-      md5 = "e924188ae5b43e7b66ef55584578b8bb";
-    };
-  };
-  vino = {
-    name = "vino-2.10.0";
-    src = fetchurl {
-      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://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://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://nix.cs.uu.nl/dist/tarballs/yelp-2.6.5.tar.bz2;
-      md5 = "9bd94af344ee6a0bf69aa6f9cbd6b7e9";
-    };
-  };
-  zenity = {
-    name = "zenity-2.10.0";
-    src = fetchurl {
-      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-desktop-2.14.3.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix
index 10777092f79..0ba5e9ba567 100644
--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix
@@ -4,448 +4,448 @@
   bugbuddy = {
     name = "bug-buddy-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/bug-buddy-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/bug-buddy-2.14.0.tar.bz2;
       md5 = "4fb288adc8f67cbfb8886ddf7b400530";
     };
   };
   controlcenter = {
     name = "control-center-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/control-center-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/control-center-2.14.2.tar.bz2;
       md5 = "08711b0f14584e7eaa9f4c275085ab36";
     };
   };
   dasher = {
     name = "dasher-4.0.4";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/dasher-4.0.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/dasher-4.0.4.tar.bz2;
       md5 = "6ab865403d29d9d3714e85840ed89dc7";
     };
   };
   deskbarapplet = {
     name = "deskbar-applet-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/deskbar-applet-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/deskbar-applet-2.14.2.tar.bz2;
       md5 = "382379d0c4ca4bd73f14b25d3a04b7cc";
     };
   };
   eel = {
     name = "eel-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/eel-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/eel-2.14.3.tar.bz2;
       md5 = "cdff898f9a054b35f5e3b7c0142cc2a5";
     };
   };
   ekiga = {
     name = "ekiga-2.0.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/ekiga-2.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/ekiga-2.0.2.tar.bz2;
       md5 = "d593da6ac49dce495ef4c6ada06b54b6";
     };
   };
   eog = {
     name = "eog-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/eog-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/eog-2.14.3.tar.bz2;
       md5 = "e90e4c1e314cfab04414464088098a16";
     };
   };
   epiphany = {
     name = "epiphany-2.14.2.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/epiphany-2.14.2.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/epiphany-2.14.2.1.tar.bz2;
       md5 = "872ef8d5e95cdc359f93b5ded501d98d";
     };
   };
   evince = {
     name = "evince-0.5.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evince-0.5.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/evince-0.5.2.tar.bz2;
       md5 = "732df368435cebddd4cc8132a8a280bd";
     };
   };
   evolution = {
     name = "evolution-2.6.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evolution-2.6.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/evolution-2.6.3.tar.bz2;
       md5 = "d7db71aaff2764f03083e6ce74c8ebde";
     };
   };
   evolutiondataserver = {
     name = "evolution-data-server-1.6.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evolution-data-server-1.6.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/evolution-data-server-1.6.3.tar.bz2;
       md5 = "e40343fa6a80916da3f4d1ba5d118c89";
     };
   };
   evolutionexchange = {
     name = "evolution-exchange-2.6.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evolution-exchange-2.6.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/evolution-exchange-2.6.3.tar.bz2;
       md5 = "c98c41db650707fb394e3a8b0cef019b";
     };
   };
   evolutionwebcal = {
     name = "evolution-webcal-2.6.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evolution-webcal-2.6.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/evolution-webcal-2.6.0.tar.bz2;
       md5 = "c779dcfc1db419f019abfcaafd6b8e4d";
     };
   };
   fastuserswitchapplet = {
     name = "fast-user-switch-applet-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/fast-user-switch-applet-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/fast-user-switch-applet-2.14.2.tar.bz2;
       md5 = "590e51fbc9dfa7e33a337d36349cf040";
     };
   };
   fileroller = {
     name = "file-roller-2.14.4";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/file-roller-2.14.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/file-roller-2.14.4.tar.bz2;
       md5 = "e86c78b3ecc90af20cf66511f4622c5c";
     };
   };
   gcalctool = {
     name = "gcalctool-5.8.19";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gcalctool-5.8.19.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gcalctool-5.8.19.tar.bz2;
       md5 = "9fbf0f2552f6fd1a0fadf54a2125fef2";
     };
   };
   gconfeditor = {
     name = "gconf-editor-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gconf-editor-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gconf-editor-2.14.0.tar.bz2;
       md5 = "eb8b979464f6e383e5a27b57ee4e8382";
     };
   };
   gdm = {
     name = "gdm-2.14.10";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gdm-2.14.10.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gdm-2.14.10.tar.bz2;
       md5 = "e880558dc3574f804f3abca869992a4f";
     };
   };
   gedit = {
     name = "gedit-2.14.4";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gedit-2.14.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gedit-2.14.4.tar.bz2;
       md5 = "189d4d9128eca1162a782744cb324aea";
     };
   };
   gnomeapplets = {
     name = "gnome-applets-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-applets-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-applets-2.14.3.tar.bz2;
       md5 = "ab96f071db993461533cb740281a7373";
     };
   };
   gnomebackgrounds = {
     name = "gnome-backgrounds-2.14.2.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-backgrounds-2.14.2.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-backgrounds-2.14.2.1.tar.bz2;
       md5 = "10480df7c2e5a08c920c5b0a2ff4f161";
     };
   };
   gnomedesktop = {
     name = "gnome-desktop-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-desktop-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-desktop-2.14.3.tar.bz2;
       md5 = "2a8547ab0dcb10a1ad297874ae95b06b";
     };
   };
   gnomedocutils = {
     name = "gnome-doc-utils-0.6.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-doc-utils-0.6.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-doc-utils-0.6.1.tar.bz2;
       md5 = "c706b807b15e07e58561f903c0f20c26";
     };
   };
   gnomegames = {
     name = "gnome-games-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-games-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-games-2.14.3.tar.bz2;
       md5 = "20f7c2e0ee4a65d15733332f34ac3cd4";
     };
   };
   gnomeicontheme = {
     name = "gnome-icon-theme-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-icon-theme-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-icon-theme-2.14.2.tar.bz2;
       md5 = "6f1d33a297bd27e0e9f4c1a5fa956166";
     };
   };
   gnomekeyring = {
     name = "gnome-keyring-0.4.9";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-keyring-0.4.9.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-keyring-0.4.9.tar.bz2;
       md5 = "9a90820acf11a66e4c3dd9e163231071";
     };
   };
   gnomekeyringmanager = {
     name = "gnome-keyring-manager-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-keyring-manager-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-keyring-manager-2.14.0.tar.bz2;
       md5 = "d4e38c7b7da99885fa898917e10d8aeb";
     };
   };
   gnomemag = {
     name = "gnome-mag-0.12.6";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-mag-0.12.6.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-mag-0.12.6.tar.bz2;
       md5 = "c402b06408d3b40843720ae09ad74234";
     };
   };
   gnomemedia = {
     name = "gnome-media-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-media-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-media-2.14.2.tar.bz2;
       md5 = "16c35916f429c5ea04fb942b4072643b";
     };
   };
   gnomemenus = {
     name = "gnome-menus-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-menus-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-menus-2.14.3.tar.bz2;
       md5 = "9926e7ad14255d1a08c7e774052f8a3a";
     };
   };
   gnomenetstatus = {
     name = "gnome-netstatus-2.12.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-netstatus-2.12.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-netstatus-2.12.0.tar.bz2;
       md5 = "a5f23731a3bf232969e82afef8792a36";
     };
   };
   gnomenettool = {
     name = "gnome-nettool-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-nettool-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-nettool-2.14.2.tar.bz2;
       md5 = "0efb13f0145abe46b26a00c75473a00f";
     };
   };
   gnomepanel = {
     name = "gnome-panel-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-panel-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-panel-2.14.3.tar.bz2;
       md5 = "14ab4c3d3ff3d0c1be397b6799a8626c";
     };
   };
   gnomepythondesktop = {
     name = "gnome-python-desktop-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-python-desktop-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-python-desktop-2.14.0.tar.bz2;
       md5 = "d3f9c2d213b7d486ca7bd87dd106ca69";
     };
   };
   gnomescreensaver = {
     name = "gnome-screensaver-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-screensaver-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-screensaver-2.14.3.tar.bz2;
       md5 = "2ed0b9322d284bb1739e037165ca94f2";
     };
   };
   gnomesession = {
     name = "gnome-session-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-session-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-session-2.14.3.tar.bz2;
       md5 = "34eb4641e2791ae51acf6f1edfcf3d64";
     };
   };
   gnomespeech = {
     name = "gnome-speech-0.4.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-speech-0.4.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-speech-0.4.2.tar.bz2;
       md5 = "df06441a5b560830264c0557e3d3c376";
     };
   };
   gnomesystemmonitor = {
     name = "gnome-system-monitor-2.14.5";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-system-monitor-2.14.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-system-monitor-2.14.5.tar.bz2;
       md5 = "1220837542f9c1905ebf3af69a608b07";
     };
   };
   gnomesystemtools = {
     name = "gnome-system-tools-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-system-tools-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-system-tools-2.14.0.tar.bz2;
       md5 = "3aded3a37f4f5b4962bf253d25cebea1";
     };
   };
   gnometerminal = {
     name = "gnome-terminal-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-terminal-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-terminal-2.14.2.tar.bz2;
       md5 = "da80071cd707e89cedcfb476cab8b39a";
     };
   };
   gnomethemes = {
     name = "gnome-themes-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-themes-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-themes-2.14.3.tar.bz2;
       md5 = "7c07c4c01404b447f2624e8e400ee787";
     };
   };
   gnomeuserdocs = {
     name = "gnome-user-docs-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-user-docs-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-user-docs-2.14.2.tar.bz2;
       md5 = "4f5a7114ccf9e4e31137da50b7333570";
     };
   };
   gnomeutils = {
     name = "gnome-utils-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-utils-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-utils-2.14.0.tar.bz2;
       md5 = "d1d16ff6bfc1f6ddc110d18ec4dfdbfa";
     };
   };
   gnomevolumemanager = {
     name = "gnome-volume-manager-1.5.15";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-volume-manager-1.5.15.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-volume-manager-1.5.15.tar.bz2;
       md5 = "0bf3ee007c951a5d833a3c17bbe59ec6";
     };
   };
   gnopernicus = {
     name = "gnopernicus-1.1.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnopernicus-1.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnopernicus-1.1.1.tar.bz2;
       md5 = "e691c408de4ca885a3589a0b6fa297be";
     };
   };
   gok = {
     name = "gok-1.0.10";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gok-1.0.10.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gok-1.0.10.tar.bz2;
       md5 = "de6cceaca780e7ad0702c4b3c0fd8d1f";
     };
   };
   gstpluginsbase = {
     name = "gst-plugins-base-0.10.7";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gst-plugins-base-0.10.7.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gst-plugins-base-0.10.7.tar.bz2;
       md5 = "d66b09de993aefd22d8fc341e5f50521";
     };
   };
   gstpluginsgood = {
     name = "gst-plugins-good-0.10.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gst-plugins-good-0.10.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gst-plugins-good-0.10.3.tar.bz2;
       md5 = "2b59bce477349628ee549c2ce1d80a3a";
     };
   };
   gstreamer = {
     name = "gstreamer-0.10.8";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gstreamer-0.10.8.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gstreamer-0.10.8.tar.bz2;
       md5 = "a094ea86d4cea4f23ef2eb8c6e7bfc10";
     };
   };
   gtkengines = {
     name = "gtk-engines-2.6.10";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gtk-engines-2.6.10.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtk-engines-2.6.10.tar.bz2;
       md5 = "f3e2b14b0cff0988277ccba42e69813d";
     };
   };
   gtkhtml = {
     name = "gtkhtml-3.10.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gtkhtml-3.10.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtkhtml-3.10.3.tar.bz2;
       md5 = "90b1807db0ef0e5d69442e1f85610ec4";
     };
   };
   gtksourceview = {
     name = "gtksourceview-1.6.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gtksourceview-1.6.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtksourceview-1.6.2.tar.bz2;
       md5 = "57f4ee84f0c494fd943c7badb0a68785";
     };
   };
   gucharmap = {
     name = "gucharmap-1.6.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gucharmap-1.6.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gucharmap-1.6.0.tar.bz2;
       md5 = "8af03f350c988d1565922b10776bc725";
     };
   };
   libgailgnome = {
     name = "libgail-gnome-1.1.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libgail-gnome-1.1.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgail-gnome-1.1.3.tar.bz2;
       md5 = "1d12c5375b3404f4f20b214b763e5225";
     };
   };
   libgnomeprint = {
     name = "libgnomeprint-2.12.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libgnomeprint-2.12.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprint-2.12.1.tar.bz2;
       md5 = "ea729d4968fe2169c84efb12ace5f6cc";
     };
   };
   libgnomeprintui = {
     name = "libgnomeprintui-2.12.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libgnomeprintui-2.12.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprintui-2.12.1.tar.bz2;
       md5 = "fa0b0410c3ba8b6899c5ed278f02cbe5";
     };
   };
   libgtop = {
     name = "libgtop-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libgtop-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgtop-2.14.2.tar.bz2;
       md5 = "adcc07c6d1c115c6d275a3c9bb1f3b68";
     };
   };
   librsvg = {
     name = "librsvg-2.14.4";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/librsvg-2.14.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/librsvg-2.14.4.tar.bz2;
       md5 = "945617bb094975d7353a3852302297c1";
     };
   };
   libsoup = {
     name = "libsoup-2.2.96";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libsoup-2.2.96.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libsoup-2.2.96.tar.bz2;
       md5 = "2704961ca2b9597819f21b40d4a0e0aa";
     };
   };
   libwnck = {
     name = "libwnck-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libwnck-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libwnck-2.14.3.tar.bz2;
       md5 = "5796c0c26c5dfbad6d4fdf77858feae6";
     };
   };
   libxklavier = {
     name = "libxklavier-2.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libxklavier-2.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxklavier-2.2.tar.bz2;
       md5 = "1c53646f35d77564f42d3f4342cd443f";
     };
   };
   metacity = {
     name = "metacity-2.14.5";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/metacity-2.14.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/metacity-2.14.5.tar.bz2;
       md5 = "a14c4a07e456a2590452d6c9db2e5153";
     };
   };
   nautilus = {
     name = "nautilus-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/nautilus-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/nautilus-2.14.3.tar.bz2;
       md5 = "e82df2a1cb11719d054959539b74b3c7";
     };
   };
   nautiluscdburner = {
     name = "nautilus-cd-burner-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/nautilus-cd-burner-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/nautilus-cd-burner-2.14.3.tar.bz2;
       md5 = "c85642630b3db5ee0a40e2fdbf4fdf94";
     };
   };
@@ -459,7 +459,7 @@
   soundjuicer = {
     name = "sound-juicer-2.14.5";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/sound-juicer-2.14.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/sound-juicer-2.14.5.tar.bz2;
       md5 = "2bb23f1bd7751eb9f14f2446beed15e0";
     };
   };
@@ -473,42 +473,42 @@
   systemtoolsbackends = {
     name = "system-tools-backends-1.4.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/system-tools-backends-1.4.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/system-tools-backends-1.4.2.tar.bz2;
       md5 = "a0af1513becdf3b9bfed3535ad8f7dab";
     };
   };
   totem = {
     name = "totem-1.4.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/totem-1.4.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/totem-1.4.3.tar.bz2;
       md5 = "971f99d769cb865f9a6b55284357f415";
     };
   };
   vino = {
     name = "vino-2.13.5";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/vino-2.13.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/vino-2.13.5.tar.bz2;
       md5 = "9bc8c3f0e639fdc7b9ed023501308359";
     };
   };
   vte = {
     name = "vte-0.12.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/vte-0.12.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/vte-0.12.2.tar.bz2;
       md5 = "7cb1bd6ca528bc4db5ec685549fd3eb1";
     };
   };
   yelp = {
     name = "yelp-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/yelp-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/yelp-2.14.3.tar.bz2;
       md5 = "d3c4300c9a7d38ff2179b934ca5e2d1a";
     };
   };
   zenity = {
     name = "zenity-2.14.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/zenity-2.14.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/zenity-2.14.3.tar.bz2;
       md5 = "00c0930abb905a5552f67ee764bd6177";
     };
   };
diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
deleted file mode 100644
index 2423d4a8933..00000000000
--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{stdenv, fetchurl} : {
-
-  gnomeicontheme = {
-    name = "gnome-icon-theme-2.8.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-icon-theme-2.8.0.tar.bz2;
-      md5 = "7be016337c44c024fb22f7b94b689d7b";
-    };
-  };
-
-  gnomekeyring = {
-    name = "gnome-keyring-0.4.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-keyring-0.4.1.tar.bz2;
-      md5 = "031901a50273cc5a39b1305924613a1b";
-    };
-  };
-
-  gtkhtml = {
-    name = "gtkhtml-3.2.5";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gtkhtml-3.2.5.tar.bz2;
-      md5 = "86e1ce32fed536bce5b2d6e8d41b0c65";
-    };
-  };
-
-  libgtkhtml = {
-    name = "libgtkhtml-2.6.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgtkhtml-2.6.3.tar.bz2;
-      md5 = "c77789241d725e189ffc0391eda94361";
-    };
-  };
-
-  gtksourceview = {
-    name = "gtksourceview-1.1.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gtksourceview-1.1.1.tar.bz2;
-      md5 = "2e59c8748594181d4bf452320c8c3b5c";
-    };
-  };
-
-  scrollkeeper = {
-    name = "scrollkeeper-0.3.14";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/scrollkeeper-0.3.14.tar.gz;
-      md5 = "161eb3f29e30e7b24f84eb93ac696155";
-    };
-  };
-  
-  gnomedesktop = {
-    name = "gnome-desktop-2.8.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-desktop-2.8.3.tar.bz2;
-      md5 = "607f8689f931336ad9a1f3f41d98a9c7";
-    };
-  };
-  
-  libwnck = {
-    name = "libwnck-2.8.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libwnck-2.8.1.tar.bz2;
-      md5 = "c0a5a8478064287e167c15e3ec0e82a1";
-    };
-  };
-  
-  gnomepanel = {
-    name = "gnome-panel-2.8.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-panel-2.8.3.tar.bz2;
-      md5 = "d76a09c321e02c18e0fdecb86677550d";
-    };
-  };
-  
-}
\ No newline at end of file
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
deleted file mode 100644
index c0f55d3f7fd..00000000000
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.10.1.nix
+++ /dev/null
@@ -1,193 +0,0 @@
-# Note: this file was generated automatically by make-listing.sh!
-
-{fetchurl} : {
-  atk = {
-    name = "atk-1.9.1";
-    src = fetchurl {
-      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://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://nix.cs.uu.nl/dist/tarballs/audiofile-0.2.6.tar.bz2;
-      md5 = "3d01302834660850b6141cac1e6f5501";
-    };
-  };
-  esound = {
-    name = "esound-0.2.35";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/gail-1.8.3.tar.bz2;
-      md5 = "9e5db197dea8f92eec1f07984f12542a";
-    };
-  };
-  GConf = {
-    name = "GConf-2.10.0";
-    src = fetchurl {
-      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://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://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://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://nix.cs.uu.nl/dist/tarballs/gtk+-2.6.7.tar.bz2;
-      md5 = "b89bf892a0dee943f98b4caa12f773c8";
-    };
-  };
-  gtkdoc = {
-    name = "gtk-doc-1.3";
-    src = fetchurl {
-      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://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://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://nix.cs.uu.nl/dist/tarballs/libbonobo-2.8.1.tar.bz2;
-      md5 = "54f863c20016cf8a2cf25056f6c7cda7";
-    };
-  };
-  libbonoboui = {
-    name = "libbonoboui-2.8.1";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/libglade-2.5.1.tar.bz2;
-      md5 = "e4734a59f1f2308d7714dc0ebf8163f1";
-    };
-  };
-  libgnome = {
-    name = "libgnome-2.10.0";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/libgnomecanvas-2.10.0.tar.bz2;
-      md5 = "88aac06c8dfd24671db3fe3bf881b5fc";
-    };
-  };
-  libgnomeprint = {
-    name = "libgnomeprint-2.10.3";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/libgnomeprintui-2.10.2.tar.bz2;
-      md5 = "01fce7918f4e106e00ee8b5447783e4c";
-    };
-  };
-  libgnomeui = {
-    name = "libgnomeui-2.10.0";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/libIDL-0.8.5.tar.bz2;
-      md5 = "c63f6513dc7789d0575bea02d62d58d7";
-    };
-  };
-  libxml2 = {
-    name = "libxml2-2.6.19";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.14.tar.bz2;
-      md5 = "1fe60d57b8fcff7462fb1d9fac6c2ae8";
-    };
-  };
-  ORBit2 = {
-    name = "ORBit2-2.12.2";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/pango-1.8.1.tar.bz2;
-      md5 = "88aa6bf1876766db6864f3b93577887c";
-    };
-  };
-  pkgconfig = {
-    name = "pkgconfig-0.17.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/pkgconfig-0.17.2.tar.bz2;
-      md5 = "eab15aecff99e98bcc5d01331452e583";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix b/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix
index efdcf19e0ff..f963d701150 100644
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix
@@ -4,14 +4,14 @@
   atk = {
     name = "atk-1.11.4";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/atk-1.11.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/atk-1.11.4.tar.bz2;
       md5 = "2f7132e46a62a2586545bca40eeeef39";
     };
   };
   atspi = {
     name = "at-spi-1.7.7";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/at-spi-1.7.7.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/at-spi-1.7.7.tar.bz2;
       md5 = "2988cd21d9f292fd404a8c532fe2723d";
     };
   };
@@ -25,28 +25,28 @@
   esound = {
     name = "esound-0.2.36";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/esound-0.2.36.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/esound-0.2.36.tar.bz2;
       md5 = "3facb5aa0115cc1c31771b9ad454ae76";
     };
   };
   gail = {
     name = "gail-1.8.11";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gail-1.8.11.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gail-1.8.11.tar.bz2;
       md5 = "ff79df7dd0cf7a5109c089b9b5fbe17f";
     };
   };
   GConf = {
     name = "GConf-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/GConf-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/GConf-2.14.0.tar.bz2;
       md5 = "d07c2efcaf477cf34225c604a04b6271";
     };
   };
   glib = {
     name = "glib-2.10.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/glib-2.10.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/glib-2.10.3.tar.bz2;
       md5 = "87206e721c12d185d17dd9ecd7e30369";
     };
   };
@@ -60,28 +60,28 @@
   gnomevfs = {
     name = "gnome-vfs-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gnome-vfs-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-vfs-2.14.2.tar.bz2;
       md5 = "b657e31974d6981adf9b2c4db981f62c";
     };
   };
   gtk = {
     name = "gtk+-2.8.20";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gtk+-2.8.20.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.8.20.tar.bz2;
       md5 = "74e7ca98194f1fadfe906e66d763d05d";
     };
   };
   gtkdoc = {
     name = "gtk-doc-1.6";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gtk-doc-1.6.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtk-doc-1.6.tar.bz2;
       md5 = "09c7a89efff2e0bbaba02a12bff58dfd";
     };
   };
   intltool = {
     name = "intltool-0.34.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/intltool-0.34.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/intltool-0.34.2.tar.bz2;
       md5 = "83914f744d927579cc47c52f8b08bf60";
     };
   };
@@ -95,77 +95,77 @@
   libbonobo = {
     name = "libbonobo-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libbonobo-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libbonobo-2.14.0.tar.bz2;
       md5 = "f1f0255f94e3354250d142b688013fad";
     };
   };
   libbonoboui = {
     name = "libbonoboui-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libbonoboui-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libbonoboui-2.14.0.tar.bz2;
       md5 = "dc26dc17cddc625cac37ecfab263a51a";
     };
   };
   libglade = {
     name = "libglade-2.6.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libglade-2.6.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libglade-2.6.0.tar.bz2;
       md5 = "81d7b2b64871ce23a5fae1e5da0b1f6e";
     };
   };
   libgnome = {
     name = "libgnome-2.14.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libgnome-2.14.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnome-2.14.1.tar.bz2;
       md5 = "bf53815df10db62bbf00defd4100b8d8";
     };
   };
   libgnomecanvas = {
     name = "libgnomecanvas-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libgnomecanvas-2.14.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomecanvas-2.14.0.tar.bz2;
       md5 = "516c46fb4a1401b05cfef58c350fbd3d";
     };
   };
   libgnomeui = {
     name = "libgnomeui-2.14.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libgnomeui-2.14.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeui-2.14.1.tar.bz2;
       md5 = "ff6b6c25de0e7e39c79998621cdec048";
     };
   };
   libIDL = {
     name = "libIDL-0.8.7";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libIDL-0.8.7.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libIDL-0.8.7.tar.bz2;
       md5 = "53a3874beb42ddfd9a5030047a0db740";
     };
   };
   libxml2 = {
     name = "libxml2-2.6.26";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libxml2-2.6.26.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.26.tar.bz2;
       md5 = "ce342b4d7b6d83e10cfa4d3f82bf75fd";
     };
   };
   libxslt = {
     name = "libxslt-1.1.17";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libxslt-1.1.17.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.17.tar.bz2;
       md5 = "af99d7b06eba109ab374ccd7015561c4";
     };
   };
   ORBit2 = {
     name = "ORBit2-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/ORBit2-2.14.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/ORBit2-2.14.2.tar.bz2;
       md5 = "88ea9b8e686ab0dd27b4199e0f41ac84";
     };
   };
   pango = {
     name = "pango-1.12.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/pango-1.12.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/pango-1.12.3.tar.bz2;
       md5 = "c8178e11a895166d86990bb2c38d831b";
     };
   };
diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix b/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
deleted file mode 100644
index 133759dcb85..00000000000
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
+++ /dev/null
@@ -1,180 +0,0 @@
-# this file can (and should) be generated from an FTP listing
-
-{stdenv, fetchurl} : {
-  gconf = {
-    name = "GConf-2.8.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/GConf-2.8.1.tar.bz2;
-      md5 = "b1173cbe33404bcbcc15710ce2a28f67";
-    };
-  };
-
-  ORBit2 = {
-    name = "ORBit2-2.12.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/ORBit2-2.12.1.tar.bz2;
-      md5 = "30ede62e194f692f2dd3daa09c752196";
-    };
-  };
-
-  atk = {
-    name = "atk-1.8.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/atk-1.8.0.tar.bz2;
-      md5 = "fc46940febb0e91427b77457e6356f3d";
-    };
-  };
-
-  audiofile = {
-    name = "audiofile-0.2.6";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/esound-0.2.35.tar.bz2;
-      md5 = "1566344f80a8909b5e6e4d6b6520c2c1";
-    };
-  };
-
-  gail = {
-    name = "gail-1.8.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gail-1.8.2.tar.bz2;
-      md5 = "3b8be198ccb8a0d92cfb0c3cdd519c1f";
-    };
-  };
-
-  glib = {
-    name = "glib-2.4.8";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/glib-2.4.8.tar.bz2;
-      md5 = "e160a5feecf46e0fbb36db09c356953c";
-    };
-  };
-
-  gnomemimedata = {
-    name = "gnome-mime-data-2.4.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.2.tar.bz2;
-      md5 = "37242776b08625fa10c73c18b790e552";
-    };
-  };
-
-  gnomevfs = {
-    name = "gnome-vfs-2.8.4";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-vfs-2.8.4.tar.bz2;
-      md5 = "42d3505e9ef9c26a7aae4e511b9b4c34";
-    };
-  };
-
-  gtk = {
-    name = "gtk+-2.4.14";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.4.14.tar.bz2;
-      md5 = "10470d574933460809e4ac488e579e26";
-    };
-  };
-
-  libIDL = {
-    name = "libIDL-0.8.5";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libIDL-0.8.5.tar.bz2;
-      md5 = "c63f6513dc7789d0575bea02d62d58d7";
-    };
-  };
-
-  libart_lgpl = {
-    name = "libart_lgpl-2.3.17";
-    src = fetchurl {
-      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://nix.cs.uu.nl/dist/tarballs/libbonobo-2.8.1.tar.bz2;
-      md5 = "54f863c20016cf8a2cf25056f6c7cda7";
-    };
-  };
-
-  libbonoboui = {
-    name = "libbonoboui-2.8.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libbonoboui-2.8.1.tar.bz2;
-      md5 = "b23daafa8344a88696d497f20285ef55";
-    };
-  };
-
-  libglade = {
-    name = "libglade-2.4.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libglade-2.4.2.tar.bz2;
-      md5 = "83d08f9ab485a10454bd5171d2d53fb0";
-    };
-  };
-
-  libgnome = {
-    name = "libgnome-2.8.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnome-2.8.1.tar.bz2;
-      md5 = "17577198f5086c48f69c361be2f4806c";
-    };
-  };
-
-  libgnomecanvas = {
-    name = "libgnomecanvas-2.8.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnomecanvas-2.8.0.tar.bz2;
-      md5 = "2bf10396a92777e7b64b6052a8a232f1";
-    };
-  };
-
-  libgnomeprint = {
-    name = "libgnomeprint-2.8.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprint-2.8.2.tar.bz2;
-      md5 = "8361c4e1bc3d87b91435807d0c06a3e4";
-    };
-  };
-
-  libgnomeprintui = {
-    name = "libgnomeprintui-2.8.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprintui-2.8.2.tar.bz2;
-      md5 = "b38d1f6813dd52879ba4174ddc3f1b1c";
-    };
-  };
-
-  libgnomeui = {
-    name = "libgnomeui-2.8.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeui-2.8.1.tar.bz2;
-      md5 = "d46a2b34bdfbc1b36464176fa8bef03c";
-    };
-  };
-
-  pango = {
-    name = "pango-1.6.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/pango-1.6.0.tar.bz2;
-      md5 = "6c732bbc5fba5a0f1f8086e8aa4f490d";
-    };
-  };
-
-  intltool = {
-    name = "intltool-0.33";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/intltool-0.33.tar.bz2;
-      md5 = "7d3b6d421b0fb9beee7faf97daab45e6";
-    };
-  };
-  
-}
diff --git a/pkgs/development/libraries/gtk-libs-2.10/glibmm/default.nix b/pkgs/development/libraries/gtk-libs-2.10/glibmm/default.nix
index b9b1df0f4a3..6ef47da5d51 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/glibmm/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/glibmm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "glibmm-2.8.9";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-2.8.9.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glibmm-2.8.9.tar.bz2;
     md5 = "6d23ba91546f51530421de5a1dc81fa8";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
index 07d9fdd21a8..240971bea60 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
@@ -10,7 +10,7 @@ assert xineramaSupport -> libXinerama != null;
 stdenv.mkDerivation {
   name = "gtk+-2.10.1";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.10.1.tar.bz2;
     md5 = "7f1d39031d50de8228211aa3230d4acd";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/gtk-libs-2.10/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs-2.10/gtkmm/default.nix
index 98a3c453336..6360ba0651f 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/gtkmm/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/gtkmm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gtkmm-2.8.8";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-2.8.8.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtkmm-2.8.8.tar.bz2;
     md5 = "319a7847f67c5099a78afb495e148143";
   };
 
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 9e3296e00a1..977f9eb1498 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.12.4";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/pango/1.12/pango-1.12.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.12.4.tar.bz2;
     md5 = "8f6749fe961e41dbeed72d1efcd55224";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index a351da592e1..b774396a557 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "id3lib-3.8.3";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/id3lib/id3lib-3.8.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/id3lib-3.8.3.tar.gz;
     md5 = "19f27ddd2dda4b2d26a559a4f0f402a7";
   };
   configureFlags = "--disable-static";
diff --git a/pkgs/development/libraries/java/javasvn/default.nix b/pkgs/development/libraries/java/javasvn/default.nix
index 2c43ba7043b..bf3ea40e5dd 100644
--- a/pkgs/development/libraries/java/javasvn/default.nix
+++ b/pkgs/development/libraries/java/javasvn/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://tmate.org/svn/org.tmatesoft.svn_1.0.6.standalone.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/org.tmatesoft.svn_1.0.6.standalone.zip;
     md5 = "459cae849eceef04cd65fd6fb54affcc";
   };
   
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 344590a4231..20f9fdf848c 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "lesstif-0.95";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/lesstif/lesstif-0.95.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/lesstif-0.95.0.tar.bz2;
     md5 = "ab895165c149d7f95843c7584b1c7ad4";
   };
   buildInputs = [x11];
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index e8e9da17544..d52acf9a83f 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libdvdcss-1.2.9";
   src = fetchurl {
-    url = http://download.videolan.org/pub/libdvdcss/1.2.9/libdvdcss-1.2.9.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libdvdcss-1.2.9.tar.bz2;
     md5 = "553383d898826c285afb2ee453b07868";
   };
 }
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index 48f990ea9ba..b3c5ab3ad49 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libdvdnav-20050211";
   src = fetchurl {
-    url = http://downloads.videolan.org/pub/videolan/vlc/0.8.4a/contrib/libdvdnav-20050211.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libdvdnav-20050211.tar.bz2;
     md5 = "e1b1d45c8fdaf6a2dce3078bd3d7047d";
   };
 }
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index fd0eee12ae4..2754540a1b2 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libdvdread-0.9.6";
   src = fetchurl {
-    url = http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-0.9.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libdvdread-0.9.6.tar.gz;
     md5 = "329401b84ad0b00aaccaad58f2fc393c";
   };
   configureFlags = "--with-libdvdcss=${libdvdcss}";
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 4402995d587..25734234994 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libevent-1.1b";
 
   src = fetchurl {
-    url = http://monkey.org/~provos/libevent-1.1b.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libevent-1.1b.tar.gz;
     md5 = "ec8dac612aa43ed172f300f396fcec49";
   };
 }
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 2a3857a735b..520d0e127a0 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libgphoto2-2.2.1";
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/gphoto/libgphoto2-2.2.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libgphoto2-2.2.1.tar.bz2;
     md5 = "69827311733e39fafa9f77bb05e55b77";
   };
   buildInputs = [pkgconfig libusb];
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 94c96b04411..41c3b6fca15 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libgsf-1.14.1";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/libgsf-1.14.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libgsf-1.14.1.tar.bz2;
     md5 = "00de00b99382d0b7e034e0fffd8951d4";
   };
   buildInputs = [perl perlXMLParser pkgconfig libxml2 glib];
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 21267bea458..0657eddef46 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -12,11 +12,11 @@ stdenv.mkDerivation {
   # Required for building of dynamic libraries on Darwin.
   patches = [
     (fetchurl {
-      url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltconfig;
+      url = http://nix.cs.uu.nl/dist/tarballs/patch-ltconfig;
       md5 = "e6725fa4a09aa1de4ca75343fd0f61d5";
     })
     (fetchurl {
-      url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltmain.sh;
+      url = http://nix.cs.uu.nl/dist/tarballs/patch-ltmain.sh;
       #md5 = "489986ad8e7a93aef036766b25f321d5";
       md5 = "092a12aeb0c386dd7dae059109d950ba";
     })
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 6db5bf798d9..1f9d5ae4b43 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libmad-0.15.1b";
   src = fetchurl {
-    url = ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libmad-0.15.1b.tar.gz;
     md5 = "1be543bc30c56fb6bea1d7bf6a64e66c";
   };
 }
diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix
index f0742d23229..e6d34d0720b 100644
--- a/pkgs/development/libraries/libmpcdec/default.nix
+++ b/pkgs/development/libraries/libmpcdec/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libmpcdec-1.2.2";
   src = fetchurl {
-    url = http://files2.musepack.net/source/libmpcdec-1.2.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libmpcdec-1.2.2.tar.bz2;
     md5 = "f14e07285b9b102a806649074c1d779b";
   };
 }
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 50351f66391..19b0edb03c0 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libogg-1.1.3";
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libogg-1.1.3.tar.gz;
     md5 = "eaf7dc6ebbff30975de7527a80831585" ;
   };
 }
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 26dd7787293..d3e4378a4d4 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.12";
   src = fetchurl {
-    url = ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.12.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libpng-1.2.12.tar.bz2;
     md5 = "2287cfaad53a714acdf6eb75a7c1d15f";
   };
   propagatedBuildInputs = [zlib];
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index f0c637d0f23..cd26c33928a 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libtheora-1.0alpha7";
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libtheora-1.0alpha7.tar.bz2;
     md5 = "1bc851e39e4b16977131d5e5f769f48b";
   };
   propagatedBuildInputs = [libogg libvorbis];
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 3a47356d1de..496035ea08e 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "libtiff-3.8.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/tiff-3.8.2.tar.gz;
     md5 = "fbb6f446ea4ed18955e2714934e5b698";
   };
   propagatedBuildInputs = [zlib libjpeg];
diff --git a/pkgs/development/libraries/libungif/default.nix b/pkgs/development/libraries/libungif/default.nix
index 6ca8679ad30..ab651e486c9 100644
--- a/pkgs/development/libraries/libungif/default.nix
+++ b/pkgs/development/libraries/libungif/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libungif-4.1.4";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/libungif/libungif-4.1.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libungif-4.1.4.tar.gz;
     md5 = "efdfcf8e32e35740288a8c5625a70ccb";
   };
 }
diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix
index a4f2fcf5ec5..f1414dee9c7 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.12";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/libusb/libusb-0.1.12.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libusb-0.1.12.tar.gz;
     md5 = "caf182cbc7565dac0fd72155919672e6";
   };
 }
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index cdcee814917..3bc452448fa 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libvorbis-1.1.2";
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.1.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libvorbis-1.1.2.tar.gz;
     md5 = "37847626b8e1b53ae79a34714c7b3211";
   };
   buildInputs = [libogg];
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 20a1b769b64..1e42f0e8594 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.5";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/libwpd/libwpd-0.8.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libwpd-0.8.5.tar.gz;
     md5 = "6b679e205a2805c3d23f41c65b35e266";
   };
   buildInputs = [pkgconfig glib libgsf libxml2];
diff --git a/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix b/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix
index 79026efd7bb..fbd59629cd9 100644
--- a/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix
+++ b/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxml2-2.6.23.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.23.tar.gz;
     md5 = "0f37385e3ad73cc94db43d6873f4fc3b";
   };
 
diff --git a/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix b/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix
index 2bd6747bc66..12ebf6a9646 100644
--- a/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix
+++ b/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxml2-2.6.26.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.26.tar.gz;
     md5 = "2d8d3805041edab967368b497642f981";
   };
 
diff --git a/pkgs/development/libraries/libxslt/libxslt-1.1.17.nix b/pkgs/development/libraries/libxslt/libxslt-1.1.17.nix
index 70596dd12a4..f9e6817b18e 100644
--- a/pkgs/development/libraries/libxslt/libxslt-1.1.17.nix
+++ b/pkgs/development/libraries/libxslt/libxslt-1.1.17.nix
@@ -5,7 +5,7 @@ assert libxml2 != null;
 stdenv.mkDerivation {
   name = "libxslt-1.1.17";
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxslt/libxslt-1.1.17.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.17.tar.gz;
     md5 = "fde6a7a93c0eb14cba628692fa3a1000";
   };
   buildInputs = [libxml2];
diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix
index 7ee4236296d..dd16c18ed1b 100644
--- a/pkgs/development/libraries/mpeg2dec/default.nix
+++ b/pkgs/development/libraries/mpeg2dec/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mpeg2dec-20050802";
   src = fetchurl {
-    url = ftp://ftp.u-strasbg.fr/pub/videolan/vlc/0.8.4a/contrib/mpeg2dec-20050802.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mpeg2dec-20050802.tar.gz;
     md5 = "79b3559a9354085fcebb1460dd93d237";
   };
 }
diff --git a/pkgs/development/libraries/mysql-connector-odbc/default.nix b/pkgs/development/libraries/mysql-connector-odbc/default.nix
index 47c14a4d793..cfa1fe616a4 100644
--- a/pkgs/development/libraries/mysql-connector-odbc/default.nix
+++ b/pkgs/development/libraries/mysql-connector-odbc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "mysql-connector-odbc-3.51.12";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.snt.utwente.nl/pub/software/mysql/Downloads/MyODBC3/mysql-connector-odbc-3.51.12.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mysql-connector-odbc-3.51.12.tar.gz;
     md5 = "a484f590464fb823a8f821b2f1fd7fef";
   };
   configureFlags = "--disable-gui";
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 64dc016d478..3dd61f53472 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ncurses-5.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/ncurses-5.5.tar.gz;
     md5 = "e73c1ac10b4bfc46db43b2ddfd6244ef";
   };
 }
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 0a75efa56ae..dc0a96f89be 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -10,7 +10,7 @@ assert sslSupport -> openssl != null;
   name = "neon-0.25.5";
   
   src = fetchurl {
-    url = http://www.webdav.org/neon/neon-0.25.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/neon-0.25.5.tar.gz;
     md5 = "b5fdb71dd407f0a3de0f267d27c9ab17";
   };
   
diff --git a/pkgs/development/libraries/neon/neon-0.26.1.nix b/pkgs/development/libraries/neon/neon-0.26.1.nix
index ce1d36a3823..632ab9e67d3 100644
--- a/pkgs/development/libraries/neon/neon-0.26.1.nix
+++ b/pkgs/development/libraries/neon/neon-0.26.1.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "neon-0.26.1";
   src = fetchurl {
-    url = http://www.webdav.org/neon/neon-0.26.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/neon-0.26.1.tar.gz;
     md5 = "3bb7a82bddfc1c56d2f9dba849aecd1f";
   };
   buildInputs = [libxml2];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index add3647071e..06c806f1c5b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -2,7 +2,7 @@
   name = "openssl-0.9.8d";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/security/openssl/openssl-0.9.8d.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/openssl-0.9.8d.tar.gz;
     sha1 = "4136fba00303a3d319d2052bfa8e1f09a2e12fc2";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix
index 84467a935f3..ae801fc7bdc 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.3";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/pangopdf/pangoxsl-1.6.0.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pangoxsl-1.6.0.3.tar.gz;
     md5 = "c98bad47ffa7de2e946a8e35d45e071c";
   };
 
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index d83b89358db..3518f13ff44 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "pcre-6.7";
   src = fetchurl {
-    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.7.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pcre-6.7.tar.bz2;
     md5 = "dbbec9d178ce199e67e98c9a4f994f90";
   };
 }
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index fe707997758..05e5936bddf 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   substitute = ../../../build-support/substitute/substitute.sh;
   hook = ./setup-hook.sh;  
   src = fetchurl {
-    url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.6.tar.bz2;
     md5 = "dc1384c03ac08af21f6fefab32d982cf";
   };
 
diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix
index 59216eef05d..f2422931ec7 100644
--- a/pkgs/development/libraries/readline/readline5.nix
+++ b/pkgs/development/libraries/readline/readline5.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "readline-5.1";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/readline/readline-5.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/readline-5.1.tar.gz;
     md5 = "7ee5a692db88b30ca48927a13fd60e46";
   };
   propagatedBuildInputs = [ncurses];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index aae056259a9..7ae05aad677 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sqlite-2.8.17";
 
   src = fetchurl {
-    url = http://www.sqlite.org/sqlite-2.8.17.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sqlite-2.8.17.tar.gz;
     md5 = "838dbac20b56d2c4292e98848505a05b";
   };
 }
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index c065b4ce3b0..e562485c9bf 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "taglib-1.4";
   src = fetchurl {
-    url = http://developer.kde.org/~wheeler/files/src/taglib-1.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/taglib-1.4.tar.gz;
     md5 = "dcd50ddb2544faeae77f194804559404";
   };
   buildInputs = [zlib];
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index fc7d11273aa..a4342c6ee7a 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "tk-8.4.13";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/tcl/tk8.4.13-src.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/tk8.4.13-src.tar.gz;
     md5 = "0a16d4d9398e43cbb85784c85fb807a4";
   };
   buildInputs = [tcl x11];
diff --git a/pkgs/development/libraries/toolbuslib/default.nix b/pkgs/development/libraries/toolbuslib/default.nix
index 0f187db8b20..562262229d7 100644
--- a/pkgs/development/libraries/toolbuslib/default.nix
+++ b/pkgs/development/libraries/toolbuslib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
 name = "toolbuslib-0.7.2";
 src = fetchurl {
-         url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.7.2.tar.gz;
+         url = http://nix.cs.uu.nl/dist/tarballs/toolbuslib-0.7.2.tar.gz;
          md5 = "6619a155c6326d728d53c6901558e350";
    };
 inherit aterm;
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index 937c6a3750e..ea297c571e9 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "unixODBC-2.2.11";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/unixodbc/unixODBC-2.2.11.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/unixODBC-2.2.11.tar.gz;
     md5 = "9ae806396844e38244cf65ad26ba0f23";
   };
   configureFlags = "--disable-gui";
diff --git a/pkgs/development/libraries/wxGTK-2.6/default.nix b/pkgs/development/libraries/wxGTK-2.6/default.nix
index 1de3bb66ed3..547ed0773a9 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.3";
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-2.6.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/wxGTK-2.6.3.tar.bz2;
     md5 = "3cd76c3c47913e52a3175dd47239c6ec";
   };
 
diff --git a/pkgs/development/libraries/zvbi/default.nix b/pkgs/development/libraries/zvbi/default.nix
index 566ce7d6bc4..763dab66013 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.12";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.22.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/zvbi-0.2.22.tar.bz2;
     md5 = "a01cbe39a48579ba92582ff75a5e37c2";
   };
   buildInputs = [x11 (if pngSupport then libpng else null)];
diff --git a/pkgs/development/misc/man-pages/default.nix b/pkgs/development/misc/man-pages/default.nix
index 3eb5df40639..efc55473b81 100644
--- a/pkgs/development/misc/man-pages/default.nix
+++ b/pkgs/development/misc/man-pages/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "man-pages-2.39";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.win.tue.nl/pub/linux-local/manpages/man-pages-2.39.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/man-pages-2.39.tar.gz;
     md5 = "770f4e5b1a1298ed054ceae7cdbbbba4";
   };
 }
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index cd58f2624ed..2d83d10094d 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnumake-3.81";
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/make/make-3.81.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/make-3.81.tar.bz2;
     md5 = "354853e0b2da90c527e35aabb8d6f1e6";
   };
   patches = [./log.diff];
diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix
index 65c934ec332..bc4fbdcd54e 100644
--- a/pkgs/development/tools/build-managers/mk/default.nix
+++ b/pkgs/development/tools/build-managers/mk/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mk-2006-01-31";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~cddouma/dist/mk-20060131.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mk-20060131.tar.gz;
     md5 = "167fd4e0eea4f49def01984ec203289b";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 134c35307b5..960d9ea8e33 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "scons-0.96.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/scons/scons-0.96.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/scons-0.96.1.tar.gz;
     md5 = "45b1c346edd8a0970210aeb1e82557c9";
   };
   buildInputs = [python];
diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix
index 5a6fd0c6f10..9e3233133c7 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "noweb-2.10c";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~cddouma/dist/noweb-20060201.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/noweb-20060201.tar.gz;
     md5 = "b4813c6bc0bab9004e57edc1d7e57638";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/tools/misc/autoconf-2.60/default.nix b/pkgs/development/tools/misc/autoconf-2.60/default.nix
index 8fdccdec7ac..b78a9ad6faa 100644
--- a/pkgs/development/tools/misc/autoconf-2.60/default.nix
+++ b/pkgs/development/tools/misc/autoconf-2.60/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "autoconf-2.60";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.60.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/autoconf-2.60.tar.bz2;
     md5 = "019609c29d0cbd9110c38480304aafc8";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/misc/binutils/binutils-2.17.nix b/pkgs/development/tools/misc/binutils/binutils-2.17.nix
index 77f21e5f406..7cd4b1444a6 100644
--- a/pkgs/development/tools/misc/binutils/binutils-2.17.nix
+++ b/pkgs/development/tools/misc/binutils/binutils-2.17.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "binutils-2.17";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/binutils/binutils-2.17.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.17.tar.bz2;
     md5 = "e26e2e06b6e4bf3acf1dc8688a94c0d1";
   };
   inherit noSysDirs;
diff --git a/pkgs/development/tools/misc/gnum4/m4-1.4.7.nix b/pkgs/development/tools/misc/gnum4/m4-1.4.7.nix
index 7f3f67bb811..90adb1a9f2a 100644
--- a/pkgs/development/tools/misc/gnum4/m4-1.4.7.nix
+++ b/pkgs/development/tools/misc/gnum4/m4-1.4.7.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation {
   name = "gnum4-1.4.7";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/m4/m4-1.4.7.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/m4-1.4.7.tar.bz2;
     md5 = "0115a354217e36ca396ad258f6749f51";
   };
 }
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index f0aaa8dd351..8d2bdee9a9e 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gperf-3.0.2";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gperf/gperf-3.0.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gperf-3.0.2.tar.gz;
     md5 = "5359fae9929f9f7235c6601f4b6e8c89";
   };
 }
diff --git a/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix b/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
index 1b2f715b7dc..6b113ad68bd 100644
--- a/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
+++ b/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "help2man-1.36.4";
 
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/help2man/help2man-1.36.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/help2man-1.36.4.tar.gz;
     md5 = "d31a0a38c2ec71faa06723f6b8bd3076";
   };
 
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 226552b3943..889ebb34502 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.22";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libtool-1.5.22.tar.gz;
     md5 = "8e0ac9797b62ba4dcc8a2fb7936412b0";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.20.nix b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.20.nix
index e8ecc09d96f..495f1c1820c 100644
--- a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.20.nix
+++ b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.20.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.20.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.20.tar.gz;
     md5 = "fb42402593e4198bc252ab248dd4158b";
   };
 }
diff --git a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
index d57d3b75676..b50ccc6b640 100644
--- a/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
+++ b/pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.21.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz;
     md5 = "476f45fab1504aac6697aa7785f0ab91";
   };
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 461ba3c3bba..4be263a0555 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.14.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/strace-4.5.14.tar.bz2;
     md5 = "09bcd5d00ece28f8154dec11cadfce3c";
   };
 }
diff --git a/pkgs/development/tools/misc/swig/swig-1.3.29.nix b/pkgs/development/tools/misc/swig/swig-1.3.29.nix
index a4666dd1bf3..6fd4bcb4d68 100644
--- a/pkgs/development/tools/misc/swig/swig-1.3.29.nix
+++ b/pkgs/development/tools/misc/swig/swig-1.3.29.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/swig/swig-1.3.29.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/swig-1.3.29.tar.gz;
     md5 = "44c6f6d8d724cf7fa4a5109e6f63c9b1";
   };
 
diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix
index 8046537e72a..5dc59a7ca6f 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.2.1";
   src = fetchurl {
-    url = http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/valgrind-3.2.1.tar.bz2;
     md5 = "9407d33961186814cef0e6ecedfd6318";
   };
 
diff --git a/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix b/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix
index 43151ba589a..72777d891fc 100644
--- a/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix
+++ b/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "antlr-2.7.6";
   builder = ./builder2.sh;
   src = fetchurl {
-    url = http://www.antlr.org/download/antlr-2.7.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/antlr-2.7.6.tar.gz;
     md5 = "17d8bf2e814f0a26631aadbbda8d7324";
   };
   inherit jre;
diff --git a/pkgs/development/tools/parsing/antlr/default.nix b/pkgs/development/tools/parsing/antlr/default.nix
index deb8040256b..e0ae2559778 100644
--- a/pkgs/development/tools/parsing/antlr/default.nix
+++ b/pkgs/development/tools/parsing/antlr/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "antlr-3.0b3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.antlr.org/download/antlr-3.0b3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/antlr-3.0b3.tar.gz;
     md5 = "6a7e70ccece8149b735cc3aaa24241cc";
   };
   inherit jre;
diff --git a/pkgs/development/tools/parsing/bison/bison-2.3.nix b/pkgs/development/tools/parsing/bison/bison-2.3.nix
index c732dd0afcf..bf424aee870 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.3.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.3.nix
@@ -5,7 +5,7 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-2.3";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/bison/bison-2.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/bison-2.3.tar.bz2;
     md5 = "c18640c6ec31a169d351e3117ecce3ec";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
index b6ba4b81c39..be1dbcdfe5e 100644
--- a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
+++ b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
@@ -8,7 +8,7 @@ assert yacc != null && m4 != null;
 stdenv.mkDerivation {
   name = "flex-2.5.33";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/flex/flex-2.5.33.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/flex-2.5.33.tar.bz2;
     md5 = "343374a00b38d9e39d1158b71af37150";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix
index 9fe1207ba22..1699857a12d 100644
--- a/pkgs/development/tools/parsing/jikespg/default.nix
+++ b/pkgs/development/tools/parsing/jikespg/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jikespg-1.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/jikes/jikespg-1.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/jikespg-1.3.tar.gz;
     md5 = "eba183713d9ae61a887211be80eeb21f";
   };
 }
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index 3df49cf5085..f18630caf48 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/exult/exult-1.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/exult-1.2.tar.gz;
     md5 = "0fc88dee74a91724d25373ba0a8670ba";
   };
 
@@ -17,11 +17,11 @@ stdenv.mkDerivation {
   # we don't need actual MIDI playback capability.
   musicFiles = [
     (fetchurl {
-      url = http://surfnet.dl.sourceforge.net/sourceforge/exult/U7MusicOGG_1of2.zip;
+      url = http://nix.cs.uu.nl/dist/tarballs/U7MusicOGG_1of2.zip;
       md5 = "7746d1a9164fd67509107797496553bf";
     })
     (fetchurl {
-      url = http://surfnet.dl.sourceforge.net/sourceforge/exult/U7MusicOGG_2of2.zip;
+      url = http://nix.cs.uu.nl/dist/tarballs/U7MusicOGG_2of2.zip;
       md5 = "cdae5956d7c52f35e90317913a660123";
     })
   ];    
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 4652aa64997..4e174f8bd08 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "scummvm-0.9.0";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/scummvm-0.9.0.tar.bz2;
     md5 = "5eede9c97d1883f80770a3e211419783";
   };
   buildInputs = [SDL];
diff --git a/pkgs/misc/busybox/busybox-1.1.nix b/pkgs/misc/busybox/busybox-1.1.nix
index e7fb996c45f..cebae6c56aa 100644
--- a/pkgs/misc/busybox/busybox-1.1.nix
+++ b/pkgs/misc/busybox/busybox-1.1.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://busybox.net/downloads/busybox-1.1.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/busybox-1.1.3.tar.bz2;
     md5 = "19a0b475169335f17e421cf644616fe7";
   };
 
diff --git a/pkgs/misc/busybox/busybox-1.2.nix b/pkgs/misc/busybox/busybox-1.2.nix
index b31762bfbf3..bf7bef886b3 100644
--- a/pkgs/misc/busybox/busybox-1.2.nix
+++ b/pkgs/misc/busybox/busybox-1.2.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://busybox.net/downloads/busybox-1.2.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/busybox-1.2.1.tar.bz2;
     md5 = "362b3dc0f2023ddfda901dc1f1a74391";
   };
 
diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index 4f00050b3d1..51dd44c03a0 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "atari++-1.46";
 #  builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.math.tu-berlin.de/~thor/atari++/download/atari++.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/atari++.tgz;
     md5 = "0619ec6b63852233111aa0bd263c8ea2";
   };
 #  rom = fetchurl {
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index 0821a05f422..a800f3c9ad3 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation {
   name = "atari800-2.0.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/atari800/atari800-2.0.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/atari800-2.0.2.tar.gz;
     md5 = "a81f8a5ace5fd89eb6094faef7c936af";
   };
   rom = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/atari800/xf25.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/xf25.zip;
     md5 = "4dc3b6b4313e9596c4d474785a37b94d";
   };
   buildInputs = [unzip zlib SDL];
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix
index d968f2f8eff..41d1885fafe 100644
--- a/pkgs/misc/emulators/dosbox/default.nix
+++ b/pkgs/misc/emulators/dosbox/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation { 
   name = "dosbox-0.65";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/dosbox/dosbox-0.65.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/dosbox-0.65.tar.gz;
     md5 = "fef84c292c3aeae747368b9875c1575a";
   };
   buildInputs = [SDL];
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 372cd568f4e..eb411e30ea7 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/ghostscript/ghostscript-8.54-gpl.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ghostscript-8.54-gpl.tar.bz2;
     md5 = "5d0ad0da8297fe459a788200f0eaeeba";
   };
 
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index 6f28cfe0a4c..cfd47bfc63c 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "sane-backends-1.0.18";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.18/sane-backends-1.0.18.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sane-backends-1.0.18.tar.gz;
     md5 = "7ca7e2908e24721471de92cf40c75e60";
   };
   udevSupport = hotplugSupport;
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix
index a120c52bb3d..c260334d2c5 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.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/rss-glx_0.8.1.tar.bz2;
     md5 = "a2bdf0e10ee4e89c8975f313c5c0ba6f";
   };
 
diff --git a/pkgs/os-specific/linux/alsa/library/default.nix b/pkgs/os-specific/linux/alsa/library/default.nix
index 463a61dafff..6d0484556f5 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.12";
   src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.12.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/alsa-lib-1.0.12.tar.bz2;
     md5 = "d351d46c5e415d4c8448487737939c72";
   };
 }
diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix
index 6e8b6d56383..ddd4010b5a1 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.30";
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/libs/dietlibc/dietlibc-0.30.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/dietlibc-0.30.tar.bz2;
     md5 = "2465d652fff6f1fad3da3b98e60e83c9";
   };
   patches = [./dietlibc-install.patch];
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index dbebbcebf68..da0db8316b9 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "iproute2-2.6.15-060110";
   src = fetchurl {
-    url = http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.15-060110.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/iproute2-2.6.15-060110.tar.gz;
     md5 = "04f57a6d366d36426d276178b600f5c5";
   };
   buildInputs = [bison flex db4];
diff --git a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.11.nix b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.11.nix
index c36c20566b8..5a9cde67247 100644
--- a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.11.nix
+++ b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.11.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "linux-headers-2.6.17.11";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.11.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.17.11.tar.bz2;
     md5 = "2958a620129c442a8ba3a665ea34ca8b";
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.17.nix b/pkgs/os-specific/linux/kernel/linux-2.6.17.nix
index a89399a5578..efdddf02daf 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.17.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "linux-2.6.17.13";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.13.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.17.13.tar.bz2;
     md5 = "834885b3ad9988b966570bee92459572";
   };
   config = ./config-2.6.17.1;
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index e0a02a14196..2f360bfa4c4 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   name = "libselinux-1.30";
   src = fetchurl {
-    url = http://www.nsa.gov/selinux/archives/libselinux-1.30.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libselinux-1.30.tgz;
     md5 = "0b7d269c9b7d847059e4b11a710ab404";
   };
 
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index eac7efecaed..8dcc1e2fb3e 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   name = "libsepol-1.12";
   src = fetchurl {
-    url = http://www.nsa.gov/selinux/archives/libsepol-1.12.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libsepol-1.12.tgz;
     md5 = "937885f1fcbfe597a0f02aa9af044710";
   };
 }
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix
index 6af69d882db..906f71b0709 100644
--- a/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix
+++ b/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ov511-2.32";
   builder = ./ov511-2.32-builder.sh;
   src = fetchurl {
-    url = http://www.ovcam.org/ov511/download/2.xx/distros/ov511-2.32.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ov511-2.32.tar.bz2;
     md5 = "6a08025311649356242761641a1df0f2";
   };
   patches = [./ov511-kernel.patch ./ov511-2.32.patch ./ov511-2.32-kdir.patch];
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index e65287e9139..0d96f166606 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.7";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://procps.sourceforge.net/procps-3.2.7.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/procps-3.2.7.tar.gz;
     md5 = "f490bca772b16472962c7b9f23b1e97d";
   };
   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 76501b1a0f7..92bb1068941 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.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/qce-ga/qc-usb-0.6.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/qc-usb-0.6.4.tar.gz;
     md5 = "7e91c3a633382c99100e3ef4f1d9f50a";
   };
   inherit kernel;
diff --git a/pkgs/os-specific/linux/squashfs/default.nix b/pkgs/os-specific/linux/squashfs/default.nix
index 7fa92baa6c2..f13162e890b 100644
--- a/pkgs/os-specific/linux/squashfs/default.nix
+++ b/pkgs/os-specific/linux/squashfs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "squashfs-3.1-r2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/squashfs/squashfs3.1-r2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/squashfs3.1-r2.tar.gz;
     md5 = "c252e5286b142afa54ca49829c51a33f";
   };
   buildInputs = [zlib];
diff --git a/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix b/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix
index c84b416bc39..61de3b46519 100644
--- a/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix
+++ b/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "syslinux-3.20";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.20.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/syslinux-3.20.tar.bz2;
     md5 = "0701e0de1de6d31bdd889384b041e5b7";
   };
  buildInputs = [nasm perl];
diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index c1dd50adfe6..f8a3aa12579 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-091";
   src = fetchurl {
-    url = http://www.us.kernel.org/pub/linux/utils/kernel/hotplug/udev-091.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/udev-091.tar.bz2;
     md5 = "4151022ea7b4dcfaa768c1b7bf2ab9e5";
   };
   patches = [./udev-091-installpath.patch];
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index 9ddc747648b..af023fc19b1 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://archive.apache.org/dist/httpd/httpd-2.2.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/httpd-2.2.3.tar.bz2;
     md5 = "887bf4a85505e97babe1d90635361c0d";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index 16d247fe8dc..c1456804489 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.surfnet.nl/httpd/modpython/mod_python-3.2.10.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mod_python-3.2.10.tgz;
     md5 = "cc6439f546a6e70cfff7ca51b8c62541";
   };
 
diff --git a/pkgs/servers/sql/mysql/default.nix b/pkgs/servers/sql/mysql/default.nix
index 3a13aa323a1..b028baa21b3 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.18";
 
   src = fetchurl {
-    url = http://downloads.mysql.com/archives/mysql-4.1/mysql-4.1.18.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mysql-4.1.18.tar.gz;
     md5 = "a2db4edb3e1e3b8e0f8c2242225ea513";
   };
 
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 0cbb1368717..01147eebd63 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://mysql.proserve.nl/Downloads/Connector-J/mysql-connector-java-3.1.12.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mysql-connector-java-3.1.12.tar.gz;
     md5 = "c8c15443dfa9541545aad02d744a077b";
   };
 
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index be37adde7d3..10e5be4480c 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -59,7 +59,7 @@ rec {
     name = "bitmap-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/bitmap-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/bitmap-X11R7.1-1.0.2.tar.bz2;
       md5 = "5a6228512bcce7d9fabe8fc2d66269bf";
     };
     buildInputs = [pkgconfig libXaw libX11 xbitmaps libXmu libXt ];
@@ -69,7 +69,7 @@ rec {
     name = "compositeproto-0.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/compositeproto-X11R7.1-0.3.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/compositeproto-X11R7.1-0.3.1.tar.bz2;
       md5 = "8e85c1e19a3169a42c5e860c36ec3e3b";
     };
     buildInputs = [pkgconfig ];
@@ -129,7 +129,7 @@ rec {
     name = "fixesproto-4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/fixesproto-X11R7.1-4.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/fixesproto-X11R7.1-4.0.tar.bz2;
       md5 = "7ba155d9209fa7320fc387b338457bc6";
     };
     buildInputs = [pkgconfig ];
@@ -509,7 +509,7 @@ rec {
     name = "font-util-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/font-util-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/font-util-X11R7.1-1.0.1.tar.bz2;
       md5 = "69ba2181665e291ea09908a11136c21a";
     };
     buildInputs = [pkgconfig ];
@@ -549,7 +549,7 @@ rec {
     name = "fstobdf-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/fstobdf-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/fstobdf-X11R7.1-1.0.2.tar.bz2;
       md5 = "e6f102e10f0861c972a250e4fc57fdc2";
     };
     buildInputs = [pkgconfig libFS libX11 ];
@@ -559,7 +559,7 @@ rec {
     name = "gccmakedep-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/gccmakedep-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gccmakedep-X11R7.1-1.0.2.tar.bz2;
       md5 = "519e8b1a9911bdddfa2ee46fb36b9774";
     };
     buildInputs = [pkgconfig ];
@@ -569,7 +569,7 @@ rec {
     name = "glproto-1.4.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/glproto-X11R7.1-1.4.7.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/glproto-X11R7.1-1.4.7.tar.bz2;
       md5 = "26744ff426147b2400b20e5c8b1eb735";
     };
     buildInputs = [pkgconfig ];
@@ -599,7 +599,7 @@ rec {
     name = "imake-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/imake-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/imake-X11R7.1-1.0.2.tar.bz2;
       md5 = "db33c65135ebc78e55c6009292c51b43";
     };
     buildInputs = [pkgconfig xproto ]; inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; 
@@ -659,7 +659,7 @@ rec {
     name = "libICE-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libICE-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libICE-X11R7.1-1.0.1.tar.bz2;
       md5 = "b372dcd527fd5b5058e77ee1b586afdf";
     };
     buildInputs = [pkgconfig xproto xtrans ];
@@ -669,7 +669,7 @@ rec {
     name = "libSM-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libSM-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libSM-X11R7.1-1.0.1.tar.bz2;
       md5 = "dc10726abe267727fa5e3c552594e3c8";
     };
     buildInputs = [pkgconfig libICE xproto xtrans ];
@@ -689,7 +689,7 @@ rec {
     name = "libX11-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/lib/libX11-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libX11-X11R7.1-1.0.1.tar.bz2;
       md5 = "f592bec1848e55c377b45e629eb09df4";
     };
     buildInputs = [pkgconfig bigreqsproto inputproto kbproto libXau xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ];
@@ -699,7 +699,7 @@ rec {
     name = "libXScrnSaver-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXScrnSaver-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXScrnSaver-X11R7.1-1.1.0.tar.bz2;
       md5 = "e9a4ed1a499595003b75a34a5633e93e";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
@@ -719,7 +719,7 @@ rec {
     name = "libXau-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXau-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXau-X11R7.1-1.0.1.tar.bz2;
       md5 = "ae91d7080784df34b2fab7bff75cfb41";
     };
     buildInputs = [pkgconfig xproto ];
@@ -729,7 +729,7 @@ rec {
     name = "libXaw-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXaw-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXaw-X11R7.1-1.0.2.tar.bz2;
       md5 = "99f2e6a3ff8e5535710150aa30f5b3c3";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
@@ -739,7 +739,7 @@ rec {
     name = "libXcomposite-0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXcomposite-X11R7.1-0.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXcomposite-X11R7.1-0.3.tar.bz2;
       md5 = "f5229a7a38bc3d90380b7c18de10db5e";
     };
     buildInputs = [pkgconfig compositeproto ];
@@ -749,7 +749,7 @@ rec {
     name = "libXcursor-1.1.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXcursor-X11R7.1-1.1.6.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXcursor-X11R7.1-1.1.6.tar.bz2;
       md5 = "a69f8735a0c1fc1df260ca4feaf4be87";
     };
     buildInputs = [pkgconfig fixesproto libX11 libXfixes libXrender ];
@@ -759,7 +759,7 @@ rec {
     name = "libXdamage-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXdamage-X11R7.1-1.0.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXdamage-X11R7.1-1.0.3.tar.bz2;
       md5 = "e9cd3688623c9c5a86d7ddb62fd88d76";
     };
     buildInputs = [pkgconfig damageproto libX11 ];
@@ -769,7 +769,7 @@ rec {
     name = "libXdmcp-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXdmcp-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXdmcp-X11R7.1-1.0.1.tar.bz2;
       md5 = "d74e6e52d598544f92e2c185e114e656";
     };
     buildInputs = [pkgconfig xproto ];
@@ -779,7 +779,7 @@ rec {
     name = "libXevie-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXevie-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXevie-X11R7.1-1.0.1.tar.bz2;
       md5 = "0f0eb4c5441a26341d3b774bc9db35ba";
     };
     buildInputs = [pkgconfig evieext libX11 libXext xextproto xproto ];
@@ -789,7 +789,7 @@ rec {
     name = "libXext-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXext-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXext-X11R7.1-1.0.1.tar.bz2;
       md5 = "273845ee8a2d5e272bb3fa08810512f3";
     };
     buildInputs = [pkgconfig libX11 libXau xextproto xproto ];
@@ -799,7 +799,7 @@ rec {
     name = "libXfixes-4.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXfixes-X11R7.1-4.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXfixes-X11R7.1-4.0.1.tar.bz2;
       md5 = "d6e91a6d366a72c090cae83da88af184";
     };
     buildInputs = [pkgconfig fixesproto libX11 xproto ];
@@ -809,7 +809,7 @@ rec {
     name = "libXfont-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXfont-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXfont-X11R7.1-1.1.0.tar.bz2;
       md5 = "d25a2c90b882c5f2ff7f13a300aa18f4";
     };
     buildInputs = [pkgconfig fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ];
@@ -819,7 +819,7 @@ rec {
     name = "libXfontcache-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXfontcache-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXfontcache-X11R7.1-1.0.2.tar.bz2;
       md5 = "87299d9c6d74b3b68e60bb4b693f5d62";
     };
     buildInputs = [pkgconfig fontcacheproto libX11 libXext xextproto ];
@@ -839,7 +839,7 @@ rec {
     name = "libXi-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXi-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXi-X11R7.1-1.0.1.tar.bz2;
       md5 = "2e3782d25d5fa6c98cfcaf055556f5c7";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ];
@@ -859,7 +859,7 @@ rec {
     name = "libXmu-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXmu-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXmu-X11R7.1-1.0.1.tar.bz2;
       md5 = "d68cacb66ee72e43d0a6b1f8b2dc901a";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXt ];
@@ -879,7 +879,7 @@ rec {
     name = "libXpm-3.5.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXpm-X11R7.1-3.5.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXpm-X11R7.1-3.5.5.tar.bz2;
       md5 = "00d91c2bcc4d2941e08339f3989c2351";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
@@ -909,7 +909,7 @@ rec {
     name = "libXrandr-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXrandr-X11R7.1-1.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXrandr-X11R7.1-1.1.1.tar.bz2;
       md5 = "021e870b637f26be58b4b1acbdea19ca";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto libXrender ];
@@ -919,7 +919,7 @@ rec {
     name = "libXrender-0.9.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXrender-X11R7.1-0.9.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXrender-X11R7.1-0.9.1.tar.bz2;
       md5 = "54dbd492753409496066383a500a6e3e";
     };
     buildInputs = [pkgconfig renderproto libX11 ];
@@ -929,7 +929,7 @@ rec {
     name = "libXres-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXres-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXres-X11R7.1-1.0.1.tar.bz2;
       md5 = "60e5bc7d04f8995bd16febcd14c034ba";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto ];
@@ -939,7 +939,7 @@ rec {
     name = "libXt-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXt-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXt-X11R7.1-1.0.2.tar.bz2;
       md5 = "a617ba32277ecffbb79be6bac49792d1";
     };
     buildInputs = [pkgconfig kbproto libSM libX11 xproto ];
@@ -969,7 +969,7 @@ rec {
     name = "libXvMC-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXvMC-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXvMC-X11R7.1-1.0.2.tar.bz2;
       md5 = "f5fe1d950925e5d70401570df3ca8ebb";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto libXv ];
@@ -979,7 +979,7 @@ rec {
     name = "libXxf86dga-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXxf86dga-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXxf86dga-X11R7.1-1.0.1.tar.bz2;
       md5 = "8350ee065737f68072c4b59bc0c66df1";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
@@ -989,7 +989,7 @@ rec {
     name = "libXxf86misc-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXxf86misc-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXxf86misc-X11R7.1-1.0.1.tar.bz2;
       md5 = "19ba9ff3f98d769a46525b0d8ce0d1e2";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
@@ -999,7 +999,7 @@ rec {
     name = "libXxf86vm-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libXxf86vm-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libXxf86vm-X11R7.1-1.0.1.tar.bz2;
       md5 = "3a5d54d0d2321c3d61c9cd9f3e2204a3";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
@@ -1009,7 +1009,7 @@ rec {
     name = "libdmx-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libdmx-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libdmx-X11R7.1-1.0.2.tar.bz2;
       md5 = "fbc2c1fa3ef95a69e1a816fbe81372f8";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
@@ -1019,7 +1019,7 @@ rec {
     name = "libfontenc-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libfontenc-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libfontenc-X11R7.1-1.0.2.tar.bz2;
       md5 = "d8ca3192867c98669bd7d6a41ed26b09";
     };
     buildInputs = [pkgconfig xproto zlib ];
@@ -1029,7 +1029,7 @@ rec {
     name = "liblbxutil-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/liblbxutil-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/liblbxutil-X11R7.1-1.0.1.tar.bz2;
       md5 = "6cef76df73f86482fa478ad8252d9055";
     };
     buildInputs = [pkgconfig xextproto xproto zlib ];
@@ -1049,7 +1049,7 @@ rec {
     name = "libxkbfile-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libxkbfile-X11R7.1-1.0.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxkbfile-X11R7.1-1.0.3.tar.bz2;
       md5 = "598ce15a8b8c9da26944ab4691df6984";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
@@ -1059,7 +1059,7 @@ rec {
     name = "libxkbui-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/libxkbui-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libxkbui-X11R7.1-1.0.2.tar.bz2;
       md5 = "e66230bc7f369e113112d1d282f7833d";
     };
     buildInputs = [pkgconfig libX11 libxkbfile libXt ];
@@ -1119,7 +1119,7 @@ rec {
     name = "mkfontdir-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/mkfontdir-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/mkfontdir-X11R7.1-1.0.2.tar.bz2;
       md5 = "384ee10787c455c520bcf031989de6f3";
     };
     buildInputs = [pkgconfig ];
@@ -1209,7 +1209,7 @@ rec {
     name = "rgb-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/rgb-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/rgb-X11R7.1-1.0.1.tar.bz2;
       md5 = "5b37afc6009cb754afb79847555d1aee";
     };
     buildInputs = [pkgconfig xproto ];
@@ -1219,7 +1219,7 @@ rec {
     name = "rstart-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/rstart-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/rstart-X11R7.1-1.0.2.tar.bz2;
       md5 = "5efe197e5ffc2ffb576714a8d6054f53";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -1239,7 +1239,7 @@ rec {
     name = "scrnsaverproto-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/scrnsaverproto-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/scrnsaverproto-X11R7.1-1.1.0.tar.bz2;
       md5 = "567152e8b564c220f5eefa2e8464e550";
     };
     buildInputs = [pkgconfig ];
@@ -1259,7 +1259,7 @@ rec {
     name = "setxkbmap-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/setxkbmap-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/setxkbmap-X11R7.1-1.0.2.tar.bz2;
       md5 = "350180a6e4132a2b1262c7a15162c007";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
@@ -1279,7 +1279,7 @@ rec {
     name = "smproxy-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/smproxy-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/smproxy-X11R7.1-1.0.2.tar.bz2;
       md5 = "668d00f87fe1123bb5bf0b22dec3e32e";
     };
     buildInputs = [pkgconfig libXmu libXt ];
@@ -1309,7 +1309,7 @@ rec {
     name = "util-macros-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/util-macros-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/util-macros-X11R7.1-1.0.2.tar.bz2;
       md5 = "6ce5a6e85653afdd10c48b89b4bcc8aa";
     };
     buildInputs = [pkgconfig ];
@@ -1349,7 +1349,7 @@ rec {
     name = "x11perf-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/x11perf-X11R7.1-1.4.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/x11perf-X11R7.1-1.4.1.tar.bz2;
       md5 = "23e2b7b53125d75820fa66db905a6a74";
     };
     buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ];
@@ -1409,7 +1409,7 @@ rec {
     name = "xclock-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xclock-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xclock-X11R7.1-1.0.2.tar.bz2;
       md5 = "349447c4398be41856f5cc8b67d5d6f4";
     };
     buildInputs = [pkgconfig libXaw libX11 libXft libxkbfile libXrender libXt ];
@@ -1439,7 +1439,7 @@ rec {
     name = "xconsole-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xconsole-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xconsole-X11R7.1-1.0.2.tar.bz2;
       md5 = "dd817a0fabe11b1b463492b37247b013";
     };
     buildInputs = [pkgconfig libXaw libXt ];
@@ -1449,7 +1449,7 @@ rec {
     name = "xcursorgen-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xcursorgen-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xcursorgen-X11R7.1-1.0.1.tar.bz2;
       md5 = "59d8d79fb950a55722c0089496fd18b1";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
@@ -1489,7 +1489,7 @@ rec {
     name = "xdm-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xdm-X11R7.1-1.0.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xdm-X11R7.1-1.0.4.tar.bz2;
       md5 = "03ca4af9bd9c96ce5240c87cad4f7157";
     };
     buildInputs = [pkgconfig libXaw libX11 libXau libXdmcp libXext libXinerama libXmu libXpm libXt ];
@@ -1509,7 +1509,7 @@ rec {
     name = "xdriinfo-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xdriinfo-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xdriinfo-X11R7.1-1.0.1.tar.bz2;
       md5 = "36cc576a71bca1177ce793003ed78f32";
     };
     buildInputs = [pkgconfig glproto libX11 ];
@@ -1519,7 +1519,7 @@ rec {
     name = "xedit-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xedit-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xedit-X11R7.1-1.0.2.tar.bz2;
       md5 = "591f578f37e0654cc7d1bb0923191797";
     };
     buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ];
@@ -1599,7 +1599,7 @@ rec {
     name = "xf86-input-acecad-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-acecad-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-acecad-X11R7.1-1.1.0.tar.bz2;
       md5 = "7ed47ca8feb1fbbe305f3a6732181550";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1609,7 +1609,7 @@ rec {
     name = "xf86-input-aiptek-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-aiptek-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-aiptek-X11R7.1-1.0.1.tar.bz2;
       md5 = "e4ede86a636263c02530005ba958b65b";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1619,7 +1619,7 @@ rec {
     name = "xf86-input-calcomp-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-calcomp-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-calcomp-X11R7.1-1.1.0.tar.bz2;
       md5 = "40a557a54cc8ff58cbc4dc1abd37bb18";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1629,7 +1629,7 @@ rec {
     name = "xf86-input-citron-2.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-citron-X11R7.1-2.2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-citron-X11R7.1-2.2.0.tar.bz2;
       md5 = "9d33544dc2beb9643cf329f5f4ab295b";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1639,7 +1639,7 @@ rec {
     name = "xf86-input-digitaledge-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-digitaledge-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-digitaledge-X11R7.1-1.1.0.tar.bz2;
       md5 = "e98d51c032e9324ab961a1353f65b6b2";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1649,7 +1649,7 @@ rec {
     name = "xf86-input-dmc-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-dmc-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-dmc-X11R7.1-1.1.0.tar.bz2;
       md5 = "d26f4abbb4c14a64cb5d19676edc1a58";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1659,7 +1659,7 @@ rec {
     name = "xf86-input-dynapro-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2;
       md5 = "5121ef14108585c902753ae6e4b813f7";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1669,7 +1669,7 @@ rec {
     name = "xf86-input-elo2300-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-elo2300-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-elo2300-X11R7.1-1.1.0.tar.bz2;
       md5 = "7eeb9f2018aef32299c37ad2b3744b8d";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1689,7 +1689,7 @@ rec {
     name = "xf86-input-evdev-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-evdev-X11R7.1-1.1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-evdev-X11R7.1-1.1.2.tar.bz2;
       md5 = "6eba3b46ff77b99c44f93d2a08cc6935";
     };
     buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ];
@@ -1699,7 +1699,7 @@ rec {
     name = "xf86-input-fpit-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-fpit-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-fpit-X11R7.1-1.1.0.tar.bz2;
       md5 = "223ef71e07b18e140ef227feef965ef2";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1709,7 +1709,7 @@ rec {
     name = "xf86-input-hyperpen-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-hyperpen-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-hyperpen-X11R7.1-1.1.0.tar.bz2;
       md5 = "8f1d96c97e48c794a61d2e81dcc1d06a";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1719,7 +1719,7 @@ rec {
     name = "xf86-input-jamstudio-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-jamstudio-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-jamstudio-X11R7.1-1.1.0.tar.bz2;
       md5 = "ca01cca63fa57600c1cf6b307bb9aa8c";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1729,7 +1729,7 @@ rec {
     name = "xf86-input-joystick-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-joystick-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-joystick-X11R7.1-1.1.0.tar.bz2;
       md5 = "6c702a255a1753bb10a3f219a3ac227a";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1739,7 +1739,7 @@ rec {
     name = "xf86-input-keyboard-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-keyboard-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-keyboard-X11R7.1-1.1.0.tar.bz2;
       md5 = "d81490c79db78b0c182f0b2a37e02756";
     };
     buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver ];
@@ -1749,7 +1749,7 @@ rec {
     name = "xf86-input-magellan-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-magellan-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-magellan-X11R7.1-1.1.0.tar.bz2;
       md5 = "9e4bde8bbc56e99f43164bbe79343360";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -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.1/src/everything/xf86-input-magictouch-X11R7.1-1.0.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-magictouch-X11R7.1-1.0.0.5.tar.bz2;
       md5 = "b3ed11fd57bf99ca515d72a16875cf68";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
@@ -1769,7 +1769,7 @@ rec {
     name = "xf86-input-microtouch-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-microtouch-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-microtouch-X11R7.1-1.1.0.tar.bz2;
       md5 = "cc96f2553c3c94dc963c07bc45a8ebb9";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1779,7 +1779,7 @@ rec {
     name = "xf86-input-mouse-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-mouse-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-mouse-X11R7.1-1.1.0.tar.bz2;
       md5 = "e427b9a1dfbed3d4c9de2bf01008fa60";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1789,7 +1789,7 @@ rec {
     name = "xf86-input-mutouch-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-mutouch-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-mutouch-X11R7.1-1.1.0.tar.bz2;
       md5 = "1f15391dc1b24cd400ccb9c370f568d0";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1799,7 +1799,7 @@ rec {
     name = "xf86-input-palmax-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-palmax-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-palmax-X11R7.1-1.1.0.tar.bz2;
       md5 = "7a1404b2ca2d84856d1e43efef69ccfe";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1809,7 +1809,7 @@ rec {
     name = "xf86-input-penmount-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-penmount-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-penmount-X11R7.1-1.1.0.tar.bz2;
       md5 = "6093b35d21ce93029b2b28d8b69a1444";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1819,7 +1819,7 @@ rec {
     name = "xf86-input-spaceorb-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-spaceorb-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-spaceorb-X11R7.1-1.1.0.tar.bz2;
       md5 = "62c381b6c56d41a75858c16dccd06394";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1829,7 +1829,7 @@ rec {
     name = "xf86-input-summa-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-summa-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-summa-X11R7.1-1.1.0.tar.bz2;
       md5 = "56765c5ee99f67802bca8a1134ad7fc1";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1839,7 +1839,7 @@ rec {
     name = "xf86-input-tek4957-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-tek4957-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-tek4957-X11R7.1-1.1.0.tar.bz2;
       md5 = "4b6b9d67d2a7056a417d26115612ecc7";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1849,7 +1849,7 @@ rec {
     name = "xf86-input-ur98-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-ur98-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-ur98-X11R7.1-1.1.0.tar.bz2;
       md5 = "7e8288f4f75bcba1e3aaf6ef68664b38";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1859,7 +1859,7 @@ rec {
     name = "xf86-input-vmmouse-12.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-vmmouse-X11R7.1-12.4.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-vmmouse-X11R7.1-12.4.0.tar.bz2;
       md5 = "f253663de03e0fbb377ce085947412b1";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1869,7 +1869,7 @@ rec {
     name = "xf86-input-void-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-input-void-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-input-void-X11R7.1-1.1.0.tar.bz2;
       md5 = "3683affae738de5ef130b6720bdfd6dd";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver ];
@@ -1899,7 +1899,7 @@ rec {
     name = "xf86-video-apm-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-apm-X11R7.1-1.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-apm-X11R7.1-1.1.1.tar.bz2;
       md5 = "a5320411ba92e637ffb233e9cbb80d13";
     };
     buildInputs = [pkgconfig randrproto renderproto videoproto xextproto xorgserver ];
@@ -1909,7 +1909,7 @@ rec {
     name = "xf86-video-ark-0.6.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-ark-X11R7.1-0.6.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-ark-X11R7.1-0.6.0.tar.bz2;
       md5 = "a5bed67815b9e650182806da301b488c";
     };
     buildInputs = [pkgconfig randrproto renderproto xextproto xorgserver ];
@@ -1919,7 +1919,7 @@ rec {
     name = "xf86-video-ast-0.81.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-ast-X11R7.1-0.81.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-ast-X11R7.1-0.81.0.tar.bz2;
       md5 = "ac1595de8397efd740038994b1e9ef67";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -1929,7 +1929,7 @@ rec {
     name = "xf86-video-ati-6.6.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-ati-X11R7.1-6.6.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-ati-X11R7.1-6.6.0.tar.bz2;
       md5 = "c490366e7a663b4d05acb45713be45ee";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
@@ -1939,7 +1939,7 @@ rec {
     name = "xf86-video-chips-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-chips-X11R7.1-1.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-chips-X11R7.1-1.1.1.tar.bz2;
       md5 = "cae9b1b131c1fc1b45ad1a9604fdeb66";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -1949,7 +1949,7 @@ rec {
     name = "xf86-video-cirrus-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-cirrus-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-cirrus-X11R7.1-1.1.0.tar.bz2;
       md5 = "0af3af1dc5686e1f487815b231b3dc0a";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -1959,7 +1959,7 @@ rec {
     name = "xf86-video-cyrix-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-cyrix-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-cyrix-X11R7.1-1.1.0.tar.bz2;
       md5 = "adb1e6346efd8dfe5dcccd47d46869cb";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
@@ -1969,7 +1969,7 @@ rec {
     name = "xf86-video-dummy-0.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-dummy-X11R7.1-0.2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-dummy-X11R7.1-0.2.0.tar.bz2;
       md5 = "d53836ac3d6f99920dc168fc22a09413";
     };
     buildInputs = [pkgconfig randrproto renderproto videoproto xf86dgaproto xorgserver ];
@@ -1979,7 +1979,7 @@ rec {
     name = "xf86-video-fbdev-0.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-fbdev-X11R7.1-0.3.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-fbdev-X11R7.1-0.3.0.tar.bz2;
       md5 = "c209e54fa8dcd3cd3342e84d261b02db";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
@@ -1989,7 +1989,7 @@ rec {
     name = "xf86-video-glint-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-glint-X11R7.1-1.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-glint-X11R7.1-1.1.1.tar.bz2;
       md5 = "99073dcfdfa24df68879c7b01324e91a";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ];
@@ -1999,7 +1999,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.1/src/everything/xf86-video-i128-X11R7.1-1.1.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-i128-X11R7.1-1.1.0.5.tar.bz2;
       md5 = "9252e33d14c8869d995bf67e445ffb4e";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2009,7 +2009,7 @@ rec {
     name = "xf86-video-i740-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-i740-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-i740-X11R7.1-1.1.0.tar.bz2;
       md5 = "d20c7155266f67c588ecb5c4ada446d2";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2019,7 +2019,7 @@ rec {
     name = "xf86-video-i810-1.6.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-i810-X11R7.1-1.6.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-i810-X11R7.1-1.6.0.tar.bz2;
       md5 = "fe6cc3eab247c7f0a1d152de0ee0fc80";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm mesa randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ];
@@ -2029,7 +2029,7 @@ rec {
     name = "xf86-video-imstt-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-imstt-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-imstt-X11R7.1-1.1.0.tar.bz2;
       md5 = "4d76953e97ee760efb7627e7ac721dbf";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2039,7 +2039,7 @@ rec {
     name = "xf86-video-mga-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-mga-X11R7.1-1.4.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-mga-X11R7.1-1.4.1.tar.bz2;
       md5 = "b42cab6a2742bf90a205a991c281f4e2";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
@@ -2049,7 +2049,7 @@ rec {
     name = "xf86-video-neomagic-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2;
       md5 = "7a0830940a0a8e99db1b5c1536b5d212";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2059,7 +2059,7 @@ rec {
     name = "xf86-video-newport-0.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-newport-X11R7.1-0.2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-newport-X11R7.1-0.2.0.tar.bz2;
       md5 = "6fa1d4b5f009999284374df1aba92b10";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
@@ -2069,7 +2069,7 @@ rec {
     name = "xf86-video-nsc-2.8.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-nsc-X11R7.1-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-nsc-X11R7.1-2.8.1.tar.bz2;
       md5 = "47a9691971e267073f99dbacf27f0ffc";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2079,7 +2079,7 @@ rec {
     name = "xf86-video-nv-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-nv-X11R7.1-1.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-nv-X11R7.1-1.1.1.tar.bz2;
       md5 = "b5c7144231652242ef8436ec8898138c";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2089,7 +2089,7 @@ rec {
     name = "xf86-video-rendition-4.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-rendition-X11R7.1-4.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-rendition-X11R7.1-4.1.0.tar.bz2;
       md5 = "6db91a9a10042424830c094ca870fe65";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
@@ -2099,7 +2099,7 @@ rec {
     name = "xf86-video-s3-0.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-s3-X11R7.1-0.4.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-s3-X11R7.1-0.4.1.tar.bz2;
       md5 = "3083c03884d44468e395d26a8d990c53";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2109,7 +2109,7 @@ rec {
     name = "xf86-video-s3virge-1.9.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2;
       md5 = "a7c74570041b2dc9346bfdd6d2a1c582";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2119,7 +2119,7 @@ rec {
     name = "xf86-video-savage-2.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-savage-X11R7.1-2.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-savage-X11R7.1-2.1.1.tar.bz2;
       md5 = "7df6bc61424a566325e48e5eb89a21e2";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
@@ -2129,7 +2129,7 @@ rec {
     name = "xf86-video-siliconmotion-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-siliconmotion-X11R7.1-1.4.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-siliconmotion-X11R7.1-1.4.1.tar.bz2;
       md5 = "559b7eeeb598b38afeb1542db6b48a0a";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2139,7 +2139,7 @@ rec {
     name = "xf86-video-sis-0.9.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-sis-X11R7.1-0.9.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sis-X11R7.1-0.9.1.tar.bz2;
       md5 = "f3ed22290e677381dd6236ef3bbfc7ac";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
@@ -2149,7 +2149,7 @@ rec {
     name = "xf86-video-sisusb-0.8.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-sisusb-X11R7.1-0.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sisusb-X11R7.1-0.8.1.tar.bz2;
       md5 = "11d580e2cc795b902b6f1a326962190b";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ];
@@ -2159,7 +2159,7 @@ rec {
     name = "xf86-video-sunbw2-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-sunbw2-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sunbw2-X11R7.1-1.1.0.tar.bz2;
       md5 = "cae0b4709a2cc489182392094fe0bba3";
     };
     buildInputs = [pkgconfig randrproto xorgserver xproto ];
@@ -2169,7 +2169,7 @@ rec {
     name = "xf86-video-suncg14-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-suncg14-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-suncg14-X11R7.1-1.1.0.tar.bz2;
       md5 = "3d95d9bf985bcf13c0d040a5136334a1";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2179,7 +2179,7 @@ rec {
     name = "xf86-video-suncg3-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-suncg3-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-suncg3-X11R7.1-1.1.0.tar.bz2;
       md5 = "b719d82950a39e33903882c7b878415e";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2189,7 +2189,7 @@ rec {
     name = "xf86-video-suncg6-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-suncg6-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-suncg6-X11R7.1-1.1.0.tar.bz2;
       md5 = "de3773fe837b633cd7841546358a90b0";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2199,7 +2199,7 @@ rec {
     name = "xf86-video-sunffb-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-sunffb-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sunffb-X11R7.1-1.1.0.tar.bz2;
       md5 = "5bcb5b90c679a046d604d4f98d804d0d";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto xextproto xf86driproto xorgserver xproto ];
@@ -2209,7 +2209,7 @@ rec {
     name = "xf86-video-sunleo-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-sunleo-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-sunleo-X11R7.1-1.1.0.tar.bz2;
       md5 = "821ddc77ada3cd3efb0a2a7bc70bf825";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2219,7 +2219,7 @@ rec {
     name = "xf86-video-suntcx-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-suntcx-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-suntcx-X11R7.1-1.1.0.tar.bz2;
       md5 = "fff6932624c93d8e208422913521bb4a";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2229,7 +2229,7 @@ rec {
     name = "xf86-video-tdfx-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-tdfx-X11R7.1-1.2.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-tdfx-X11R7.1-1.2.1.tar.bz2;
       md5 = "21500d264bccecde3122835bc39c7793";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
@@ -2239,7 +2239,7 @@ rec {
     name = "xf86-video-tga-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-tga-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-tga-X11R7.1-1.1.0.tar.bz2;
       md5 = "0a9356394373e42b96e9500b51f6c45c";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2249,7 +2249,7 @@ rec {
     name = "xf86-video-trident-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-trident-X11R7.1-1.2.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-trident-X11R7.1-1.2.1.tar.bz2;
       md5 = "d08a761111bbfef8d60131d0dc46d784";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2259,7 +2259,7 @@ rec {
     name = "xf86-video-tseng-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-tseng-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-tseng-X11R7.1-1.1.0.tar.bz2;
       md5 = "62d58d822fdd32e67658bb86ab4e4390";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
@@ -2269,7 +2269,7 @@ rec {
     name = "xf86-video-v4l-0.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-v4l-X11R7.1-0.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-v4l-X11R7.1-0.1.1.tar.bz2;
       md5 = "fac76ca4a56380f0765d884e1b20a487";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
@@ -2279,7 +2279,7 @@ rec {
     name = "xf86-video-vesa-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-vesa-X11R7.1-1.2.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-vesa-X11R7.1-1.2.0.tar.bz2;
       md5 = "16a20d6bf7ba858d511e96daaf43700c";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
@@ -2289,7 +2289,7 @@ rec {
     name = "xf86-video-vga-4.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-vga-X11R7.1-4.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-vga-X11R7.1-4.1.0.tar.bz2;
       md5 = "b08b488f1b98d9152f5416091bc85055";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
@@ -2299,7 +2299,7 @@ rec {
     name = "xf86-video-via-0.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-via-X11R7.1-0.2.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-via-X11R7.1-0.2.1.tar.bz2;
       md5 = "f3ee13a05c62dd5298bd773dd0e5e951";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ];
@@ -2309,7 +2309,7 @@ rec {
     name = "xf86-video-vmware-10.13.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-vmware-X11R7.1-10.13.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-vmware-X11R7.1-10.13.0.tar.bz2;
       md5 = "ee3c0f3130a68c6833084db5deb441ca";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
@@ -2319,7 +2319,7 @@ rec {
     name = "xf86-video-voodoo-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xf86-video-voodoo-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xf86-video-voodoo-X11R7.1-1.1.0.tar.bz2;
       md5 = "0c96fac2d303dd5981de78e704d3a067";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
@@ -2369,7 +2369,7 @@ rec {
     name = "xfs-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xfs-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xfs-X11R7.1-1.0.2.tar.bz2;
       md5 = "b1650e876b19741762b654dcdb98be47";
     };
     buildInputs = [pkgconfig libFS libXfont xtrans ];
@@ -2419,7 +2419,7 @@ rec {
     name = "xhost-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xhost-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xhost-X11R7.1-1.0.1.tar.bz2;
       md5 = "d12efb18c7e3025c5e6a6f63144c2145";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu ];
@@ -2439,7 +2439,7 @@ rec {
     name = "xinit-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xinit-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xinit-X11R7.1-1.0.2.tar.bz2;
       md5 = "05ae7771d2245bf325ff30b13da92666";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -2449,7 +2449,7 @@ rec {
     name = "xkbcomp-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xkbcomp-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xkbcomp-X11R7.1-1.0.2.tar.bz2;
       md5 = "ed19a000dc13dae9ee45df8f26cebfc5";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
@@ -2469,7 +2469,7 @@ rec {
     name = "xkbevd-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xkbevd-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xkbevd-X11R7.1-1.0.2.tar.bz2;
       md5 = "af4fb106610b4ee3e36ddfdfe213f40f";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
@@ -2569,7 +2569,7 @@ rec {
     name = "xman-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xman-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xman-X11R7.1-1.0.2.tar.bz2;
       md5 = "89761d6047acca5fb6fb69eb2633afe9";
     };
     buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ];
@@ -2599,7 +2599,7 @@ rec {
     name = "xmodmap-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xmodmap-X11R7.1-1.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xmodmap-X11R7.1-1.0.1.tar.bz2;
       md5 = "0e11f78c00e27e775c4606c7e021cbf4";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -2619,7 +2619,7 @@ rec {
     name = "xorg-cf-files-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xorg-cf-files-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xorg-cf-files-X11R7.1-1.0.2.tar.bz2;
       md5 = "073c1b4f0029249a05800900abd13077";
     };
     buildInputs = [pkgconfig ];
@@ -2629,7 +2629,7 @@ rec {
     name = "xorg-docs-1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xorg-docs-X11R7.1-1.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xorg-docs-X11R7.1-1.2.tar.bz2;
       md5 = "a7c05bf0897ba99fe01af528c0831183";
     };
     buildInputs = [pkgconfig ];
@@ -2639,7 +2639,7 @@ rec {
     name = "xorg-server-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xorg-server-X11R7.1-1.1.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xorg-server-X11R7.1-1.1.0.tar.bz2;
       md5 = "59bc20bcade0293042edc8a99aa2c832";
     };
     buildInputs = [pkgconfig bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype 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 ];
@@ -2649,7 +2649,7 @@ rec {
     name = "xorg-sgml-doctools-1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xorg-sgml-doctools-X11R7.1-1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xorg-sgml-doctools-X11R7.1-1.1.tar.bz2;
       md5 = "2b820facb5658160a08ff4d9ca906ad5";
     };
     buildInputs = [pkgconfig ];
@@ -2709,7 +2709,7 @@ rec {
     name = "xproto-7.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xproto-X11R7.1-7.0.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xproto-X11R7.1-7.0.5.tar.bz2;
       md5 = "930c4c618a6523fec1095827d8117fed";
     };
     buildInputs = [pkgconfig ];
@@ -2729,7 +2729,7 @@ rec {
     name = "xrandr-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xrandr-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xrandr-X11R7.1-1.0.2.tar.bz2;
       md5 = "e148e9ba69092127598c8d72debeae90";
     };
     buildInputs = [pkgconfig libX11 libXrandr libXrender ];
@@ -2739,7 +2739,7 @@ rec {
     name = "xrdb-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xrdb-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xrdb-X11R7.1-1.0.2.tar.bz2;
       md5 = "2187897f97f0c818b27f8b8d33f31fa8";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2749,7 +2749,7 @@ rec {
     name = "xrefresh-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xrefresh-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xrefresh-X11R7.1-1.0.2.tar.bz2;
       md5 = "16df4b8f3d844236dfd24efd88e8ea99";
     };
     buildInputs = [pkgconfig libX11 ];
@@ -2769,7 +2769,7 @@ rec {
     name = "xset-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xset-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xset-X11R7.1-1.0.2.tar.bz2;
       md5 = "ba1e928daa7146e44e3c55db323884f4";
     };
     buildInputs = [pkgconfig libX11 libXext libXfontcache libXmu libXp libXxf86misc ];
@@ -2839,7 +2839,7 @@ rec {
     name = "xtrap-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xtrap-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xtrap-X11R7.1-1.0.2.tar.bz2;
       md5 = "435778018128f2b9402252c9022b44fa";
     };
     buildInputs = [pkgconfig libX11 libXTrap ];
@@ -2879,7 +2879,7 @@ rec {
     name = "xwininfo-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.1/src/everything/xwininfo-X11R7.1-1.0.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/xwininfo-X11R7.1-1.0.2.tar.bz2;
       md5 = "6a80a6512b9286f15a5bc47d3a019bc9";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu ];
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index f13d3167378..82f204bd52c 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bash-3.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/bash/bash-3.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bash-3.1.tar.gz;
     md5 = "ef5304c4b22aaa5088972c792ed45d72";
   };
 
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
index 27a4a032c5f..93f0e8b9a28 100755
--- a/pkgs/stdenv/mingw/pkgs/default.nix
+++ b/pkgs/stdenv/mingw/pkgs/default.nix
@@ -23,7 +23,7 @@ rec {
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-1.tar.gz;
+          url = http://nix.cs.uu.nl/dist/tarballs/mingw32-make-3.81-1.tar.gz;
           md5 = "74c2f44ecc699b318edeb07d838feae5";
         };
     };
@@ -37,7 +37,7 @@ rec {
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/gcc-core-3.4.2-20040916-1.tar.gz;
+          url = http://nix.cs.uu.nl/dist/tarballs/gcc-core-3.4.2-20040916-1.tar.gz;
           md5 = "d9cd78f926fc31ef101c6fa7072fc65d";
         };
     };
@@ -51,7 +51,7 @@ rec {
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/gcc-g++-3.4.2-20040916-1.tar.gz;
+          url = http://nix.cs.uu.nl/dist/tarballs/gcc-g++-3.4.2-20040916-1.tar.gz;
           md5 = "e5c7eb2c1e5f7e10842eac03d1d6fcdc";
         };
     };
@@ -65,7 +65,7 @@ rec {
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/binutils-2.16.91-20060119-1.tar.gz;
+          url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.16.91-20060119-1.tar.gz;
           md5 = "a54f33ca9d6cf56dc99c0c5367f58ea3";
         };
     };
@@ -76,7 +76,7 @@ rec {
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.10.tar.gz;
+          url = http://nix.cs.uu.nl/dist/tarballs/mingw-runtime-3.10.tar.gz;
           md5 = "7fa2638d23136fd84d5d627bef3b408a";
         };
     };
@@ -87,7 +87,7 @@ rec {
       builder = ./src-builder.sh;
       src =
         fetchurl {
-          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.10-src.tar.gz;
+          url = http://nix.cs.uu.nl/dist/tarballs/mingw-runtime-3.10-src.tar.gz;
           md5 = "9225684e663eafa900b4075731c25f4c";
         };
     };
@@ -98,7 +98,7 @@ rec {
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/w32api-3.7.tar.gz;
+          url = http://nix.cs.uu.nl/dist/tarballs/w32api-3.7.tar.gz;
           md5 = "0b3a6d08136581c93b3a3207588acea9";
         };
     };
@@ -109,7 +109,7 @@ rec {
       builder = ./src-builder.sh;
       src = 
         fetchurl {
-          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/w32api-3.7-src.tar.gz;
+          url = http://nix.cs.uu.nl/dist/tarballs/w32api-3.7-src.tar.gz;
           md5 = "d799c407b4c1b480d0339994d01f355d";
         };
     };
diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix
index 45b9b6bfd0a..8f19700323d 100644
--- a/pkgs/tools/admin/tightvnc/default.nix
+++ b/pkgs/tools/admin/tightvnc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "tightvnc-1.3dev7";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/vnc-tight/tightvnc-1.3dev7_unixsrc.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/tightvnc-1.3dev7_unixsrc.tar.bz2;
     md5 = "8e9e63f19d8351a5359c0cc15d96c18c";
   };
   buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp];
diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix
index c8c214c598c..829c8b1a7c7 100644
--- a/pkgs/tools/archivers/cabextract/default.nix
+++ b/pkgs/tools/archivers/cabextract/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "cabextract-1.1";
   src = fetchurl {
-    url = http://www.kyz.uklinux.net/downloads/cabextract-1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cabextract-1.1.tar.gz;
     md5 = "f4b729c0be7d288660f4fc167de199a1";
   };
 }
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 51a1b618e02..c6a53b7dafd 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -2,7 +2,7 @@
   name = "zip-2.32";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/zip232.tar.gz;
     md5 = "8a4da4460386e324debe97f3b7fe4d96";
   };
 }
diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix
index 5907f1a1ca3..9d284d29d84 100644
--- a/pkgs/tools/graphics/ploticus/default.nix
+++ b/pkgs/tools/graphics/ploticus/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/ploticus/pl233src.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pl233src.tar.gz;
     md5 = "1e242200e7e52f7a24041c95f58f2fc1";
   };
 
diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix
index cf3722bbf1f..9b90c0ecbbc 100644
--- a/pkgs/tools/graphics/transfig/default.nix
+++ b/pkgs/tools/graphics/transfig/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "transfig-3.2.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/transfig.3.2.4.tar.gz;
     md5 = "742de0f7a3cae74d247bbd0c70dd9dd7";
   };
 
diff --git a/pkgs/tools/misc/coreutils/coreutils-6.3.nix b/pkgs/tools/misc/coreutils/coreutils-6.3.nix
index d7fe22e351f..cfbf1afbb91 100644
--- a/pkgs/tools/misc/coreutils/coreutils-6.3.nix
+++ b/pkgs/tools/misc/coreutils/coreutils-6.3.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "coreutils-6.3";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-6.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/coreutils-6.3.tar.bz2;
     md5 = "065e9662c5aa2694693910ca9e6c9ec8";
   };
 }
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 74c39813ee4..8d3c9365ffc 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "coreutils-5.97";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-5.97.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.97.tar.gz;
     md5 = "bdec4b75c76ac9bf51b6dd1747d3b06e";
   };
 }
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index d7e31e9cf32..bfdd60626d6 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "file-4.17";
   src = fetchurl {
-    url = ftp://ftp.astron.com/pub/file/file-4.17.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/file-4.17.tar.gz;
     md5 = "50919c65e0181423d66bb25d7fe7b0fd";
   };
 }
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index c0256e593e1..93ef7f0aaf0 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.27";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/findutils/findutils-4.2.27.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/findutils-4.2.27.tar.gz;
     md5 = "f1e0ddf09f28f8102ff3b90f3b5bc920";
   };
   buildInputs = [coreutils];
diff --git a/pkgs/tools/misc/getopt/getopt-1.1.4.nix b/pkgs/tools/misc/getopt/getopt-1.1.4.nix
index c091863ccbf..d8e8bb9ab62 100644
--- a/pkgs/tools/misc/getopt/getopt-1.1.4.nix
+++ b/pkgs/tools/misc/getopt/getopt-1.1.4.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "getopt-1.1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://software.frodo.looijaard.name/getopt/files/getopt-1.1.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/getopt-1.1.4.tar.gz;
     md5 = "02188ca68da27c4175d6e9f3da732101";
   };
 }
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index ad7fe970d31..e6ece605c53 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "less-394";
  
   src = fetchurl {
-    url = http://www.greenwoodsoftware.com/less/less-394.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/less-394.tar.gz;
     md5 = "a9f072ccefa0d315b325f3e9cdbd4b97";
   };
  
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 5b0d32c673c..67ebb8eeaa5 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "parted-1.7.1";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/parted/parted-1.7.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/parted-1.7.1.tar.bz2;
     md5 = "baa6771273c8362d735086d52a0d6efe";
   };
   buildInputs = [e2fsprogs ncurses readline];
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index ce8900ea031..71cfc6e4e14 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "curl-7.15.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://curl.haxx.se/download/curl-7.15.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.5.tar.bz2;
     md5 = "594142c7d53bbdd988e8cef6354eeeff";
   };
   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 958f81edc4e..52d7c4ecb74 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.4";
   builder=./builder.sh;
   src = fetchurl {
-    url = http://ftp.isc.org/isc/dhcp/dhcp-3.0.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/dhcp-3.0.4.tar.gz;
     md5 = "004ef935fd54b8046b16bdde31a9e151";
   };
   buildInputs = [groff];
diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix
index 5e44de4eb2e..0d134935fc2 100644
--- a/pkgs/tools/networking/netcat/default.nix
+++ b/pkgs/tools/networking/netcat/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "netcat-gnu-0.7.1";
   src = fetchurl {
-    url = http://osdn.dl.sourceforge.net/sourceforge/netcat/netcat-0.7.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/netcat-0.7.1.tar.bz2;
     md5 = "0a29eff1736ddb5effd0b1ec1f6fe0ef";
   };
 }
diff --git a/pkgs/tools/networking/openssh/openssh-4.3p2.nix b/pkgs/tools/networking/openssh/openssh-4.3p2.nix
index c7c0b93fe84..cae587a9f67 100644
--- a/pkgs/tools/networking/openssh/openssh-4.3p2.nix
+++ b/pkgs/tools/networking/openssh/openssh-4.3p2.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
  
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/security/OpenSSH/openssh-4.3p2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/openssh-4.3p2.tar.gz;
     md5 = "7e9880ac20a9b9db0d3fea30a9ff3d46";
   };
  
diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index a0a9e33f056..5199dbde6f9 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gtk-gnutella-0.96.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/gtk-gnutella/gtk-gnutella-0.96.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk-gnutella-0.96.1.tar.bz2;
     md5 = "6529379cc105c1e98f501a67e8e875fd";
   };
   buildInputs = [pkgconfig glib gtk libxml2];
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index e7cc0c91727..34094faab91 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "wget-1.10.2";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/wget/wget-1.10.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/wget-1.10.2.tar.gz;
     md5 = "795fefbb7099f93e2d346b026785c4b8";
   };
 
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 2a61127a0f0..f839db368a3 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.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gnupg-1.4.5.tar.bz2;
     sha1 = "553fefe0da5a91108dd9468e381faf9487754f9a";
   };
   buildInputs = [readline];
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 799503abde5..d560aabfbe0 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.5";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/sed/sed-4.1.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sed-4.1.5.tar.gz;
     md5 = "7a1cbbbb3341287308e140bd4834c3ba";
   };
 } // 
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index fde60a4e5f6..87b4a0f8228 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.2";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/groff/groff-1.19.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/groff-1.19.2.tar.gz;
     md5 = "f7c9cf2e4b9967d3af167d7c9fadaae4";
   };
 }
diff --git a/pkgs/tools/text/xml/sablotron/default.nix b/pkgs/tools/text/xml/sablotron/default.nix
index a523ebe954c..e0aefb5f11a 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.3";
   src = fetchurl {
-    url = http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/Sablot-1.0.3.tar.gz;
     md5 = "72654c4b832e7562f8240ea675577f5e";
   };
   buildInputs = [expat];
diff --git a/pkgs/tools/text/xml/trang/default.nix b/pkgs/tools/text/xml/trang/default.nix
index b87a5575d26..efd2c897dea 100644
--- a/pkgs/tools/text/xml/trang/default.nix
+++ b/pkgs/tools/text/xml/trang/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.thaiopensource.com/download/trang-20030619.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/trang-20030619.zip;
     md5 = "9611ea59fda0f62fecc4a5017a72984e";
   };
 
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix
index 3c2eb728ec7..73712c3fdfd 100644
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/pkgs/tools/typesetting/xmlroff/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   #name = "xmlroff-0.3.5";
   name = "xmlroff-0.3.98";
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/xmlroff/xmlroff-0.3.98.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xmlroff-0.3.98.tar.gz;
     md5 = "6c1d05b6480e98870751bf9102ea68e2";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c178400aea..c502fc1ebfd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1716,7 +1716,7 @@ rec {
   perlCGISession = import ../development/perl-modules/generic perl {
     name = "CGI-Session-3.95";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/CGI-Session-3.95.tar.gz;
       md5 = "fe9e46496c7c711c54ca13209ded500b";
     };
   };
@@ -1736,7 +1736,7 @@ rec {
   perlDigestSHA1 = import ../development/perl-modules/generic perl {
     name = "Digest-SHA1-2.11";
     src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/Digest-SHA1-2.11.tar.gz;
       md5 = "2449bfe21d6589c96eebf94dae24df6b";
     };
   };