diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-16 12:52:42 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-16 14:41:39 +0200 |
| commit | f82ce8f6b1e1f64aad08e66eec77d72d8e53b1ad (patch) | |
| tree | 828eb697398286e4b4e9ff7647a723c2e50414b4 | |
| parent | b9bb50c608447170891af524a614748210deea89 (diff) | |
| download | patches-f82ce8f6b1e1f64aad08e66eec77d72d8e53b1ad.tar patches-f82ce8f6b1e1f64aad08e66eec77d72d8e53b1ad.tar.gz | |
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.ac | 4 | ||||
| -rw-r--r-- | 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? |