* 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

21 files changed, 21 insertions, 21 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 87038c7f26c7..070cc4071ad3 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://nix.cs.uu.nl/dist/tarballs/apache-ant-1.6.1-bin.tar.bz2;
+    url = http://www.apache.org/dist/ant/binaries/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 aed7ebd66d39..668a6c4d6b56 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://nix.cs.uu.nl/dist/tarballs/apache-ant-1.6.5-bin.tar.bz2;
+    url = http://apache.surfnet.nl/ant/binaries/apache-ant-1.6.5-bin.tar.bz2;
     md5 = "26031ee1a2fd248ad0cc2e7f17c44c39";
   };
 }
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 9e751902922d..66de0c954835 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.81";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/make-3.81.tar.bz2;
+    url = http://ftp.gnu.org/pub/gnu/make/make-3.81.tar.bz2;
     md5 = "354853e0b2da90c527e35aabb8d6f1e6";
   };
   
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 960d9ea8e332..134c35307b56 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "scons-0.96.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/scons-0.96.1.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/scons/scons-0.96.1.tar.gz;
     md5 = "45b1c346edd8a0970210aeb1e82557c9";
   };
   buildInputs = [python];
diff --git a/pkgs/development/tools/documentation/xdoc/default.nix b/pkgs/development/tools/documentation/xdoc/default.nix
index 324090532546..cc56d7e133e4 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://nix.cs.uu.nl/dist/tarballs/xdoc-0.1.tar.gz;
+    url = http://machina.nl/xdoc/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 dc0d475c4389..49b21c23397f 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://nix.cs.uu.nl/dist/tarballs/jclasslib_unix_2_0.tar.gz;
+    url = http://belnet.dl.sourceforge.net/sourceforge/jclasslib/jclasslib_unix_2_0.tar.gz;
     md5 = "31d91bb03fee23410689d2f1c4c439b1";
   };
 
diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
index d6e76d485303..745964accafc 100644
--- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/automake-1.9.6.tar.gz;
+    url = ftp://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.gz;
     md5 = "c60f77a42f103606981d456f1615f5b4";
   };
   buildInputs = [perl autoconf];
diff --git a/pkgs/development/tools/misc/binutils-cross/default.nix b/pkgs/development/tools/misc/binutils-cross/default.nix
index b3949e43f5c7..7d77baced373 100644
--- a/pkgs/development/tools/misc/binutils-cross/default.nix
+++ b/pkgs/development/tools/misc/binutils-cross/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "binutils-2.16.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.16.1.tar.bz2;
+    url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2;
     md5 = "6a9d529efb285071dad10e1f3d2b2967";
   };
   inherit noSysDirs;
diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix
index 2957710a34f1..a8f4a821a20c 100644
--- a/pkgs/development/tools/misc/ctags/default.nix
+++ b/pkgs/development/tools/misc/ctags/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ctags-5.5.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ctags-5.5.4.tar.gz;
+    url = http://heanet.dl.sourceforge.net/sourceforge/ctags/ctags-5.5.4.tar.gz;
     md5 = "a84124caadd4103270e0b84596ecfe83";
   };
 }
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 19b9848309da..0a9e66568b5f 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "help2man-1.35.1";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/help2man-1.35.1.tar.gz;
+    url = http://ftp.gnu.org/gnu/help2man/help2man-1.35.1.tar.gz;
     md5 = "e3c9e846dd163eb7f1d1661e2d0baa07";
   };
 
diff --git a/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix b/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
index 7705265667bc..1a7be3747194 100644
--- a/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
+++ b/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "help2man-1.36.4";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/help2man-1.36.4.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/help2man/help2man-1.36.4.tar.gz;
     md5 = "d31a0a38c2ec71faa06723f6b8bd3076";
   };
 
diff --git a/pkgs/development/tools/misc/kcachegrind/default.nix b/pkgs/development/tools/misc/kcachegrind/default.nix
index 171a6e60e30f..d6ceaa4eb5dc 100644
--- a/pkgs/development/tools/misc/kcachegrind/default.nix
+++ b/pkgs/development/tools/misc/kcachegrind/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "kcachegrind-0.4.6";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/kcachegrind-0.4.6.tar.gz;
+    url = http://kcachegrind.sourceforge.net/kcachegrind-0.4.6.tar.gz;
     md5 = "4ed60028dcefd6bf626635d5f2f50273";
   };
 
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 889ebb345027..226552b3943e 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.22";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libtool-1.5.22.tar.gz;
+    url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz;
     md5 = "8e0ac9797b62ba4dcc8a2fb7936412b0";
   };
   buildInputs = [m4 perl];
diff --git a/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix b/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix
index 72777d891fce..43151ba589af 100644
--- a/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix
+++ b/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "antlr-2.7.6";
   builder = ./builder2.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/antlr-2.7.6.tar.gz;
+    url = http://www.antlr.org/download/antlr-2.7.6.tar.gz;
     md5 = "17d8bf2e814f0a26631aadbbda8d7324";
   };
   inherit jre;
diff --git a/pkgs/development/tools/parsing/antlr/default.nix b/pkgs/development/tools/parsing/antlr/default.nix
index e0ae25597786..deb8040256b5 100644
--- a/pkgs/development/tools/parsing/antlr/default.nix
+++ b/pkgs/development/tools/parsing/antlr/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "antlr-3.0b3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/antlr-3.0b3.tar.gz;
+    url = http://www.antlr.org/download/antlr-3.0b3.tar.gz;
     md5 = "6a7e70ccece8149b735cc3aaa24241cc";
   };
   inherit jre;
diff --git a/pkgs/development/tools/parsing/bison/bison-2.3.nix b/pkgs/development/tools/parsing/bison/bison-2.3.nix
index bf424aee8700..c732dd0afcf1 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.3.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.3.nix
@@ -5,7 +5,7 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-2.3";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bison-2.3.tar.bz2;
+    url = ftp://ftp.nluug.nl/pub/gnu/bison/bison-2.3.tar.bz2;
     md5 = "c18640c6ec31a169d351e3117ecce3ec";
   };
   buildInputs = [m4];
diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
index be1dbcdfe5ec..b6ba4b81c39c 100644
--- a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
+++ b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
@@ -8,7 +8,7 @@ assert yacc != null && m4 != null;
 stdenv.mkDerivation {
   name = "flex-2.5.33";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/flex-2.5.33.tar.bz2;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/flex/flex-2.5.33.tar.bz2;
     md5 = "343374a00b38d9e39d1158b71af37150";
   };
   buildInputs = [yacc];
diff --git a/pkgs/development/tools/parsing/happy/default.nix b/pkgs/development/tools/parsing/happy/default.nix
index e46b7292da83..ac3fb088bbab 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://nix.cs.uu.nl/dist/tarballs/happy-1.14-src.tar.gz;
+    url = http://www.haskell.org/happy/dist/1.14/happy-1.14-src.tar.gz;
     md5 = "501b5b63533b2e2838de18085e8c4492";
   };
   buildInputs = [ghc perl];
diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix
index 1699857a12d7..9fe1207ba224 100644
--- a/pkgs/development/tools/parsing/jikespg/default.nix
+++ b/pkgs/development/tools/parsing/jikespg/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jikespg-1.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/jikespg-1.3.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/jikes/jikespg-1.3.tar.gz;
     md5 = "eba183713d9ae61a887211be80eeb21f";
   };
 }
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 def781540910..4b93aa24bafc 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://nix.cs.uu.nl/dist/tarballs/toolbuslib-0.5.1.tar.gz;
+    url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/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 a231e834d3f6..c49ac9f0663a 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://nix.cs.uu.nl/dist/tarballs/toolbuslib-0.6.tar.gz;
+    url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.6.tar.gz;
     md5 = "e117c574b428408ad172b1ad904ff430";
   };
   buildInputs = [aterm];