store: Default to a non-empty list of substituters.
Fixes <http://bugs.gnu.org/20163>. Reported by Mark H Weaver <mhw@netris.org>. * guix/store.scm (%default-substitute-urls): New variable. (set-build-options): Change default value of #:substitute-urls to %DEFAULT-SUBSTITUTE-URLS.
This commit is contained in:
parent
1123759b45
commit
4d58122071
|
@ -447,6 +447,10 @@ encoding conversion errors."
|
||||||
(message "invalid error code")
|
(message "invalid error code")
|
||||||
(status k))))))))
|
(status k))))))))
|
||||||
|
|
||||||
|
(define %default-substitute-urls
|
||||||
|
;; Default list of substituters.
|
||||||
|
'("http://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?
|
||||||
(verbosity 0)
|
(verbosity 0)
|
||||||
|
@ -459,7 +463,12 @@ encoding conversion errors."
|
||||||
(print-build-trace #t)
|
(print-build-trace #t)
|
||||||
(build-cores (current-processor-count))
|
(build-cores (current-processor-count))
|
||||||
(use-substitutes? #t)
|
(use-substitutes? #t)
|
||||||
(substitute-urls '())) ; client "untrusted" cache URLs
|
|
||||||
|
;; Client-provided substitute URLs. For
|
||||||
|
;; unprivileged clients, these are considered
|
||||||
|
;; "untrusted"; for root, they override the
|
||||||
|
;; daemon's settings.
|
||||||
|
(substitute-urls %default-substitute-urls))
|
||||||
;; Must be called after `open-connection'.
|
;; Must be called after `open-connection'.
|
||||||
|
|
||||||
(define socket
|
(define socket
|
||||||
|
|
Loading…
Reference in New Issue