diff options
| author | Linus Heckemann <git@sphalerite.org> | 2023-12-14 14:39:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-14 14:39:07 +0100 |
| commit | bb2a5d870674ae386b0c1b75131b58214ea0a0cc (patch) | |
| tree | e047c2bfe09d2dc9a3029dbce4a0302146418752 | |
| parent | bc120559075a89510e227a54c734d0065dc924ca (diff) | |
| parent | 89ef7b76f3be2540cbb3d99a20c99029d481a613 (diff) | |
| download | nixlib-bb2a5d870674ae386b0c1b75131b58214ea0a0cc.tar nixlib-bb2a5d870674ae386b0c1b75131b58214ea0a0cc.tar.gz nixlib-bb2a5d870674ae386b0c1b75131b58214ea0a0cc.tar.bz2 nixlib-bb2a5d870674ae386b0c1b75131b58214ea0a0cc.tar.lz nixlib-bb2a5d870674ae386b0c1b75131b58214ea0a0cc.tar.xz nixlib-bb2a5d870674ae386b0c1b75131b58214ea0a0cc.tar.zst nixlib-bb2a5d870674ae386b0c1b75131b58214ea0a0cc.zip | |
Merge pull request #270212 from SuperSandro2000/nixos-rebuild-accept-flake-config
nixos-rebuild: passthru accept-flake-config
| -rw-r--r-- | pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 | 2 | ||||
| -rwxr-xr-x | pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index 47ffd20740f6..9eca8163feda 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -34,6 +34,7 @@ .Op Fl -show-trace .Op Fl I Va NIX_PATH .Op Fl -verbose | v +.Op Fl -accept-flake-config .Op Fl -impure .Op Fl -max-jobs | j Va number .Op Fl -keep-failed | K @@ -395,6 +396,7 @@ accepts various Nix-related flags, including .Fl -max-jobs Ns , .Fl j Ns , .Fl I Ns , +.Fl -accept-flake-config Ns , .Fl -show-trace Ns , .Fl -keep-failed Ns , .Fl -keep-going Ns , diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 1748236369e8..f9bda1a64b62 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -82,7 +82,7 @@ while [ "$#" -gt 0 ]; do j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - -j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net) + --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net) extraBuildFlags+=("$i") ;; --verbose|-v|-vv|-vvv|-vvvv|-vvvvv) |