* Copy even more files (in particular from losser.st-lab.cs.uu.nl,

  can't assume that it will live forever).

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

26 files changed, 26 insertions, 26 deletions

diff --git a/pkgs/applications/editors/emacs-22-aa/default.nix b/pkgs/applications/editors/emacs-22-aa/default.nix
index 28a8f60f96aa..606e6ba5fd94 100644
--- a/pkgs/applications/editors/emacs-22-aa/default.nix
+++ b/pkgs/applications/editors/emacs-22-aa/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   name = "emacs-22.0.50-pre-xft";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/emacs-22.0.50-xft.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/emacs-22.0.50-xft.tar.bz2;
     md5 = "4f96ada6f18513aeb70adc27b7ac862f";
   };
   patches = [./crt.patch];
diff --git a/pkgs/applications/editors/emacs-22/default.nix b/pkgs/applications/editors/emacs-22/default.nix
index 503a715d16ad..cfa3a937de95 100644
--- a/pkgs/applications/editors/emacs-22/default.nix
+++ b/pkgs/applications/editors/emacs-22/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   name = "emacs-22.0.50-pre20051207";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/emacs-22.0.50.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/emacs-22.0.50.tar.bz2;
     md5 = "011d40367015691e4319ddc65b4e7843";
   };
   patches = [./crt.patch];
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 57a7207546a3..050467c46242 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://losser.labs.cs.uu.nl/~eelco/mono-tmp/monodevelop-0.6-pre2315.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/monodevelop-0.6-pre2315.tar.bz2;
     md5 = "8c33df5629b0676b7ab552854c1de6fd";
   };
 
diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
index 8d422b6f880c..8b9ac5a9f546 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://apache.cs.uu.nl/dist/xml/batik/batik-1.6.zip;
+    url = http://nix.cs.uu.nl/dist/tarballs/batik-1.6.zip;
     md5 = "edff288fc64f968ff96ca49763d50f3c";
   };
 
diff --git a/pkgs/applications/package-management/rpm/default.nix b/pkgs/applications/package-management/rpm/default.nix
index 4fa768256a5e..a13d3ff76217 100644
--- a/pkgs/applications/package-management/rpm/default.nix
+++ b/pkgs/applications/package-management/rpm/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rpm-4.4.5";
 
   src = fetchurl {
-    url = http://losser.labs.cs.uu.nl/~armijn/.nix/rpm-4.4.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/rpm-4.4.5.tar.gz;
     #md5 = "e24ce468082479fe850c9d6563f56db5";
     md5 = "3f277388b0486c6e8ce9b07fdf53993e";
   };
diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix
index dd96a9df48b9..2af5ac93ca99 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://losser.labs.cs.uu.nl/~eelco/mono-tmp/gtkmozembed-sharp-0.7-pre41601.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/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 0f74647e5b04..430226789ead 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://losser.labs.cs.uu.nl/~eelco/mono-tmp/gtksourceview-sharp-0.6-pre40261.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtksourceview-sharp-0.6-pre40261.tar.bz2;
     md5 = "8bc26c182bd897f50988e110a9a11f34";
   };
 
diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
index 806db3e14ae3..c8bcf25dcc4b 100644
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ b/pkgs/development/libraries/haskell/uulib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "uulib-0.9.2";
   src = fetchurl {
-    url = http://abaris.zoo.cs.uu.nl:8080/wiki/pub/HUT/Download/uulib-0.9.2-src.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/uulib-0.9.2-src.tar.gz;
     md5 = "0cc9acc6a268e2bc5c8a954e67406e2d";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/libraries/java/jakarta-bcel/default.nix b/pkgs/development/libraries/java/jakarta-bcel/default.nix
index 79bd8aa8c8eb..fc609d8095b6 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://apache.cs.uu.nl/dist/jakarta/bcel/binaries/bcel-5.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bcel-5.1.tar.gz;
     md5 = "318f22e4f5f59b68cd004db83a7d65dc";
   };
 
diff --git a/pkgs/development/libraries/xlibs/libXp/default.nix b/pkgs/development/libraries/xlibs/libXp/default.nix
index 4295e0dc0681..9ffe61ba28a1 100644
--- a/pkgs/development/libraries/xlibs/libXp/default.nix
+++ b/pkgs/development/libraries/xlibs/libXp/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXp-6.2.0-cvs";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXp-6.2.0-cvs.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXp-6.2.0-cvs.tar.bz2;
     md5 = "e9e69235e00fb80c3b399507f2699b1e";
   };
   buildInputs = [pkgconfig libXt];
diff --git a/pkgs/development/libraries/xlibs/libXtst/default.nix b/pkgs/development/libraries/xlibs/libXtst/default.nix
index 4319a6f0cec7..9fdddf7ee89d 100644
--- a/pkgs/development/libraries/xlibs/libXtst/default.nix
+++ b/pkgs/development/libraries/xlibs/libXtst/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXtst-6.2.2-cvs";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXtst-6.2.2.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXtst-6.2.2.tar.bz2;
     md5 = "6ee58bdcb151f1eccc761262f737e7d3";
   };
   buildInputs = [pkgconfig libX11 libXext recordext libXtrans];
diff --git a/pkgs/development/libraries/xlibs/libXxf86vm/default.nix b/pkgs/development/libraries/xlibs/libXxf86vm/default.nix
index de6990b2db87..ec78d2ac47e3 100644
--- a/pkgs/development/libraries/xlibs/libXxf86vm/default.nix
+++ b/pkgs/development/libraries/xlibs/libXxf86vm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libXxf86vm-2.2.0-cvs";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXxf86vm-2.2.0-cvs.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libXxf86vm-2.2.0-cvs.tar.bz2;
     md5 = "0645a4f18ff720dbeabf5b2ff0fcd82a";
   };
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/xlibs/recordext/default.nix b/pkgs/development/libraries/xlibs/recordext/default.nix
index c1e67f5b31be..e682e949213a 100644
--- a/pkgs/development/libraries/xlibs/recordext/default.nix
+++ b/pkgs/development/libraries/xlibs/recordext/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "recordext-1.13-cvs";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/recordext-1.13.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/recordext-1.13.tar.bz2;
     md5 = "dcb2519a76ce238507e777bd79b67ab5";
   };
 }
diff --git a/pkgs/development/libraries/xlibs/xf86vmext/default.nix b/pkgs/development/libraries/xlibs/xf86vmext/default.nix
index 34d5af4ca0b8..17339c201b8d 100644
--- a/pkgs/development/libraries/xlibs/xf86vmext/default.nix
+++ b/pkgs/development/libraries/xlibs/xf86vmext/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xf86vmext-2.2-cvs";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/xf86vmext-2.2-cvs.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/xf86vmext-2.2-cvs.tar.bz2;
     md5 = "5a5818accd51799626b8c6db429907e0";
   };
 }
diff --git a/pkgs/development/perl-modules/Archive-Zip/default.nix b/pkgs/development/perl-modules/Archive-Zip/default.nix
index bb2d2ed3b6de..752b812a2de5 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 = ftp://ftp.cs.uu.nl/mirror/CPAN/authors/id/S/SM/SMPETERS/Archive-Zip-1.16.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/Archive-Zip-1.16.tar.gz;
     md5 = "e28dff400d07b1659d659d8dde7071f1";
   };
 }
diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix
index 6c03aa2e6e0f..58c054beda2c 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -3,7 +3,7 @@
 import ../generic perl {
   name = "BerkeleyDB-0.27";
   src = fetchurl {
-    url = ftp://ftp.cs.uu.nl/mirror/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-0.27.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/BerkeleyDB-0.27.tar.gz;
     md5 = "43aa72c0c6941af0d656d749ad543e96";
   };
   perlPreHook = ./hook.sh;
diff --git a/pkgs/development/perl-modules/Compress-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Zlib/default.nix
index 892216842ac3..38a821d915f9 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 = ftp://ftp.cs.uu.nl/mirror/CPAN/authors/Paul_Marquess/Compress-Zlib-1.41.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/Compress-Zlib-1.41.tar.gz;
     md5 = "ac135b84a03e814734496777cf5e5722";
   };
 }
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index 53c5db34d649..3a6354bddc88 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -11,7 +11,7 @@ let {
   body = stdenv.mkDerivation {
     name = "uuagc";
     src = fetchurl {
-      url = http://abaris.zoo.cs.uu.nl:8080/wiki/pub/HUT/Download/uuagc-0.9.1-src.tar.gz;
+      url = http://nix.cs.uu.nl/dist/tarballs/uuagc-0.9.1-src.tar.gz;
       md5 = "0f29cad75bd759696edc61c24d1a5db9";
     };
     buildInputs = [uulibGHC];
diff --git a/pkgs/development/tools/misc/callgrind/default.nix b/pkgs/development/tools/misc/callgrind/default.nix
index a69a4aaa7032..2da38e0f10b3 100644
--- a/pkgs/development/tools/misc/callgrind/default.nix
+++ b/pkgs/development/tools/misc/callgrind/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~mbravenb/clg3-cvs-2005.11.11.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/clg3-cvs-2005.11.11.tar.gz;
     md5 = "c272cff1c567ba154ccc60fe2ff241d8";
   };
 
diff --git a/pkgs/development/tools/misc/lcov/default.nix b/pkgs/development/tools/misc/lcov/default.nix
index f1a82a67ea8f..4df104d53cb1 100644
--- a/pkgs/development/tools/misc/lcov/default.nix
+++ b/pkgs/development/tools/misc/lcov/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lcov-1.4pre-cvs-20041021";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/lcov-1.4pre-cvs-20041021.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/lcov-1.4pre-cvs-20041021.tar.gz;
     md5 = "5150da759b4047b19d026c6ab1216841";
   };
   patches = [./lcov.patch];
diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix
index 222ccefee549..c7fe303b5eff 100644
--- a/pkgs/games/quake3/game/default.nix
+++ b/pkgs/games/quake3/game/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "quake3-icculus-1.33pre526";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/quake3-icculus-r526.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/quake3-icculus-r526.tar.bz2;
     md5 = "63429347b918052c27cdb5c1d15939ad";
   };
   builder = ./builder.sh;
diff --git a/pkgs/os-specific/linux/initscripts/default.nix b/pkgs/os-specific/linux/initscripts/default.nix
index fe63526723c0..338191ce1384 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://losser.labs.cs.uu.nl/~armijn/.nix/initscripts-8.18.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/initscripts-8.18.tar.bz2;
     md5 = "1b89ac4d344f1f20fe5022a198b69915";
   };
   buildInputs = [popt pkgconfig glib];
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index ba0835d1a301..617c1f1262b9 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://apache.cs.uu.nl/dist/httpd/httpd-2.0.55.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/httpd-2.0.55.tar.bz2;
     md5 = "f1b5b65c8661db9ffe38b5a4a865a0e2";
   };
 
diff --git a/pkgs/tools/X11/xauth/default.nix b/pkgs/tools/X11/xauth/default.nix
index 82cb4e29f7cb..e946ef81669a 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://losser.st-lab.cs.uu.nl/~eelco/dist/xauth-7.0.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/xauth-7.0.tar.bz2;
     md5 = "d597005016baa8af81a5b0e38951d563";
   };
   buildInputs = [pkgconfig libX11 libXau libXext libXmu];
diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
index 0a4df07f60fa..7170eaf8160a 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://losser.st-lab.cs.uu.nl/~mbravenb/software/xpf/xpf-0.2.tar.gz;
+    url = http://nix.cs.uu.nl/dist/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 df4a5b422491..71c4584402a0 100644
--- a/pkgs/tools/typesetting/bibtex-tools/default.nix
+++ b/pkgs/tools/typesetting/bibtex-tools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bibtex-tools-0.2pre13026";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/stratego/bibtex-tools-0.2pre13026/bibtex-tools-0.2pre13026.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/bibtex-tools-0.2pre13026.tar.gz;
     md5 = "2d8a5de7c53eb670307048eb3d14cdd6";
   };
   inherit aterm tetex hevea sdf strategoxt;