b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos-rebuild: prevent masking return value with declaration

Browse source
This commit is contained in:
Jonathan Ringer 2021-06-10 15:14:49 -07:00 committed by Jonathan Ringer
parent ea5956a2ed
commit 0e8e7968d1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View file

@ -171,6 +171,7 @@ nixBuild() {
else else
local instArgs=() local instArgs=()
local buildArgs=() local buildArgs=()
local drv=
while [ "$#" -gt 0 ]; do while [ "$#" -gt 0 ]; do
local i="$1"; shift 1 local i="$1"; shift 1
@ -197,7 +198,7 @@ nixBuild() {
esac esac
done done
local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")"
if [ -a "$drv" ]; then if [ -a "$drv" ]; then
NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$buildHost" "$drv" NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$buildHost" "$drv"
buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}"
@ -217,6 +218,8 @@ nixFlakeBuild() {
shift 1 shift 1
local evalArgs=() local evalArgs=()
local buildArgs=() local buildArgs=()
local drv=
while [ "$#" -gt 0 ]; do while [ "$#" -gt 0 ]; do
local i="$1"; shift 1 local i="$1"; shift 1
case "$i" in case "$i" in
@ -238,7 +241,7 @@ nixFlakeBuild() {
esac esac
done done
local drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")"
if [ -a "$drv" ]; then if [ -a "$drv" ]; then
NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv"
buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}"