diff options
author | Mark H Weaver <mhw@netris.org> | 2015-07-15 15:10:32 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-07-15 15:10:32 -0400 |
commit | 35995769b516d228793940c5333ad522de992a6c (patch) | |
tree | 366b81995e9afbf8f94ecf7d4237b325ec07a0a1 /guix/scripts/build.scm | |
parent | c6f909809aecb225b66dc27e4afd3ff46ec31a38 (diff) | |
parent | e03f6d5e956b348c142d0ffd9f89af845f05eb86 (diff) | |
download | gnu-guix-35995769b516d228793940c5333ad522de992a6c.tar gnu-guix-35995769b516d228793940c5333ad522de992a6c.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/build.scm')
-rw-r--r-- | guix/scripts/build.scm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 7fd05da189..d593b5a8a7 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -118,6 +118,9 @@ options handled by 'set-build-options-from-command-line', and listed in (display (_ " --no-substitutes build instead of resorting to pre-built substitutes")) (display (_ " + --substitute-urls=URLS + fetch substitute from URLS if they are authorized")) + (display (_ " --no-build-hook do not attempt to offload builds via the build hook")) (display (_ " --max-silent-time=SECONDS @@ -141,6 +144,8 @@ options handled by 'set-build-options-from-command-line', and listed in #:max-build-jobs (or (assoc-ref opts 'max-jobs) 1) #:fallback? (assoc-ref opts 'fallback?) #:use-substitutes? (assoc-ref opts 'substitutes?) + #:substitute-urls (or (assoc-ref opts 'substitute-urls) + %default-substitute-urls) #:use-build-hook? (assoc-ref opts 'build-hook?) #:max-silent-time (assoc-ref opts 'max-silent-time) #:timeout (assoc-ref opts 'timeout) @@ -177,6 +182,13 @@ options handled by 'set-build-options-from-command-line', and listed in (alist-cons 'substitutes? #f (alist-delete 'substitutes? result)) rest))) + (option '("substitute-urls") #t #f + (lambda (opt name arg result . rest) + (apply values + (alist-cons 'substitute-urls + (string-tokenize arg) + (alist-delete 'substitute-urls result)) + rest))) (option '("no-build-hook") #f #f (lambda (opt name arg result . rest) (apply values |