* Get rid of all references to nix.cs.uu.nl.

svn path=/nixpkgs/trunk/; revision=13299

64 files changed, 77 insertions, 75 deletions

diff --git a/pkgs/applications/audio/xmms/default.nix b/pkgs/applications/audio/xmms/default.nix
index 8e2650fd7c09..4fe952f4b3d2 100644
--- a/pkgs/applications/audio/xmms/default.nix
+++ b/pkgs/applications/audio/xmms/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xmms-1.2.10";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xmms-1.2.10.tar.bz2;
+    url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2;
     md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
   };
 
diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix
index 4c782525ec7d..59fe53c3736f 100644
--- a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix
+++ b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
 fetchurl {
-  url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.10.jar;
+  url = http://nixos.org/tarballs/org.spoofax.editor_0.3.10.jar;
   md5 = "ff77853e750e19a9b8d380c17ea27f3d";
 }
diff --git a/pkgs/applications/editors/emacs-21/default.nix b/pkgs/applications/editors/emacs-21/default.nix
index 31a685ef7177..9fc16594e26f 100644
--- a/pkgs/applications/editors/emacs-21/default.nix
+++ b/pkgs/applications/editors/emacs-21/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "emacs-21.4a";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/emacs-21.4a.tar.gz;
+    url = http://nixos.org/tarballs/emacs-21.4a.tar.gz;
     md5 = "8f9d97cbd126121bd5d97e5e31168a87";
   };
   patches = [./crt.patch];
diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix
index ddc2dca22326..b5348967a3e7 100644
--- a/pkgs/applications/editors/emacs-modes/cua/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cua/default.nix
@@ -2,7 +2,7 @@
   name = "cua-mode-2.10";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
+    url = http://nixos.org/tarballs/cua-mode-2.10.el;
     md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/nxml/default.nix b/pkgs/applications/editors/emacs-modes/nxml/default.nix
index 57583bbfcb62..c8d441475c85 100644
--- a/pkgs/applications/editors/emacs-modes/nxml/default.nix
+++ b/pkgs/applications/editors/emacs-modes/nxml/default.nix
@@ -2,7 +2,7 @@
   name = "nxml-mode-20041004";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
+    url = http://nixos.org/tarballs/nxml-mode-20041004.tar.gz;
     md5 = "ac137024cf337d6f11d8ab278d39b4db";
   };
 }
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 050467c46242..23dab206e188 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/monodevelop-0.6-pre2315.tar.bz2;
+    url = http://nixos.org/tarballs/monodevelop-0.6-pre2315.tar.bz2;
     md5 = "8c33df5629b0676b7ab552854c1de6fd";
   };
 
diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix
index d65302e62ee4..db8b2e478846 100644
--- a/pkgs/applications/editors/monodoc/default.nix
+++ b/pkgs/applications/editors/monodoc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/monodoc-1.0.6.tar.gz;
+    url = http://nixos.org/tarballs/monodoc-1.0.6.tar.gz;
     md5 = "f2fc27e8e4717d90dc7efa2450625693";
   };
 
diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
index 8b9ac5a9f546..fbe67d1600dc 100644
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "batik-1.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/batik-1.6.zip;
+    url = http://nixos.org/tarballs/batik-1.6.zip;
     md5 = "edff288fc64f968ff96ca49763d50f3c";
   };
 
diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix
index 40329412449b..17a3cd22a5fa 100644
--- a/pkgs/applications/graphics/f-spot/default.nix
+++ b/pkgs/applications/graphics/f-spot/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/f-spot-0.0.10.tar.bz2;
+    url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2;
     md5 = "19cc6e067ccc261b0502ff6189b79832";
   };
 
diff --git a/pkgs/applications/video/zapping/0.10.nix b/pkgs/applications/video/zapping/0.10.nix
index 69c4ce51e469..067917abe77b 100644
--- a/pkgs/applications/video/zapping/0.10.nix
+++ b/pkgs/applications/video/zapping/0.10.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.10cvs6.tar.bz2;
+    url = http://nixos.org/tarballs/zapping-0.10cvs6.tar.bz2;
     md5 = "6aa7614ac3fd5d39c89c2198598ad27b";
   };
 
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index 2276bfc1de3d..bbdf5fb7b4e2 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -85,7 +85,7 @@ for url in $urls; do
             echo "warning: unknown mirror:// site \`$site'"
         else
             # Assume that SourceForge/GNU/kernel mirrors have better
-            # bandwidth than nix.cs.uu.nl.
+            # bandwidth than nixos.org.
             preferHashedMirrors=
 
             mirrors=${!varName}
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index ee3800f6d9bb..00b7f3cc0794 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
   urls = urls_;
 
   # If set, prefer the content-addressable mirrors
-  # (http://nix.cs.uu.nl/dist/tarballs) over the original URLs.
+  # (http://nixos.org/tarballs) over the original URLs.
   preferHashedMirrors = true;
 
   # Compatibility with Nix <= 0.7.
diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix
index b913cc132f4f..c7f1ad38f47c 100644
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bakoma-ttf";
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bakoma-ttf.tar.bz2;
+    url = http://nixos.org/tarballs/bakoma-ttf.tar.bz2;
     sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";
   };
   
diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix
index dde5f76284d3..60664374b8e5 100644
--- a/pkgs/development/compilers/ghc/boot.nix
+++ b/pkgs/development/compilers/ghc/boot.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
+        url = http://nixos.org/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
         md5 = "092fe2e25dab22b926babe97cc77db1f";
       }
     else if stdenv.system == "x86_64-linux" then
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index f0b1bc2132c6..22214aa84cfa 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mono-1.1.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/mono-1.1.4.tar.gz;
+    url = http://nixos.org/tarballs/mono-1.1.4.tar.gz;
     md5 = "66755e5f201e912cecdd19807ba62487";
   };
 
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix
index 6d4b4ca616ce..b2e7e131a817 100644
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/3.08.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ocaml-3.08.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ocaml-3.08.0.tar.gz;
+    url = http://nixos.org/tarballs/ocaml-3.08.0.tar.gz;
     md5 = "c6ef478362295c150101cdd2efcd38e0";
   };
   configureScript = ./configure-3.08.0;
diff --git a/pkgs/development/compilers/qcmm/default.nix b/pkgs/development/compilers/qcmm/default.nix
index 508221aeaefa..b7f118666870 100644
--- a/pkgs/development/compilers/qcmm/default.nix
+++ b/pkgs/development/compilers/qcmm/default.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation {
   name = "qcmm-2006-01-31";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/qc--20060131.tar.gz;
+    url = http://nixos.org/tarballs/qc--20060131.tar.gz;
     md5 = "9097830775bcf22c9bad54f389f5db23";
   };
   buildInputs = [ mk ocaml noweb groff ];
diff --git a/pkgs/development/interpreters/toolbus/default.nix b/pkgs/development/interpreters/toolbus/default.nix
index 5acc1f780bc2..eda55b069633 100644
--- a/pkgs/development/interpreters/toolbus/default.nix
+++ b/pkgs/development/interpreters/toolbus/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
    name = "toolbus-1.2.2";
    builder = ./builder.sh;
    src = fetchurl {
-            url = http://nix.cs.uu.nl/dist/tarballs/toolbus-1.2.2.tar.gz;
+            url = http://nixos.org/tarballs/toolbus-1.2.2.tar.gz;
             md5 = "887349b097006c0883e1948797349a50";
          };
    java = if javaAdapter then true else false;
diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix
index 4fdd914ccffa..dd47f35a138a 100644
--- a/pkgs/development/libraries/arts/default.nix
+++ b/pkgs/development/libraries/arts/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     --x-libraries=${libX11}/lib";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/arts-1.5.4.tar.bz2;
+    url = http://nixos.org/tarballs/arts-1.5.4.tar.bz2;
     md5 = "886ba4a13dc0da312d94c09f50c3ffe6";
   };
 
diff --git a/pkgs/development/libraries/aterm/2.3.nix b/pkgs/development/libraries/aterm/2.3.nix
index 4ce1f4a61b85..e27acb6a21ee 100644
--- a/pkgs/development/libraries/aterm/2.3.nix
+++ b/pkgs/development/libraries/aterm/2.3.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   configureFlags = "--with-gcc";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/aterm-2.3.1.tar.gz;
+    url = http://nixos.org/tarballs/aterm-2.3.1.tar.gz;
     md5 = "5a2d70acc45a9d301e0dba12fcaf77e7";
   };
 
diff --git a/pkgs/development/libraries/aterm/2.4.nix b/pkgs/development/libraries/aterm/2.4.nix
index fc88ef34692f..849faae02513 100644
--- a/pkgs/development/libraries/aterm/2.4.nix
+++ b/pkgs/development/libraries/aterm/2.4.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "aterm-2.4.2";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/aterm-2.4.2.tar.gz;
+    url = http://nixos.org/tarballs/aterm-2.4.2.tar.gz;
     md5 = "18617081dd112d85e6c4b1b552628114";
   };
   patches = 
diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index baa509eadb08..ecfa41e23058 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0l9kar7h80kkvs394dyzbn02jkd8hzynh9kxyqrlacj1wp35rmah";
   };
   dicts = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/cracklib-words.gz;
+    url = http://nixos.org/tarballs/cracklib-words.gz;
     md5 = "d18e670e5df560a8745e1b4dede8f84f";
   };
 }
diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix
index 2746d8127232..4304cd8f9f39 100644
--- a/pkgs/development/libraries/db4/db4-4.4.nix
+++ b/pkgs/development/libraries/db4/db4-4.4.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation ({
   src = fetchurl {
     urls = [
       http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz
-      http://nix.cs.uu.nl/dist/tarballs/db-4.4.20.NC.tar.gz
+      http://nixos.org/tarballs/db-4.4.20.NC.tar.gz
     ];
     md5 = "afd9243ea353bbaa04421488d3b37900";
   };
diff --git a/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix b/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
index 980b04a9d612..acfdfa6a5532 100644
--- a/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
+++ b/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ffmpeg-svn-pre-r11901";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ffmpeg-svn-r11901.tar.bz2;
+    url = http://nixos.org/tarballs/ffmpeg-svn-r11901.tar.bz2;
     sha256 = "0l5207gnfaz57pvlxpxyjphyz0mp9plnxzd0aghy0nz3hmqh4rs7";
   };
   # !!! Hm, what are the legal consequences of --enable-gpl?
diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix
index 262e42bf0000..2110884a0225 100644
--- a/pkgs/development/libraries/gtk-sharp-1/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-1/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gtk-sharp-1.0.6.tar.gz;
+    url = http://nixos.org/tarballs/gtk-sharp-1.0.6.tar.gz;
     md5 = "2651d14fe77174ab20b8af53d150ee11";
   };
 
diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix
index e308a2afa39f..cd2adfdd66b5 100644
--- a/pkgs/development/libraries/gtk-sharp-2/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gtk-sharp-1.9.2.tar.gz;
+    url = http://nixos.org/tarballs/gtk-sharp-1.9.2.tar.gz;
     md5 = "b7c5afab5f736ffa4011974302831363";
   };
 
diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix
index 2af5ac93ca99..43476d6e78a9 100644
--- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix
+++ b/pkgs/development/libraries/gtkmozembed-sharp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gtkmozembed-sharp-0.7-pre41601.tar.bz2;
+    url = http://nixos.org/tarballs/gtkmozembed-sharp-0.7-pre41601.tar.bz2;
     md5 = "34aac139377296791acf3af9b5dc27ed";
   };
 
diff --git a/pkgs/development/libraries/gtksourceview-sharp/default.nix b/pkgs/development/libraries/gtksourceview-sharp/default.nix
index 430226789ead..abd97ca777b0 100644
--- a/pkgs/development/libraries/gtksourceview-sharp/default.nix
+++ b/pkgs/development/libraries/gtksourceview-sharp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gtksourceview-sharp-0.6-pre40261.tar.bz2;
+    url = http://nixos.org/tarballs/gtksourceview-sharp-0.6-pre40261.tar.bz2;
     md5 = "8bc26c182bd897f50988e110a9a11f34";
   };
 
diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix
index de548d1ddb7e..24e7d2afab54 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "imlib-1.9.15";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/imlib-1.9.15.tar.gz;
+    url = http://nixos.org/tarballs/imlib-1.9.15.tar.gz;
     md5 = "2a5561457e7f8b2e04d88f73508fd13a";
   };
 
diff --git a/pkgs/development/libraries/java/jakarta-bcel/default.nix b/pkgs/development/libraries/java/jakarta-bcel/default.nix
index fc609d8095b6..3bea2a0d8f4b 100644
--- a/pkgs/development/libraries/java/jakarta-bcel/default.nix
+++ b/pkgs/development/libraries/java/jakarta-bcel/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bcel-5.1.tar.gz;
+    url = http://nixos.org/tarballs/bcel-5.1.tar.gz;
     md5 = "318f22e4f5f59b68cd004db83a7d65dc";
   };
 
diff --git a/pkgs/development/libraries/java/jakarta-regexp/default.nix b/pkgs/development/libraries/java/jakarta-regexp/default.nix
index e95df89ecc32..d6c093423d84 100644
--- a/pkgs/development/libraries/java/jakarta-regexp/default.nix
+++ b/pkgs/development/libraries/java/jakarta-regexp/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   builder = ./java-bin-builder.sh;
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/jakarta-regexp-1.4.tar.gz;
+    url = http://nixos.org/tarballs/jakarta-regexp-1.4.tar.gz;
     md5 = "d903d84c949df848009f3bf205b32c97";
   };
 
diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix
index e3730693659b..13018d29dcb2 100644
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/pkgs/development/libraries/lcms/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lcms-1.14";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/lcms-1.14.tar.gz;
+    url = http://nixos.org/tarballs/lcms-1.14.tar.gz;
     md5 = "5a803460aeb10e762d97e11a37462a69";
   };
 }
diff --git a/pkgs/development/libraries/libjpeg-static/default.nix b/pkgs/development/libraries/libjpeg-static/default.nix
index a088987fcba8..e0722eba4155 100644
--- a/pkgs/development/libraries/libjpeg-static/default.nix
+++ b/pkgs/development/libraries/libjpeg-static/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libjpeg-6b";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/jpegsrc.v6b.tar.gz;
+    url = http://nixos.org/tarballs/jpegsrc.v6b.tar.gz;
     md5 = "dbd5f3b47ed13132f04c685d608a7547";
   };
   inherit libtool;
@@ -15,11 +15,11 @@ stdenv.mkDerivation {
   # Required for building of dynamic libraries on Darwin.
   patches = [
     (fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/patch-ltconfig;
+      url = http://nixos.org/tarballs/patch-ltconfig;
       md5 = "e6725fa4a09aa1de4ca75343fd0f61d5";
     })
     (fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/patch-ltmain.sh;
+      url = http://nixos.org/tarballs/patch-ltmain.sh;
       #md5 = "489986ad8e7a93aef036766b25f321d5";
       md5 = "092a12aeb0c386dd7dae059109d950ba";
     })
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9b78d5463712..2e4013f16ec7 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,11 +23,11 @@ stdenv.mkDerivation {
     md5 = "93e6ed7924ff069a4f883b4fce5349dc";
   };
 /*    (fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2;
+      url = http://nixos.org/tarballs/MesaGLUT-6.4.tar.bz2;
       md5 = "1a8c4d4fc699233f5fdb902b8753099e";
     })
     (fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/MesaDemos-6.4.tar.bz2;
+      url = http://nixos.org/tarballs/MesaDemos-6.4.tar.bz2;
       md5 = "1a8c4d4fc699233f5fdb902b8753099e";
     }) */
   
diff --git a/pkgs/development/libraries/popt/popt-1.7.nix b/pkgs/development/libraries/popt/popt-1.7.nix
index 9ae06b0ed267..d82fa2b9fc76 100644
--- a/pkgs/development/libraries/popt/popt-1.7.nix
+++ b/pkgs/development/libraries/popt/popt-1.7.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     urls = [
       ftp://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/popt-1.7.tar.gz
-      http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz
+      http://nixos.org/tarballs/popt-1.7.tar.gz
     ];
     md5 = "5988e7aeb0ae4dac8d83561265984cc9";
   };
diff --git a/pkgs/development/perl-modules/Archive-Zip/default.nix b/pkgs/development/perl-modules/Archive-Zip/default.nix
index 752b812a2de5..44f34e169825 100644
--- a/pkgs/development/perl-modules/Archive-Zip/default.nix
+++ b/pkgs/development/perl-modules/Archive-Zip/default.nix
@@ -3,7 +3,7 @@
 import ../generic perl {
   name = "Archive-Zip-1.16";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/Archive-Zip-1.16.tar.gz;
+    url = http://nixos.org/tarballs/Archive-Zip-1.16.tar.gz;
     md5 = "e28dff400d07b1659d659d8dde7071f1";
   };
 }
diff --git a/pkgs/development/perl-modules/Compress-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Zlib/default.nix
index 38a821d915f9..44941689acdc 100644
--- a/pkgs/development/perl-modules/Compress-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Zlib/default.nix
@@ -3,7 +3,7 @@
 import ../generic perl {
   name = "Compress-Zlib-1.41";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/Compress-Zlib-1.41.tar.gz;
+    url = http://nixos.org/tarballs/Compress-Zlib-1.41.tar.gz;
     md5 = "ac135b84a03e814734496777cf5e5722";
   };
 }
diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
index 2e343b4237b3..dbc68e1d90ce 100644
--- a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnumake-3.80";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/make-3.80.tar.bz2;
+    url = http://nixos.org/tarballs/make-3.80.tar.bz2;
     md5 = "0bbd1df101bc0294d440471e50feca71";
   };
   patches = [./log.patch];
diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix
index bc4fbdcd54ea..9cd208f5a818 100644
--- a/pkgs/development/tools/build-managers/mk/default.nix
+++ b/pkgs/development/tools/build-managers/mk/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mk-2006-01-31";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/mk-20060131.tar.gz;
+    url = http://nixos.org/tarballs/mk-20060131.tar.gz;
     md5 = "167fd4e0eea4f49def01984ec203289b";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix
index 9e3233133c77..37d9e685eb1e 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "noweb-2.10c";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/noweb-20060201.tar.gz;
+    url = http://nixos.org/tarballs/noweb-20060201.tar.gz;
     md5 = "b4813c6bc0bab9004e57edc1d7e57638";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/tools/misc/automake/automake-1.7.x.nix b/pkgs/development/tools/misc/automake/automake-1.7.x.nix
index 5c2a720aaabd..fc34ef8e3aad 100644
--- a/pkgs/development/tools/misc/automake/automake-1.7.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.7.x.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/automake-1.7.9.tar.bz2;
+    url = http://nixos.org/tarballs/automake-1.7.9.tar.bz2;
     md5 = "571fd0b0598eb2a27dcf68adcfddfacb";
   };
   buildInputs = [perl autoconf];
diff --git a/pkgs/development/tools/misc/elfutils/0.127.nix b/pkgs/development/tools/misc/elfutils/0.127.nix
index 198242e27087..3d6f650290b8 100644
--- a/pkgs/development/tools/misc/elfutils/0.127.nix
+++ b/pkgs/development/tools/misc/elfutils/0.127.nix
@@ -3,7 +3,7 @@ args: with args;
 stdenv.mkDerivation {
   name = "elfutils-"+version;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/elfutils-0.127.tar.gz;
+    url = http://nixos.org/tarballs/elfutils-0.127.tar.gz;
     sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv";
   };
   preBuild = "sed -e 's/-Werror//' -i */Makefile ";
diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix
index 09596f173d01..b188c77e99fc 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.4.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [m4];
 
+  x = "z";
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/misc/linuxwacom/default.nix b/pkgs/misc/linuxwacom/default.nix
index c7fc90e1b885..7fbf62b05895 100644
--- a/pkgs/misc/linuxwacom/default.nix
+++ b/pkgs/misc/linuxwacom/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "linuxwacom-0.7.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/linuxwacom-0.7.2.tar.bz2;
+    url = http://nixos.org/tarballs/linuxwacom-0.7.2.tar.bz2;
     md5 = "3f6290101d5712a24097243ca9f092ed";
   };
   buildInputs = [libX11 libXi];
diff --git a/pkgs/os-specific/linux/initscripts/default.nix b/pkgs/os-specific/linux/initscripts/default.nix
index 338191ce1384..acb138265154 100644
--- a/pkgs/os-specific/linux/initscripts/default.nix
+++ b/pkgs/os-specific/linux/initscripts/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "initscripts-8.18";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/initscripts-8.18.tar.bz2;
+    url = http://nixos.org/tarballs/initscripts-8.18.tar.bz2;
     md5 = "1b89ac4d344f1f20fe5022a198b69915";
   };
   buildInputs = [popt pkgconfig glib];
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix
index 0a4886d1ab1e..4b2cd1ed5b22 100644
--- a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix
+++ b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ov511-2.30";
   builder = ./ov511-2.30-builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ov511-2.30.tar.bz2;
+    url = http://nixos.org/tarballs/ov511-2.30.tar.bz2;
     md5 = "9eacf9e54f2f54a59ddbf14221a53f2a";
   };
   patches = [./ov511-kernel.patch ./ov511-2.32-kdir.patch];
diff --git a/pkgs/os-specific/linux/uml-utilities/default.nix b/pkgs/os-specific/linux/uml-utilities/default.nix
index 3e085b41ebf6..4fb4ea553105 100644
--- a/pkgs/os-specific/linux/uml-utilities/default.nix
+++ b/pkgs/os-specific/linux/uml-utilities/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "uml-utilities-20040114";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/uml_utilities_20040114.tar.bz2;
+    url = http://nixos.org/tarballs/uml_utilities_20040114.tar.bz2;
     md5 = "1fd5b791ef32c6a3ed4ae42c4a53a316";
   };
 }
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 1f123fadc879..fbd5e8c7cdfb 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -3,7 +3,7 @@
 let
 
   usbids = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/usb.ids.20080115.bz2;
+    url = http://nixos.org/tarballs/usb.ids.20080115.bz2;
     sha256 = "0xymp8fpp9pnkj2i4ry8zpsvy18zw14sx03pnz316lpgwc6dx12n";
   };
 
diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix
index db5c581453b9..e065931e5ebf 100644
--- a/pkgs/stdenv/linux/bootstrap/i686/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix
@@ -6,22 +6,22 @@
   tar = ./tar.bz2;
 
   binutilsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/binutils.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/binutils.tar.bz2;
     sha1 = "73532561c2f98d0df641fbd778bc92cea298762a";
   };
 
   gccURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/gcc.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/gcc.tar.bz2;
     sha1 = "522dc2e22dc42f640b0290638382d45bd43a7d55";
   };
 
   glibcURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/glibc.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/glibc.tar.bz2;
     sha1 = "b9ae1e43e9977476ef53f8c1c9cd1cff5526ff40";
   };
 
   staticToolsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/static-tools.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/static-tools.tar.bz2;
     sha1 = "ebe826e848736a82bcdd9a195dd510b533ecc997";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
index a354cc01d859..61f7f8635128 100644
--- a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
@@ -6,22 +6,22 @@
   tar = ./tar.bz2;
 
   staticToolsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
     sha1 = "e4d1680e3dfa752e49a996a31140db53b10061cb";
   };
 
   binutilsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
     sha1 = "2609f4d9277a60fcd178395d3d49911190e08f36";
   };
 
   gccURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
     sha1 = "71d79d736bfef6252208fe6239e528a591becbed";
   };
 
   glibcURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
     sha1 = "bf0245e16235800c8aa9c6a5de6565583a66e46d";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
index 5746bbbfa2e5..1b265bd66a5f 100644
--- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
@@ -6,22 +6,22 @@
   tar = ./tar.bz2;
 
   binutilsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/binutils.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/binutils.tar.bz2;
     sha1 = "9ac95e34c96c19cd0b925af46c97c9979becaaca";
   };
 
   gccURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/gcc.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/gcc.tar.bz2;
     sha1 = "e8cb32425c8f55833ca081bd74668a029bdf1755";
   };
 
   glibcURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/glibc.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/glibc.tar.bz2;
     sha1 = "74b1698a4595ce4b4f43a33b3ceca1e4459e494e";
   };
 
   staticToolsURL = {
-    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/static-tools.tar.bz2;
+    url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/static-tools.tar.bz2;
     sha1 = "4da3af92c9bcd8fc43b31934d8429412e209741b";
   };
 }
diff --git a/pkgs/tools/X11/xauth/default.nix b/pkgs/tools/X11/xauth/default.nix
index e946ef81669a..42e01c0aeda6 100644
--- a/pkgs/tools/X11/xauth/default.nix
+++ b/pkgs/tools/X11/xauth/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xauth-7.0";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xauth-7.0.tar.bz2;
+    url = http://nixos.org/tarballs/xauth-7.0.tar.bz2;
     md5 = "d597005016baa8af81a5b0e38951d563";
   };
   buildInputs = [pkgconfig libX11 libXau libXext libXmu];
diff --git a/pkgs/tools/archivers/gnutar/1.15.1.nix b/pkgs/tools/archivers/gnutar/1.15.1.nix
index 841280d5730e..77dc1a3c76e1 100644
--- a/pkgs/tools/archivers/gnutar/1.15.1.nix
+++ b/pkgs/tools/archivers/gnutar/1.15.1.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnutar-1.15.1";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/tar-1.15.1.tar.bz2;
+    url = http://nixos.org/tarballs/tar-1.15.1.tar.bz2;
     md5 = "57da3c38f8e06589699548a34d5a5d07";
   };
 }
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index a690a8e71639..9e17e2d9edd2 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "unzip-5.52";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/unzip552.tar.gz;
+    url = http://nixos.org/tarballs/unzip552.tar.gz;
     md5 = "9d23919999d6eac9217d1f41472034a9";
   };
 
diff --git a/pkgs/tools/misc/coreutils-5/default.nix b/pkgs/tools/misc/coreutils-5/default.nix
index e09a44842d5e..fc9ef3b7c427 100644
--- a/pkgs/tools/misc/coreutils-5/default.nix
+++ b/pkgs/tools/misc/coreutils-5/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "coreutils-5.97";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.97.tar.gz;
+    url = http://nixos.org/tarballs/coreutils-5.97.tar.gz;
     md5 = "bdec4b75c76ac9bf51b6dd1747d3b06e";
   };
   patches = [./dietlibc.patch];
diff --git a/pkgs/tools/misc/findutils/4.2.27.nix b/pkgs/tools/misc/findutils/4.2.27.nix
index 80f5fbfc5d70..591134d692d1 100644
--- a/pkgs/tools/misc/findutils/4.2.27.nix
+++ b/pkgs/tools/misc/findutils/4.2.27.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "findutils-4.2.27";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/findutils-4.2.27.tar.gz;
+    url = http://nixos.org/tarballs/findutils-4.2.27.tar.gz;
     md5 = "f1e0ddf09f28f8102ff3b90f3b5bc920";
   };
   buildInputs = [coreutils];
diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix
index d8e8bb9ab629..faa4a9e8f7a9 100644
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/pkgs/tools/misc/getopt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "getopt-1.1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/getopt-1.1.4.tar.gz;
+    url = http://nixos.org/tarballs/getopt-1.1.4.tar.gz;
     md5 = "02188ca68da27c4175d6e9f3da732101";
   };
 }
diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix
index 69fb60117e96..3e613bb9a6b3 100644
--- a/pkgs/tools/networking/p2p/azureus/default.nix
+++ b/pkgs/tools/networking/p2p/azureus/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "azureus-2.3.0.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/Azureus2.3.0.6.jar;
+    url = http://nixos.org/tarballs/Azureus2.3.0.6.jar;
     md5 = "84f85b144cdc574338c2c84d659ca620";
   };
 #  buildInputs = [unzip];
diff --git a/pkgs/tools/package-management/nix/custom.nix b/pkgs/tools/package-management/nix/custom.nix
index 475a365d95be..dea1c93b01a9 100644
--- a/pkgs/tools/package-management/nix/custom.nix
+++ b/pkgs/tools/package-management/nix/custom.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "The Nix Deployment System";
-    homepage = http://nix.cs.uu.nl/;
+    homepage = http://nixos.org/;
     license = "LGPL";
   };
 }
diff --git a/pkgs/tools/package-management/snix/default.nix b/pkgs/tools/package-management/snix/default.nix
index 72cf291bdd6b..c8a13944d5b4 100644
--- a/pkgs/tools/package-management/snix/default.nix
+++ b/pkgs/tools/package-management/snix/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "The SNix Deployment System (Nix extended to handle state)";
-    homepage = http://nix.cs.uu.nl/;
+    homepage = http://nixos.org/;
     license = "LGPL";
   };
 }
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 9182d1cf4bb0..5e8023a582a0 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [readline];
   idea = if ideaSupport then fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/idea.c.gz;
+    url = http://nixos.org/tarballs/idea.c.gz;
     md5 = "9dc3bc086824a8c7a331f35e09a3e57f";
   } else null;
 
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index fcb45f2cb3de..c44aa10c7008 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gnugrep-2.5.3";
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/grep-2.5.3-with-info.tar.bz2;
+    url = http://nixos.org/tarballs/grep-2.5.3-with-info.tar.bz2;
     sha256 = "0rg9dipksqzbg8v1xalib1n3xkkycc5r1l2gb9cxy1cz3cjip5l8";
   };
   
diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
index 7170eaf8160a..7ad55102c4f8 100644
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/pkgs/tools/text/xml/xpf/default.nix
@@ -5,7 +5,7 @@ assert libxml2.pythonSupport == true;
 stdenv.mkDerivation {
   name = "xpf-0.2";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xpf-0.2.tar.gz;
+    url = http://nixos.org/tarballs/xpf-0.2.tar.gz;
     md5 = "d92658828139e1495e052d0cfe25d312";
   };
   buildInputs = [python libxml2];
diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix
index 86e856a4d513..304f50f29060 100644
--- a/pkgs/tools/typesetting/bibtex-tools/default.nix
+++ b/pkgs/tools/typesetting/bibtex-tools/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "bibtex-tools-0.2pre13026";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bibtex-tools-0.2pre13026.tar.gz;
+    url = http://nixos.org/tarballs/bibtex-tools-0.2pre13026.tar.gz;
     md5 = "2d8a5de7c53eb670307048eb3d14cdd6";
   };
   configureFlags = "