diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-11-21 15:14:33 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-11-26 00:16:36 +0100 |
| commit | dc209d5a5ddba4320c9a4f893d6df4b70f3685a0 (patch) | |
| tree | e3ecd25f201444a62ea2638d9dabd518b5b4f896 /guix/scripts/build.scm | |
| parent | 6a893fa8692ef32a1dbef219d87b2336e26f1423 (diff) | |
| download | guix-dc209d5a5ddba4320c9a4f893d6df4b70f3685a0.tar guix-dc209d5a5ddba4320c9a4f893d6df4b70f3685a0.tar.gz | |
guix build, daemon: Rename "--no-build-hook" to "--no-offload".
This is a followup to bc69ea2d605810cc32e13ed03d5848b8dc358b61.
* guix/scripts/build.scm (show-build-options-help): Rename
"--no-build-hook" to "--no-offload".
(%standard-build-options): Likewise, and warn when "--no-build-hook" is
passed.
* nix/nix-daemon/guix-daemon.cc (options): Add "--no-offload" and mark
"--no-build-hook" as hidden.
* guix/scripts/offload.scm: Adjust comment.
* doc/guix.texi (Invoking guix-daemon, Common Build Options): Replace
"--no-build-hook" with "--no-offload".
* etc/completion/fish/guix.fish, etc/completion/zsh/_guix: Adjust
accordingly.
Diffstat (limited to 'guix/scripts/build.scm')
| -rw-r--r-- | guix/scripts/build.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index ae78df9c5c..e72b89d2d4 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -504,7 +504,7 @@ options handled by 'set-build-options-from-command-line', and listed in (display (G_ " --no-grafts do not graft packages")) (display (G_ " - --no-build-hook do not attempt to offload builds via the build hook")) + --no-offload do not attempt to offload builds")) (display (G_ " --max-silent-time=SECONDS mark the build as failed after SECONDS of silence")) @@ -610,8 +610,12 @@ talking to a remote daemon\n"))) (alist-cons 'graft? #f (alist-delete 'graft? result eq?)) rest))) - (option '("no-build-hook") #f #f + (option '("no-offload" "no-build-hook") #f #f (lambda (opt name arg result . rest) + (when (string=? name "no-build-hook") + (warning (G_ "'--no-build-hook' is deprecated; \ +use '--no-offload' instead~%"))) + (apply values (alist-cons 'build-hook? #f (alist-delete 'build-hook? result)) |