diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 298e790fe2e7..96b1c654fa7b 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "cdparanoia-III-alpha9.8";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cdparanoia-III-alpha9.8.src.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cdparanoia-III-alpha9.8.src.tgz;
     md5 = "7218e778b5970a86c958e597f952f193" ;
   };
   
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 8238d3b9e55a..9bad24968866 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "flac-1.1.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flac-1.1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/flac-1.1.1.tar.gz;
     md5 = "c6ccddccf8ad344065698047c2fc7280" ;
   };
 
diff --git a/pkgs/applications/audio/lame/default.nix b/pkgs/applications/audio/lame/default.nix
index be6153083917..11ff7ae0bdb4 100644
--- a/pkgs/applications/audio/lame/default.nix
+++ b/pkgs/applications/audio/lame/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "lame-3.96.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lame-3.96.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/lame-3.96.1.tar.gz;
     md5 = "e1206c46a5e276feca11a7149e2fc6ac" ;
   };
 }
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index cee38c18e542..e244bf383ce6 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -11,7 +11,7 @@ let {
 
   bindist = 
     fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/eclipse-SDK-3.0.1-linux-gtk.zip;
+      url = http://nix.cs.uu.nl/dist/tarballs/eclipse-SDK-3.0.1-linux-gtk.zip;
       md5 = "d0f743c972adf13e71a43b2dc6c9c55b";
     };
 }
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 08e46ea5b163..07253ec9d5bf 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "emacs-21.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/emacs-21.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/emacs-21.3.tar.gz;
     md5 = "a0bab457cbf5b4f8eb99d1d0a3ada420";
   };
   patches = [./patchfile];
diff --git a/pkgs/applications/editors/emacs/modes/cua/default.nix b/pkgs/applications/editors/emacs/modes/cua/default.nix
index fa6a3f66b56d..ddc2dca22326 100644
--- a/pkgs/applications/editors/emacs/modes/cua/default.nix
+++ b/pkgs/applications/editors/emacs/modes/cua/default.nix
@@ -2,7 +2,7 @@
   name = "cua-mode-2.10";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
+    url = http://nix.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
     md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
   };
 }
diff --git a/pkgs/applications/editors/emacs/modes/haskell/default.nix b/pkgs/applications/editors/emacs/modes/haskell/default.nix
index c75c1caf133c..644c485b947b 100644
--- a/pkgs/applications/editors/emacs/modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs/modes/haskell/default.nix
@@ -2,7 +2,7 @@
   name = "haskell-mode-1.45";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
     md5 = "c609998580cdb9ca8888c7d47d22ca3b";
   };
 }
diff --git a/pkgs/applications/editors/emacs/modes/nxml/default.nix b/pkgs/applications/editors/emacs/modes/nxml/default.nix
index c807cd21e4db..57583bbfcb62 100644
--- a/pkgs/applications/editors/emacs/modes/nxml/default.nix
+++ b/pkgs/applications/editors/emacs/modes/nxml/default.nix
@@ -2,7 +2,7 @@
   name = "nxml-mode-20041004";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
     md5 = "ac137024cf337d6f11d8ab278d39b4db";
   };
 }
diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix
index df96b2838599..d65302e62ee4 100644
--- a/pkgs/applications/editors/monodoc/default.nix
+++ b/pkgs/applications/editors/monodoc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/monodoc-1.0.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/monodoc-1.0.6.tar.gz;
     md5 = "f2fc27e8e4717d90dc7efa2450625693";
   };
 
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 0a7eb76477f8..dca0608b5cda 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "nano-1.2.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nano-1.2.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/nano-1.2.4.tar.gz;
     md5 = "2c513310ec5e8b63abaecaf48670ac7a";
   };
 
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 0eace652a74b..23b1831e1f39 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 = http://catamaran.labs.cs.uu.nl/dist/tarballs/vim-6.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/vim-6.3.tar.bz2;
     md5 = "821fda8f14d674346b87e3ef9cb96389";
   };
  
diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix
index e01153837fe7..0da1d4fe473b 100644
--- a/pkgs/applications/graphics/f-spot/default.nix
+++ b/pkgs/applications/graphics/f-spot/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
   
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/f-spot-0.0.10.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/f-spot-0.0.10.tar.bz2;
     md5 = "19cc6e067ccc261b0502ff6189b79832";
   };
 
diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index 8a83164ee5cf..c79d3f3a4862 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "gqview-2.0.0";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-2.0.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gqview-2.0.0.tar.gz;
     md5 = "421c9a79827e91e394bdfc924071d66f";
   };
 
diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix
index de2454cf1e35..bb88cf8a8244 100644
--- a/pkgs/applications/misc/hello/ex-1/default.nix
+++ b/pkgs/applications/misc/hello/ex-1/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "hello-2.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
   inherit perl;
diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix
index 48931d8654ca..78a436e4ad7c 100644
--- a/pkgs/applications/misc/hello/ex-2/default.nix
+++ b/pkgs/applications/misc/hello/ex-2/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "hello-2.1.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
   buildInputs = [perl];
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 3a791647f9f2..4187474d8478 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xchm-0.9.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xchm-0.9.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xchm-0.9.1.tar.gz;
     md5 = "5ba671e09e4c3ac46ffb5ce9d2c985eb";
   };
   buildInputs = [wxGTK chmlib];
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 2df161bfe13d..d3af07682e3e 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "lynx-2.8.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lynx2.8.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/lynx2.8.5.tar.bz2;
     md5 = "d1e5134e5d175f913c16cb6768bc30eb";
   };
   inherit ncurses;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 76256ee590c1..776e926acd5c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -5,7 +5,7 @@
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz;
     md5 = "79c59a5ea29347e01c8e6575dd054cd1";
   };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index 3e08603d65db..d103950dc3e8 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://catamaran.labs.cs.uu.nl/dist/tarballs/mplayerplug-in-2.80.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mplayerplug-in-2.80.tar.gz;
     md5 = "ce3235ff7d46fae416cfb175193a5f25";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 59bdf29174b6..f5c009e37d58 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/thunderbird-source-0.8.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/thunderbird-source-0.8.tar.bz2;
     md5 = "76de1827d66ac482cfc4dd32e7b1e257";
   };
 
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 191fb8fb4900..eed44a9573cb 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "pan-0.14.2.91";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pan-0.14.2.91.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pan-0.14.2.91.tar.bz2;
     md5 = "4770d899a1c1ba968ce96bc5aeb07b62";
   };
 
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index 36469ce3036a..1af8ed370ab9 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rcs-5.7";
   # builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/rcs-5.7.tar;
+    url = http://nix.cs.uu.nl/dist/tarballs/rcs-5.7.tar;
     md5 = "f7b3f106bf87ff6344df38490f6a02c5";
   };
 }
diff --git a/pkgs/applications/version-management/subversion-1.1.x/default.nix b/pkgs/applications/version-management/subversion-1.1.x/default.nix
index 7c9143e6d966..ff9faaf3aaf7 100644
--- a/pkgs/applications/version-management/subversion-1.1.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.1.x/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.1.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/subversion-1.1.4.tar.bz2;
     md5 = "6e557ae65b6b8d7577cc7704ede85a23";
   };
 
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index fef7315aa1fc..117294315e70 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     md5 = "5fadd6957d3aab989cd760ff38fb8fdf";
   };
   fonts = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/font-arial-iso-8859-1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/font-arial-iso-8859-1.tar.bz2;
     md5 = "1ecd31d17b51f16332b1fcc7da36b312";
   };
 
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 67efd0d44c71..21efadbb3880 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mythtv-0.17.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/mythtv-0.17.tar.bz2;
     md5 = "c996dc690d36e946396fc5cd4b715e3b";
   };
 
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 4ea0636c139c..cf1f526e77ad 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "vlc-0.7.2";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/vlc-0.7.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/vlc-0.7.2.tar.gz;
     md5 = "25dfcc804cb92f46c0b64ce1466515cc";
   };
 
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 0d66a14ba2e9..3c6d42ffc732 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xine-ui-0.99.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xine-ui-0.99.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xine-ui-0.99.3.tar.gz;
     md5 = "aa7805a93e511e3d67dc1bf09a71fcdd";
   };
   buildInputs = [x11 xineLib libpng];
diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix
index e704d7ff7ee1..1a643f5da03d 100644
--- a/pkgs/applications/video/zapping/default.nix
+++ b/pkgs/applications/video/zapping/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zapping-0.7.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.7.tar.bz2;
     md5 = "dd7b3d920509709692c41c9c6c767746";
   };
 
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
index 8b76ea38ba7a..e08350cdc7f6 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "docbook-xml-4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xml-4.2.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbook-xml-4.2.zip;
     md5 = "73fe50dfe74ca631c1602f558ed8961f";
   };
   buildInputs = [unzip];
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
index 3ceef6e28239..68319b08c355 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "docbook-xml-4.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xml-4.3.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/docbook-xml-4.3.zip;
     md5 = "ab200202b9e136a144db1e0864c45074";
   };
   buildInputs = [unzip];
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
index eeda6b0b6cdb..d574ff2a8139 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "docbook-xml-ebnf-1.2b1";
   builder = ./builder.sh;
   dtd = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/dbebnf-1.2b1.dtd;
+    url = http://nix.cs.uu.nl/dist/tarballs/dbebnf-1.2b1.dtd;
     md5 = "e50f7d38caf4285965c7a247e026fa7c";
   };
   catalog = ./docbook-ebnf.cat;
diff --git a/pkgs/development/compilers/gcc-2.95/default.nix b/pkgs/development/compilers/gcc-2.95/default.nix
index ce5c56487fbf..223647c295b6 100644
--- a/pkgs/development/compilers/gcc-2.95/default.nix
+++ b/pkgs/development/compilers/gcc-2.95/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "gcc-2.95.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gcc-2.95.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-2.95.3.tar.gz;
     md5 = "f3ad4f32c2296fad758ed051b5ac8e28";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/gcc-static-3.4/default.nix b/pkgs/development/compilers/gcc-static-3.4/default.nix
index 4809e593fea9..fd40db594a62 100644
--- a/pkgs/development/compilers/gcc-static-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-static-3.4/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gcc-static-3.4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gcc-3.4.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-3.4.2.tar.bz2;
     md5 = "2fada3a3effd2fd791df09df1f1534b3";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix
index 8ba747bbf22d..c46b3aa2fffb 100644
--- a/pkgs/development/compilers/ghc/boot.nix
+++ b/pkgs/development/compilers/ghc/boot.nix
@@ -7,7 +7,7 @@ assert stdenv.system == "i686-linux";
 stdenv.mkDerivation {
   name = "ghc-6.2.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ghc-6.2.1-i386-unknown-linux.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.2.1-i386-unknown-linux.tar.bz2;
     md5 = "48d9d6b9f7bf1f15d69e8bd732ee254c";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix
index e23f98f47ea0..f6142f434ecf 100644
--- a/pkgs/development/compilers/ghc/default.nix
+++ b/pkgs/development/compilers/ghc/default.nix
@@ -5,7 +5,7 @@ assert perl != null && ghc != null && m4 != null;
 stdenv.mkDerivation {
   name = "ghc-6.2.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ghc-6.2.1-src.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.2.1-src.tar.bz2;
     md5 = "fa9f90fd6b8852679c5fc16509e94d7a";
   };
   buildInputs = [perl ghc m4];
diff --git a/pkgs/development/compilers/gwydion-dylan/binary.nix b/pkgs/development/compilers/gwydion-dylan/binary.nix
index 6e606c1abd14..e453bef5d455 100644
--- a/pkgs/development/compilers/gwydion-dylan/binary.nix
+++ b/pkgs/development/compilers/gwydion-dylan/binary.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "binary-gwydion-dylan-2.4.0";
   builder = ./binary-builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gwydion-dylan-2.4.0-x86-linux.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gwydion-dylan-2.4.0-x86-linux.tar.gz;
     md5 = "52643ad51a455d21fd4d5bf82d98914c";
   };
 }
diff --git a/pkgs/development/compilers/gwydion-dylan/default.nix b/pkgs/development/compilers/gwydion-dylan/default.nix
index 7d9feba592b8..443fbaff7293 100644
--- a/pkgs/development/compilers/gwydion-dylan/default.nix
+++ b/pkgs/development/compilers/gwydion-dylan/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gwydion-dylan-2.4.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gwydion-dylan-2.4.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gwydion-dylan-2.4.0.tar.gz;
     md5 = "7ed180bf4ef11e8e8da3bd78b45477a8";
   };
 
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 6069e299b5cc..c7077418f4fc 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mono-1.1.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mono-1.1.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mono-1.1.4.tar.gz;
     md5 = "66755e5f201e912cecdd19807ba62487";
   };
 
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 9415c36dfc02..f1e532810305 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "nasm-0.98.38";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nasm-0.98.38.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/nasm-0.98.38.tar.bz2;
     md5 = "9f682490c132b070d54e395cb6ee145e";
   };
 }
diff --git a/pkgs/development/compilers/ocaml/default.nix b/pkgs/development/compilers/ocaml/default.nix
index f2850b7647b9..b8d86e83eb44 100644
--- a/pkgs/development/compilers/ocaml/default.nix
+++ b/pkgs/development/compilers/ocaml/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ocaml-3.08.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ocaml-3.08.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/ocaml-3.08.0.tar.gz;
     md5 = "c6ef478362295c150101cdd2efcd38e0";
   };
   configureScript = ./configure;
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 051b0aa55231..0cb5e2333bf1 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "clisp-2.33.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/clisp-2.33.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/clisp-2.33.2.tar.bz2;
     md5 = "ee4ea316db1e843dcb16094bf500012f";
   };
 
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 95b47eaa85f0..164fc7fbfc56 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "guile-1.6.7";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/guile-1.6.7.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/guile-1.6.7.tar.gz;
     md5 = "c2ff2a2231f0cbb2e838dd8701a587c5";
   };
 
diff --git a/pkgs/development/interpreters/kaffe/default.nix b/pkgs/development/interpreters/kaffe/default.nix
index d4e5bf4e1098..7e5c2d5dc172 100644
--- a/pkgs/development/interpreters/kaffe/default.nix
+++ b/pkgs/development/interpreters/kaffe/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "kaffe-1.1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/kaffe-1.1.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/kaffe-1.1.4.tar.gz;
     md5 = "94d6e7035ba68c2221dce68bb5b3f6e9";
   };
   inherit jikes alsaLib;
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 26c4fe5c36bd..713a2d88b074 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.0";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/octave-2.9.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/octave-2.9.0.tar.bz2;
     md5 = "687a09033bc68f09810e947010bc8f29";
   };
   buildInputs = [g77 readline ncurses perl flex];
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 90e717de513f..317a04c96fa3 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/perl-5.8.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/perl-5.8.6.tar.bz2;
     md5 = "3d030b6ff2a433840edb1a407d18dc0a";
   };
 
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index 95dec16587fe..45a0038c5897 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "a52dec-0.7.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/a52dec-0.7.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/a52dec-0.7.4.tar.gz;
     md5 = "caa9f5bc44232dc8aeea773fea56be80";
   };
 }
diff --git a/pkgs/development/libraries/aterm/aterm-2.3.1.nix b/pkgs/development/libraries/aterm/aterm-2.3.1.nix
index 61aa07530ee9..4ce1f4a61b85 100644
--- a/pkgs/development/libraries/aterm/aterm-2.3.1.nix
+++ b/pkgs/development/libraries/aterm/aterm-2.3.1.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   configureFlags = "--with-gcc";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-2.3.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/aterm-2.3.1.tar.gz;
     md5 = "5a2d70acc45a9d301e0dba12fcaf77e7";
   };
 
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index d66b50a55405..cf41fe6c9aa2 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "audiofile-0.2.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/audiofile-0.2.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/audiofile-0.2.5.tar.gz;
     md5 = "fd07c62a17ceafa317929e55e51e26c5";
   };
 }
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 68689952c562..83b400af57b5 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "boehm-gc-6.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gc6.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gc6.3.tar.gz;
     md5 = "8b37ee18cbeb1dfd1866958e280db871";
   };
 }
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index 83551ea18260..77e3d343a44c 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "chmlib-0.33";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/chmlib-0.33.tbz;
+    url = http://nix.cs.uu.nl/dist/tarballs/chmlib-0.33.tbz;
     md5 = "8bc84e94f1cea65005e5cb0ab40e2e86";
   };
   buildInputs = [libtool];
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 75f2424a5d23..bf336f700099 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "expat-1.95.8";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/expat-1.95.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/expat-1.95.8.tar.gz;
     md5 = "aff487543845a82fe262e6e2922b4c8e";
   };
 }
diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix
index ffdcd4f54986..fe3d1f85829b 100644
--- a/pkgs/development/libraries/gnet/default.nix
+++ b/pkgs/development/libraries/gnet/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null;
 stdenv.mkDerivation {
   name = "gnet-2.0.5";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnet-2.0.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gnet-2.0.5.tar.gz;
     md5 = "126f140618de34801933d192302ed0b9";
   };
   buildInputs = [pkgconfig glib];
diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
index 67fecd88e0c1..2423d4a89337 100644
--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
@@ -3,7 +3,7 @@
   gnomeicontheme = {
     name = "gnome-icon-theme-2.8.0";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-icon-theme-2.8.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-icon-theme-2.8.0.tar.bz2;
       md5 = "7be016337c44c024fb22f7b94b689d7b";
     };
   };
@@ -11,7 +11,7 @@
   gnomekeyring = {
     name = "gnome-keyring-0.4.1";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-keyring-0.4.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-keyring-0.4.1.tar.bz2;
       md5 = "031901a50273cc5a39b1305924613a1b";
     };
   };
@@ -19,7 +19,7 @@
   gtkhtml = {
     name = "gtkhtml-3.2.5";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtkhtml-3.2.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtkhtml-3.2.5.tar.bz2;
       md5 = "86e1ce32fed536bce5b2d6e8d41b0c65";
     };
   };
@@ -27,7 +27,7 @@
   libgtkhtml = {
     name = "libgtkhtml-2.6.3";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgtkhtml-2.6.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgtkhtml-2.6.3.tar.bz2;
       md5 = "c77789241d725e189ffc0391eda94361";
     };
   };
@@ -35,7 +35,7 @@
   gtksourceview = {
     name = "gtksourceview-1.1.1";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtksourceview-1.1.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtksourceview-1.1.1.tar.bz2;
       md5 = "2e59c8748594181d4bf452320c8c3b5c";
     };
   };
@@ -43,7 +43,7 @@
   scrollkeeper = {
     name = "scrollkeeper-0.3.14";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/scrollkeeper-0.3.14.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/scrollkeeper-0.3.14.tar.gz;
       md5 = "161eb3f29e30e7b24f84eb93ac696155";
     };
   };
@@ -51,7 +51,7 @@
   gnomedesktop = {
     name = "gnome-desktop-2.8.3";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-desktop-2.8.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-desktop-2.8.3.tar.bz2;
       md5 = "607f8689f931336ad9a1f3f41d98a9c7";
     };
   };
@@ -59,7 +59,7 @@
   libwnck = {
     name = "libwnck-2.8.1";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libwnck-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libwnck-2.8.1.tar.bz2;
       md5 = "c0a5a8478064287e167c15e3ec0e82a1";
     };
   };
@@ -67,7 +67,7 @@
   gnomepanel = {
     name = "gnome-panel-2.8.3";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-panel-2.8.3.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-panel-2.8.3.tar.bz2;
       md5 = "d76a09c321e02c18e0fdecb86677550d";
     };
   };
diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix b/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
index 8038043c01c3..133759dcb851 100644
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
@@ -4,7 +4,7 @@
   gconf = {
     name = "GConf-2.8.1";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/GConf-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/GConf-2.8.1.tar.bz2;
       md5 = "b1173cbe33404bcbcc15710ce2a28f67";
     };
   };
@@ -12,7 +12,7 @@
   ORBit2 = {
     name = "ORBit2-2.12.1";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ORBit2-2.12.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/ORBit2-2.12.1.tar.bz2;
       md5 = "30ede62e194f692f2dd3daa09c752196";
     };
   };
@@ -20,7 +20,7 @@
   atk = {
     name = "atk-1.8.0";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/atk-1.8.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/atk-1.8.0.tar.bz2;
       md5 = "fc46940febb0e91427b77457e6356f3d";
     };
   };
@@ -28,7 +28,7 @@
   audiofile = {
     name = "audiofile-0.2.6";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/audiofile-0.2.6.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/audiofile-0.2.6.tar.bz2;
       md5 = "3d01302834660850b6141cac1e6f5501";
     };
   };
@@ -36,7 +36,7 @@
   esound = {
     name = "esound-0.2.35";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/esound-0.2.35.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/esound-0.2.35.tar.bz2;
       md5 = "1566344f80a8909b5e6e4d6b6520c2c1";
     };
   };
@@ -44,7 +44,7 @@
   gail = {
     name = "gail-1.8.2";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gail-1.8.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gail-1.8.2.tar.bz2;
       md5 = "3b8be198ccb8a0d92cfb0c3cdd519c1f";
     };
   };
@@ -52,7 +52,7 @@
   glib = {
     name = "glib-2.4.8";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.4.8.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/glib-2.4.8.tar.bz2;
       md5 = "e160a5feecf46e0fbb36db09c356953c";
     };
   };
@@ -60,7 +60,7 @@
   gnomemimedata = {
     name = "gnome-mime-data-2.4.2";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.2.tar.bz2;
       md5 = "37242776b08625fa10c73c18b790e552";
     };
   };
@@ -68,7 +68,7 @@
   gnomevfs = {
     name = "gnome-vfs-2.8.4";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-vfs-2.8.4.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-vfs-2.8.4.tar.bz2;
       md5 = "42d3505e9ef9c26a7aae4e511b9b4c34";
     };
   };
@@ -76,7 +76,7 @@
   gtk = {
     name = "gtk+-2.4.14";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.4.14.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.4.14.tar.bz2;
       md5 = "10470d574933460809e4ac488e579e26";
     };
   };
@@ -84,7 +84,7 @@
   libIDL = {
     name = "libIDL-0.8.5";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libIDL-0.8.5.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libIDL-0.8.5.tar.bz2;
       md5 = "c63f6513dc7789d0575bea02d62d58d7";
     };
   };
@@ -92,7 +92,7 @@
   libart_lgpl = {
     name = "libart_lgpl-2.3.17";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libart_lgpl-2.3.17.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libart_lgpl-2.3.17.tar.bz2;
       md5 = "dfca42529393c8a8f59dc4dc10675a46";
     };
   };
@@ -100,7 +100,7 @@
   libbonobo = {
     name = "libbonobo-2.8.1";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonobo-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libbonobo-2.8.1.tar.bz2;
       md5 = "54f863c20016cf8a2cf25056f6c7cda7";
     };
   };
@@ -108,7 +108,7 @@
   libbonoboui = {
     name = "libbonoboui-2.8.1";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonoboui-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libbonoboui-2.8.1.tar.bz2;
       md5 = "b23daafa8344a88696d497f20285ef55";
     };
   };
@@ -116,7 +116,7 @@
   libglade = {
     name = "libglade-2.4.2";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libglade-2.4.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libglade-2.4.2.tar.bz2;
       md5 = "83d08f9ab485a10454bd5171d2d53fb0";
     };
   };
@@ -124,7 +124,7 @@
   libgnome = {
     name = "libgnome-2.8.1";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnome-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnome-2.8.1.tar.bz2;
       md5 = "17577198f5086c48f69c361be2f4806c";
     };
   };
@@ -132,7 +132,7 @@
   libgnomecanvas = {
     name = "libgnomecanvas-2.8.0";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomecanvas-2.8.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomecanvas-2.8.0.tar.bz2;
       md5 = "2bf10396a92777e7b64b6052a8a232f1";
     };
   };
@@ -140,7 +140,7 @@
   libgnomeprint = {
     name = "libgnomeprint-2.8.2";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeprint-2.8.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprint-2.8.2.tar.bz2;
       md5 = "8361c4e1bc3d87b91435807d0c06a3e4";
     };
   };
@@ -148,7 +148,7 @@
   libgnomeprintui = {
     name = "libgnomeprintui-2.8.2";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeprintui-2.8.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprintui-2.8.2.tar.bz2;
       md5 = "b38d1f6813dd52879ba4174ddc3f1b1c";
     };
   };
@@ -156,7 +156,7 @@
   libgnomeui = {
     name = "libgnomeui-2.8.1";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeui-2.8.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeui-2.8.1.tar.bz2;
       md5 = "d46a2b34bdfbc1b36464176fa8bef03c";
     };
   };
@@ -164,7 +164,7 @@
   pango = {
     name = "pango-1.6.0";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.6.0.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/pango-1.6.0.tar.bz2;
       md5 = "6c732bbc5fba5a0f1f8086e8aa4f490d";
     };
   };
@@ -172,7 +172,7 @@
   intltool = {
     name = "intltool-0.33";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/intltool-0.33.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/intltool-0.33.tar.bz2;
       md5 = "7d3b6d421b0fb9beee7faf97daab45e6";
     };
   };
diff --git a/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
index 5dc8eed02d95..4e38cb23a5bf 100644
--- a/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "gdk-pixbuf-0.22.0";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gdk-pixbuf-0.22.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gdk-pixbuf-0.22.0.tar.bz2;
     md5 = "05fcb68ceaa338614ab650c775efc2f2";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
index 78e9ed621991..07fa0dc28fb8 100644
--- a/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "glib-1.2.10";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-1.2.10.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/glib-1.2.10.tar.gz;
     md5 = "6fe30dad87c77b91b632def29dd69ef9";
   };
   # Patch for gcc 3.4 compatibility.  Based on
diff --git a/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
index f8d52f96283d..49c8625d0441 100644
--- a/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-1.2.10.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-1.2.10.tar.gz;
     md5 = "4d5cb2fc7fb7830e4af9747a36bfce20";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix
index 73f336066eb9..d3ebdab0c357 100644
--- a/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null && perl != null;
 stdenv.mkDerivation {
   name = "atk-1.2.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/atk-1.2.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/atk-1.2.4.tar.bz2;
     md5 = "2d6d50df31abe0e8892b5d3e7676a02d";
   };
   buildInputs = [pkgconfig perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix
index 51bbf4fbbda6..ebd5956e69c9 100644
--- a/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.2.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.2.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glib-2.2.3.tar.bz2;
     md5 = "aa214a10d873b68ddd67cd9de2ccae55";
   };
   buildInputs = [pkgconfig gettext perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix
index 546d5ee2cbd0..a5780612f3fa 100644
--- a/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix
@@ -12,7 +12,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "gtk+-2.2.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.2.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.2.4.tar.bz2;
     md5 = "605332199533e73bc6eec481fb4f1671";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
diff --git a/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix
index bc82e2da6098..4457f2912a17 100644
--- a/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix
@@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "pango-1.2.5";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.2.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.2.5.tar.bz2;
     md5 = "df00fe3e71cd297010f24f439b6c8ee6";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
index 727d27aab68b..af46b511e1e0 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null && perl != null;
 stdenv.mkDerivation {
   name = "atk-1.6.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/atk-1.6.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/atk-1.6.1.tar.bz2;
     md5 = "f77be7e128c957bd3056c2e270b5f283";
   };
   buildInputs = [pkgconfig perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
index a2f7df490820..2dad864c936c 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.4.7";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.4.7.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glib-2.4.7.tar.bz2;
     md5 = "eff6fec89455addf8b0dee5a19e343be";
   };
   buildInputs = [pkgconfig gettext perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
index 439722b9933b..9c92dcfce290 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
@@ -12,7 +12,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "gtk+-2.4.13";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.4.13.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.4.13.tar.bz2;
     md5 = "3a438e1010704b11acaf060c9ba0fd7b";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
diff --git a/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
index 21299d2d0639..bfd1e0be546b 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
@@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "pango-1.4.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.4.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.4.1.tar.bz2;
     md5 = "39868e0da250fd4c00b2970e4eb84389";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/gtk-libs-2.6/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.6/atk/default.nix
index f5c4c50eb6c4..66720d4dbebe 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/atk/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/atk/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null && perl != null;
 stdenv.mkDerivation {
   name = "atk-1.9.0";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/atk-1.9.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/atk-1.9.0.tar.bz2;
     md5 = "7f41bd9c6dcd83c8df391dc1805be653";
   };
   buildInputs = [pkgconfig perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
index 0df6f111f3b9..15364750dffe 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
@@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "pango-1.8.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.8.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.8.1.tar.bz2;
     md5 = "88aa6bf1876766db6864f3b93577887c";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix
index 062fdcce228e..262e42bf0000 100644
--- a/pkgs/development/libraries/gtk-sharp-1/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-1/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk-sharp-1.0.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk-sharp-1.0.6.tar.gz;
     md5 = "2651d14fe77174ab20b8af53d150ee11";
   };
 
diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix
index d6fcbd6ef88d..e308a2afa39f 100644
--- a/pkgs/development/libraries/gtk-sharp-2/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk-sharp-1.9.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk-sharp-1.9.2.tar.gz;
     md5 = "b7c5afab5f736ffa4011974302831363";
   };
 
diff --git a/pkgs/development/libraries/java/aterm/default.nix b/pkgs/development/libraries/java/aterm/default.nix
index 893f2a608edd..5aa11ea0a4a7 100644
--- a/pkgs/development/libraries/java/aterm/default.nix
+++ b/pkgs/development/libraries/java/aterm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "aterm-java-1.6";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-java-1.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/aterm-java-1.6.tar.gz;
     md5 = "abf475dae2f5efca865fcdff871feb5e";
   };
   buildInputs = [stdenv j2sdk sharedobjects jjtraveler];
diff --git a/pkgs/development/libraries/java/jjtraveler/default.nix b/pkgs/development/libraries/java/jjtraveler/default.nix
index afd90c606c31..ea2c3eb46de5 100644
--- a/pkgs/development/libraries/java/jjtraveler/default.nix
+++ b/pkgs/development/libraries/java/jjtraveler/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "jjtraveler-0.4.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/JJTraveler-0.4.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/JJTraveler-0.4.3.tar.gz;
     md5 = "35bf801ee61f042513ae88247fe1bf1d";
   };
   buildInputs = [stdenv j2sdk];
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index 3e5596e58b20..475f0ac9c9c2 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "saxon-6.5.3";
   builder = ./unzip-builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/saxon6_5_3.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/saxon6_5_3.zip;
     md5 = "7b8c7c187473c04d2abdb40d8ddab5c6";
   };
 
diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix
index e0487da3a908..af5461d76f07 100644
--- a/pkgs/development/libraries/java/saxon/default8.nix
+++ b/pkgs/development/libraries/java/saxon/default8.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "saxonb-8.0";
   builder = ./unzip-builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/saxonb8-0.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/saxonb8-0.zip;
     md5 = "d05fbd398847ef27b2d1d875bb5136ea";
   };
 
diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix
index d855f299d9e9..d863679c16e9 100644
--- a/pkgs/development/libraries/java/shared-objects/default.nix
+++ b/pkgs/development/libraries/java/shared-objects/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "shared-objects-1.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/shared-objects-1.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/shared-objects-1.4.tar.gz;
     md5 = "c1f2c58bd1a07be32da8a6b89354a11f";
   };
   buildInputs = [stdenv j2sdk];
diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix
index b83f53137aa6..e3730693659b 100644
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/pkgs/development/libraries/lcms/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lcms-1.14";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lcms-1.14.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/lcms-1.14.tar.gz;
     md5 = "5a803460aeb10e762d97e11a37462a69";
   };
 }
diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix
index 705d7267c519..ee328a297f66 100644
--- a/pkgs/development/libraries/libcdaudio/default.nix
+++ b/pkgs/development/libraries/libcdaudio/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libcdaudio-0.99.12";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libcdaudio-0.99.12.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libcdaudio-0.99.12.tar.gz;
     md5 = "63b49cf14d53eed31e7a87cca17a3963" ;
   };
 }
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index 1cf01d6e9976..3af3399ea2f7 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libdvdcss-1.2.8";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libdvdcss-1.2.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libdvdcss-1.2.8.tar.gz;
     md5 = "e35e4240b6ca0b66a0218065dffe6adb";
   };
 }
diff --git a/pkgs/development/libraries/libdvdplay/default.nix b/pkgs/development/libraries/libdvdplay/default.nix
index 1b7ed9656fa9..991ba758071c 100644
--- a/pkgs/development/libraries/libdvdplay/default.nix
+++ b/pkgs/development/libraries/libdvdplay/default.nix
@@ -5,7 +5,7 @@ assert libdvdread != null;
 stdenv.mkDerivation {
   name = "libdvdplay-1.0.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libdvdplay-1.0.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libdvdplay-1.0.1.tar.bz2;
     md5 = "602bca4ef78d79aa87e5e8920d958a78";
   };
   buildInputs = [libdvdread];
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 809a6a3f7e5f..674db2480e2e 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "libdvdread-20030812";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libdvdread-20030812.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libdvdread-20030812.tar.bz2;
     md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274";
   };
   buildInputs = libdvdcss;
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index 971597fd6fcd..2a9857d77df3 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libexif-0.6.11";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libexif-0.6.11.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libexif-0.6.11.tar.bz2;
     md5 = "211996a336f1b1a06def5a6d5c94284e";
   };
 
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 3b41bb677508..83a383ad8da6 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libgphoto2-2.1.5";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgphoto2-2.1.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libgphoto2-2.1.5.tar.gz;
     md5 = "210844f0d88f58842917af6eaff06382";
   };
 }
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index c614311ca9e3..64256e3f1923 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -2,7 +2,7 @@
   name = "libjpeg-6b";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jpegsrc.v6b.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/jpegsrc.v6b.tar.gz;
     md5 = "dbd5f3b47ed13132f04c685d608a7547";
   };
 }
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 66a2169e5876..1d6ab57c26b8 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libmad-0.15.0b";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libmad-0.15.0b.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libmad-0.15.0b.tar.gz;
     md5 = "2e4487cdf922a6da2546bad74f643205";
   };
 }
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 05811638bf40..f3e33a016a98 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libogg-1.1.2";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libogg-1.1.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libogg-1.1.2.tar.gz;
     md5 = "4d82996517bf33bb912c97e9d0b635c4" ;
   };
 }
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 2416e1e0ed2c..3437299f5d56 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libsigsegv-2.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libsigsegv-2.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libsigsegv-2.1.tar.gz;
     md5 = "6d75ca3fede5fbfd72a78bc918d9e174";
   };
 }
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index 356235dd545c..278eea690946 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libtheora-1.0alpha4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libtheora-1.0alpha4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libtheora-1.0alpha4.tar.bz2;
     md5 = "a71ac42ec0f848da327930841a80ff2b";
   };
   propagatedBuildInputs = [libogg libvorbis];
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index e3248344adb3..43000691bece 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "libtiff-3.7.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tiff-3.7.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/tiff-3.7.2.tar.gz;
     md5 = "9d7123bd0dbde2a3853fb758346adb78";
   };
   propagatedBuildInputs = [zlib libjpeg];
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 6a2385fe9505..ba70b012d099 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libvorbis-1.1.0";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libvorbis-1.1.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libvorbis-1.1.0.tar.gz;
     md5 = "bb764aeabde613d1a424a29b1f15e7e6";
   };
   buildInputs = [libogg];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 833d47bd7cae..3f17e929ecdf 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation {
   name = "mesa-6.0.1";
   srcs = [
     (fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/MesaLib-6.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/MesaLib-6.0.1.tar.bz2;
       md5 = "b7f14088c5c2f14490d2739a91102112";
     })
     (fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/MesaDemos-6.0.1.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/MesaDemos-6.0.1.tar.bz2;
       md5 = "dd6aadfd9ca8e1cfa90c6ee492bc6f43";
     })
   ];
diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix
index cca12fb9f814..a22cd500896e 100644
--- a/pkgs/development/libraries/mpeg2dec/default.nix
+++ b/pkgs/development/libraries/mpeg2dec/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mpeg2dec-0.4.0b";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mpeg2dec-0.4.0b.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mpeg2dec-0.4.0b.tar.gz;
     md5 = "52d10ea80595ec83d8557ba7ac6dc8e6";
   };
 }
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 0625d726e287..28a4a35c4a27 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ncurses-5.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ncurses-5.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/ncurses-5.4.tar.gz;
     md5 = "069c8880072060373290a4fefff43520";
   };
   configureFlags = "--with-shared";
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 43ad631187ff..e8d23dbe188b 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "popt-1.7";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz;
     md5 = "5988e7aeb0ae4dac8d83561265984cc9";
   };
   gettext = gettext;
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 8c6412eef9a6..ff332bc4345c 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   substitute = ../../../build-support/substitute/substitute.sh;
   hook = ./setup-hook.sh;  
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.3.tar.bz2;
     md5 = "3e0a0c8429b0a974b39b5f535ddff01c";
   };
 
diff --git a/pkgs/development/libraries/readline/default.nix b/pkgs/development/libraries/readline/default.nix
index 00e58d81b43d..b67cf23339ae 100644
--- a/pkgs/development/libraries/readline/default.nix
+++ b/pkgs/development/libraries/readline/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "readline-5.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/readline-5.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/readline-5.0.tar.gz;
     md5 = "9a39d15f1ed592883f8c6671e8c13120";
   };
   inherit ncurses;
diff --git a/pkgs/development/libraries/rte/default.nix b/pkgs/development/libraries/rte/default.nix
index 2f478a6b4d69..c38bfd6fc99a 100644
--- a/pkgs/development/libraries/rte/default.nix
+++ b/pkgs/development/libraries/rte/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rte-0.5.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/rte-0.5.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/rte-0.5.2.tar.bz2;
     md5 = "152d5d81169f0c9a543078543e354ebe";
   };
 }
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 26f9b6315737..1b50af6fe21e 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sqlite-2.8.16";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sqlite-2.8.16.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sqlite-2.8.16.tar.gz;
     md5 = "9c79b461ff30240a6f9d70dd67f8faea";
   };
 }
diff --git a/pkgs/development/libraries/wxGTK-2.5/default.nix b/pkgs/development/libraries/wxGTK-2.5/default.nix
index 16d321bb874f..305ddb3da83b 100644
--- a/pkgs/development/libraries/wxGTK-2.5/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.5/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "wxGTK-2.5.2";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wxGTK-2.5.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/wxGTK-2.5.2.tar.bz2;
     md5 = "b45874428b0164bfa5bd1a5a11b3eb4a";
   };
 
diff --git a/pkgs/development/libraries/wxGTK/default.nix b/pkgs/development/libraries/wxGTK/default.nix
index 31c8910342ff..a918043cbdb4 100644
--- a/pkgs/development/libraries/wxGTK/default.nix
+++ b/pkgs/development/libraries/wxGTK/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "wxGTK-2.4.2";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wxGTK-2.4.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/wxGTK-2.4.2.tar.bz2;
     md5 = "cdadfe82fc93f8a65a2ae18a95b0b0e3";
   };
 
diff --git a/pkgs/development/libraries/xlibs/libICE/default.nix b/pkgs/development/libraries/xlibs/libICE/default.nix
index 7d3fb7fa5b62..923624d37a8e 100644
--- a/pkgs/development/libraries/xlibs/libICE/default.nix
+++ b/pkgs/development/libraries/xlibs/libICE/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libICE-6.3.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libICE-6.3.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libICE-6.3.3.tar.bz2;
     md5 = "e67d98bebfabf884e58501e44b7efd35";
   };
   buildInputs = [pkgconfig libX11];
diff --git a/pkgs/development/libraries/xlibs/libSM/default.nix b/pkgs/development/libraries/xlibs/libSM/default.nix
index 81f831a9fd34..417f2d6ffa0c 100644
--- a/pkgs/development/libraries/xlibs/libSM/default.nix
+++ b/pkgs/development/libraries/xlibs/libSM/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libSM-6.0.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libSM-6.0.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libSM-6.0.3.tar.bz2;
     md5 = "e01ec6568ad17c5df8f56828e34a0b2b";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libX11/default.nix b/pkgs/development/libraries/xlibs/libX11/default.nix
index 469e9a9f9d49..9991c37f84a1 100644
--- a/pkgs/development/libraries/xlibs/libX11/default.nix
+++ b/pkgs/development/libraries/xlibs/libX11/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libX11-6.2.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libX11-6.2.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libX11-6.2.1.tar.bz2;
     md5 = "59b6fa7cd6fe7ee1da92fd1b56d1cee3";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXau/default.nix b/pkgs/development/libraries/xlibs/libXau/default.nix
index d7510d1ea8e4..4ba16cead090 100644
--- a/pkgs/development/libraries/xlibs/libXau/default.nix
+++ b/pkgs/development/libraries/xlibs/libXau/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXau-0.1.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXau-0.1.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXau-0.1.1.tar.bz2;
     md5 = "3d747ada4a7d17538fa21c62d5608656";
   };
   buildInputs = [pkgconfig xproto];
diff --git a/pkgs/development/libraries/xlibs/libXaw/default.nix b/pkgs/development/libraries/xlibs/libXaw/default.nix
index 8b1912ba8d2a..e644ee92e25b 100644
--- a/pkgs/development/libraries/xlibs/libXaw/default.nix
+++ b/pkgs/development/libraries/xlibs/libXaw/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXaw-7.0.2";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXaw-7.0.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXaw-7.0.2.tar.bz2;
     md5 = "30d569f9560c1daac184d5be8085ce37";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXext/default.nix b/pkgs/development/libraries/xlibs/libXext/default.nix
index 66ec8d784c9d..dbbeac242115 100644
--- a/pkgs/development/libraries/xlibs/libXext/default.nix
+++ b/pkgs/development/libraries/xlibs/libXext/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXext-6.4.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXext-6.4.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXext-6.4.3.tar.bz2;
     md5 = "b7117194e69867905da9701dff56f3ee";
   };
   buildInputs = [pkgconfig xproto xextensions libX11];
diff --git a/pkgs/development/libraries/xlibs/libXi/default.nix b/pkgs/development/libraries/xlibs/libXi/default.nix
index 799f441eb28e..8171b5d8e8f0 100644
--- a/pkgs/development/libraries/xlibs/libXi/default.nix
+++ b/pkgs/development/libraries/xlibs/libXi/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXi-6.0.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXi-6.0.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXi-6.0.1.tar.bz2;
     md5 = "7e935a42428d63a387b3c048be0f2756";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXinerama/default.nix b/pkgs/development/libraries/xlibs/libXinerama/default.nix
index f97d37931b0f..819bb387c108 100644
--- a/pkgs/development/libraries/xlibs/libXinerama/default.nix
+++ b/pkgs/development/libraries/xlibs/libXinerama/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXinerama-1.0.2";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXinerama-1.0.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXinerama-1.0.2.tar.bz2;
     md5 = "637b2c5758d2de558670428d33178174";
   };
   buildInputs = [pkgconfig panoramixext];
diff --git a/pkgs/development/libraries/xlibs/libXmu/default.nix b/pkgs/development/libraries/xlibs/libXmu/default.nix
index da243f204495..ad03d8f14eea 100644
--- a/pkgs/development/libraries/xlibs/libXmu/default.nix
+++ b/pkgs/development/libraries/xlibs/libXmu/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXmu-6.2.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXmu-6.2.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXmu-6.2.3.tar.bz2;
     md5 = "7671745bd8a1b0595847541479a327d6";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXpm/default.nix b/pkgs/development/libraries/xlibs/libXpm/default.nix
index e0897621c5da..54177eb7a039 100644
--- a/pkgs/development/libraries/xlibs/libXpm/default.nix
+++ b/pkgs/development/libraries/xlibs/libXpm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXpm-3.5.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXpm-3.5.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXpm-3.5.1.tar.bz2;
     md5 = "733e20a60c3343531b50bcc48348fd3e";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/libXtrans/default.nix b/pkgs/development/libraries/xlibs/libXtrans/default.nix
index a4839f3e699a..5ba3664220d0 100644
--- a/pkgs/development/libraries/xlibs/libXtrans/default.nix
+++ b/pkgs/development/libraries/xlibs/libXtrans/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXtrans-0.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXtrans-0.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXtrans-0.1.tar.bz2;
     md5 = "a5ae4c7a75f930053b8327f7bd0c1361";
   };
 }
diff --git a/pkgs/development/libraries/xlibs/libXv/default.nix b/pkgs/development/libraries/xlibs/libXv/default.nix
index bfaada1198d7..86234b7e5e56 100644
--- a/pkgs/development/libraries/xlibs/libXv/default.nix
+++ b/pkgs/development/libraries/xlibs/libXv/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXv-2.2.2";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libXv-2.2.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXv-2.2.2.tar.bz2;
     md5 = "cdd6a79bac8807da83c008dac42fdddb";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/panoramixext/default.nix b/pkgs/development/libraries/xlibs/panoramixext/default.nix
index 538a92096b21..5594f2a40a86 100644
--- a/pkgs/development/libraries/xlibs/panoramixext/default.nix
+++ b/pkgs/development/libraries/xlibs/panoramixext/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "panoramixext-1.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/panoramixext-1.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/panoramixext-1.1.tar.bz2;
     md5 = "129f8623dc4f70188a015e3cbd7eae82";
   };
 }
diff --git a/pkgs/development/libraries/xlibs/xextensions/default.nix b/pkgs/development/libraries/xlibs/xextensions/default.nix
index b7e77f6bd64d..45db6adbc74c 100644
--- a/pkgs/development/libraries/xlibs/xextensions/default.nix
+++ b/pkgs/development/libraries/xlibs/xextensions/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xextensions-1.0.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xextensions-1.0.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/xextensions-1.0.1.tar.bz2;
     md5 = "e61bca2a4757b736c9557dc8a7df2217";
   };
 }
diff --git a/pkgs/development/libraries/zvbi/default.nix b/pkgs/development/libraries/zvbi/default.nix
index 58ca60e57e6f..f53d5a661c93 100644
--- a/pkgs/development/libraries/zvbi/default.nix
+++ b/pkgs/development/libraries/zvbi/default.nix
@@ -7,7 +7,7 @@ assert pngSupport -> libpng != null;
 stdenv.mkDerivation {
   name = "zvbi-0.2.8";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zvbi-0.2.8.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/zvbi-0.2.8.tar.bz2;
     md5 = "8701d3e4387cd896ff8b68831b57d814";
   };
   buildInputs = [x11 (if pngSupport then libpng else null)];
diff --git a/pkgs/development/perl-modules/XML-Parser/default.nix b/pkgs/development/perl-modules/XML-Parser/default.nix
index b9adcaab7069..8ea0606f0eb0 100644
--- a/pkgs/development/perl-modules/XML-Parser/default.nix
+++ b/pkgs/development/perl-modules/XML-Parser/default.nix
@@ -3,7 +3,7 @@
 import ../generic perl {
   name = "XML-Parser-2.34";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-Parser-2.34.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/XML-Parser-2.34.tar.gz;
     md5 = "84d9e0001fe01c14867256c3fe115899";
   };
   perlPreHook = ./hook.sh;
diff --git a/pkgs/development/python-modules/wxPython-2.5/default.nix b/pkgs/development/python-modules/wxPython-2.5/default.nix
index dce3aa567419..455208721ef6 100644
--- a/pkgs/development/python-modules/wxPython-2.5/default.nix
+++ b/pkgs/development/python-modules/wxPython-2.5/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "wxPython-2.5.2.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wxPythonSrc-2.5.2.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/wxPythonSrc-2.5.2.8.tar.gz;
     md5 = "573fd376fd39b66ad5fbf44b487aa0b2";
   };
   buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
diff --git a/pkgs/development/python-modules/wxPython/default.nix b/pkgs/development/python-modules/wxPython/default.nix
index 5382d0a766e3..7db7e287778d 100644
--- a/pkgs/development/python-modules/wxPython/default.nix
+++ b/pkgs/development/python-modules/wxPython/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "wxPython-2.4.2.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wxPythonSrc-2.4.2.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/wxPythonSrc-2.4.2.4.tar.gz;
     md5 = "ea4eb68e10a0c2a9be643b35dcb78e41";
   };
   buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
index 33c81878d263..87038c7f26c7 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   builder = ./core-builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/apache-ant-1.6.1-bin.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/apache-ant-1.6.1-bin.tar.bz2;
     md5 = "703d0265d05b98afd95be0bc21b98420";
   };
 }
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 0826092439c0..caedaac14964 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnumake-3.80";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/make-3.80.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/make-3.80.tar.bz2;
     md5 = "0bbd1df101bc0294d440471e50feca71";
   };
   patches = [./log.diff];
diff --git a/pkgs/development/tools/documentation/xdoc/default.nix b/pkgs/development/tools/documentation/xdoc/default.nix
index 571bce453529..324090532546 100644
--- a/pkgs/development/tools/documentation/xdoc/default.nix
+++ b/pkgs/development/tools/documentation/xdoc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xdoc-0.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xdoc-0.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xdoc-0.1.tar.gz;
     md5 = "6f601254013d5fe3d2fdbd33b827001a";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/tools/java/jclasslib/default.nix b/pkgs/development/tools/java/jclasslib/default.nix
index a81c8f6032ef..f87edb3eab01 100644
--- a/pkgs/development/tools/java/jclasslib/default.nix
+++ b/pkgs/development/tools/java/jclasslib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jclasslib-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jclasslib_unix_2_0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/jclasslib_unix_2_0.tar.gz;
     md5 = "31d91bb03fee23410689d2f1c4c439b1";
   };
 
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 6711acb39f87..9902c3c5dd79 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "autoconf-2.59";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/autoconf-2.59.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/autoconf-2.59.tar.bz2;
     md5 = "1ee40f7a676b3cfdc0e3f7cd81551b5f";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/misc/automake/automake-1.7.9.nix b/pkgs/development/tools/misc/automake/automake-1.7.9.nix
index 13b1b7380863..6a0f466cf372 100644
--- a/pkgs/development/tools/misc/automake/automake-1.7.9.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.7.9.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/automake-1.7.9.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/automake-1.7.9.tar.bz2;
     md5 = "571fd0b0598eb2a27dcf68adcfddfacb";
   };
   buildInputs = [perl autoconf];
diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
index e5bcd4fc680a..1fe9e0b1c39a 100644
--- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/automake-1.9.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/automake-1.9.4.tar.gz;
     md5 = "5b46bde56e321a7bab7832168cf0b9b8";
   };
   buildInputs = [perl autoconf];
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index 0ded5fe27b51..9e6e11da2af3 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gperf-2.7.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gperf-2.7.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gperf-2.7.2.tar.gz;
     md5 = "e501acc2e18eed2c8f25ca0ac2330d68";
   };
 }
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 568e37d8d544..c1319e914432 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.14";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libtool-1.5.14.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libtool-1.5.14.tar.gz;
     md5 = "049bf67de9b0eb75cd943dafe3d749ec";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 26f0888de63b..e030cb1d338d 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "patchelf-0.1pre2286";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/nix/patchelf-0.1pre2286/patchelf-0.1pre2286.tar.gz;
+    url = http://nix.cs.uu.nl/dist/nix/patchelf-0.1pre2286/patchelf-0.1pre2286.tar.gz;
     md5 = "2b1377e6745c239255b3f4a6ba6c0c87";
   };
 }
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index b15f04264aa9..ba5b3a95ac78 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pkgconfig-0.15.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pkgconfig-0.15.0.tar.gz;
     md5 = "a7e4f60a6657dbc434334deb594cc242";
   };
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 111ff74f5755..fb6dadb85202 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://catamaran.labs.cs.uu.nl/dist/tarballs/strace-4.5.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/strace-4.5.6.tar.bz2;
     md5 = "2dd9d23430957a7ee0221efb28c66d1e";
   };
 }
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index 6c043e3025b3..1e14ddc8f299 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/swig-1.3.19.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/swig-1.3.19.tar.gz;
     md5 = "a733455544426b31868dd87fc162e750";
   };
 
diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix
index b48f4695c2aa..8f69b793b9a7 100644
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ b/pkgs/development/tools/misc/texinfo/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "texinfo-4.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/texinfo-4.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/texinfo-4.6.tar.gz;
     md5 = "5730c8c0c7484494cca7a7e2d7459c64";
   };
   inherit ncurses;
diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix
index 9c85197591e8..2f28c8b12176 100644
--- a/pkgs/development/tools/misc/valgrind/default.nix
+++ b/pkgs/development/tools/misc/valgrind/default.nix
@@ -8,7 +8,7 @@
 stdenv.mkDerivation {
   name = "valgrind-2.4.0";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/valgrind-2.4.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/valgrind-2.4.0.tar.bz2;
     md5 = "1d0bd81d368789946d32d18a468ea0cf";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix b/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
index 7ecdbbf6041b..ec173ba86fd0 100644
--- a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asc-support-1.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asc-support-1.8.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/asc-support-1.8.tar.gz;
     md5 = "e85a790c6004dfb974d79fc9699f69f4";
   };
   inherit stdenv aterm ptsupport toolbuslib asfsupport;
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix b/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
index ebc4f64ca397..4aa1c92d0806 100644
--- a/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asc-support-1.9";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asc-support-1.9.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/asc-support-1.9.tar.gz;
     md5 = "0c395efec4d3b582af016ab03306ed0a";
   };
   inherit stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix b/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
index 666ab4397781..de23398cccbb 100644
--- a/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asc-support-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asc-support-2.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/asc-support-2.0.tar.gz;
     md5 = "34368ca79e524157bf6e89281371cb5a";
   };
   inherit stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix b/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
index 6232a5bbe5a9..c577d07db07b 100644
--- a/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
+++ b/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "asf-library-1.0";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-library-1.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/asf-library-1.0.tar.gz;
     md5 = "e531f78941e2d2dab1b87a56522e9fb5";
   };
 }
diff --git a/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix b/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
index 31162b7b2d5a..6344b3a47acc 100644
--- a/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
+++ b/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "asf-library-1.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-library-1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/asf-library-1.1.tar.gz;
     md5 = "09b2ccbd115434cedb180e5575d0fa98";
   };
 }
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
index 49ad29229d74..fbbf8b69ce77 100644
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asf-support-1.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-support-1.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/asf-support-1.2.tar.gz;
     md5 = "f32de4c97e62486b67e0af4408585980";
   };
   inherit stdenv aterm ptsupport;
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
index b970a9483dde..a0cd69f15dd4 100644
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asf-support-1.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-support-1.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/asf-support-1.3.tar.gz;
     md5 = "23539387ff9b0423c1c1933a8ff75d27";
   };
   inherit stdenv aterm ptsupport errorsupport;
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
index c6043a289bbb..4bb2c3d5c66b 100644
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asf-support-1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-support-1.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/asf-support-1.4.tar.gz;
     md5 = "520ea7d73094346d3010187f22927870";
   };
   inherit stdenv aterm ptsupport errorsupport;
diff --git a/pkgs/development/tools/parsing/bison/bison-new.nix b/pkgs/development/tools/parsing/bison/bison-new.nix
index 00a7f87e776f..4bdab887ba5c 100644
--- a/pkgs/development/tools/parsing/bison/bison-new.nix
+++ b/pkgs/development/tools/parsing/bison/bison-new.nix
@@ -5,7 +5,7 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-1.875d";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bison-1.875d.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bison-1.875d.tar.gz;
     md5 = "faaa4a271ca722fb6c769d72e18ade0b";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index ba3926878c42..92aeafb335a4 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -5,7 +5,7 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-1.875";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2;
     md5 = "b7f8027b249ebd4dd0cc948943a71af0";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix b/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
index a55892155f52..13142d6ff21e 100644
--- a/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
+++ b/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "error-support-0.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/error-support-0.1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/error-support-0.1.1.tar.gz;
     md5 = "ebd0965e29ee22508a189477b1dae12b";
   };
   inherit aterm toolbuslib;
diff --git a/pkgs/development/tools/parsing/error-support/error-support-0.1.nix b/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
index d84b641a6ad8..53c223f3eafc 100644
--- a/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
+++ b/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "error-support-0.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/error-support-0.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/error-support-0.1.tar.gz;
     md5 = "906389fd8b44bf2847d8281450d5a701";
   };
   inherit aterm toolbuslib;
diff --git a/pkgs/development/tools/parsing/flex-iputils/default.nix b/pkgs/development/tools/parsing/flex-iputils/default.nix
index 24303fd6a539..c680f0f5c490 100644
--- a/pkgs/development/tools/parsing/flex-iputils/default.nix
+++ b/pkgs/development/tools/parsing/flex-iputils/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "flex-2.5.4a";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flex-2.5.4a.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/flex-2.5.4a.tar.gz;
     md5 = "bd8753d0b22e1f4ec87a553a73021adf";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/flex-iputils/flex-new.nix b/pkgs/development/tools/parsing/flex-iputils/flex-new.nix
index fddd8eaa6cd9..802f77a9ad60 100644
--- a/pkgs/development/tools/parsing/flex-iputils/flex-new.nix
+++ b/pkgs/development/tools/parsing/flex-iputils/flex-new.nix
@@ -8,7 +8,7 @@ assert yacc != null && m4 != null;
 stdenv.mkDerivation {
   name = "flex-2.5.31";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flex-2.5.31.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/flex-2.5.31.tar.bz2;
     md5 = "363dcc4afc917dc51306eb9d3de0152f";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index c386c2be4765..2d146eeca250 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -5,7 +5,7 @@ assert yacc != null;
 stdenv.mkDerivation {
   name = "flex-2.5.4a";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flex-2.5.4a.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/flex-2.5.4a.tar.gz;
     md5 = "bd8753d0b22e1f4ec87a553a73021adf";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/flex/flex-new.nix b/pkgs/development/tools/parsing/flex/flex-new.nix
index fddd8eaa6cd9..802f77a9ad60 100644
--- a/pkgs/development/tools/parsing/flex/flex-new.nix
+++ b/pkgs/development/tools/parsing/flex/flex-new.nix
@@ -8,7 +8,7 @@ assert yacc != null && m4 != null;
 stdenv.mkDerivation {
   name = "flex-2.5.31";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flex-2.5.31.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/flex-2.5.31.tar.bz2;
     md5 = "363dcc4afc917dc51306eb9d3de0152f";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/happy/default.nix b/pkgs/development/tools/parsing/happy/default.nix
index 2bfc703deb79..e46b7292da83 100644
--- a/pkgs/development/tools/parsing/happy/default.nix
+++ b/pkgs/development/tools/parsing/happy/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "happy-1.14";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/happy-1.14-src.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/happy-1.14-src.tar.gz;
     md5 = "501b5b63533b2e2838de18085e8c4492";
   };
   buildInputs = [ghc perl];
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix b/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
index 1e0d80eab0d9..571efd4f2d45 100644
--- a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgen-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pgen-2.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pgen-2.0.tar.gz;
     md5 = "368cd8abeed29591a35660d8cea79975";
   };
   inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr;
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.1.nix b/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
index 5758dfb9a166..eafa402a49f0 100644
--- a/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgen-2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pgen-2.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pgen-2.1.tar.gz;
     md5 = "3fd46ae1ddc891a488f74350d7b477f9";
   };
   inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.2.nix b/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
index 70d4fd0fc839..8f803a8072d2 100644
--- a/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgen-2.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pgen-2.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pgen-2.2.tar.gz;
     md5 = "e23323a96d7b1f72a0e10673fa93ef7c";
   };
   inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
index 39b0c2031834..3961db6be5a6 100644
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pt-support-1.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pt-support-1.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pt-support-1.0.tar.gz;
     md5 = "cc96dc2bfbaf3f218dfe9a0b8bb4d801";
   };
   inherit aterm toolbuslib;
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
index 6ba2bf7450d0..8c2c3037a8d0 100644
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pt-support-1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pt-support-1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pt-support-1.1.tar.gz;
     md5 = "51bad46427c7cf95d029c33f079581ff";
   };
   inherit aterm toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
index b86a615a4a78..6a605fe1d2da 100644
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pt-support-1.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pt-support-1.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/pt-support-1.2.tar.gz;
     md5 = "2ba2fa388130b11b9b91970ebe20c1c7";
   };
   inherit aterm toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
index 167db88a5f26..dfd05e79ad44 100644
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sdf-support-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sdf-support-2.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sdf-support-2.0.tar.gz;
     md5 = "2987b89ed1d73e34e128b895ff44264c";
   };
   inherit stdenv aterm ptsupport toolbuslib;
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
index 33d9c6da380d..582d5806d0f0 100644
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sdf-support-2.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sdf-support-2.1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sdf-support-2.1.1.tar.gz;
     md5 = "28b2c044ee711d6c5f22772b7dfafb76";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
index e0c1b697cc0b..94588e27fe6f 100644
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sdf-support-2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sdf-support-2.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sdf-support-2.1.tar.gz;
     md5 = "dbb1d3c51a82dadfaaf5319dba5cc9ef";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix b/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
index 6bc566307709..6415ac89cf79 100644
--- a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sglr-3.10.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sglr-3.10.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sglr-3.10.2.tar.gz;
     md5 = "39aa609be84115d7ddc56a6c74b792b7";
   };
   inherit stdenv aterm ptsupport toolbuslib;
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.11.nix b/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
index 181387bf6213..5ae6f946a11a 100644
--- a/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sglr-3.11";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sglr-3.11.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sglr-3.11.tar.gz;
     md5 = "c60536c7e967e93d1ec2cd9c8ae0a4ae";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.12.nix b/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
index dc6dfa8ee7a7..f385a8761074 100644
--- a/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sglr-3.12";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sglr-3.12.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sglr-3.12.tar.gz;
     md5 = "053753e419adfc337c4776412e3787ab";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
index e14be3815ee9..def781540910 100644
--- a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
+++ b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "toolbuslib-0.5.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/toolbuslib-0.5.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/toolbuslib-0.5.1.tar.gz;
     md5 = "1c7c7cce870f813bef60bbffdf061c90";
   };
   buildInputs = [aterm];
diff --git a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
index 22b37a0d58a5..a231e834d3f6 100644
--- a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
+++ b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "toolbuslib-0.6";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/toolbuslib-0.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/toolbuslib-0.6.tar.gz;
     md5 = "e117c574b428408ad172b1ad904ff430";
   };
   buildInputs = [aterm];
diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix
index bdf4554eb31d..e4823da2c426 100644
--- a/pkgs/games/zoom/default.nix
+++ b/pkgs/games/zoom/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation {
   name = "zoom-1.0.2alpha1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zoom-1.0.2alpha1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/zoom-1.0.2alpha1.tar.gz;
     md5 = "91b2fe444028178aa3b23bd0e3ae1a61";
   };
   buildInputs = [perl expat xlibs freetype];
diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix
index e600fc94a304..9991c7d49a72 100644
--- a/pkgs/misc/nix/default.nix
+++ b/pkgs/misc/nix/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   name = "nix-0.8.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.8.1/nix-0.8.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/nix/nix-0.8.1/nix-0.8.1.tar.gz;
     md5 = "5e4679c655f0bd7f8b69d349945b4f00";
   };
   buildInputs = [aterm bdb perl curl];
diff --git a/pkgs/misc/uml-utilities/default.nix b/pkgs/misc/uml-utilities/default.nix
index 452c498d6c78..4b01ad912534 100644
--- a/pkgs/misc/uml-utilities/default.nix
+++ b/pkgs/misc/uml-utilities/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "uml-utilities-20040114";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/uml_utilities_20040114.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/uml_utilities_20040114.tar.bz2;
     md5 = "1fd5b791ef32c6a3ed4ae42c4a53a316";
   };
 }
diff --git a/pkgs/misc/uml/default.nix b/pkgs/misc/uml/default.nix
index 2b763a6b24b1..48e869251325 100644
--- a/pkgs/misc/uml/default.nix
+++ b/pkgs/misc/uml/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation {
   name = "uml-2.4.27-1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-2.4.27.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/linux-2.4.27.tar.bz2;
     md5 = "59a2e6fde1d110e2ffa20351ac8b4d9e";
   };
   umlPatch = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/uml-patch-2.4.27-1.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/uml-patch-2.4.27-1.bz2;
     md5 = "63178bbd3a383a1005738f4628ff583e";
   };
   noAioPatch = ./no-aio.patch;
diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix
index 561eaab7a88e..3157a3ea2f87 100644
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "e2fsprogs-1.36";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/e2fsprogs-1.36.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.36.tar.gz;
     md5 = "1804ee96b76e5e7113fe3cecd6fe582b";
   };
   configureFlags = "--enable-dynamic-e2fsck --enable-elf-shlibs";
diff --git a/pkgs/os-specific/linux/modutils/default.nix b/pkgs/os-specific/linux/modutils/default.nix
index 33eef83c1927..19f9efae19ce 100644
--- a/pkgs/os-specific/linux/modutils/default.nix
+++ b/pkgs/os-specific/linux/modutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "modutils-2.4.25";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/modutils-2.4.25.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/modutils-2.4.25.tar.bz2;
     md5 = "2c0cca3ef6330a187c6ef4fe41ecaa4d";
   };
   buildInputs = [bison flex];
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 240e9b571526..1538ac47aa8d 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "net-tools-1.60";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/net-tools-1.60.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/net-tools-1.60.tar.bz2;
     md5 = "888774accab40217dde927e21979c165";
   };
   config = ./config.h;
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index 64658f29aa3d..a211bdde4545 100644
--- a/pkgs/os-specific/linux/procps/default.nix
+++ b/pkgs/os-specific/linux/procps/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "procps-3.2.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/procps-3.2.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/procps-3.2.4.tar.gz;
     md5 = "1bec6740b385b3f73800827437f14f85";
   };
   patches = [./makefile.patch];
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 59c810798842..12b1ced1ecb8 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
    
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/shadow-4.0.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/shadow-4.0.6.tar.bz2;
     md5 = "3ca79b02c0aaa82128f4c32cb68ffe4f";
   };
    
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 0f8cf21b26e7..449326826313 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sysvinit-2.85";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sysvinit-2.85.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/sysvinit-2.85.tar.gz;
     md5 = "8a2d8f1ed5a2909da04132fefa44905e";
   };
   srcPatch = ./patch;
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 4e352212103d..6410016d9b34 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "util-linux-2.12q";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/util-linux-2.12q.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/util-linux-2.12q.tar.bz2;
     md5 = "54320aa1abbce00c0dc030e2c3afe5d7";
   };
   patches = [./MCONFIG.patch];
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 16ab4bb5d174..f7cb3c47d9d1 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jakarta-tomcat-5.0.27.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/jakarta-tomcat-5.0.27.tar.gz;
     md5 = "b802ee042677e284bcf65738c7bdc3b6";
   };
 
diff --git a/pkgs/servers/x11/xfree86/default.nix b/pkgs/servers/x11/xfree86/default.nix
index 67a26d41a4be..64eced0c46a2 100644
--- a/pkgs/servers/x11/xfree86/default.nix
+++ b/pkgs/servers/x11/xfree86/default.nix
@@ -12,15 +12,15 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   hostdef = ./host.def;
   src1 = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/X430src-1.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/X430src-1.tgz;
     md5 = "4f241a4f867363f40efa2b00dca292af";
   };
   src2 = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/X430src-2.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/X430src-2.tgz;
     md5 = "844c2ee908d21dbf8911fd13115bf8b4";
   };
   src3 = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/X430src-3.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/X430src-3.tgz;
     md5 = "b82a0443e1b7bf860e4343e6b6766cb6";
   };
 
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 84d2270c0923..f7a70f9337ec 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bash-3.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bash-3.0.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bash-3.0.tar.gz;
     md5 = "26c4d642e29b3533d8d754995bc277b3";
   };
 }
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 34d678c2fc0d..e548bc343ed8 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -62,19 +62,19 @@ rec {
   # The various statically linked components that make up the standard
   # environment.
   staticTools = downloadAndUnpack {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/stdenv-linux/static-tools.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/static-tools.tar.bz2;
     pkgname = "static-tools";
     md5 = "90578c603079313123e8c754a85e40d7";
   };
 
   binutils = downloadAndUnpack {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/stdenv-linux/binutils-2.15-static.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/binutils-2.15-static.tar.bz2;
     pkgname = "binutils";
     md5 = "9c134038b7f1894a4b307d600207047c";
   };
 
   gcc = (downloadAndUnpack {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/stdenv-linux/gcc-3.4.2-static.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/gcc-3.4.2-static.tar.bz2;
     pkgname = "gcc";
     md5 = "600452fac470a49a41ea81d39c209f35";
     postProcess = [./scripts/fix-outpath.sh];
@@ -82,7 +82,7 @@ rec {
   }) // { langC = true; langCC = false; langF77 = false; };
 
   glibc = downloadAndUnpack {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/stdenv-linux/glibc-2.3.3-static.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/glibc-2.3.3-static.tar.bz2;
     pkgname = "glibc";
     md5 = "36ff244e666c60784edfe1cc66f68e4c";
     postProcess = [./scripts/fix-outpath.sh];
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index eab6a4215448..8835d49222a5 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -878,7 +878,7 @@ rec {
   perlXMLLibXML = import ../development/perl-modules/generic perl {
     name = "XML-LibXML-1.58";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-LibXML-1.58.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/XML-LibXML-1.58.tar.gz;
       md5 = "4691fc436e5c0f22787f5b4a54fc56b0";
     };
     buildInputs = [libxml2];
@@ -888,7 +888,7 @@ rec {
   perlXMLLibXMLCommon = import ../development/perl-modules/generic perl {
     name = "XML-LibXML-Common-0.13";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-LibXML-Common-0.13.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/XML-LibXML-Common-0.13.tar.gz;
       md5 = "13b6d93f53375d15fd11922216249659";
     };
     buildInputs = [libxml2];
@@ -897,7 +897,7 @@ rec {
   perlXMLSAX = import ../development/perl-modules/generic perl {
     name = "XML-SAX-0.12";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-SAX-0.12.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/XML-SAX-0.12.tar.gz;
       md5 = "bff58bd077a9693fc8cf32e2b95f571f";
     };
     propagatedBuildInputs = [perlXMLNamespaceSupport];
@@ -906,7 +906,7 @@ rec {
   perlXMLNamespaceSupport = import ../development/perl-modules/generic perl {
     name = "XML-NamespaceSupport-1.08";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-NamespaceSupport-1.08.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/XML-NamespaceSupport-1.08.tar.gz;
       md5 = "81bd5ae772906d0579c10061ed735dc8";
     };
     buildInputs = [];
@@ -915,7 +915,7 @@ rec {
   perlXMLTwig = import ../development/perl-modules/generic perl {
     name = "XML-Twig-3.15";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-Twig-3.15.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/XML-Twig-3.15.tar.gz;
       md5 = "b26886b8bd19761fff37b23e4964b499";
     };
     propagatedBuildInputs = [perlXMLParser];
@@ -924,7 +924,7 @@ rec {
   perlXMLWriter = import ../development/perl-modules/generic perl {
     name = "XML-Writer-0.520";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-Writer-0.520.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/XML-Writer-0.520.tar.gz;
       md5 = "0a194acc70c906c0be32f4b2b7a9f689";
     };
   };
@@ -932,7 +932,7 @@ rec {
   perlXMLSimple = import ../development/perl-modules/generic perl {
     name = "XML-Simple-2.14";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-Simple-2.14.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/XML-Simple-2.14.tar.gz;
       md5 = "f321058271815de28d214c8efb9091f9";
     };
     propagatedBuildInputs = [perlXMLParser];
@@ -941,7 +941,7 @@ rec {
   perlTermReadKey = import ../development/perl-modules/generic perl {
     name = "TermReadKey-2.30";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/TermReadKey-2.30.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/TermReadKey-2.30.tar.gz;
       md5 = "f0ef2cea8acfbcc58d865c05b0c7e1ff";
     };
   };
@@ -949,7 +949,7 @@ rec {
   perlDateManip = import ../development/perl-modules/generic perl {
     name = "DateManip-5.42a";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/DateManip-5.42a.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/DateManip-5.42a.tar.gz;
       md5 = "648386bbf46d021ae283811f75b07bdf";
     };
   };
@@ -957,7 +957,7 @@ rec {
   perlHTMLTree = import ../development/perl-modules/generic perl {
     name = "HTML-Tree-3.18";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/HTML-Tree-3.18.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/HTML-Tree-3.18.tar.gz;
       md5 = "6a9e4e565648c9772e7d8ec6d4392497";
     };
   };
@@ -965,7 +965,7 @@ rec {
   perlHTMLParser = import ../development/perl-modules/generic perl {
     name = "HTML-Parser-3.45";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/HTML-Parser-3.45.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/HTML-Parser-3.45.tar.gz;
       md5 = "c2ac1379ac5848dd32e24347cd679391";
     };
   };
@@ -973,7 +973,7 @@ rec {
   perlHTMLTagset = import ../development/perl-modules/generic perl {
     name = "HTML-Tagset-3.04";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/HTML-Tagset-3.04.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/HTML-Tagset-3.04.tar.gz;
       md5 = "b82e0f08c1ececefe98b891f30dd56a6";
     };
   };
@@ -981,7 +981,7 @@ rec {
   perlURI = import ../development/perl-modules/generic perl {
     name = "URI-1.35";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/URI-1.35.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/URI-1.35.tar.gz;
       md5 = "1a933b1114c41a25587ee59ba8376f7c";
     };
   };
@@ -989,7 +989,7 @@ rec {
   perlLWP = import ../development/perl-modules/generic perl {
     name = "libwww-perl-5.803";
     src = fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libwww-perl-5.803.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/libwww-perl-5.803.tar.gz;
       md5 = "3345d5f15a4f42350847254141725c8f";
     };
     propagatedBuildInputs = [perlURI perlHTMLParser];
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index eda3900e39e9..e19e564a421c 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "unzip-5.52";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/unzip552.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/unzip552.tar.gz;
     md5 = "9d23919999d6eac9217d1f41472034a9";
   };
 }
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
index 2e761e6bcd3d..a8ef5ef025ad 100644
--- a/pkgs/tools/compression/bsdiff/default.nix
+++ b/pkgs/tools/compression/bsdiff/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bsdiff-4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bsdiff-4.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bsdiff-4.2.tar.gz;
     md5 = "9f582a77eb76d116d82d1ad268ef48fa";
   };
   patches = [./makefile.patch];
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index fded4d785a68..ec572f8a3d17 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gzip-1.3.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gzip-1.3.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gzip-1.3.3.tar.gz;
     md5 = "52eaf713673507d21f7abefee98ba662";
   };
 }
diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix
index 466b3b4191b1..49ee14b10e84 100644
--- a/pkgs/tools/compression/zdelta/default.nix
+++ b/pkgs/tools/compression/zdelta/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "zdelta-2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zdelta-2.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/zdelta-2.1.tar.gz;
     md5 = "c69583a64f42f69a39e297d0d27d77e5";
   };
 }
diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix
index 71d2acff48f0..aa4d82468c30 100644
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/pkgs/tools/graphics/exif/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "exif-0.6.9";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/exif-0.6.9.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/exif-0.6.9.tar.gz;
     md5 = "555029098386fa677c461eb249d852d7";
   };
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 4e5b6f17f752..17053aa3126d 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "coreutils-5.2.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/coreutils-5.2.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.2.1.tar.bz2;
     md5 = "172ee3c315af93d3385ddfbeb843c53f";
   };
 }
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index a4e7db590b30..775b6e32cc55 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "file-4.13";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/file-4.13.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/file-4.13.tar.gz;
     md5 = "2bfc0f878ee22e50441b68df2ccbb984";
   };
 }
diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix
index bac1293004c4..ed9de85fcbc8 100644
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/pkgs/tools/misc/getopt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "getopt-1.1.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/getopt-1.1.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/getopt-1.1.3.tar.gz;
     md5 = "7b7637dcb0ac531f1af29f4d6b018e86";
   };
 }
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 9b9d382a5752..f65e85395932 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
  
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/less-382.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/less-382.tar.gz;
     md5 = "103fe4aef6297b93f0f73f38cc3b1bd7";
   };
  
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 44528e08855d..f9e1d8f261e1 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "screen-4.0.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/screen-4.0.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/screen-4.0.2.tar.gz;
     md5 = "ed68ea9b43d9fba0972cb017a24940a1";
   };
 
diff --git a/pkgs/tools/misc/xmltv/default.nix b/pkgs/tools/misc/xmltv/default.nix
index cd50e7c93010..d91511a1b6a5 100644
--- a/pkgs/tools/misc/xmltv/default.nix
+++ b/pkgs/tools/misc/xmltv/default.nix
@@ -6,7 +6,7 @@
 import ../../../development/perl-modules/generic perl {
   name = "xmltv-0.5.37";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xmltv-0.5.37.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/xmltv-0.5.37.tar.bz2;
     md5 = "40b7675cc1b7632065ebbd1e0ecf860f";
   };
   makeMakerFlags = "-components tv_grab_nl";
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index 283edf2ea674..d1e08c338977 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/pkgs/tools/misc/xsel/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xsel-0.9.6";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xsel-0.9.6.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/xsel-0.9.6.tar.gz;
     md5 = "cec2fb09a4101b7f2beab8094234e2f4";
   };
 
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index 70c48c4be135..4bf226198330 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/pkgs/tools/networking/cksfv/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cksfv-1.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cksfv-1.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cksfv-1.3.tar.gz;
     md5 = "e00cf6a80a566539eb6f3432f2282c38";
   };
 }
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 0afb683a6479..63f4c908b5b5 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
  
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/openssh-3.8.1p1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/openssh-3.8.1p1.tar.gz;
     md5 = "1dbfd40ae683f822ae917eebf171ca42";
   };
  
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index 005eb46da2e2..3c1aa03c105b 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -2,7 +2,7 @@
   name = "par2cmdline-0.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/par2cmdline-0.3.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/par2cmdline-0.3.tar.gz;
     md5 = "705c97bc41b862d281dd41c219a60849";
   };
 }
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 9429a181b609..23301ca21e34 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "wget-1.9.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wget-1.9.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/wget-1.9.1.tar.gz;
     md5 = "e6051f1e1487ec0ebfdbda72bedc70ad";
   };
 }
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 4e456a8e7ada..135eab15391f 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gnupg-1.4.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnupg_1.4.0.orig.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/gnupg_1.4.0.orig.tar.gz;
     md5 = "74e407a8dcb09866555f79ae797555da";
   };
 }
diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix
index 33e9580cead1..e73f38d5dbc3 100644
--- a/pkgs/tools/security/mktemp/default.nix
+++ b/pkgs/tools/security/mktemp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mktemp-1.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mktemp-1.5.tar.gz;
     md5 = "9a35c59502a228c6ce2be025fc6e3ff2";
   };
   
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 6230ea978ec9..83aeaad445e3 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nmap-3.55.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/nmap-3.55.tar.bz2;
     md5 = "88b5f010f43b0e2ee0c2cfb468796aa9";
   };
   
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix
index 6cfe25183b96..915354ea21de 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/pkgs/tools/system/which/default.nix
@@ -2,7 +2,7 @@
   name = "which-2.16";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/which-2.16.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/which-2.16.tar.gz;
     md5 = "830b83af48347a9a3520f561e47cbc9b";
   };
 }
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 847c494c3d22..227d445086de 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "diffutils-2.8.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/diffutils-2.8.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/diffutils-2.8.1.tar.gz;
     md5 = "71f9c5ae19b60608f6c7f162da86a428";
   };
   /* If no explicit coreutils is given, use the one from stdenv. */
diff --git a/pkgs/tools/text/ed/default.nix b/pkgs/tools/text/ed/default.nix
index f25f62d04d19..2c8ba7ef6f6e 100644
--- a/pkgs/tools/text/ed/default.nix
+++ b/pkgs/tools/text/ed/default.nix
@@ -2,7 +2,7 @@
   name = "ed-0.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ed-0.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/ed-0.2.tar.gz;
     md5 = "ddd57463774cae9b50e70cd51221281b";
   };
 }
diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix
index a84c6eb5178a..725875e74caf 100644
--- a/pkgs/tools/text/enscript/default.nix
+++ b/pkgs/tools/text/enscript/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "enscript-1.6.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/enscript-1.6.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/enscript-1.6.4.tar.gz;
     md5 = "b5174b59e4a050fb462af5dbf28ebba3";
   };
 }
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 34db9ba3afa5..e1e865edf562 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gawk-3.1.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gawk-3.1.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gawk-3.1.4.tar.bz2;
     md5 = "b8b532beaf02350e69d2d5dc98cb1e37";
   };
 }
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index c11afc38eeb7..ae798ce71289 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -2,7 +2,7 @@
   name = "gnupatch-2.5.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/patch-2.5.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/patch-2.5.4.tar.gz;
     md5 = "ee5ae84d115f051d87fcaaef3b4ae782";
   };
 }
diff --git a/pkgs/tools/text/xml/jing/default.nix b/pkgs/tools/text/xml/jing/default.nix
index 3e261d9e618f..f101f0ff7b57 100644
--- a/pkgs/tools/text/xml/jing/default.nix
+++ b/pkgs/tools/text/xml/jing/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./unzip-builder.sh;
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jing-20030619.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/jing-20030619.zip;
     md5 = "f9b0775d8740f16ab3df82ad3707a093";
   };
 
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index aa44e64af7aa..32fbda84becd 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -2,7 +2,7 @@
   name = "hevea-1.07";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hevea-1.07.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/hevea-1.07.tar.gz;
     md5 = "561d7a2c10ea9e6a5b352c24d9b65998";
   };
   buildInputs = [ocaml];
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index ab79086b9839..3ac57124a7de 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mjpegtools-1.6.2";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mjpegtools-1.6.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/mjpegtools-1.6.2.tar.gz;
     md5 = "01c0120b0182de67f182ef99ad855daa" ;
   };
   buildInputs = [libjpeg libX11];