* 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

37 files changed, 37 insertions, 37 deletions

diff --git a/pkgs/applications/audio/GStreamer/default.nix b/pkgs/applications/audio/GStreamer/default.nix
index 89c6c745f08..607d2e9ce9f 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 9b553dc1988..141476642de 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 03dc5546c0c..bd8f6370a88 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 96b1c654fa7..0d741899cdf 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 7e0439d60bf..6d6b07348ff 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 11ff7ae0bdb..d995dc8222e 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" ;
   };
 }
diff --git a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
index bfceaa15770..0627d5d13e8 100644
--- a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
+++ b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
@@ -12,7 +12,7 @@ let {
 
   bindist = 
     fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/eclipse-SDK-3.1-linux-gtk.tar.gz;
+      url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1-200506271435/eclipse-SDK-3.1-linux-gtk.tar.gz;
       md5 = "0441c11cc5af1e84ed3be322929899e8";
     };
 }
diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix
index abca499a715..3d61fbbe809 100644
--- a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix
+++ b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
 fetchurl {
-  url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.0.jar;
+  url = http://www.ii.uib.no/~karltk/spoofax/plugins/org.spoofax.editor_0.3.0.jar;
   md5 = "ff66d229c774f840ec8285f64c0f95bc";
 }
diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix
index d926064a4db..649619e487e 100644
--- a/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix
+++ b/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
 fetchurl {
-  url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.11.jar;
+  url = http://www.ii.uib.no/~karltk/spoofax/plugins/org.spoofax.editor_0.3.11.jar;
   md5 = "c36941afcb0e538e16fafd594eae128e";
 }
diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix
index 33336355326..cc6db1c2e8e 100644
--- a/pkgs/applications/editors/joe/default.nix
+++ b/pkgs/applications/editors/joe/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
 name = "joe-3.3";
 src = fetchurl {
-         url = http://nix.cs.uu.nl/dist/tarballs/joe-3.3.tar.gz;
+         url = http://surfnet.dl.sourceforge.net/sourceforge/joe-editor/joe-3.3.tar.gz;
          md5 = "02221716679c039c5da00c275d61dbf4";
    };
 }
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index a6bfe1f3dae..345eccb0ff9 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/nedit-5.5-src.tar.bz2;
+    url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2;
     md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe";
   };
   patches = [./dynamic.patch];
diff --git a/pkgs/applications/editors/vim-diet/default.nix b/pkgs/applications/editors/vim-diet/default.nix
index 5c6991b895c..76c022896fe 100644
--- a/pkgs/applications/editors/vim-diet/default.nix
+++ b/pkgs/applications/editors/vim-diet/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "vim-7.0";
  
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/vim-7.0.tar.bz2;
+    url = ftp://ftp.vim.org/pub/vim/unix/vim-7.0.tar.bz2;
     md5 = "4ca69757678272f718b1041c810d82d8";
   };
  
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 244890fd453..61bff991534 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   name = "inkscape-0.43";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/inkscape-0.43.tar.bz2;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/inkscape/inkscape-0.43.tar.bz2;
     md5 = "97c606182f5e177eef70c1e8a55efc1f";
   };
 
diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix
index fa05e413c4f..83fac86bf81 100644
--- a/pkgs/applications/graphics/kuickshow/default.nix
+++ b/pkgs/applications/graphics/kuickshow/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/kuickshow-0.8.5.tgz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/kuickshow/kuickshow-0.8.5.tgz;
     md5 = "7a95852a0670b18859a1e6789b256ebd";
   };
 
diff --git a/pkgs/applications/misc/bluez-firmware/default.nix b/pkgs/applications/misc/bluez-firmware/default.nix
index af5dcc00733..91b8dbdf8f4 100644
--- a/pkgs/applications/misc/bluez-firmware/default.nix
+++ b/pkgs/applications/misc/bluez-firmware/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "bluez-firmware-1.1";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bluez-firmware-1.1.tar.gz;
+    url = http://bluez.sf.net/download/bluez-firmware-1.1.tar.gz;
     md5 = "2f1c2d939108c865dd07bae3e819c573";
   };
 }
diff --git a/pkgs/applications/misc/bluez-utils/default.nix b/pkgs/applications/misc/bluez-utils/default.nix
index 5705d2ce1ca..7cf88851fc3 100644
--- a/pkgs/applications/misc/bluez-utils/default.nix
+++ b/pkgs/applications/misc/bluez-utils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "bluez-utils-2.25";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bluez-utils-2.25.tar.gz;
+    url = http://bluez.sf.net/download/bluez-utils-2.25.tar.gz;
     md5 = "ae3729ab5592be06ed01b973d4b3e9fe";
   };
   buildInputs = [bluezLibs];
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index 5354fbeede4..4c00e13c59b 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cdrtools-2.01";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/cdrtools-2.01.tar.bz2;
+    url = ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2;
     md5 = "d44a81460e97ae02931c31188fe8d3fd";
   };
   patches = [./cdrtools-2.01-install.patch];
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index c04f7d12c05..0f4af78213d 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gphoto2-2.2.0";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gphoto2-2.2.0.tar.bz2;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/gphoto/gphoto2-2.2.0.tar.bz2;
     md5 = "f5c1f83185db598b4ca52889964a5e84";
   };
   buildInputs = [pkgconfig libgphoto2 libexif popt];
diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix
index b35c8adc390..9bcd2340e37 100644
--- a/pkgs/applications/misc/hello/ex-1/default.nix
+++ b/pkgs/applications/misc/hello/ex-1/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "hello-2.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
   inherit perl;
diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix
index 78a436e4ad7..017ccf617ed 100644
--- a/pkgs/applications/misc/hello/ex-2/default.nix
+++ b/pkgs/applications/misc/hello/ex-2/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "hello-2.1.1";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
   buildInputs = [perl];
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix
index 9647349af5a..b44cca5ff2c 100644
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/pkgs/applications/misc/pinfo/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "pinfo-0.6.8";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pinfo-0.6.8.tar.gz;
+    url = http://dione.cc/~pborys/software/pinfo/pinfo-0.6.8.tar.gz;
     md5 = "55feb4ebaa709b52bd00a15ed0fb52fb";
   };
   buildInputs = [ncurses];
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 338ac1363c5..1137a9d8838 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xchm-1.9";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xchm-1.9.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/xchm/xchm-1.9.tar.gz;
     md5 = "12e1faf49447c743c5c936636cd8a172";
   };
   buildInputs = [wxGTK chmlib];
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 6bf84d4f966..c14ceb84e87 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xterm-208";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xterm.tar.gz;
+    url = ftp://invisible-island.net/xterm/xterm.tar.gz;
     md5 = "a062d0b398918015d07c31ecdcc5111a";
   };
   buildInputs = [libXaw xproto libXt libX11 libSM libICE ncurses];
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";
   };
 
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index e40324c0df4..cf142e3ad74 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "openoffice.org-2.0.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/OOo_2.0.0_src.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/office/openoffice/stable/2.0.0/OOo_2.0.0_src.tar.gz;
     md5 = "a68933afc2bf432d11b2043ac99ba0aa";
     #url = http://ftp.snt.utwente.nl/pub/software/openoffice/stable/2.2.1/OOo_2.2.1_src_core.tar.bz2;
     #sha256 = "adc54c88892f5ced9887945709856efeb628fe5f7b5b2f2aa7797c5391b9c7d6";
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 5460cc11b62..cb6a4dbf6f8 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cvs-1.12.13";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/cvs-1.12.13.tar.bz2;
+    url = http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2;
     md5 = "956ab476ce276c2d19d583e227dbdbea";
   };
   buildInputs = [vim];
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index a12bbdc1e9f..6fb111c47a3 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "rcs-5.7";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/rcs-5.7.tar;
+    url = ftp://ftp.cs.purdue.edu/pub/RCS/rcs-5.7.tar;
     md5 = "f7b3f106bf87ff6344df38490f6a02c5";
   };
 }
diff --git a/pkgs/applications/version-management/subversion-1.2.x/default.nix b/pkgs/applications/version-management/subversion-1.2.x/default.nix
index 495cbbbacdd..e6932d481f1 100644
--- a/pkgs/applications/version-management/subversion-1.2.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.2.x/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/subversion-1.2.3.tar.bz2;
+    url = http://subversion.tigris.org/downloads/subversion-1.2.3.tar.bz2;
     md5 = "a14bc6590241b6e5c2ff2b354cc184a1";
   };
 
diff --git a/pkgs/applications/version-management/subversion-1.3.x/default.nix b/pkgs/applications/version-management/subversion-1.3.x/default.nix
index 394cbda2dd5..421cd043858 100644
--- a/pkgs/applications/version-management/subversion-1.3.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.3.x/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/subversion-1.3.2.tar.bz2;
+    url = http://subversion.tigris.org/downloads/subversion-1.3.2.tar.bz2;
     sha1 = "688ab178db1f6acb2ad3bd99f030402621f837b6";
   };
 
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 148612834f8..fbec28a7831 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/mythtv-0.20.tar.bz2;
+    url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.20.tar.bz2;
     md5 = "52bec1e0fadf7d24d6dcac3f773ddf74";
   };
 
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix
index 48721d3467c..aaa83ccc144 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/pkgs/applications/video/xawtv/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xawtv-3.95";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xawtv-3.95.tar.gz;
+    url = http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz;
     md5 = "ad25e03f7e128b318e392cb09f52207d";
   };
   buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE perl xextproto];
diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix
index 6eae79ddbe1..444cd974f8f 100644
--- a/pkgs/applications/video/zapping/default.nix
+++ b/pkgs/applications/video/zapping/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.9.6.tar.bz2;
+    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.9.6.tar.bz2;
     md5 = "8306775c6a11de4d72345b5eee970ea6";
   };