* 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

4 files changed, 4 insertions, 4 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];