* 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

15 files changed, 15 insertions, 15 deletions

diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix
index 633bd40749d..4927b5ce379 100644
--- a/pkgs/os-specific/linux/dietlibc/default.nix
+++ b/pkgs/os-specific/linux/dietlibc/default.nix
@@ -5,7 +5,7 @@ assert stdenv.isLinux;
 stdenv.mkDerivation {
   name = "dietlibc-0.30";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/dietlibc-0.30.tar.bz2;
+    url = http://www.kernel.org/pub/linux/libs/dietlibc/dietlibc-0.30.tar.bz2;
     md5 = "2465d652fff6f1fad3da3b98e60e83c9";
   };
   builder = ./builder.sh;
diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix
index dd63bdd0cf7..7b2ff8b85fc 100644
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "e2fsprogs-1.39";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.39.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.39.tar.gz;
     md5 = "06f7806782e357797fad1d34b7ced0c6";
   };
   configureFlags =
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index a624afd0d6f..4c0a46f460c 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "hwdata-0.172";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/hwdata_0.172.orig.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/h/hwdata/hwdata_0.172.orig.tar.gz;
     md5 = "1c6b7f4dfe489f881702176c5f8e5a2e";
   };
 }
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index cc875f6b145..c57cf68fd5d 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "iputils-20020927";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/iputils_20020927.orig.tar.gz;
+    url = ftp://ftp.nl.debian.org/debian/pool/main/i/iputils/iputils_20020927.orig.tar.gz;
     md5 = "b5493f7a2997130a4f86c486c9993b86";
   };
 
diff --git a/pkgs/os-specific/linux/kernel-headers-cross/default.nix b/pkgs/os-specific/linux/kernel-headers-cross/default.nix
index a20dbabc4c4..efe6ba383f4 100644
--- a/pkgs/os-specific/linux/kernel-headers-cross/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers-cross/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "linux-headers-2.6.14.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.14.5.tar.bz2;
+    url = ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.5.tar.bz2;
     md5 = "9f057e3bd31c50dc48553def01bc8037";
   };
   inherit cross;
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 2f360bfa4c4..e0a02a14196 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   name = "libselinux-1.30";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libselinux-1.30.tgz;
+    url = http://www.nsa.gov/selinux/archives/libselinux-1.30.tgz;
     md5 = "0b7d269c9b7d847059e4b11a710ab404";
   };
 
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index 8dcc1e2fb3e..eac7efecaed 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   name = "libsepol-1.12";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libsepol-1.12.tgz;
+    url = http://www.nsa.gov/selinux/archives/libsepol-1.12.tgz;
     md5 = "937885f1fcbfe597a0f02aa9af044710";
   };
 }
diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix
index f824c3f4aa9..efb8240fdde 100644
--- a/pkgs/os-specific/linux/mingetty/default.nix
+++ b/pkgs/os-specific/linux/mingetty/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "mingetty-1.07";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/mingetty_1.07.orig.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/m/mingetty/mingetty_1.07.orig.tar.gz;
     md5 = "491dedf1ceff0e0f5f7bb9f55bf5213e";
   };
   patches = [./makefile.patch];
diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix
index 1702bc014b9..3b46e6a36d5 100644
--- a/pkgs/os-specific/linux/module-init-tools/default.nix
+++ b/pkgs/os-specific/linux/module-init-tools/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "module-init-tools-3.2.2";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/module-init-tools-3.2.2.tar.bz2;
+    url = ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.2.2.tar.bz2;
     md5 = "a1ad0a09d3231673f70d631f3f5040e9";
   };
   patches = [./module-dir.patch];
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 1538ac47aa8..d8764f391d6 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "net-tools-1.60";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/net-tools-1.60.tar.bz2;
+    url = http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2;
     md5 = "888774accab40217dde927e21979c165";
   };
   config = ./config.h;
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix
index 906f71b0709..6af69d882db 100644
--- a/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix
+++ b/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ov511-2.32";
   builder = ./ov511-2.32-builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ov511-2.32.tar.bz2;
+    url = http://www.ovcam.org/ov511/download/2.xx/distros/ov511-2.32.tar.bz2;
     md5 = "6a08025311649356242761641a1df0f2";
   };
   patches = [./ov511-kernel.patch ./ov511-2.32.patch ./ov511-2.32-kdir.patch];
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index 0d96f166606..e65287e9139 100644
--- a/pkgs/os-specific/linux/procps/default.nix
+++ b/pkgs/os-specific/linux/procps/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "procps-3.2.7";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/procps-3.2.7.tar.gz;
+    url = http://procps.sourceforge.net/procps-3.2.7.tar.gz;
     md5 = "f490bca772b16472962c7b9f23b1e97d";
   };
   patches = [./makefile.patch ./procps-build.patch];
diff --git a/pkgs/os-specific/linux/qc-usb/default.nix b/pkgs/os-specific/linux/qc-usb/default.nix
index 92bb1068941..76501b1a0f7 100644
--- a/pkgs/os-specific/linux/qc-usb/default.nix
+++ b/pkgs/os-specific/linux/qc-usb/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "qc-usb-0.6.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/qc-usb-0.6.4.tar.gz;
+    url = http://heanet.dl.sourceforge.net/sourceforge/qce-ga/qc-usb-0.6.4.tar.gz;
     md5 = "7e91c3a633382c99100e3ef4f1d9f50a";
   };
   inherit kernel;
diff --git a/pkgs/os-specific/linux/squashfs/default.nix b/pkgs/os-specific/linux/squashfs/default.nix
index f13162e890b..7fa92baa6c2 100644
--- a/pkgs/os-specific/linux/squashfs/default.nix
+++ b/pkgs/os-specific/linux/squashfs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "squashfs-3.1-r2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/squashfs3.1-r2.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/squashfs/squashfs3.1-r2.tar.gz;
     md5 = "c252e5286b142afa54ca49829c51a33f";
   };
   buildInputs = [zlib];
diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix
index b2319ab446f..d991d7e653e 100644
--- a/pkgs/os-specific/linux/sysklogd/default.nix
+++ b/pkgs/os-specific/linux/sysklogd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sysklogd-1.4.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sysklogd-1.4.1.tar.gz;
+    url = http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.4.1.tar.gz;
     md5 = "d214aa40beabf7bdb0c9b3c64432c774";
   };
   patches = [./sysklogd-1.4.1-cvs-20050525-local.diff ./sysklogd-1.4.1-asm.patch];