From 56b1f4b78070e3012b8c46dae1d2008c8d3e1c0a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 29 May 2013 23:08:06 +0200 Subject: build, package: Add `--fallback' option. * guix/scripts/build.scm (%options, show-help): Add `--fallback'. (guix-build): Call `set-build-options' with #:fallback?. * guix/scripts/package.scm (%options, show-help): Add `--fallback'. (guix-package): Call `set-build-options' with #:fallback?. * doc/guix.texi (Invoking guix package, Invoking guix build): Document `--fallback'. --- guix/scripts/build.scm | 7 +++++++ guix/scripts/package.scm | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'guix') diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 995d96362b..26cd28215e 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -81,6 +81,8 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n")) -K, --keep-failed keep build tree of failed builds")) (display (_ " -n, --dry-run do not build the derivations")) + (display (_ " + --fallback fall back to building when the substituter fails")) (display (_ " --no-substitutes build instead of resorting to pre-built substitutes")) (display (_ " @@ -140,6 +142,10 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n")) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) (alist-cons 'dry-run? #t result))) + (option '("fallback") #f #f + (lambda (opt name arg result) + (alist-cons 'fallback? #t + (alist-delete 'fallback? result)))) (option '("no-substitutes") #f #f (lambda (opt name arg result) (alist-cons 'substitutes? #f @@ -267,6 +273,7 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n")) (set-build-options (%store) #:keep-failed? (assoc-ref opts 'keep-failed?) #:build-cores (or (assoc-ref opts 'cores) 0) + #:fallback? (assoc-ref opts 'fallback?) #:use-substitutes? (assoc-ref opts 'substitutes?) #:max-silent-time (assoc-ref opts 'max-silent-time) #:verbosity (assoc-ref opts 'verbosity)) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index cd93cc3758..69b7efd154 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -437,6 +437,8 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n")) -p, --profile=PROFILE use PROFILE instead of the user's default profile")) (display (_ " -n, --dry-run show what would be done without actually doing it")) + (display (_ " + --fallback fall back to building when the substituter fails")) (display (_ " --no-substitutes build instead of resorting to pre-built substitutes")) (display (_ " @@ -499,6 +501,10 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n")) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) (alist-cons 'dry-run? #t result))) + (option '("fallback") #f #f + (lambda (opt name arg result) + (alist-cons 'fallback? #t + (alist-delete 'fallback? result)))) (option '("no-substitutes") #f #f (lambda (opt name arg result) (alist-cons 'substitutes? #f @@ -909,6 +915,7 @@ more information.~%")) (with-error-handling (parameterize ((%store (open-connection))) (set-build-options (%store) + #:fallback? (assoc-ref opts 'fallback?) #:use-substitutes? (assoc-ref opts 'substitutes?) #:max-silent-time -- cgit v1.2.3