* 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

6 files changed, 8 insertions, 8 deletions

diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index f0aff0c80582..89e61553ec20 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://archive.apache.org/dist/httpd/httpd-2.0.52.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/httpd-2.0.52.tar.bz2;
     md5 = "0e1b47c53921a1fc8fb006effdb3bf1c";
   };
 
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 20cc2b223327..b561b56b351c 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   builder = ./bin-builder.sh;
 
   src = fetchurl {
-    url = http://belnet.dl.sourceforge.net/sourceforge/jetty/jetty-4.2.22.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jetty-4.2.22.tar.gz;
     md5 = "e89c582d1846cd7d31e402abaf801e17";
   };
 }
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 4ea86930bc8c..16ab4bb5d174 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://apache.essentkabel.com/jakarta/tomcat-5/v5.0.27/bin/jakarta-tomcat-5.0.27.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jakarta-tomcat-5.0.27.tar.gz;
     md5 = "b802ee042677e284bcf65738c7bdc3b6";
   };
 
diff --git a/pkgs/servers/sql/mysql/default.nix b/pkgs/servers/sql/mysql/default.nix
index 40d9500d1fb7..b13675bea44d 100644
--- a/pkgs/servers/sql/mysql/default.nix
+++ b/pkgs/servers/sql/mysql/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 #  builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/mysql-4.1.9.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mysql-4.1.9.tar.gz;
     md5 = "7bc44befe155d619c4e4705f68874278";
   };
 
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index c3f80fce61dc..e587ca7a9579 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://ftp2.nl.postgresql.org/mirror/postgresql/src/7.4.5/postgresql-7.4.5.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/postgresql-7.4.5.tar.bz2;
     md5 = "97e750c8e69c208b75b6efedc5a36efb";
   };
 
diff --git a/pkgs/servers/x11/xfree86/default.nix b/pkgs/servers/x11/xfree86/default.nix
index 63eff2baf02b..67a26d41a4be 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 = ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-1.tgz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/X430src-1.tgz;
     md5 = "4f241a4f867363f40efa2b00dca292af";
   };
   src2 = fetchurl {
-    url = ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-2.tgz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/X430src-2.tgz;
     md5 = "844c2ee908d21dbf8911fd13115bf8b4";
   };
   src3 = fetchurl {
-    url = ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-3.tgz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/X430src-3.tgz;
     md5 = "b82a0443e1b7bf860e4343e6b6766cb6";
   };