diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 18:21:53 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:57 +0100 |
| commit | 92ef9d6b4653362dc9d0cbacdec863e7d41674cd (patch) | |
| tree | 4805b2cf7edda10c29dfb0c9f8a056f4b0bd78b2 /nixos | |
| parent | 657c8d9ea799f32077b14aefa3b1c9406d5d8aab (diff) | |
| download | nixlib-92ef9d6b4653362dc9d0cbacdec863e7d41674cd.tar nixlib-92ef9d6b4653362dc9d0cbacdec863e7d41674cd.tar.gz nixlib-92ef9d6b4653362dc9d0cbacdec863e7d41674cd.tar.bz2 nixlib-92ef9d6b4653362dc9d0cbacdec863e7d41674cd.tar.lz nixlib-92ef9d6b4653362dc9d0cbacdec863e7d41674cd.tar.xz nixlib-92ef9d6b4653362dc9d0cbacdec863e7d41674cd.tar.zst nixlib-92ef9d6b4653362dc9d0cbacdec863e7d41674cd.zip | |
nixos-rebuild: Ignore failure from get-version-suffix
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 0eca902dd741..5c89394abceb 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -121,7 +121,7 @@ fi # Update the version suffix if we're building from Git (so that # nixos-version shows something useful). if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then - suffix=$(@shell@ $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}") + suffix=$(@shell@ $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}" || true) if [ -n "$suffix" ]; then echo -n "$suffix" > "$nixpkgs/.version-suffix" || true fi |