* 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

104 files changed, 107 insertions, 107 deletions

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index fe6820ba149a..a74a1590113c 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -8,7 +8,7 @@ assert alsaSupport -> alsaLib != null;
 stdenv.mkDerivation {
   name = "SDL-1.2.11";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/SDL-1.2.11.tar.gz;
+    url = http://www.libsdl.org/release/SDL-1.2.11.tar.gz;
     md5 = "418b42956b7cd103bfab1b9077ccc149";
   };
   propagatedBuildInputs = [x11 libXrandr];
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index f60d188886b3..14b8359c70a4 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "SDL_mixer-1.2.7";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/SDL_mixer-1.2.7.tar.gz;
+    url = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.7.tar.gz;
     md5 = "7959b89c8f8f1564ca90968f6c88fa1e";
   };
   buildInputs = [SDL libogg libvorbis];
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index da99571a82ad..a0603b546cf6 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "Xaw3d-1.5E";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/Xaw3d-1.5E.tar.gz;
+    url = http://freshmeat.net/redir/xaw3d/11835/url_tgz/Xaw3d-1.5E.tar.gz;
     md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
   };
   patches = [./config.patch ./laylex.patch];
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index 45a0038c5897..4a75e11ec304 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "a52dec-0.7.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/a52dec-0.7.4.tar.gz;
+    url = http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz;
     md5 = "caa9f5bc44232dc8aeea773fea56be80";
   };
 }
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index b06db7eb39d7..5f138ef729af 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "aalib-1.4rc4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/aalib-1.4rc4.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/aa-project/aalib-1.4rc4.tar.gz;
     md5 = "d5aa8e9eae07b7441298b5c30490f6a6";
   };
   buildInputs = [ncurses];
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 5dd4292bcaf2..7f2ce3e3882a 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -7,7 +7,7 @@ assert bdbSupport -> db4 != null;
 (stdenv.mkDerivation {
   name = "apr-util-1.2.7";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/apr-util-1.2.7.tar.bz2;
+    url = http://archive.apache.org/dist/apr/apr-util-1.2.7.tar.bz2;
     md5 = "a4c527f08ae2298e62a88472291bf066";
   };
   configureFlags = "
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 976774b91f9e..a42699063c50 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "apr-1.2.7";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/apr-1.2.7.tar.bz2;
+    url = http://archive.apache.org/dist/apr/apr-1.2.7.tar.bz2;
     md5 = "e77887dbafc515c63feac84686bcb3bc";
   };
 }
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 69a097b0c8bc..79da04d486ad 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/attr_2.4.32-1.tar.gz;
+    url = ftp://oss.sgi.com/projects/xfs/download/download/cmd_tars/attr_2.4.32-1.tar.gz;
     md5 = "092739e9b944815aecc1f5d8379d5ea5";
   };
 
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index f0156d45e3b3..a10ec7a95c3e 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/