diff options
author | tv <tv@krebsco.de> | 2017-09-21 21:08:34 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-09-21 21:08:34 +0200 |
commit | 79df0635690a7e8457b3d4fa509be75b8f344146 (patch) | |
tree | ad3c30413274ae61790bb62cd0eee9919f8e5d73 | |
parent | 43b891ef00b10a4aa574e77b58773b0f2e7d15b4 (diff) |
shell: inline utils.deploy
-rw-r--r-- | shell.nix | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -22,7 +22,12 @@ let . ${init.env} . ${init.proxy opts} - exec ${utils.deploy} + # Use system's nixos-rebuild, which is not self-contained + export PATH=/run/current-system/sw/bin + exec ${utils.with-whatsupnix} \ + nixos-rebuild switch \ + --show-trace \ + -I "$target_path" ''); cmds.install = pkgs.withGetopt { @@ -205,16 +210,6 @@ let -I "$target_path" \ ''; - utils.deploy = pkgs.writeDash "utils.deploy" '' - set -efu - # Use system's nixos-rebuild, which is not self-contained - export PATH=/run/current-system/sw/bin - ${utils.with-whatsupnix} \ - nixos-rebuild switch \ - --show-trace \ - -I "$target_path" - ''; - utils.with-whatsupnix = pkgs.writeDash "utils.with-whatsupnix" '' set -efu if \test "$quiet" = true; then |