More Apache mirrors; use them for Ant.

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

2 files changed, 7 insertions, 2 deletions

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 10531a248c55..1f6be22ed6fb 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -244,10 +244,15 @@ rec {
     http://ftp.x.org/pub/ # often incomplete (e.g. files missing from X.org 7.4)
   ];
 
-  # Apache mirrors.
+  # Apache mirrors (see http://www.apache.org/mirrors/).
   apache = [
     http://apache.cs.uu.nl/dist/
     http://www.eu.apache.org/dist/
+    ftp://ftp.inria.fr/pub/Apache/
+    http://apache.cict.fr/
+    ftp://ftp.fu-berlin.de/unix/www/apache/
+    ftp://crysys.hit.bme.hu/pub/apache/dist/
+    http://mirror.cc.columbia.edu/pub/software/apache/
     http://www.apache.org/dist/
     http://archive.apache.org/dist/ # fallback for old releases
   ];
diff --git a/pkgs/development/tools/build-managers/apache-ant/from-source.nix b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
index 698066aaba26..2cf588ba377c 100644
--- a/pkgs/development/tools/build-managers/apache-ant/from-source.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "ant-gcj-${version}";
 
   src = fetchurl {
-    url = "http://mirrors.linhub.com/apache/ant/source/apache-ant-${version}-src.tar.bz2";
+    url = "mirror://apache/ant/source/apache-ant-${version}-src.tar.bz2";
     sha256 = "19pvqvgkxgpgsqm4lvbki5sm0z84kxmykdqicvfad47gc1r9mi2d";
   };