* 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

6 files changed, 6 insertions, 6 deletions

diff --git a/pkgs/applications/networking/browsers/links/default.nix b/pkgs/applications/networking/browsers/links/default.nix
index ce1ee2d2c92..6bbd0fc800c 100644
--- a/pkgs/applications/networking/browsers/links/default.nix
+++ b/pkgs/applications/networking/browsers/links/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "links-1.00pre15";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/links-1.00pre15.tar.gz;
+    url = http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-1.00pre15.tar.gz;
     md5 = "f64823b9a1ac2d79df578a991dfae8b8";
   };
 }
diff --git a/pkgs/applications/networking/browsers/mozilla/default.nix b/pkgs/applications/networking/browsers/mozilla/default.nix
index 67d7726e680..cb7573eb8a1 100644
--- a/pkgs/applications/networking/browsers/mozilla/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/mozilla-1.7.12-source.tar.bz2;
+    url = http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.12/source/mozilla-1.7.12-source.tar.bz2;
     md5 = "f1ad6adbbc0510eb76d352c94c801fac";
   };
 
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 02726326df2..39339dfd8f3 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/opera-9.02-20060919.5-shared-qt.i386-en.tar.bz2;
+    url = ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/902/final/en/i386/shared/opera-9.02-20060919.5-shared-qt.i386-en.tar.bz2;
     md5 = "327d0bf1f3c4eedd47b444b36c9091f6";
   };
 
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index aafcaf4d00c..227c7d1b35b 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   name = "w3m-0.5.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/w3m-0.5.1.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/w3m/w3m-0.5.1.tar.gz;
     md5 = "0678b72e07e69c41709d71ef0fe5da13";
   };
   inherit openssl boehmgc;
diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index 61d049f93ce..768e19842c1 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   src = fetchurl {
     # Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
-    url = http://nix.cs.uu.nl/dist/tarballs/chatzilla-0.9.74-xr.zip;
+    url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.74-xr.zip;
     md5 = "a1eada15b172eab6a771afa5f8670f7a";
   };
 
diff --git a/pkgs/applications/networking/p2p/valknut/default.nix b/pkgs/applications/networking/p2p/valknut/default.nix
index 5dc1bdf5ed9..994f6b44f94 100644
--- a/pkgs/applications/networking/p2p/valknut/default.nix
+++ b/pkgs/applications/networking/p2p/valknut/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/valknut-0.3.7.tar.bz2;
+    url = http://download.berlios.de/dcgui/valknut-0.3.7.tar.bz2;
     md5 = "848f9b3f25af15c3f1837133ac4b9415";
   };