* Update more URLs.

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

15 files changed, 18 insertions, 18 deletions

diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix
index 21ff1a0fc6f1..dbb6baf526a3 100644
--- 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 = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-3.4.6.tar.bz2;
     md5 = "4a21ac777d4b5617283ce488b808da7b";
   };
   # !!! apply only if noSysDirs is set
diff --git a/pkgs/development/compilers/gcc-static-4.1/default.nix b/pkgs/development/compilers/gcc-static-4.1/default.nix
index 878fd9bac8a9..dae40313cc94 100644
--- a/pkgs/development/compilers/gcc-static-4.1/default.nix
+++ b/pkgs/development/compilers/gcc-static-4.1/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "gcc-4.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gcc-4.1.1.tar.bz2;
     md5 = "ad9f97a4d04982ccf4fd67cb464879f3";
   };
   patches = [./no-sys-dirs.patch];
diff --git a/pkgs/development/interpreters/jre/jre-sun-linux.nix b/pkgs/development/interpreters/jre/jre-sun-linux.nix
index 77d5d02c4712..2c27caf81728 100644
--- a/pkgs/development/interpreters/jre/jre-sun-linux.nix
+++ b/pkgs/development/interpreters/jre/jre-sun-linux.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   version = "jre1.5.0_07";
   builder = ./builder.sh;
   src = fetchurl {
-      url = "http://jdl.sun.com/webapps/download/AutoDL?BundleId=10542";
+      url = http://jdl.sun.com/webapps/download/AutoDL?BundleId=10542;
       md5 = "e2ad1c9e47f3e34d1efae059b9e2a2d9";
     };
 }
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index 096f2e0e2295..412186f54c72 100644
--- 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://66.93.236.84/~jedwin/projects/chmlib/chmlib-0.38.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/chmlib-0.38.tar.bz2;
     md5 = "d72661526aaea377ed30e9f58a086964";
   };
 }
diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix
index 0ba5e9ba5672..eb1e09040bce 100644
--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix
@@ -452,7 +452,7 @@
   scrollkeeper = {
     name = "scrollkeeper-0.3.14";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/scrollkeeper-0.3.14.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/scrollkeeper-0.3.14.tar.bz2;
       md5 = "b175e582a6cec3e50a9de73a5bb7455a";
     };
   };
@@ -466,7 +466,7 @@
   startupnotification = {
     name = "startup-notification-0.8";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/startup-notification-0.8.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/startup-notification-0.8.tar.bz2;
       md5 = "d9b2e9fba18843314ae42334ceb4336d";
     };
   };
diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix b/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix
index f963d7011500..c6f90204fc94 100644
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix
@@ -18,7 +18,7 @@
   audiofile = {
     name = "audiofile-0.2.6";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/audiofile-0.2.6.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/audiofile-0.2.6.tar.bz2;
       md5 = "3d01302834660850b6141cac1e6f5501";
     };
   };
@@ -53,7 +53,7 @@
   gnomemimedata = {
     name = "gnome-mime-data-2.4.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gnome-mime-data-2.4.2.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.2.tar.bz2;
       md5 = "37242776b08625fa10c73c18b790e552";
     };
   };
@@ -88,7 +88,7 @@
   libart_lgpl = {
     name = "libart_lgpl-2.3.17";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libart_lgpl-2.3.17.tar.bz2;
+      url = http://nix.cs.uu.nl/dist/tarballs/libart_lgpl-2.3.17.tar.bz2;
       md5 = "dfca42529393c8a8f59dc4dc10675a46";
     };
   };
diff --git a/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
index 591eebc3ee88..1c23e6064c14 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
@@ -5,7 +5,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "pango-1.12.3";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.10/pango-1.12.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/pango-1.12.3.tar.bz2;
     md5 = "c8178e11a895166d86990bb2c38d831b";
   };
   buildInputs = [pkgconfig libpng];
diff --git a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
index f73a1f388f4e..1c82f63cafa7 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.10.3";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/glib/2.10/glib-2.10.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glib-2.10.3.tar.bz2;
     md5 = "87206e721c12d185d17dd9ecd7e30369";
   };
   buildInputs = [pkgconfig perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
index c5a012d9baaa..82c729802a03 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
@@ -10,7 +10,7 @@ assert xineramaSupport -> libXinerama != null;
 stdenv.mkDerivation {
   name = "gtk+-2.8.20";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.20.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.8.20.tar.bz2;
     md5 = "74e7ca98194f1fadfe906e66d763d05d";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/java/xalanj/default.nix b/pkgs/development/libraries/java/xalanj/default.nix
index af13a5015fd7..b286d94d6148 100644
--- a/pkgs/development/libraries/java/xalanj/default.nix
+++ b/pkgs/development/libraries/java/xalanj/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "xalanj-2.7.0";
   directory = "xalan-j_2_7_0";
   src = fetchurl {
-    url = "http://apache.cs.uu.nl/dist/xml/xalan-j/xalan-j_2_7_0-bin-2jars.tar.gz";
+    url = http://nix.cs.uu.nl/dist/tarballs/xalan-j_2_7_0-bin-2jars.tar.gz;
     md5 = "4d7b03dcaf2484b5f9685cc4309a9910";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/libraries/libpng/libpng-1.2.12.nix b/pkgs/development/libraries/libpng/libpng-1.2.12.nix
index 26dd77872932..d3e4378a4d40 100644
--- a/pkgs/development/libraries/libpng/libpng-1.2.12.nix
+++ b/pkgs/development/libraries/libpng/libpng-1.2.12.nix
@@ -5,7 +5,7 @@ assert zlib != null;
 stdenv.mkDerivation {
   name = "libpng-1.2.12";
   src = fetchurl {
-    url = ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.12.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/libpng-1.2.12.tar.bz2;
     md5 = "2287cfaad53a714acdf6eb75a7c1d15f";
   };
   propagatedBuildInputs = [zlib];
diff --git a/pkgs/development/libraries/libxslt/libxslt-1.1.15.nix b/pkgs/development/libraries/libxslt/libxslt-1.1.15.nix
index 24795bd2cbb2..e1010b2fd98f 100644
--- a/pkgs/development/libraries/libxslt/libxslt-1.1.15.nix
+++ b/pkgs/development/libraries/libxslt/libxslt-1.1.15.nix
@@ -5,7 +5,7 @@ assert libxml2 != null;
 stdenv.mkDerivation {
   name = "libxslt-1.1.15";
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxslt-1.1.15.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.15.tar.gz;
     md5 = "238de9eda71b570ff7b78aaf65308fc6";
   };
   buildInputs = [libxml2];
diff --git a/pkgs/development/libraries/ncurses-diet/default.nix b/pkgs/development/libraries/ncurses-diet/default.nix
index 64dc016d4788..3dd61f534727 100644
--- a/pkgs/development/libraries/ncurses-diet/default.nix
+++ b/pkgs/development/libraries/ncurses-diet/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ncurses-5.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/ncurses-5.5.tar.gz;
     md5 = "e73c1ac10b4bfc46db43b2ddfd6244ef";
   };
 }
diff --git a/pkgs/development/tools/misc/binutils-static/binutils-2.17.nix b/pkgs/development/tools/misc/binutils-static/binutils-2.17.nix
index 77f21e5f406e..7cd4b1444a61 100644
--- a/pkgs/development/tools/misc/binutils-static/binutils-2.17.nix
+++ b/pkgs/development/tools/misc/binutils-static/binutils-2.17.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "binutils-2.17";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/binutils/binutils-2.17.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.17.tar.bz2;
     md5 = "e26e2e06b6e4bf3acf1dc8688a94c0d1";
   };
   inherit noSysDirs;
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index c7b3a67db08e..f34e5475e657 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/swig/swig-1.3.29.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/swig-1.3.29.tar.gz;
     md5 = "44c6f6d8d724cf7fa4a5109e6f63c9b1";
   };