* 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

12 files changed, 12 insertions, 12 deletions

diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 7af57fb703a4..9e189a4af7ad 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 e8c23bfa80e7..13b1b7380863 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 7d0f58cc5505..e5bcd4fc680a 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 21d03b19c5a1..307de63c7fc9 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 408c97a3563d..788c32cf6b8a 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 ded80edca837..0ded5fe27b51 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 9bf3574fec6c..c59b26f613f4 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 0dae1094666a..b15f04264aa9 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 2463420540ce..111ff74f5755 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 e8ba2d23f987..6c043e3025b3 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 d97f8ffbbe1c..b48f4695c2aa 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 8c3ff3e8a13d..c98c2fe0756d 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];