02/03: download: Try FTP servers last.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit ecc585711e5120bfa0e9f9839d560d831f40c1a1
Author: Leo Famulari <address@hidden>
Date:   Sun Nov 12 17:40:52 2017 -0500

    download: Try FTP servers last.
    
    * guix/download.scm (%mirrors)[savannah, kernel.org, apache, xorg, 
imagemagick]:
    Re-arrange so that FTP is last.
---
 guix/download.scm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/guix/download.scm b/guix/download.scm
index 17dac3f..95829f5 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -95,17 +95,17 @@
        "http://hackage.haskell.org/";)
       (savannah
        "http://download.savannah.gnu.org/releases/";
-       "ftp://ftp.twaren.net/Unix/NonGNU/";
-       "ftp://mirror.csclub.uwaterloo.ca/nongnu/";
-       "ftp://mirror.publicns.net/pub/nongnu/";
-       "ftp://savannah.c3sl.ufpr.br/";
        "http://ftp.cc.uoc.gr/mirrors/nongnu.org/";
        "http://ftp.twaren.net/Unix/NonGNU/";
        "http://mirror.csclub.uwaterloo.ca/nongnu/";
        "http://nongnu.askapache.com/";
        "http://savannah.c3sl.ufpr.br/";
        "http://download.savannah.gnu.org/releases-noredirect/";
-       "http://download-mirror.savannah.gnu.org/releases/";)
+       "http://download-mirror.savannah.gnu.org/releases/";
+       "ftp://ftp.twaren.net/Unix/NonGNU/";
+       "ftp://mirror.csclub.uwaterloo.ca/nongnu/";
+       "ftp://mirror.publicns.net/pub/nongnu/";
+       "ftp://savannah.c3sl.ufpr.br/";)
       (sourceforge ; https://sourceforge.net/p/forge/documentation/Mirrors/
        "http://downloads.sourceforge.net/project/";
        "http://ufpr.dl.sourceforge.net/project/";
@@ -134,26 +134,26 @@
        "http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/";
        "http://linux-kernel.uio.no/pub/";
        "http://kernel.osuosl.org/pub/";
-       "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/";
        "http://ftp.be.debian.org/pub/";
-       "http://mirror.linux.org.au/";)
+       "http://mirror.linux.org.au/";
+       "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/";)
       (apache             ; from http://www.apache.org/mirrors/dist.html
        "http://www.eu.apache.org/dist/";
        "http://www.us.apache.org/dist/";
-       "ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/";
        "http://apache.belnet.be/";
        "http://mirrors.ircam.fr/pub/apache/";
        "http://apache-mirror.rbc.ru/pub/apache/";
+       "ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/";
 
        ;; As a last resort, try the archive.
        "http://archive.apache.org/dist/";)
       (xorg               ; from http://www.x.org/wiki/Releases/Download
        "http://www.x.org/releases/"; ; main mirrors
-       "ftp://mirror.csclub.uwaterloo.ca/x.org/"; ; North America
-       "ftp://xorg.mirrors.pair.com/";
-       "http://mirror.csclub.uwaterloo.ca/x.org/";
+       "http://mirror.csclub.uwaterloo.ca/x.org/"; ; North America
        "http://xorg.mirrors.pair.com/";
        "http://mirror.us.leaseweb.net/xorg/";
+       "ftp://mirror.csclub.uwaterloo.ca/x.org/";
+       "ftp://xorg.mirrors.pair.com/";
        "ftp://artfiles.org/x.org/"; ; Europe
        "ftp://ftp.chg.ru/pub/X11/x.org/";
        "ftp://ftp.fu-berlin.de/unix/X11/FTP.X.ORG/";
@@ -169,12 +169,12 @@
        "ftp://mirror.switch.ch/mirror/X11/";
        "ftp://mirrors.ircam.fr/pub/x.org/";
        "ftp://x.mirrors.skynet.be/pub/ftp.x.org/";
-       "ftp://ftp.cs.cuhk.edu.hk/pub/X11"; ; East Asia
+       "http://x.cs.pu.edu.tw/"; ; East Asia
+       "ftp://ftp.cs.cuhk.edu.hk/pub/X11";
        "ftp://ftp.u-aizu.ac.jp/pub/x11/x.org/";
        "ftp://ftp.yz.yamagata-u.ac.jp/pub/X11/x.org/";
        "ftp://ftp.kaist.ac.kr/x.org/";
        "ftp://mirrors.go-part.com/xorg/";
-       "http://x.cs.pu.edu.tw/";
        "ftp://ftp.is.co.za/pub/x.org";)            ; South Africa
       (cpan
        "http://www.cpan.org/";
@@ -249,18 +249,18 @@
        ;; mirrors keeping old versions at the top level
        "ftp://sunsite.icm.edu.pl/packages/ImageMagick/";
        ;; mirrors moving old versions to "legacy"
-       "ftp://mirror.aarnet.edu.au/pub/imagemagick/";
+       "http://mirrors-usa.go-parts.com/mirrors/ImageMagick/";
        "http://mirror.checkdomain.de/imagemagick/";
+       "http://ftp.surfnet.nl/pub/ImageMagick/";
+       "http://mirror.searchdaimon.com/ImageMagick";
+       "http://mirror.is.co.za/pub/imagemagick/";
+       "http://www.imagemagick.org/download/";
+       "ftp://mirror.aarnet.edu.au/pub/imagemagick/";
        "ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/";
        "ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/";
        "ftp://ftp.nluug.nl/pub/ImageMagick/";
-       "http://ftp.surfnet.nl/pub/ImageMagick/";
-       "http://mirror.searchdaimon.com/ImageMagick";
        "ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/";
-       "http://mirror.is.co.za/pub/imagemagick/";
-       "http://mirrors-usa.go-parts.com/mirrors/ImageMagick/";
        "ftp://ftp.fifi.org/pub/ImageMagick/";
-       "http://www.imagemagick.org/download/";
        ;; one legacy location as a last resort
        "http://www.imagemagick.org/download/legacy/";)
       (debian