* 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

9 files changed, 9 insertions, 9 deletions

diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index bdf5a50aa0b..18d00169729 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/pkgs/tools/misc/bc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "bc-1.0.6";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bc-1.06.tar.gz;
+    url = http://ftp.gnu.org/pub/gnu/bc/bc-1.06.tar.gz;
     md5 = "d44b5dddebd8a7a7309aea6c36fda117";
   };
 
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index bfdd60626d6..d7e31e9cf32 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "file-4.17";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/file-4.17.tar.gz;
+    url = ftp://ftp.astron.com/pub/file/file-4.17.tar.gz;
     md5 = "50919c65e0181423d66bb25d7fe7b0fd";
   };
 }
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 9a1ee4319df..0a406f72b46 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -7,7 +7,7 @@ else
 stdenv.mkDerivation {
   name = "grub-0.97";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/grub-0.97.tar.gz;
+    url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
     md5 = "cd3f3eb54446be6003156158d51f4884";
   };
 }
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index 952599e6937..6229ca60d4c 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "jdiskreport-1.2.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/jdiskreport-1_2_3.zip;
+    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_2_3.zip;
     md5 = "4a33c5c1344ed9e0fa531e2cb1875cb8";
   };
   buildInputs = [unzip];
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index e6ece605c53..ad7fe970d31 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "less-394";
  
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/less-394.tar.gz;
+    url = http://www.greenwoodsoftware.com/less/less-394.tar.gz;
     md5 = "a9f072ccefa0d315b325f3e9cdbd4b97";
   };
  
diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man/default.nix
index cc5166d6648..deb0f83ad8a 100644
--- a/pkgs/tools/misc/man/default.nix
+++ b/pkgs/tools/misc/man/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "man-2.4.3";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/man-db-2.4.3.tar.gz;
+    url = http://savannah.nongnu.org/download/man-db/man-db-2.4.3.tar.gz;
     md5 = "30814a47f209f43b152659ba51fc7937";
   };
   buildInputs = [db4 groff];
diff --git a/pkgs/tools/misc/qtparted/default.nix b/pkgs/tools/misc/qtparted/default.nix
index cebda2dea05..9f56b026f95 100644
--- a/pkgs/tools/misc/qtparted/default.nix
+++ b/pkgs/tools/misc/qtparted/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "qtparted-0.4.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/qtparted-0.4.4.tar.bz2;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/qtparted/qtparted-0.4.4.tar.bz2;
     md5 = "b8253bf21eaebe1f2c22b50462e8046c";
   };
   buildInputs = [e2fsprogs ncurses readline parted libXext libX11 zlib qt3];
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 482b6acf0ae..64eb6ed125c 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "screen-4.0.2";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/screen-4.0.2.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/screen/screen-4.0.2.tar.gz;
     md5 = "ed68ea9b43d9fba0972cb017a24940a1";
   };
 
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index d1e08c33897..5c8d6f37c7c 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://nix.cs.uu.nl/dist/tarballs/xsel-0.9.6.tar.gz;
+    url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-0.9.6.tar.gz;
     md5 = "cec2fb09a4101b7f2beab8094234e2f4";
   };