* 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
17 years ago · a0159dee8e
parent c9bd5b7397
commit a0159dee8e
260 changed files with 279 additions and 279 deletions
--- 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" ;
  };

--- 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];
--- 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";
  };

--- 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" ;
  };
  
--- 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" ;
  };

--- 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" ;
  };
 }
--- 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";
    };
 }
--- 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";
 }
--- 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";
 }
--- 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";
   };
 }
--- 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];
--- 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";
  };
 
--- 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";
  };

--- 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";
  };

--- 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";
  };
 }
--- 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];
--- 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];
--- 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];
--- 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;
--- 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];
--- 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];
--- 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];
--- 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];
--- 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";
  };
 }
--- 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";
  };

--- 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";
  };

--- 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;
--- 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";
  };

--- 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";
  };

--- 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";
--- 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];
--- 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";
  };
 }
--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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];
--- 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";
  };

--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation {
  name = "docbook-xml-4.2";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/docbook-xml-4.2.zip;
+    url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip;
    md5 = "73fe50dfe74ca631c1602f558ed8961f";
  };
  buildInputs = [unzip];
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation {
  name = "docbook-xml-4.3";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/docbook-xml-4.3.zip;
+    url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip;
    md5 = "ab200202b9e136a144db1e0864c45074";
  };
  buildInputs = [unzip];
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation {
  name = "docbook-xml-ebnf-1.2b1";
  builder = ./builder.sh;
  dtd = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/dbebnf-1.2b1.dtd;
+    url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd;
    md5 = "e50f7d38caf4285965c7a247e026fa7c";
  };
  catalog = ./docbook-ebnf.cat;
--- a/pkgs/development/compilers/abc/default.nix
+++ b/pkgs/development/compilers/abc/default.nix
@ -7,7 +7,7 @@ let {
      builder = ./builder.sh;

      src = fetchurl {
-        url = http://nix.cs.uu.nl/dist/tarballs/abc-1.2.0-src.tar.gz;
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz;
        md5 = "aef9e8eac860f904f2a841e18770dc47";
      };

@ -39,7 +39,7 @@ let {
      jarname = "jedd.runtime";
      builder = ./builder-binjar.sh;
      src = fetchurl {
-        url = http://nix.cs.uu.nl/dist/tarballs/jedd-runtime-snapshot.jar;
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/jedd-runtime-snapshot.jar;
        md5 = "595c5ac2f6384f4c34f1854891b5e422";
      };
    };
@ -50,7 +50,7 @@ let {
      jarname = "javabdd";
      builder = ./builder-binjar.sh;
      src = fetchurl {
-        url = http://nix.cs.uu.nl/dist/tarballs/javabdd_0.6.jar;
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/javabdd_0.6.jar;
        md5 = "6e0246e891b7431f4e7265b5b1471307";
      };
    };
@ -61,7 +61,7 @@ let {
      jarname = "paddle";
      builder = ./builder-binjar.sh;
      src = fetchurl {
-        url = http://nix.cs.uu.nl/dist/tarballs/paddle-snapshot.jar;
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/paddle-snapshot.jar;
        md5 = "a8e032310137945124a2850cd8cfc277";
      };
    };
@ -72,7 +72,7 @@ let {
      jarname = "xact";
      builder = ./builder-binjar.sh;
      src = fetchurl {
-        url = http://nix.cs.uu.nl/dist/tarballs/xact-complete-1.0-1.jar;
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/xact-complete-1.0-1.jar;
        md5 = "9810ad8762101ea691a895f0a6b7a5c3";
      };
    };
--- a/pkgs/development/compilers/abc/jasmin/default.nix
+++ b/pkgs/development/compilers/abc/jasmin/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {
  builder = ./builder.sh;

  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/jasmin-dev-20060422015512.tar.gz;
+    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/jasmin-dev-20060422015512.tar.gz;
    md5 = "0e49e532b4658c959582c5d5b5e28bf1";
  };

--- a/pkgs/development/compilers/abc/polyglot/default.nix
+++ b/pkgs/development/compilers/abc/polyglot/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {
  builder = ./builder.sh;

  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/polyglot-dev-20060422015512.tar.gz;
+    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/polyglot-dev-20060422015512.tar.gz;
    md5 = "6972fe537b4edd41872ed1cf24d24b50";
  };

--- a/pkgs/development/compilers/abc/soot/default.nix
+++ b/pkgs/development/compilers/abc/soot/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {
  builder = ./builder.sh;

  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/soot-dev-20060422015512.tar.gz;
+    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/soot-dev-20060422015512.tar.gz;
    md5 = "20dae3e31215b7ec88e3ff32a107d713";
  };

--- a/pkgs/development/compilers/aspectj/default.nix
+++ b/pkgs/development/compilers/aspectj/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {
  builder = ./builder.sh;

  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/aspectj-1.5.2.jar;
+    url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/aspectj/aspectj-1.5.2.jar;
    md5 = "64245d451549325147e3ca1ec4c9e57c";
  };

--- a/pkgs/development/compilers/gcc-2.95/default.nix
+++ b/pkgs/development/compilers/gcc-2.95/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation {
  name = "gcc-2.95.3";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gcc-2.95.3.tar.gz;
+    url = ftp://ftp.gnu.org/pub/gnu/gcc/gcc-2.95.3.tar.gz;
    md5 = "f3ad4f32c2296fad758ed051b5ac8e28";
  };
  # !!! apply only if noSysDirs is set
--- a/pkgs/development/compilers/gcc-3.3/default.nix
+++ b/pkgs/development/compilers/gcc-3.3/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation {
  name = "gcc-3.3.6";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gcc-3.3.6.tar.bz2;
+    url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2;
    md5 = "6936616a967da5a0b46f1e7424a06414";
  };
  inherit noSysDirs langC langCC langF77;
--- a/pkgs/development/compilers/gcc-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-3.4/default.nix
@ -9,7 +9,7 @@ stdenv.mkDerivation {
  name = "gcc-3.4.6";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gcc-3.4.6.tar.bz2;
+    url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2;
    md5 = "4a21ac777d4b5617283ce488b808da7b";
  };

--- a/pkgs/development/compilers/gcc-apple/default.nix
+++ b/pkgs/development/compilers/gcc-apple/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation {
  name = "gcc-4.0.1-apple-5341";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gcc-5341.tar.gz;
+    url = http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5341.tar.gz;
    md5 = "a135f107ddc55b773b40dfff4f049640";
  };
  patches =
--- a/pkgs/development/compilers/ghc/default.nix
+++ b/pkgs/development/compilers/ghc/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "ghc-6.4.2";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-src.tar.bz2;
+    url = http://www.haskell.org/ghc/dist/6.4.2/ghc-6.4.2-src.tar.bz2;
    md5 = "a394bf14e94c3bca5507d568fcc03375";
  };
  buildInputs = [perl ghc m4];
--- a/pkgs/development/compilers/gwydion-dylan/binary.nix
+++ b/pkgs/development/compilers/gwydion-dylan/binary.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "binary-gwydion-dylan-2.4.0";
  builder = ./binary-builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gwydion-dylan-2.4.0-x86-linux.tar.gz;
+    url = http://www.gwydiondylan.org/downloads/binaries/linux/x86/tar/gwydion-dylan-2.4.0-x86-linux.tar.gz;
    md5 = "52643ad51a455d21fd4d5bf82d98914c";
  };
 }
--- a/pkgs/development/compilers/gwydion-dylan/default.nix
+++ b/pkgs/development/compilers/gwydion-dylan/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "gwydion-dylan-2.4.0";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gwydion-dylan-2.4.0.tar.gz;
+    url = http://www.gwydiondylan.org/downloads/src/tar/gwydion-dylan-2.4.0.tar.gz;
    md5 = "7ed180bf4ef11e8e8da3bd78b45477a8";
  };

--- a/pkgs/development/compilers/jikes/default.nix
+++ b/pkgs/development/compilers/jikes/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "jikes-1.22";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/jikes-1.22.tar.bz2;
+    url = http://mesh.dl.sourceforge.net/sourceforge/jikes/jikes-1.22.tar.bz2;
    md5 = "cda958c7fef6b43b803e1d1ef9afcb85";
  };
 }
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "nasm-0.98.39";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/nasm-0.98.39.tar.bz2;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/nasm/nasm-0.98.39.tar.bz2;
    md5 = "2032ad44c7359f7a9a166a40a633e772";
  };
 }
--- a/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix
+++ b/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "ocaml-3.09.1";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ocaml-3.09.1.tar.gz;
+    url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.1.tar.gz;
    md5 = "c73f4b093e27ba5bf13d62923f89befc";
  };
  configureScript = ./configure-3.09.1;
--- a/pkgs/development/compilers/opencxx/default.nix
+++ b/pkgs/development/compilers/opencxx/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "opencxx-2.8";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/opencxx-2.8.tar.gz;
+    url = http://mesh.dl.sourceforge.net/sourceforge/opencxx/opencxx-2.8.tar.gz;
    md5 = "0f71df82751fe8aba5122d6e0541c98a";
  };

--- a/pkgs/development/compilers/transformers/transformers-0.4.nix
+++ b/pkgs/development/compilers/transformers/transformers-0.4.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {
  name = "transformers-0.4";

  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/transformers-0.4.tar.bz2;
+    url = http://www.lrde.epita.fr/dload/transformers/transformers-0.4.tar.bz2;
    md5 = "19f5b752aec5f4d09cf45cc199fd5bfb";
  };

--- a/pkgs/development/eclipse/ecj/default.nix
+++ b/pkgs/development/eclipse/ecj/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "ecj-3.1";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/eclipse-sourceBuild-srcIncluded-3.1.zip;
+    url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/R-3.1-200506271435/eclipse-sourceBuild-srcIncluded-3.1.zip;
    md5 = "19ad65d52005da5eaa1d3687b3a50de2";
  };

--- a/pkgs/development/eclipse/jdt-sdk/default.nix
+++ b/pkgs/development/eclipse/jdt-sdk/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "eclipse-jdt-sdk-3.1";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/eclipse-JDT-SDK-3.1.zip;
+    url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1-200506271435/eclipse-JDT-SDK-3.1.zip;
    md5 = "665b51beaa718b2fec6b0155ed369f76";
  };

--- a/pkgs/development/interpreters/kaffe/default.nix
+++ b/pkgs/development/interpreters/kaffe/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "kaffe-1.1.4";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/kaffe-1.1.4.tar.gz;
+    url = ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/kaffe-1.1.4.tar.gz;
    md5 = "94d6e7035ba68c2221dce68bb5b3f6e9";
  };
  inherit jikes alsaLib;
--- a/pkgs/development/interpreters/lua-4/default.nix
+++ b/pkgs/development/interpreters/lua-4/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "lua-4.0.1";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/lua-4.0.1.tar.gz;
+    url = http://www.lua.org/ftp/lua-4.0.1.tar.gz;
    md5 = "a31d963dbdf727f9b34eee1e0d29132c";
  };
  builder= ./builder.sh;
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@ -6,7 +6,7 @@ assert g77.langF77;
 stdenv.mkDerivation {
  name = "octave-2.9.6";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/octave-2.9.6.tar.bz2;
+    url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.6.tar.bz2;
    md5 = "10f07dbc0951a7318502a9f1e51e6388";
  };
  buildInputs = [g77 readline ncurses perl flex];
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "tcl-8.4.13";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/tcl8.4.13-src.tar.gz;
+    url = http://heanet.dl.sourceforge.net/sourceforge/tcl/tcl8.4.13-src.tar.gz;
    md5 = "c6b655ad5db095ee73227113220c0523";
  };
 }
--- a/pkgs/development/interpreters/xulrunner/default.nix
+++ b/pkgs/development/interpreters/xulrunner/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xulrunner-1.8.0.4-source.tar.bz2;
+    url = http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.8.0.4/source/xulrunner-1.8.0.4-source.tar.bz2;
    md5 = "4dc09831aa4e94fda5182a4897ed08e9";
  };

--- 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];
--- 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];
--- 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];
--- 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";
  };
 }
--- 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];
--- 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 = "
--- 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";
  };
 }
--- 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";
  };

--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "audiofile-0.2.3";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/audiofile-0.2.5.tar.gz;
+    url = http://www.68k.org/~michael/audiofile/audiofile-0.2.5.tar.gz;
    md5 = "fd07c62a17ceafa317929e55e51e26c5";
  };
 }
--- a/pkgs/development/libraries/beecrypt/default.nix
+++ b/pkgs/development/libraries/beecrypt/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "beecrypt-4.1.2";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/beecrypt-4.1.2.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/beecrypt/beecrypt-4.1.2.tar.gz;
    md5 = "820d26437843ab0a6a8a5151a73a657c";
  };
  buildInputs = [m4];
--- a/pkgs/development/libraries/bluez-libs/default.nix
+++ b/pkgs/development/libraries/bluez-libs/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "bluez-libs-2.25";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bluez-libs-2.25.tar.gz;
+    url = http://bluez.sf.net/download/bluez-libs-2.25.tar.gz;
    md5 = "ebc8408c9a74c785786a2ef7185fe628";
  };
 }
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "boehm-gc-6.8";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gc6.8.tar.gz;
+    url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.8.tar.gz;
    md5 = "418d38bd9c66398386a372ec0435250e";
  };
 }
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "chmlib-0.38";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/chmlib-0.38.tar.bz2;
+    url = http://66.93.236.84/~jedwin/projects/chmlib/chmlib-0.38.tar.bz2;
    md5 = "d72661526aaea377ed30e9f58a086964";
  };
 }
--- a/pkgs/development/libraries/cil/default.nix
+++ b/pkgs/development/libraries/cil/default.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl, ocaml, perl}: stdenv.mkDerivation {
  name = "cil-1.3.2";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/cil-1.3.2.tar.gz;
+    url = http://manju.cs.berkeley.edu/cil/distrib/cil-1.3.2.tar.gz;
    md5 = "aba80dd700fcb1411598670cc36a9573";
  };
  buildInputs = [ocaml perl];
--- a/pkgs/development/libraries/clearsilver/default.nix
+++ b/pkgs/development/libraries/clearsilver/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name="clearsilver-0.10.3";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/clearsilver-0.10.3.tar.gz;
+    url = "http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz";
    md5 = "ff4104b0e58bca1b61d528edbd902769";
  };
  builder = ./builder.sh;
--- a/pkgs/development/libraries/coredumper/default.nix
+++ b/pkgs/development/libraries/coredumper/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "coredumper-0.2";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/coredumper-0.2.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/goog-coredumper/coredumper-0.2.tar.gz;
    md5 = "024f8e4afe73c4cc4f4a0b0ef585e9b7";
  };
 }
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "cracklib-2.8.9";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/cracklib-2.8.9.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/cracklib/cracklib-2.8.9.tar.gz;
    md5 = "9a8c9eb26b48787c84024ac779f64bb2";
  };
  dicts = fetchurl {
--- a/pkgs/development/libraries/dclib/default.nix
+++ b/pkgs/development/libraries/dclib/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "dclib-0.3.7";

  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/dclib-0.3.7.tar.bz2;
+    url = http://download.berlios.de/dcgui/dclib-0.3.7.tar.bz2;
    md5 = "d35833414534bcac8ce2c8a62ce903a4";
  };

--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
  name = "expat-2.0.0";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/expat-2.0.0.tar.gz;
+    url = http://surfnet.dl.sourceforge.net/sourceforge/expat/expat-2.0.0.tar.gz;
    md5 = "d945df7f1c0868c5c73cf66ba9596f3f";
  };
 }
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "ffmpeg-20051126";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ffmpeg-20051126.tar.bz2;
+    url = http://downloads.videolan.org/pub/videolan/vlc/0.8.4a/contrib/ffmpeg-20051126.tar.bz2;
    md5 = "f9e50bf9ee1dd248a276bf9bd4d606e0";
  };
  # !!! Hm, what are the legal consequences of --enable-gpl?
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "fribidi-0.10.7";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/fribidi-0.10.7.tar.gz;
+    url = http://fribidi.org/download/fribidi-0.10.7.tar.gz;
    md5 = "0f602ed32869dbc551dc6bc83d8a3d28";
  };
 }
--- a/pkgs/development/libraries/gettext/gettext-0.14.6.nix
+++ b/pkgs/development/libraries/gettext/gettext-0.14.6.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
  name = "gettext-0.14.6";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gettext-0.14.6.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.14.6.tar.gz;
    md5 = "c26fc7f0a493c5c7c39bbc4e7ed42790";
  };
  configureFlags = "--disable-csharp";
--- a/pkgs/development/libraries/gettext/gettext-0.15.nix
+++ b/pkgs/development/libraries/gettext/gettext-0.15.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
  name = "gettext-0.15";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gettext-0.15.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.15.tar.gz;
    md5 = "16bc6e4d37ac3d07495f737a2349a22b";
  };
  configureFlags = "--disable-csharp";
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "gmime-2.2.1";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gmime-2.2.1.tar.gz;
+    url = http://spruce.sourceforge.net/gmime/sources/v2.2/gmime-2.2.1.tar.gz;
    md5 = "b05e4d6344c8465fb74386e5f1fed45c";
  };
  buildInputs = [pkgconfig glib zlib];
--- a/pkgs/development/libraries/gnet/default.nix
+++ b/pkgs/development/libraries/gnet/default.nix
@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null;
 stdenv.mkDerivation {
  name = "gnet-2.0.7";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gnet-2.0.7.tar.gz;
+    url = http://www.gnetlibrary.org/src/gnet-2.0.7.tar.gz;
    md5 = "3a7a40411775688fe4c42141ab007048";
  };
  buildInputs = [pkgconfig glib];
--- a/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
@ -7,7 +7,7 @@ stdenv.mkDerivation {
  name = "gdk-pixbuf-0.22.0";

  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gdk-pixbuf-0.22.0.tar.bz2;
+    url = ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/gdk-pixbuf-0.22.0.tar.bz2;
    md5 = "05fcb68ceaa338614ab650c775efc2f2";
  };

--- a/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "glib-1.2.10";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/glib-1.2.10.tar.gz;
+    url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
    md5 = "6fe30dad87c77b91b632def29dd69ef9";
  };
  # Patch for gcc 3.4 compatibility.  Based on
--- a/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-1.2.10.tar.gz;
+    url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz;
    md5 = "4d5cb2fc7fb7830e4af9747a36bfce20";
  };

--- a/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix
@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null && perl != null;
 stdenv.mkDerivation {
  name = "atk-1.2.4";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/atk-1.2.4.tar.bz2;
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2;
    md5 = "2d6d50df31abe0e8892b5d3e7676a02d";
  };
  buildInputs = [pkgconfig perl];
--- a/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix
@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
  name = "glib-2.2.3";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/glib-2.2.3.tar.bz2;
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2;
    md5 = "aa214a10d873b68ddd67cd9de2ccae55";
  };
  buildInputs = [pkgconfig gettext perl];
--- a/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix
@ -12,7 +12,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
  name = "gtk+-2.2.4";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.2.4.tar.bz2;
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2;
    md5 = "605332199533e73bc6eec481fb4f1671";
  };
  buildInputs = [pkgconfig perl libtiff libjpeg libpng];
--- a/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix
@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
  name = "pango-1.2.5";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.2.5.tar.bz2;
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2;
    md5 = "df00fe3e71cd297010f24f439b6c8ee6";
  };
  buildInputs = [pkgconfig];
--- a/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
@ -5,7 +5,7 @@ assert pkgconfig != null && glib != null && perl != null;
 stdenv.mkDerivation {
  name = "atk-1.6.1";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/atk-1.6.1.tar.bz2;
+    url = ftp://ftp.gtk.org/pub/gtk/v2.4/atk-1.6.1.tar.bz2;
    md5 = "f77be7e128c957bd3056c2e270b5f283";
  };
  buildInputs = [pkgconfig perl];
--- a/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
  name = "glib-2.4.7";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/glib-2.4.7.tar.bz2;
+    url = ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.7.tar.bz2;
    md5 = "eff6fec89455addf8b0dee5a19e343be";
  };
  buildInputs = [pkgconfig gettext perl];
--- a/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
@ -12,7 +12,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
  name = "gtk+-2.4.13";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.4.13.tar.bz2;
+    url = ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-2.4.13.tar.bz2;
    md5 = "3a438e1010704b11acaf060c9ba0fd7b";
  };
  buildInputs = [pkgconfig perl libtiff libjpeg libpng];
--- a/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
  name = "pango-1.4.1";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.4.1.tar.bz2;
+    url = ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2;
    md5 = "39868e0da250fd4c00b2970e4eb84389";
  };
  buildInputs = [pkgconfig];
--- a/Show More
+++ b/Show More