summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-07-16 12:52:42 +0200
committerLudovic Courtès <ludo@gnu.org>2016-07-16 14:41:39 +0200
commitf82ce8f6b1e1f64aad08e66eec77d72d8e53b1ad (patch)
tree828eb697398286e4b4e9ff7647a723c2e50414b4
parentb9bb50c608447170891af524a614748210deea89 (diff)
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".
-rw-r--r--config-daemon.ac4
-rw-r--r--guix/store.scm2
2 files changed, 3 insertions, 3 deletions
diff --git a/config-daemon.ac b/config-daemon.ac
index 803eb536996..f66f31269df 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -113,10 +113,10 @@ if test "x$guix_build_daemon" = "xyes"; then
113 dnl Determine the appropriate default list of substitute URLs. 113 dnl Determine the appropriate default list of substitute URLs.
114 GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)]) 114 GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)])
115 if test "x$have_gnutls" = "xyes"; then 115 if test "x$have_gnutls" = "xyes"; then
116 guix_substitute_urls="https://mirror.hydra.gnu.org https://hydra.gnu.org" 116 guix_substitute_urls="https://mirror.hydra.gnu.org"
117 else 117 else
118 AC_MSG_WARN([GnuTLS is missing, substitutes will be downloaded in the clear]) 118 AC_MSG_WARN([GnuTLS is missing, substitutes will be downloaded in the clear])
119 guix_substitute_urls="http://mirror.hydra.gnu.org http://hydra.gnu.org" 119 guix_substitute_urls="http://mirror.hydra.gnu.org"
120 fi 120 fi
121 AC_MSG_CHECKING([for default substitute URLs]) 121 AC_MSG_CHECKING([for default substitute URLs])
122 AC_MSG_RESULT([$guix_substitute_urls]) 122 AC_MSG_RESULT([$guix_substitute_urls])
diff --git a/guix/store.scm b/guix/store.scm
index 276684e2fbe..9f409b42097 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -510,7 +510,7 @@ encoding conversion errors."
510 (map (if (false-if-exception (resolve-interface '(gnutls))) 510 (map (if (false-if-exception (resolve-interface '(gnutls)))
511 (cut string-append "https://" <>) 511 (cut string-append "https://" <>)
512 (cut string-append "http://" <>)) 512 (cut string-append "http://" <>))
513 '("mirror.hydra.gnu.org" "hydra.gnu.org"))) 513 '("mirror.hydra.gnu.org")))
514 514
515(define* (set-build-options server 515(define* (set-build-options server
516 #:key keep-failed? keep-going? fallback? 516 #:key keep-failed? keep-going? fallback?