* 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

31 files changed, 31 insertions, 33 deletions

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index e901dcb0f0480..e8aeb929f71b0 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnutar-1.14";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/tar/tar-1.14.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tar-1.14.tar.bz2;
     md5 = "f1932e0fbd4641885bfdcc75495c91b7";
   };
 }
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index c871c7755d6e7..8f68baa2e7d70 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "unzip-5.50";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/unzip550.tar.gz;
     md5 = "798592d62e37f92571184236947122ed";
   };
 }
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index d5f8f910a7e8b..055ea5f4b6000 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -2,7 +2,7 @@
   name = "zip-2.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.info-zip.org/pub/infozip/src/zip23.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zip23.tar.gz;
     md5 = "5206a99541f3b0ab90f1baa167392c4f";
   };
 }
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
index 9f1c3ecf8bcb5..2e761e6bcd3df 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://www.daemonology.net/bsdiff/bsdiff-4.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bsdiff-4.2.tar.gz;
     md5 = "9f582a77eb76d116d82d1ad268ef48fa";
   };
   patches = [./makefile.patch];
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index afe2a620377e3..128a5d71a2c86 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bzip2-1.0.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bzip2-1.0.2.tar.gz;
     md5 = "ee76864958d568677f03db8afad92beb";
   };
 }
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 7e324fc91271e..fded4d785a68b 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://www.gzip.org/gzip-1.3.3.tar.gz;
+    url = http://catamaran.labs.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 8bd6d8a0e16b1..466b3b4191b1e 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://cis.poly.edu/zdelta/downloads/zdelta-2.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zdelta-2.1.tar.gz;
     md5 = "c69583a64f42f69a39e297d0d27d77e5";
   };
 }
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 8e03439e32e1b..e29554c78ac5c 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -6,9 +6,7 @@ stdenv.mkDerivation {
   name = "graphviz-1.12";
 
   src = fetchurl {
-#    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz;
-#    md5 = "e1402531abff68d146bf94e72b44dc2a";
-    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/graphviz-1.12.tar.gz;
     md5 = "a5c004c42f58c957f772060d0889059c";
   };
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 01b5044fbeb38..4e5b6f17f7529 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 = ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-5.2.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/coreutils-5.2.1.tar.bz2;
     md5 = "172ee3c315af93d3385ddfbeb843c53f";
   };
 }
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index ea20991062965..6210f5e3fc59e 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "findutils-4.1.20";
   src = fetchurl {
-    url = ftp://alpha.gnu.org/pub/gnu/findutils/findutils-4.1.20.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/findutils-4.1.20.tar.gz;
     md5 = "e90ce7222daadeb8616b8db461e17cbc";
   };
 }
diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix
index b02648e8c9305..bac1293004c4f 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://huizen.dds.nl/~frodol/getopt-1.1.3.tar.gz;
+    url = http://catamaran.labs.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 db5a118091478..9b9d382a57525 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 = ftp://ftp.nluug.nl/pub/gnu/less/less-382.tar.gz;
+    url = http://catamaran.labs.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 4fffe6413332e..44528e08855d2 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 = ftp://ftp.nluug.nl/pub/gnu/screen/screen-4.0.2.tar.gz;
+    url = http://catamaran.labs.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 be5e85cc20f17..cd50e7c930107 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://heanet.dl.sourceforge.net/sourceforge/xmltv/xmltv-0.5.37.tar.bz2;
+    url = http://catamaran.labs.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 5c8d6f37c7c66..283edf2ea6749 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://www.vergenet.net/~conrad/software/xsel/download/xsel-0.9.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xsel-0.9.6.tar.gz;
     md5 = "cec2fb09a4101b7f2beab8094234e2f4";
   };
 
diff --git a/pkgs/tools/networking/bittorrent/default.nix b/pkgs/tools/networking/bittorrent/default.nix
index c4b19c9f807e3..f516ea4225aa6 100644
--- a/pkgs/tools/networking/bittorrent/default.nix
+++ b/pkgs/tools/networking/bittorrent/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "bittorrent-3.4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/bittorrent/BitTorrent-3.4.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/BitTorrent-3.4.2.tar.gz;
     md5 = "b854f25a33289565bcaeaded04955c1a";
   };
   inherit wxPython;
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index 643355eb5d2e5..70c48c4be1354 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://www.fodder.org/cksfv/cksfv-1.3.tar.gz;
+    url = http://catamaran.labs.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 f5ca543f70b0f..0afb683a64795 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 = ftp://ftp.bit.nl/mirror/openssh/openssh-3.8.1p1.tar.gz;
+    url = http://catamaran.labs.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 3c669d20c686f..005eb46da2e20 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://heanet.dl.sourceforge.net/sourceforge/parchive/par2cmdline-0.3.tar.gz;
+    url = http://catamaran.labs.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 95f59ca123899..9429a181b609a 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 = ftp://ftp.nl.net/pub/gnu/wget/wget-1.9.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/wget-1.9.1.tar.gz;
     md5 = "e6051f1e1487ec0ebfdbda72bedc70ad";
   };
 }
diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix
index 279448baded9b..33e9580cead1a 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 = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.5.tar.gz;
+    url = http://catamaran.labs.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 0e32a8f6dc0a0..6230ea978ec9a 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://download.insecure.org/nmap/dist/nmap-3.55.tar.bz2;
+    url = http://catamaran.labs.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 0c9f6b6a7764e..6cfe25183b961 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://ftp.gnu.org/gnu/which/which-2.16.tar.gz;
+    url = http://catamaran.labs.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 783bf5d06f747..847c494c3d22b 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 = ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz;
+    url = http://catamaran.labs.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 dbbd944e05ec6..f25f62d04d194 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 = ftp://ftp.gnu.org/pub/gnu/ed/ed-0.2.tar.gz;
+    url = http://catamaran.labs.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 67dc4302d03fb..a84c6eb5178a3 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://www.iki.fi/mtr/genscript/enscript-1.6.4.tar.gz;
+    url = http://catamaran.labs.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 be599115e671a..34db9ba3afa50 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 = ftp://ftp.nluug.nl/pub/gnu/gawk/gawk-3.1.4.tar.bz2;
+    url = http://catamaran.labs.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 e5e02730e6d6e..c11afc38eeb7f 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 = ftp://ftp.nluug.nl/pub/gnu/patch/patch-2.5.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/patch-2.5.4.tar.gz;
     md5 = "ee5ae84d115f051d87fcaaef3b4ae782";
   };
 }
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index da970828cbe0f..c88c339aa5959 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnused-4.1.2";
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/sed/sed-4.1.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sed-4.1.2.tar.gz;
     md5 = "928f0e06422f414091917401f1a834d0";
   };
 }
diff --git a/pkgs/tools/text/xml/jing/default.nix b/pkgs/tools/text/xml/jing/default.nix
index 5b7c0803fc8a1..3e261d9e618f9 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://www.thaiopensource.com/download/jing-20030619.zip;
+    url = http://catamaran.labs.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 dfa8a43974a02..aa44e64af7aa9 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://pauillac.inria.fr/~maranget/hevea/distri/hevea-1.07.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hevea-1.07.tar.gz;
     md5 = "561d7a2c10ea9e6a5b352c24d9b65998";
   };
   buildInputs = [ocaml];