Merge remote-tracking branch 'origin/master' into core-updates

1 files changed, 56 insertions, 21 deletions

diff --git a/guix/download.scm b/guix/download.scm
index 449521c199..1bd4875b10 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -176,28 +176,63 @@
        "ftp://mirrors.go-part.com/xorg/"
        "http://x.cs.pu.edu.tw/"
        "ftp://ftp.is.co.za/pub/x.org")            ; South Africa
-      (cpan                              ; from http://www.cpan.org/SITES.html
-       "http://mirror.ibcp.fr/pub/CPAN/"
-       "ftp://ftp.ciril.fr/pub/cpan/"
-       "ftp://artfiles.org/cpan.org/"
+      (cpan
        "http://www.cpan.org/"
-       "ftp://cpan.rinet.ru/pub/mirror/CPAN/"
-       "ftp://cpan.inode.at/"
-       "ftp://cpan.iht.co.il/"
-       "ftp://ftp.osuosl.org/pub/CPAN/"
-       "ftp://ftp.nara.wide.ad.jp/pub/CPAN/"
-       "http://mirrors.163.com/cpan/"
-       "ftp://cpan.mirror.ac.za/"
-       "http://cpan.mirrors.ionfish.org/"
-       "http://cpan.mirror.dkm.cz/pub/CPAN/"
-       "http://cpan.mirror.iphh.net/"
-       "http://mirrors.teentelecom.net/CPAN/"
-       "http://mirror.teklinks.com/CPAN/"
-       "http://cpan.weepeetelecom.be/"
-       "http://mirrors.xservers.ro/CPAN/"
-       "http://cpan.yimg.com/"
-       "http://mirror.yazd.ac.ir/cpan/"
-       "http://ftp.belnet.be/ftp.cpan.org/")
+       "http://cpan.metacpan.org/"
+       ;; A selection of HTTP mirrors from http://www.cpan.org/SITES.html.
+       ;; Europe.
+       "http://ftp.belnet.be/mirror/ftp.cpan.org/"
+       "http://mirrors.nic.cz/CPAN/"
+       "http://mirror.ibcp.fr/pub/CPAN/"
+       "http://ftp.ntua.gr/pub/lang/perl/"
+       "http://kvin.lv/pub/CPAN/"
+       "http://mirror.as43289.net/pub/CPAN/"
+       "http://cpan.cs.uu.nl/"
+       "http://cpan.uib.no/"
+       "http://cpan-mirror.rbc.ru/pub/CPAN/"
+       "http://mirror.sbb.rs/CPAN/"
+       "http://cpan.lnx.sk/"
+       "http://ftp.rediris.es/mirror/CPAN/"
+       "http://mirror.ox.ac.uk/sites/www.cpan.org/"
+       ;; Africa.
+       "http://mirror.liquidtelecom.com/CPAN/"
+       "http://cpan.mirror.ac.za/"
+       "http://mirror.is.co.za/pub/cpan/"
+       "http://cpan.saix.net/"
+       "http://mirror.ucu.ac.ug/cpan/"
+       ;; North America.
+       "http://mirrors.gossamer-threads.com/CPAN/"
+       "http://mirror.csclub.uwaterloo.ca/CPAN/"
+       "http://mirrors.ucr.ac.cr/CPAN/"
+       "http://www.msg.com.mx/CPAN/"
+       "http://mirrors.namecheap.com/CPAN/"
+       "http://mirror.uic.edu/CPAN/"
+       "http://mirror.datapipe.net/CPAN/"
+       "http://mirror.cc.columbia.edu/pub/software/cpan/"
+       "http://mirror.uta.edu/CPAN/"
+       ;; South America.
+       "http://cpan.mmgdesigns.com.ar/"
+       "http://mirror.nbtelecom.com.br/CPAN/"
+       "http://linorg.usp.br/CPAN/"
+       "http://cpan.dcc.uchile.cl/"
+       "http://mirror.cedia.org.ec/CPAN/"
+       ;; Oceania.
+       "http://cpan.mirror.serversaustralia.com.au/"
+       "http://mirror.waia.asn.au/pub/cpan/"
+       "http://mirror.as24220.net/pub/cpan/"
+       "http://cpan.lagoon.nc/pub/CPAN/"
+       "http://cpan.inspire.net.nz/"
+       ;; Asia.
+       "http://mirror.dhakacom.com/CPAN/"
+       "http://mirrors.ustc.edu.cn/CPAN/"
+       "http://ftp.cuhk.edu.hk/pub/packages/perl/CPAN/"
+       "http://kambing.ui.ac.id/cpan/"
+       "http://cpan.hostiran.ir/"
+       "http://ftp.nara.wide.ad.jp/pub/CPAN/"
+       "http://mirror.neolabs.kz/CPAN/"
+       "http://cpan.nctu.edu.tw/"
+       "http://cpan.ulak.net.tr/"
+       "http://mirrors.vinahost.vn/CPAN/")
       (cran
        ;; Arbitrary mirrors from http://cran.r-project.org/mirrors.html
        ;; This one automatically redirects to servers worldwide