diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-11-21 15:28:13 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-11-26 00:16:36 +0100 |
commit | 7f44ab48f902e713ece5c5a0ae68519577a2344e (patch) | |
tree | 8de6ef3830f3ee5fccd0c1647fee5853a6099712 /guix/store.scm | |
parent | dc209d5a5ddba4320c9a4f893d6df4b70f3685a0 (diff) | |
download | guix-7f44ab48f902e713ece5c5a0ae68519577a2344e.tar guix-7f44ab48f902e713ece5c5a0ae68519577a2344e.tar.gz |
Use 'offload?' instead of 'build-hook?' internally.
* guix/scripts/archive.scm (%default-options): Replace 'build-hook?'
with 'offload?'.
* guix/scripts/build.scm (set-build-options-from-command-line): Pass
#:offload? instead of #:use-build-hook?.
(%standard-build-options): Use the 'offload? key instead of 'build-hook?.
(%default-options): Replace 'build-hook?' with 'offload?'.
* guix/scripts/copy.scm (%default-options): Likewise.
* guix/scripts/deploy.scm (%default-options): Likewise.
* guix/scripts/environment.scm (%default-options): Likewise.
* guix/scripts/pack.scm (%default-options): Likewise.
* guix/scripts/package.scm (%default-options): Likewise.
* guix/scripts/pull.scm (%default-options): Likewise.
* guix/scripts/system.scm (%default-options): Likewise.
* guix/scripts/time-machine.scm (%default-options): Likewise.
* guix/store.scm (set-build-options): Have #:use-build-hook? default
to *unspecified*. Add #:offload?. Add call to 'warn-about-deprecation'
when #:use-build-hook? is specified.
Diffstat (limited to 'guix/store.scm')
-rw-r--r-- | guix/store.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/guix/store.scm b/guix/store.scm index a276554a52..cf25d347fc 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -763,7 +763,8 @@ encoding conversion errors." max-build-jobs timeout max-silent-time - (use-build-hook? #t) + (offload? #t) + (use-build-hook? *unspecified*) ;deprecated (build-verbosity 0) (log-type 0) (print-build-trace #t) @@ -803,6 +804,10 @@ encoding conversion errors." (define socket (store-connection-socket server)) + (unless (unspecified? use-build-hook?) + (warn-about-deprecation #:use-build-hook? #f + #:replacement #:offload?)) + (let-syntax ((send (syntax-rules () ((_ (type option) ...) (begin @@ -816,7 +821,9 @@ encoding conversion errors." (max-silent-time (or max-silent-time 3600))) (send (integer max-build-jobs) (integer max-silent-time)))) (when (>= (store-connection-minor-version server) 2) - (send (boolean use-build-hook?))) + (send (boolean (if (unspecified? use-build-hook?) + offload? + use-build-hook?)))) (when (>= (store-connection-minor-version server) 4) (send (integer build-verbosity) (integer log-type) (boolean print-build-trace))) |