* 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, 11 insertions, 11 deletions

diff --git a/pkgs/misc/busybox/busybox-1.1.nix b/pkgs/misc/busybox/busybox-1.1.nix
index cebae6c56aa2..e7fb996c45f0 100644
--- a/pkgs/misc/busybox/busybox-1.1.nix
+++ b/pkgs/misc/busybox/busybox-1.1.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/busybox-1.1.3.tar.bz2;
+    url = http://busybox.net/downloads/busybox-1.1.3.tar.bz2;
     md5 = "19a0b475169335f17e421cf644616fe7";
   };
 
diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index 51dd44c03a0c..4f00050b3d1e 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "atari++-1.46";
 #  builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/atari++.tgz;
+    url = http://www.math.tu-berlin.de/~thor/atari++/download/atari++.tgz;
     md5 = "0619ec6b63852233111aa0bd263c8ea2";
   };
 #  rom = fetchurl {
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index a800f3c9ad3f..0821a05f422e 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation {
   name = "atari800-2.0.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/atari800-2.0.2.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/atari800/atari800-2.0.2.tar.gz;
     md5 = "a81f8a5ace5fd89eb6094faef7c936af";
   };
   rom = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xf25.zip;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/atari800/xf25.zip;
     md5 = "4dc3b6b4313e9596c4d474785a37b94d";
   };
   buildInputs = [unzip zlib SDL];
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix
index 41d1885fafe0..d968f2f8eff4 100644
--- a/pkgs/misc/emulators/dosbox/default.nix
+++ b/pkgs/misc/emulators/dosbox/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation { 
   name = "dosbox-0.65";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/dosbox-0.65.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/dosbox/dosbox-0.65.tar.gz;
     md5 = "fef84c292c3aeae747368b9875c1575a";
   };
   buildInputs = [SDL];
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index fff030a625c7..561e053416e0 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "sane-backends-1.0.18";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sane-backends-1.0.18.tar.gz;
+    url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.18/sane-backends-1.0.18.tar.gz;
     md5 = "7ca7e2908e24721471de92cf40c75e60";
   };
   udevSupport = hotplugSupport;
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix
index c260334d2c51..a120c52bb3dc 100644
--- a/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/pkgs/misc/screensavers/rss-glx/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/rss-glx_0.8.1.tar.bz2;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2;
     md5 = "a2bdf0e10ee4e89c8975f313c5c0ba6f";
   };
 
diff --git a/pkgs/misc/tex/lazylist/default.nix b/pkgs/misc/tex/lazylist/default.nix
index bd5983efa737..19637793b00d 100644
--- a/pkgs/misc/tex/lazylist/default.nix
+++ b/pkgs/misc/tex/lazylist/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/lazylist-1.0a.tar.bz2;
+    url = http://www.iai.uni-bonn.de/~loeh/lhs2tex/lazylist-1.0a.tar.bz2;
     md5 = "8ef357df5845bd8d6075fca6e1f214ab";
   };
 
diff --git a/pkgs/misc/tex/polytable/default.nix b/pkgs/misc/tex/polytable/default.nix
index af05c24abf7b..0b6d954fc197 100644
--- a/pkgs/misc/tex/polytable/default.nix
+++ b/pkgs/misc/tex/polytable/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/polytable-0.8.2.tar.gz;
+    url = http://www.iai.uni-bonn.de/~loeh/polytable-0.8.2.tar.gz;
     md5 = "c59edf035ae6e19b64b1ae920fea28e7";
   };
 
diff --git a/pkgs/misc/tex/tetex/default.nix b/pkgs/misc/tex/tetex/default.nix
index 82fb27c8369d..9ff50dd5ab38 100644
--- a/pkgs/misc/tex/tetex/default.nix
+++ b/pkgs/misc/tex/tetex/default.nix
@@ -5,12 +5,12 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/tetex-src-3.0.tar.gz;
+    url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-3.0.tar.gz;
     md5 = "944a4641e79e61043fdaf8f38ecbb4b3";
   };
 
   texmf = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/tetex-texmf-3.0.tar.gz;
+    url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-3.0.tar.gz;
     md5 = "11aa15c8d3e28ee7815e0d5fcdf43fd4";
   };