summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-03-28 22:18:17 +0200
committerLudovic Courtès <ludo@gnu.org>2016-03-28 22:25:42 +0200
commitd70533cbe9210c665f86d935b61ac0aaf28d397e (patch)
treebf3cd84260454a2f509fca8f9e588892fb896de7
parentefa77c6c92d47f7eab5827681e83a94bc3cc7a8c (diff)
downloadguix-d70533cbe9210c665f86d935b61ac0aaf28d397e.tar.gz
store: Prepend mirror.hydra.gnu.org to %DEFAULT-SUBSTITUTE-URLS.
This allows GuixSD to default to the right list of URLs, with
mirror.hydra.gnu.org coming first.

Reported by Chris Marusich <cmmarusich@gmail.com>.

* guix/store.scm (%default-substitute-urls): Prepend
"mirror.hydra.gnu.org."
-rw-r--r--guix/store.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/store.scm b/guix/store.scm
index ae52628545..906611658e 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -504,12 +504,13 @@ encoding conversion errors."
                               (status   k))))))))
 
 (define %default-substitute-urls
-  ;; Default list of substituters.  This is *not* the list used by
-  ;; 'guix-daemon', and few clients use it ('guix build --log-file' uses it.)
+  ;; Default list of substituters.  This is *not* the list baked in
+  ;; 'guix-daemon', but it is used by 'guix-service-type' and and a couple of
+  ;; clients ('guix build --log-file' uses it.)
   (map (if (false-if-exception (resolve-interface '(gnutls)))
            (cut string-append "https://" <>)
            (cut string-append "http://" <>))
-       '("hydra.gnu.org")))
+       '("mirror.hydra.gnu.org" "hydra.gnu.org")))
 
 (define* (set-build-options server
                             #:key keep-failed? keep-going? fallback?