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

  gazillion different servers.  Resurrected some 25 missing files.

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

46 files changed, 46 insertions, 46 deletions

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 070cc4071ad33..33c81878d2639 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   builder = ./core-builder.sh;
   src = fetchurl {
-    url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.1-bin.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/apache-ant-1.6.1-bin.tar.bz2;
     md5 = "703d0265d05b98afd95be0bc21b98420";
   };
 }
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
index a5fec1fdfd009..1fd0810ede4a9 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   builder = ./core-builder.sh;
   src = fetchurl {
-    url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.2-bin.tar.bz2 ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/apache-ant-1.6.2-bin.tar.bz2;
     md5 = "a568c7271c3f168771c0313926d060fa";
   };
 }
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 16347e39fd161..0826092439c02 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnumake-3.80";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/make/make-3.80.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/make-3.80.tar.bz2;
     md5 = "0bbd1df101bc0294d440471e50feca71";
   };
   patches = [./log.diff];
diff --git a/pkgs/development/tools/documentation/xdoc/default.nix b/pkgs/development/tools/documentation/xdoc/default.nix
index cc56d7e133e42..571bce4535297 100644
--- a/pkgs/development/tools/documentation/xdoc/default.nix
+++ b/pkgs/development/tools/documentation/xdoc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xdoc-0.1";
   src = fetchurl {
-    url = http://machina.nl/xdoc/xdoc-0.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xdoc-0.1.tar.gz;
     md5 = "6f601254013d5fe3d2fdbd33b827001a";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/tools/java/jclasslib/default.nix b/pkgs/development/tools/java/jclasslib/default.nix
index 9aa08d2ce69d4..a81c8f6032ef8 100644
--- a/pkgs/development/tools/java/jclasslib/default.nix
+++ b/pkgs/development/tools/java/jclasslib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jclasslib-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://belnet.dl.sourceforge.net/sourceforge/jclasslib/jclasslib_unix_2_0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jclasslib_unix_2_0.tar.gz;
     md5 = "31d91bb03fee23410689d2f1c4c439b1";
   };
 
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 7af57fb703a4e..9e189a4af7ad3 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "autoconf-2.58";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.58.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/autoconf-2.58.tar.bz2;
     md5 = "db3fa3069c6554b3505799c7e1022e2b";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/misc/automake/automake-1.7.9.nix b/pkgs/development/tools/misc/automake/automake-1.7.9.nix
index e8c23bfa80e71..13b1b7380863a 100644
--- a/pkgs/development/tools/misc/automake/automake-1.7.9.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.7.9.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/automake/automake-1.7.9.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/automake-1.7.9.tar.bz2;
     md5 = "571fd0b0598eb2a27dcf68adcfddfacb";
   };
   buildInputs = [perl autoconf];
diff --git a/pkgs/development/tools/misc/automake/automake-1.9.4.nix b/pkgs/development/tools/misc/automake/automake-1.9.4.nix
index 7d0f58cc55056..e5bcd4fc680a6 100644
--- a/pkgs/development/tools/misc/automake/automake-1.9.4.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.9.4.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/automake/automake-1.9.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/automake-1.9.4.tar.gz;
     md5 = "5b46bde56e321a7bab7832168cf0b9b8";
   };
   buildInputs = [perl autoconf];
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 21d03b19c5a16..307de63c7fc95 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "binutils-2.15";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/binutils/binutils-2.15.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/binutils-2.15.tar.bz2;
     md5 = "624e6b74983ac6b2960edaf2d522ca58";
   };
   patches = [./no-lex.patch];
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 408c97a3563d6..788c32cf6b8af 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "gnum4-1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/m4/m4-1.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/m4-1.4.tar.gz;
     md5 = "9eb2dd07740b2d2f3c7adb3e8d299bda";
   };
 }
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index ded80edca8371..0ded5fe27b513 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gperf-2.7.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/gperf/gperf-2.7.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gperf-2.7.2.tar.gz;
     md5 = "e501acc2e18eed2c8f25ca0ac2330d68";
   };
 }
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 9bf3574fec6cd..c59b26f613f41 100644
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libtool-1.5.2";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libtool-1.5.2.tar.gz;
     md5 = "db66ba05502f533ad0cfd84dc0e03bd5";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 0dae1094666af..b15f04264aa95 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pkgconfig-0.15.0.tar.gz;
     md5 = "a7e4f60a6657dbc434334deb594cc242";
   };
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 2463420540ce9..111ff74f57553 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/strace/strace-4.5.6.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/strace-4.5.6.tar.bz2;
     md5 = "2dd9d23430957a7ee0221efb28c66d1e";
   };
 }
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index e8ba2d23f9873..6c043e3025b31 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/swig/swig-1.3.19.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/swig-1.3.19.tar.gz;
     md5 = "a733455544426b31868dd87fc162e750";
   };
 
diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix
index d97f8ffbbe1ce..b48f4695c2aa3 100644
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ b/pkgs/development/tools/misc/texinfo/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "texinfo-4.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/texinfo-4.6.tar.gz;
     md5 = "5730c8c0c7484494cca7a7e2d7459c64";
   };
   inherit ncurses;
diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix
index 8c3ff3e8a13d6..c98c2fe0756df 100644
--- a/pkgs/development/tools/misc/valgrind/default.nix
+++ b/pkgs/development/tools/misc/valgrind/default.nix
@@ -8,7 +8,7 @@
 stdenv.mkDerivation {
   name = "valgrind-2.2.0";
   src = fetchurl {
-    url = http://developer.kde.org/~sewardj/valgrind-2.2.0.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/valgrind-2.2.0.tar.bz2;
     md5 = "30dc51f6fc94751b90b04af9c2e2c656";
   };
   buildInputs = [perl];
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix b/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
index b12b4af1c869e..7ecdbbf6041b9 100644
--- a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asc-support-1.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asc-support/asc-support-1.8.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asc-support-1.8.tar.gz;
     md5 = "e85a790c6004dfb974d79fc9699f69f4";
   };
   inherit stdenv aterm ptsupport toolbuslib asfsupport;
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix b/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
index a7710ea952bef..ebc4f64ca397d 100644
--- a/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asc-support-1.9";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asc-support/asc-support-1.9.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asc-support-1.9.tar.gz;
     md5 = "0c395efec4d3b582af016ab03306ed0a";
   };
   inherit stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix b/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
index 9559bf75d7af2..666ab4397781c 100644
--- a/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asc-support-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asc-support/asc-support-2.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asc-support-2.0.tar.gz;
     md5 = "34368ca79e524157bf6e89281371cb5a";
   };
   inherit stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix b/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
index d31e3c6e0590e..6232a5bbe5a9e 100644
--- a/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
+++ b/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "asf-library-1.0";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-library/asf-library-1.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-library-1.0.tar.gz;
     md5 = "e531f78941e2d2dab1b87a56522e9fb5";
   };
 }
diff --git a/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix b/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
index 5722012b89c9f..31162b7b2d5a9 100644
--- a/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
+++ b/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "asf-library-1.1";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-library/asf-library-1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-library-1.1.tar.gz;
     md5 = "09b2ccbd115434cedb180e5575d0fa98";
   };
 }
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
index eb97ad9cf0e81..49ad29229d74a 100644
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asf-support-1.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-support/asf-support-1.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-support-1.2.tar.gz;
     md5 = "f32de4c97e62486b67e0af4408585980";
   };
   inherit stdenv aterm ptsupport;
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
index cc9056e9ee0cf..b970a9483ddef 100644
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asf-support-1.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-support/asf-support-1.3.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-support-1.3.tar.gz;
     md5 = "23539387ff9b0423c1c1933a8ff75d27";
   };
   inherit stdenv aterm ptsupport errorsupport;
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
index 5cfea08dbf795..c6043a289bbb7 100644
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "asf-support-1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/asf-support/asf-support-1.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/asf-support-1.4.tar.gz;
     md5 = "520ea7d73094346d3010187f22927870";
   };
   inherit stdenv aterm ptsupport errorsupport;
diff --git a/pkgs/development/tools/parsing/bison/bison-new.nix b/pkgs/development/tools/parsing/bison/bison-new.nix
index e0791b4ab414f..00a7f87e776fa 100644
--- a/pkgs/development/tools/parsing/bison/bison-new.nix
+++ b/pkgs/development/tools/parsing/bison/bison-new.nix
@@ -5,7 +5,7 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-1.875d";
   src = fetchurl {
-    url = ftp://alpha.gnu.org/pub/gnu/bison/bison-1.875d.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bison-1.875d.tar.gz;
     md5 = "faaa4a271ca722fb6c769d72e18ade0b";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 7c08550b87f2e..ba3926878c424 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -5,7 +5,7 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-1.875";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/bison/bison-1.875.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2;
     md5 = "b7f8027b249ebd4dd0cc948943a71af0";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix b/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
index fb24c55a2b960..a55892155f52c 100644
--- a/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
+++ b/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "error-support-0.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/error-support/error-support-0.1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/error-support-0.1.1.tar.gz;
     md5 = "ebd0965e29ee22508a189477b1dae12b";
   };
   inherit aterm toolbuslib;
diff --git a/pkgs/development/tools/parsing/error-support/error-support-0.1.nix b/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
index 58d0c9e03fab1..d84b641a6ad8c 100644
--- a/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
+++ b/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "error-support-0.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/error-support/error-support-0.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/error-support-0.1.tar.gz;
     md5 = "906389fd8b44bf2847d8281450d5a701";
   };
   inherit aterm toolbuslib;
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index efaed6e459f54..c386c2be47659 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -5,7 +5,7 @@ assert yacc != null;
 stdenv.mkDerivation {
   name = "flex-2.5.4a";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/non-gnu/flex/flex-2.5.4a.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flex-2.5.4a.tar.gz;
     md5 = "bd8753d0b22e1f4ec87a553a73021adf";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/flex/flex-new.nix b/pkgs/development/tools/parsing/flex/flex-new.nix
index e102a1d079351..fddd8eaa6cd92 100644
--- a/pkgs/development/tools/parsing/flex/flex-new.nix
+++ b/pkgs/development/tools/parsing/flex/flex-new.nix
@@ -8,7 +8,7 @@ assert yacc != null && m4 != null;
 stdenv.mkDerivation {
   name = "flex-2.5.31";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/lex/flex-2.5.31.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flex-2.5.31.tar.bz2;
     md5 = "363dcc4afc917dc51306eb9d3de0152f";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/happy/default.nix b/pkgs/development/tools/parsing/happy/default.nix
index ac3fb088bbab3..2bfc703deb79c 100644
--- a/pkgs/development/tools/parsing/happy/default.nix
+++ b/pkgs/development/tools/parsing/happy/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "happy-1.14";
   src = fetchurl {
-    url = http://www.haskell.org/happy/dist/1.14/happy-1.14-src.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/happy-1.14-src.tar.gz;
     md5 = "501b5b63533b2e2838de18085e8c4492";
   };
   buildInputs = [ghc perl];
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix b/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
index 8eea83cea0a55..1e0d80eab0d9c 100644
--- a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgen-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pgen/pgen-2.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pgen-2.0.tar.gz;
     md5 = "368cd8abeed29591a35660d8cea79975";
   };
   inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr;
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.1.nix b/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
index de6132881a255..5758dfb9a166b 100644
--- a/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgen-2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pgen/pgen-2.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pgen-2.1.tar.gz;
     md5 = "3fd46ae1ddc891a488f74350d7b477f9";
   };
   inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.2.nix b/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
index 731b981b1a3a6..70d4fd0fc839b 100644
--- a/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgen-2.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pgen/pgen-2.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pgen-2.2.tar.gz;
     md5 = "e23323a96d7b1f72a0e10673fa93ef7c";
   };
   inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
index ed8bde95c0ee7..39b0c20318345 100644
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pt-support-1.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pt-support/pt-support-1.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pt-support-1.0.tar.gz;
     md5 = "cc96dc2bfbaf3f218dfe9a0b8bb4d801";
   };
   inherit aterm toolbuslib;
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
index 9058917f05f4a..6ba2bf7450d00 100644
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pt-support-1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pt-support/pt-support-1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pt-support-1.1.tar.gz;
     md5 = "51bad46427c7cf95d029c33f079581ff";
   };
   inherit aterm toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
index fb7de5d384426..b86a615a4a783 100644
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pt-support-1.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/pt-support/pt-support-1.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pt-support-1.2.tar.gz;
     md5 = "2ba2fa388130b11b9b91970ebe20c1c7";
   };
   inherit aterm toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
index 4b314887a914b..167db88a5f267 100644
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sdf-support-2.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sdf-support/sdf-support-2.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sdf-support-2.0.tar.gz;
     md5 = "2987b89ed1d73e34e128b895ff44264c";
   };
   inherit stdenv aterm ptsupport toolbuslib;
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
index 5a2eb7bcfea76..33d9c6da380d2 100644
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sdf-support-2.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sdf-support/sdf-support-2.1.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sdf-support-2.1.1.tar.gz;
     md5 = "28b2c044ee711d6c5f22772b7dfafb76";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
index 61746eb099bdd..e0c1b697cc0b2 100644
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sdf-support-2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sdf-support/sdf-support-2.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sdf-support-2.1.tar.gz;
     md5 = "dbb1d3c51a82dadfaaf5319dba5cc9ef";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix b/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
index 5a464ad40e54d..6bc5663077099 100644
--- a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sglr-3.10.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sglr/sglr-3.10.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sglr-3.10.2.tar.gz;
     md5 = "39aa609be84115d7ddc56a6c74b792b7";
   };
   inherit stdenv aterm ptsupport toolbuslib;
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.11.nix b/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
index 9e3b956350887..181387bf6213c 100644
--- a/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sglr-3.11";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sglr/sglr-3.11.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sglr-3.11.tar.gz;
     md5 = "c60536c7e967e93d1ec2cd9c8ae0a4ae";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.12.nix b/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
index 0ecfa5d42db38..dc6dfa8ee7a7c 100644
--- a/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sglr-3.12";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/sglr/sglr-3.12.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sglr-3.12.tar.gz;
     md5 = "053753e419adfc337c4776412e3787ab";
   };
   inherit stdenv aterm ptsupport toolbuslib errorsupport;
diff --git a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
index 4b93aa24bafc6..e14be3815ee9f 100644
--- a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
+++ b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "toolbuslib-0.5.1";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.5.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/toolbuslib-0.5.1.tar.gz;
     md5 = "1c7c7cce870f813bef60bbffdf061c90";
   };
   buildInputs = [aterm];
diff --git a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
index c49ac9f0663a2..22b37a0d58a5c 100644
--- a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
+++ b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "toolbuslib-0.6";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/toolbuslib-0.6.tar.gz;
     md5 = "e117c574b428408ad172b1ad904ff430";
   };
   buildInputs = [aterm];