From f82ce8f6b1e1f64aad08e66eec77d72d8e53b1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 16 Jul 2016 12:52:42 +0200
Subject: [PATCH] build: Substitute URLs now default to "mirror.hydra.gnu.org"
 alone.

* config-daemon.ac: Remove "hydra.gnu.org" from 'guix_substitute_urls'.
* guix/store.scm (%default-substitute-urls): Remove "hydra.gnu.org".
---
 config-daemon.ac | 4 ++--
 guix/store.scm   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config-daemon.ac b/config-daemon.ac
index 803eb53699..f66f31269d 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -113,10 +113,10 @@ if test "x$guix_build_daemon" = "xyes"; then
   dnl Determine the appropriate default list of substitute URLs.
   GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)])
   if test "x$have_gnutls" = "xyes"; then
-    guix_substitute_urls="https://mirror.hydra.gnu.org https://hydra.gnu.org"
+    guix_substitute_urls="https://mirror.hydra.gnu.org"
   else
     AC_MSG_WARN([GnuTLS is missing, substitutes will be downloaded in the clear])
-    guix_substitute_urls="http://mirror.hydra.gnu.org http://hydra.gnu.org"
+    guix_substitute_urls="http://mirror.hydra.gnu.org"
   fi
   AC_MSG_CHECKING([for default substitute URLs])
   AC_MSG_RESULT([$guix_substitute_urls])
diff --git a/guix/store.scm b/guix/store.scm
index 276684e2fb..9f409b4209 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -510,7 +510,7 @@ encoding conversion errors."
   (map (if (false-if-exception (resolve-interface '(gnutls)))
            (cut string-append "https://" <>)
            (cut string-append "http://" <>))
-       '("mirror.hydra.gnu.org" "hydra.gnu.org")))
+       '("mirror.hydra.gnu.org")))
 
 (define* (set-build-options server
                             #:key keep-failed? keep-going? fallback?