diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-01-11 10:39:26 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-01-11 11:40:25 +0000 |
| commit | e40bfa4d850ed5973bdfd965fc331feb545a5e76 (patch) | |
| tree | 24f36ec8ba2e3b2f6330d146cd16807646cae65d /nixos/modules/installer | |
| parent | 5ef8b40d4dd134a285b17125db89f1e0af4e55cb (diff) | |
| download | nixlib-e40bfa4d850ed5973bdfd965fc331feb545a5e76.tar nixlib-e40bfa4d850ed5973bdfd965fc331feb545a5e76.tar.gz nixlib-e40bfa4d850ed5973bdfd965fc331feb545a5e76.tar.bz2 nixlib-e40bfa4d850ed5973bdfd965fc331feb545a5e76.tar.lz nixlib-e40bfa4d850ed5973bdfd965fc331feb545a5e76.tar.xz nixlib-e40bfa4d850ed5973bdfd965fc331feb545a5e76.tar.zst nixlib-e40bfa4d850ed5973bdfd965fc331feb545a5e76.zip | |
nixos-rebuild: allow to override builders
Since nix 2.0 the no-build-hook option was replaced by the builders options that allows to override remote builders ad-hoc. Since it is useful to disable remote builders updating nixos without network, this commit reintroduces the option.
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 2af73519bc52..361c2e49e05c 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -53,11 +53,11 @@ while [ "$#" -gt 0 ]; do repair=1 extraBuildFlags+=("$i") ;; - --max-jobs|-j|--cores|-I) + --max-jobs|-j|--cores|-I|--builders) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*) + --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*) extraBuildFlags+=("$i") ;; --option) |