steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
Conversation 32 Commits 71 Files changed 44 +4 -2
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 62d1e8dec7 - Show all commits

6
nix/os/devices/default.nix
View file

@ -18,11 +18,13 @@ let
[[ -e "''${NIXOS_CONFIG}" ]] [[ -e "''${NIXOS_CONFIG}" ]]
${if (builtins.elem rebuildarg rebuildargsSudo) then ${if (builtins.elem rebuildarg rebuildargsSudo)
&& builtins.match ".*--target-host.*" moreargs == null
then
"sudo -E \\" "sudo -E \\"
else else
"" ""
} }
nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs} nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
if test -L result; then if test -L result; then
rm result rm result