[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: store: Default to a non-empty list of substituters.
From: |
Ludovic Courtès |
Subject: |
05/05: store: Default to a non-empty list of substituters. |
Date: |
Sun, 22 Mar 2015 22:43:59 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 4d58122071bbd7bb56c9658a9bbe7621bf3e423d
Author: Ludovic Courtès <address@hidden>
Date: Sun Mar 22 23:43:25 2015 +0100
store: Default to a non-empty list of substituters.
Fixes <http://bugs.gnu.org/20163>.
Reported by Mark H Weaver <address@hidden>.
* guix/store.scm (%default-substitute-urls): New variable.
(set-build-options): Change default value of #:substitute-urls to
%DEFAULT-SUBSTITUTE-URLS.
---
guix/store.scm | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/guix/store.scm b/guix/store.scm
index 45c555b..3d6b069 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -447,6 +447,10 @@ encoding conversion errors."
(message "invalid error code")
(status k))))))))
+(define %default-substitute-urls
+ ;; Default list of substituters.
+ '("http://hydra.gnu.org"))
+
(define* (set-build-options server
#:key keep-failed? keep-going? fallback?
(verbosity 0)
@@ -459,7 +463,12 @@ encoding conversion errors."
(print-build-trace #t)
(build-cores (current-processor-count))
(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'.
(define socket