diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-28 00:38:25 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-28 00:38:25 +0100 |
| commit | 0897ad7fac04fc9d814e83eed46e88c7bf9740bc (patch) | |
| tree | 9bccfdb52de4c468778ceaabe337c0539c302a30 /nix/nix-daemon | |
| parent | 6d460e80d1b06fc094374e7ba5c2503f2a897f11 (diff) | |
| parent | 9943d238e9f07dccae973b641eb7738637ce95fb (diff) | |
| download | guix-0897ad7fac04fc9d814e83eed46e88c7bf9740bc.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'nix/nix-daemon')
| -rw-r--r-- | nix/nix-daemon/guix-daemon.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index 6f9c404c8d..cd949aca67 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -113,8 +113,11 @@ static const struct argp_option options[] = n_("do not use substitutes") }, { "substitute-urls", GUIX_OPT_SUBSTITUTE_URLS, n_("URLS"), 0, n_("use URLS as the default list of substitute providers") }, - { "no-build-hook", GUIX_OPT_NO_BUILD_HOOK, 0, 0, - n_("do not use the 'build hook'") }, + { "no-offload", GUIX_OPT_NO_BUILD_HOOK, 0, 0, + n_("do not attempt to offload builds") }, + { "no-build-hook", GUIX_OPT_NO_BUILD_HOOK, 0, + OPTION_HIDDEN, // deprecated + n_("do not attempt to offload builds") }, { "cache-failures", GUIX_OPT_CACHE_FAILURES, 0, 0, n_("cache build failures") }, { "rounds", GUIX_OPT_BUILD_ROUNDS, "N", 0, |