* 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/audio/GStreamer/default.nix b/pkgs/applications/audio/GStreamer/default.nix
index 89c6c745f0834..607d2e9ce9fea 100644
--- a/pkgs/applications/audio/GStreamer/default.nix
+++ b/pkgs/applications/audio/GStreamer/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation {
   name = "GStreamer-0.10.10";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gstreamer-0.10.10.tar.bz2;
+    url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2;
     md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc" ;
   };
 
diff --git a/pkgs/applications/audio/bmp-plugins/musepack/default.nix b/pkgs/applications/audio/bmp-plugins/musepack/default.nix
index 9b553dc1988b6..141476642dee9 100644
--- a/pkgs/applications/audio/bmp-plugins/musepack/default.nix
+++ b/pkgs/applications/audio/bmp-plugins/musepack/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bmp-plugin-musepack-1.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bmp-musepack-1.2.tar.bz2;
+    url = http://files2.musepack.net/linux/plugins/bmp-musepack-1.2.tar.bz2;
     md5 = "5fe0c9d341ca37d05c780a478f829a5f";
   };
   buildInputs = [pkgconfig bmp libmpcdec taglib];
diff --git a/pkgs/applications/audio/bmp/default.nix b/pkgs/applications/audio/bmp/default.nix
index 03dc5546c0c40..bd8f6370a881c 100644
--- a/pkgs/applications/audio/bmp/default.nix
+++ b/pkgs/applications/audio/bmp/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation {
   name = "bmp-0.9.7.1";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bmp-0.9.7.1.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/beepmp/bmp-0.9.7.1.tar.gz;
     md5 = "c25d5a8d49cc5851d13d525a20023c4c";
   };
 
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 96b1c654fa7bb..0d741899cdf2c 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "cdparanoia-III-alpha9.8";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/cdparanoia-III-alpha9.8.src.tgz;
+    url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz ;
     md5 = "7218e778b5970a86c958e597f952f193" ;
   };
   
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 7e0439d60bfa6..6d6b07348ff9e 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "flac-1.1.2";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/flac-1.1.2.tar.gz;
+    url = http://downloads.xiph.org/releases/flac/flac-1.1.2.tar.gz;
     md5 = "2bfc127cdda02834d0491ab531a20960" ;
   };
 
diff --git a/pkgs/applications/audio/lame/default.nix b/pkgs/applications/audio/lame/default.nix
index 11ff7ae0bdb4e..d995dc8222ed8 100644
--- a/pkgs/applications/audio/lame/default.nix
+++ b/pkgs/applications/audio/lame/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "lame-3.96.1";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/lame-3.96.1.tar.gz;
+    url = http://mesh.dl.sourceforge.net/sourceforge/lame/lame-3.96.1.tar.gz ;
     md5 = "e1206c46a5e276feca11a7149e2fc6ac" ;
   };
 }