* Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl

  URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

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

15 files changed, 15 insertions, 15 deletions

diff --git a/pkgs/development/libraries/java/aterm/default.nix b/pkgs/development/libraries/java/aterm/default.nix
index 35b6ea258ed..5a3f735b43a 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://nix.cs.uu.nl/dist/tarballs/aterm-java-1.6.tar.gz;
+    url = http://www.cwi.nl/projects/MetaEnv/aterm-java/aterm-java-1.6.tar.gz;
     md5 = "abf475dae2f5efca865fcdff871feb5e";
   };
   buildInputs = [stdenv jdk sharedobjects jjtraveler];
diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix
index adee415651b..1181cef074e 100644
--- a/pkgs/development/libraries/java/cup/default.nix
+++ b/pkgs/development/libraries/java/cup/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/java_cup_v10k.tar.gz;
+    url = http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz;
     md5 = "8b11edfec13c590ea443d0f0ae0da479";
   };
 
diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix
index 55f0483720a..67baff53d42 100644
--- a/pkgs/development/libraries/java/httpunit/default.nix
+++ b/pkgs/development/libraries/java/httpunit/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/httpunit-1.6.zip;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/httpunit/httpunit-1.6.zip;
     md5 = "e94b53b9f4d7bdb706e4baac95b6e424";
   };
 
diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
index 4f6f2a7109e..a609532f282 100644
--- a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
+++ b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/commons-fileupload-1.0.tar.gz;
+    url = http://archive.apache.org/dist/jakarta/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz;
     md5 = "5618b26b1a5c006d7236fb4465e907b6";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/java/javasvn/default.nix b/pkgs/development/libraries/java/javasvn/default.nix
index bf3ea40e5dd..2c43ba7043b 100644
--- a/pkgs/development/libraries/java/javasvn/default.nix
+++ b/pkgs/development/libraries/java/javasvn/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/org.tmatesoft.svn_1.0.6.standalone.zip;
+    url = http://tmate.org/svn/org.tmatesoft.svn_1.0.6.standalone.zip;
     md5 = "459cae849eceef04cd65fd6fb54affcc";
   };
   
diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix
index 8b09a9d6ab1..bca165bb324 100644
--- a/pkgs/development/libraries/java/jdom/default.nix
+++ b/pkgs/development/libraries/java/jdom/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/jdom-1.0.tar.gz;
+    url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz;
     md5 = "ce29ecc05d63fdb419737fd00c04c281";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix
index bfb8b3f7a03..4d0eda22c5b 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/jflex-1.4.1.tar.gz;
+    url = http://jflex.de/jflex-1.4.1.tar.gz;
     md5 = "9e4be6e826e6b344e84c0434d6fd4b46";
   };
 }
diff --git a/pkgs/development/libraries/java/jjtraveler/default.nix b/pkgs/development/libraries/java/jjtraveler/default.nix
index 01199f9e22f..cb359fd9492 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://nix.cs.uu.nl/dist/tarballs/JJTraveler-0.4.3.tar.gz;
+    url = http://www.cwi.nl/projects/MetaEnv/jjtraveler/JJTraveler-0.4.3.tar.gz;
     md5 = "35bf801ee61f042513ae88247fe1bf1d";
   };
   buildInputs = [stdenv jdk];
diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index ed7969bb311..84004f973b6 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/junit3.8.1.zip;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip;
     md5 = "5110326e4b7f7497dfa60ede4b626751";
   };
 
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index 40ee2c64fc9..9380591636c 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/lucene-1.4.1.tar.gz;
+    url = http://cvs.apache.org/dist/jakarta/lucene/v1.4.1/lucene-1.4.1.tar.gz;
     md5 = "656a6f40f5b8f7d2e19453436848bfe8";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix
index ef1970f74e8..5315cc63f1c 100644
--- a/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/pkgs/development/libraries/java/mockobjects/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/mockobjects-bin-0.09.tar;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/mockobjects/mockobjects-bin-0.09.tar;
     md5 = "a0e11423bd5fcbb6ea65753643ea8852";
   };
 }
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index 475f0ac9c9c..cab9fafdf8d 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://nix.cs.uu.nl/dist/tarballs/saxon6_5_3.zip;
+    url = http://belnet.dl.sourceforge.net/sourceforge/saxon/saxon6_5_3.zip;
     md5 = "7b8c7c187473c04d2abdb40d8ddab5c6";
   };
 
diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix
index cc76ca8ac4a..c0f12248b3c 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://nix.cs.uu.nl/dist/tarballs/shared-objects-1.4.tar.gz;
+    url = http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz;
     md5 = "c1f2c58bd1a07be32da8a6b89354a11f";
   };
   buildInputs = [stdenv jdk];
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index 196237e15db..f06f9ff5be9 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   # releases of SWT.  So we just grab a binary release and extract
   # "src.zip" from that.
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/swt-3.1.1-gtk-linux-x86.zip;
+    url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.1-200509290840/swt-3.1.1-gtk-linux-x86.zip;
     md5 = "23dfe5a4a566439c5f526d9ea3b3db1c";
   };
   
diff --git a/pkgs/development/libraries/java/xalanj/default.nix b/pkgs/development/libraries/java/xalanj/default.nix
index b286d94d614..af13a5015fd 100644
--- a/pkgs/development/libraries/java/xalanj/default.nix
+++ b/pkgs/development/libraries/java/xalanj/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "xalanj-2.7.0";
   directory = "xalan-j_2_7_0";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xalan-j_2_7_0-bin-2jars.tar.gz;
+    url = "http://apache.cs.uu.nl/dist/xml/xalan-j/xalan-j_2_7_0-bin-2jars.tar.gz";
     md5 = "4d7b03dcaf2484b5f9685cc4309a9910";
   };
   builder = ./builder.sh;