14 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 97a12ecc1d2f..8072c5865807 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnutar-1.16.1";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/tar/tar-1.16.1.tar.bz2;
+    url = mirror://gnu/tar/tar-1.16.1.tar.bz2;
     md5 = "d51593461c5ef1f7e37134f22338bb9e";
   };
   patches = [./implausible.patch];
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index 18d00169729d..48de3879d393 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://ftp.gnu.org/pub/gnu/bc/bc-1.06.tar.gz;
+    url = mirror://gnu/bc/bc-1.06.tar.gz;
     md5 = "d44b5dddebd8a7a7309aea6c36fda117";
   };
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 5d5c6d258d62..a6079654d461 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "coreutils-6.9";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-6.9.tar.bz2;
+    url = mirror://gnu/coreutils/coreutils-6.9.tar.bz2;
     sha256 = "1c4p2kiy4m024qcl1przvphy8vhivf8jvclq6bjm1pjps5d8khl9";
   };
 }
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 69b9b777c4c5..812b0c78e2cd 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation {
   name = "findutils-4.2.30";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/findutils/findutils-4.2.30.tar.gz;
+    url = mirror://gnu/findutils/findutils-4.2.30.tar.gz;
     sha256 = "1x1s0h1gf4hxh6xi6vq336sz8zsh4hvnsslc7607z41l82xrqjrl";
   };
   buildInputs = [coreutils];
+
   patches = [ ./findutils-path.patch ./change_echo_path.patch ]
-  
     # Note: the dietlibc patch is just to get findutils to compile.
     # The locate command probably won't work though.
     ++ stdenv.lib.optional (stdenv ? isDietLibC) ./dietlibc-hack.patch;
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 169d541e3922..d135a63dd949 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "parted-1.8.7";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/parted/parted-1.8.7.tar.bz2;
+    url = mirror://gnu/parted/parted-1.8.7.tar.bz2;
     sha256 = "0njabfinn1kbkdx80gayqanpammnl28pklli34bymhx1sxn82kk3";
   };
   buildInputs = [e2fsprogs readline];
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 64eb6ed125cb..f8c49bed673d 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 = ftp://ftp.nluug.nl/pub/gnu/screen/screen-4.0.2.tar.gz;
+    url = mirror://gnu/screen/screen-4.0.2.tar.gz;
     md5 = "ed68ea9b43d9fba0972cb017a24940a1";
   };
 
diff --git a/pkgs/tools/misc/su/default.nix b/pkgs/tools/misc/su/default.nix
index 1cfc80376560..440c33e8f5c9 100644
--- a/pkgs/tools/misc/su/default.nix
+++ b/pkgs/tools/misc/su/default.nix
@@ -7,7 +7,7 @@
 stdenv.mkDerivation {
   name = "su-6.7";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-6.7.tar.bz2;
+    url = mirror://gnu/coreutils/coreutils-6.7.tar.bz2;
     md5 = "a16465d0856cd011a1acc1c21040b7f4";
   };
   patches = [
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix
index b01cddb4edf7..281e0a08bfbe 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/pkgs/tools/misc/time/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "time-1.7";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/pub/gnu/time/time-1.7.tar.gz;
+    url = mirror://gnu/time/time-1.7.tar.gz;
     sha256 = "0va9063fcn7xykv658v2s9gilj2fq4rcdxx2mn2mmy1v4ndafzp3";
   };
   meta = {
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 5ae36a4f2155..8817466432da 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "wget-1.10.2";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/wget/wget-1.10.2.tar.gz;
+    url = mirror://gnu/wget/wget-1.10.2.tar.gz;
     md5 = "795fefbb7099f93e2d346b026785c4b8";
   };
 
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 39aa48353fc6..3c0d5479ec55 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 = ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz;
+    url = mirror://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/ed/default.nix b/pkgs/tools/text/ed/default.nix
index 60e64df51a1c..139a9493109d 100644
--- a/pkgs/tools/text/ed/default.nix
+++ b/pkgs/tools/text/ed/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "ed-0.8";
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/ed/ed-0.8.tar.bz2;
+    url = mirror://gnu/ed/ed-0.8.tar.bz2;
     sha256 = "07zaw9w6vrcvpc2srd0zkm7948j262zx2xwj5qbb3lhvry3kr61p";
   };
 }
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index bb1faf214e67..272eaee785c1 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 = ftp://ftp.nluug.nl/pub/gnu/patch/patch-2.5.4.tar.gz;
+    url = mirror://gnu/patch/patch-2.5.4.tar.gz;
     md5 = "ee5ae84d115f051d87fcaaef3b4ae782";
   };
 
diff --git a/pkgs/tools/text/gnused/4.1.2.nix b/pkgs/tools/text/gnused/4.1.2.nix
index a439a152114f..fce5228cbbbc 100644
--- a/pkgs/tools/text/gnused/4.1.2.nix
+++ b/pkgs/tools/text/gnused/4.1.2.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnused-4.1.2";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/pub/gnu/sed/sed-4.1.2.tar.gz;
+    url = mirror://gnu/sed/sed-4.1.2.tar.gz;
     md5 = "928f0e06422f414091917401f1a834d0";
   };
 }
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index d55639494f05..c70cf0225706 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 = ftp://ftp.nluug.nl/pub/gnu/sed/sed-4.1.5.tar.gz;
+    url = mirror://gnu/sed/sed-4.1.5.tar.gz;
     md5 = "7a1cbbbb3341287308e140bd4834c3ba";
   };
   # !!! hack: this should go away in gnused > 4.1.5