me
/
guix
Archived
1
0
Fork 0
Code

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".
master
Ludovic Courtès 2016-07-16 12:52:42 +02:00
parent b9bb50c608
commit f82ce8f6b1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config-daemon.ac
View File

@ -113,10 +113,10 @@ if test "x$guix_build_daemon" = "xyes"; then
dnl Determine the appropriate default list of substitute URLs. dnl Determine the appropriate default list of substitute URLs.
GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)]) GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)])
if test "x$have_gnutls" = "xyes"; then 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 else
AC_MSG_WARN([GnuTLS is missing, substitutes will be downloaded in the clear]) 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 fi
AC_MSG_CHECKING([for default substitute URLs]) AC_MSG_CHECKING([for default substitute URLs])
AC_MSG_RESULT([$guix_substitute_urls]) AC_MSG_RESULT([$guix_substitute_urls])

2
guix/store.scm
View File

@ -510,7 +510,7 @@ encoding conversion errors."
(map (if (false-if-exception (resolve-interface '(gnutls))) (map (if (false-if-exception (resolve-interface '(gnutls)))
(cut string-append "https://" <>) (cut string-append "https://" <>)
(cut string-append "http://" <>)) (cut string-append "http://" <>))
'("mirror.hydra.gnu.org" "hydra.gnu.org"))) '("mirror.hydra.gnu.org")))
(define* (set-build-options server (define* (set-build-options server
#:key keep-failed? keep-going? fallback? #:key keep-failed? keep-going? fallback?