* 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

10 files changed, 10 insertions, 10 deletions

diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 57531c69f295..39aa48353fc6 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "diffutils-2.8.1";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/diffutils-2.8.1.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz;
     md5 = "71f9c5ae19b60608f6c7f162da86a428";
   };
   /* If no explicit coreutils is given, use the one from stdenv. */
diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix
index 725875e74caf..67dc4302d03f 100644
--- a/pkgs/tools/text/enscript/default.nix
+++ b/pkgs/tools/text/enscript/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "enscript-1.6.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/enscript-1.6.4.tar.gz;
+    url = http://www.iki.fi/mtr/genscript/enscript-1.6.4.tar.gz;
     md5 = "b5174b59e4a050fb462af5dbf28ebba3";
   };
 }
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index ccfeb6466a05..2c495f8c2711 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gawk-3.1.5";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gawk-3.1.5.tar.bz2;
+    url = ftp://ftp.gnu.org/gnu/gawk/gawk-3.1.5.tar.bz2;
     md5 = "5703f72d0eea1d463f735aad8222655f";
   };
 }
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index a787fc253a69..15a7a5ad2393 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnugrep-2.5.1a";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/grep-2.5.1a.tar.bz2;
+    url = http://ftp.gnu.org/gnu/grep/grep-2.5.1a.tar.bz2;
     md5 = "52202fe462770fa6be1bb667bd6cf30c";
   };
   buildInputs = [pcre];
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index 3206e1023fb3..bb1faf214e67 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnupatch-2.5.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/patch-2.5.4.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/patch/patch-2.5.4.tar.gz;
     md5 = "ee5ae84d115f051d87fcaaef3b4ae782";
   };
 
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 9395fcd1a401..d55639494f05 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnused-4.1.5";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sed-4.1.5.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/sed/sed-4.1.5.tar.gz;
     md5 = "7a1cbbbb3341287308e140bd4834c3ba";
   };
   # !!! hack: this should go away in gnused > 4.1.5
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 87b4a0f8228a..fde60a4e5f6a 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "groff-1.19.2";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/groff-1.19.2.tar.gz;
+    url = ftp://ftp.gnu.org/gnu/groff/groff-1.19.2.tar.gz;
     md5 = "f7c9cf2e4b9967d3af167d7c9fadaae4";
   };
 }
diff --git a/pkgs/tools/text/xml/jing/default.nix b/pkgs/tools/text/xml/jing/default.nix
index f101f0ff7b57..5b7c0803fc8a 100644
--- a/pkgs/tools/text/xml/jing/default.nix
+++ b/pkgs/tools/text/xml/jing/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./unzip-builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/jing-20030619.zip;
+    url = http://www.thaiopensource.com/download/jing-20030619.zip;
     md5 = "f9b0775d8740f16ab3df82ad3707a093";
   };
 
diff --git a/pkgs/tools/text/xml/sablotron/default.nix b/pkgs/tools/text/xml/sablotron/default.nix
index e0aefb5f11a3..a523ebe954c2 100644
--- a/pkgs/tools/text/xml/sablotron/default.nix
+++ b/pkgs/tools/text/xml/sablotron/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "sablotron-1.0.3";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/Sablot-1.0.3.tar.gz;
+    url = http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz;
     md5 = "72654c4b832e7562f8240ea675577f5e";
   };
   buildInputs = [expat];
diff --git a/pkgs/tools/text/xml/trang/default.nix b/pkgs/tools/text/xml/trang/default.nix
index efd2c897dea1..b87a5575d26c 100644
--- a/pkgs/tools/text/xml/trang/default.nix
+++ b/pkgs/tools/text/xml/trang/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/trang-20030619.zip;
+    url = http://www.thaiopensource.com/download/trang-20030619.zip;
     md5 = "9611ea59fda0f62fecc4a5017a72984e";
   };