From 79df0635690a7e8457b3d4fa509be75b8f344146 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 21 Sep 2017 21:08:34 +0200
Subject: [PATCH] shell: inline utils.deploy
---
shell.nix | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/shell.nix b/shell.nix
index 4b8abed58..c9b197a26 100644
--- a/shell.nix
+++ b/shell.nix
@@ -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