summaryrefslogtreecommitdiff
path: root/guix/download.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-06-20 23:51:00 +0200
committerLudovic Courtès <ludo@gnu.org>2013-06-20 23:51:00 +0200
commitd501fad11cfbd69245a4d5e2d632a0ab37985b55 (patch)
tree4d5a347efb3a5476937b21cb5bdb26204aaeea0c /guix/download.scm
parent4db00e42109b6f8229259859deac35499eec9004 (diff)
parentf3211ef3868326e3cec5318bc799a2ff6572741b (diff)
downloadguix-patches-d501fad11cfbd69245a4d5e2d632a0ab37985b55.tar
guix-patches-d501fad11cfbd69245a4d5e2d632a0ab37985b55.tar.gz
Merge branch 'master' into core-updates
Conflicts: gnu/packages/make-bootstrap.scm
Diffstat (limited to 'guix/download.scm')
-rw-r--r--guix/download.scm9
1 files changed, 8 insertions, 1 deletions
diff --git a/guix/download.scm b/guix/download.scm
index 99353be8b0..fc6c815792 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -148,7 +148,14 @@
"ftp://ftp.osuosl.org/pub/CPAN/"
"ftp://ftp.nara.wide.ad.jp/pub/CPAN/"
"http://mirrors.163.com/cpan/"
- "ftp://cpan.mirror.ac.za/"))))
+ "ftp://cpan.mirror.ac.za/")
+ (imagemagick ; from http://www.imagemagick.org/script/download.php
+ "http://mirror.checkdomain.de/imagemagick/"
+ "ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/"
+ "http://www.imagemagick.org/download"
+ "ftp://mirror.searchdaimon.com/ImageMagick"
+ "http://mirror.is.co.za/pub/imagemagick/"
+ "ftp://mirror.aarnet.edu.au/pub/imagemagick/"))))
(define (gnutls-derivation store system)
"Return the GnuTLS derivation for SYSTEM."