aboutsummaryrefslogtreecommitdiff
path: root/nixops/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'nixops/scripts')
-rwxr-xr-xnixops/scripts/nixops_wrap4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 2d61ed5..914f2cc 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -12,6 +12,7 @@ chmod go-rwx $TEMP
12finish() { 12finish() {
13 rm -rf "$TEMP" 13 rm -rf "$TEMP"
14 nixops set-args --unset privateFiles 14 nixops set-args --unset privateFiles
15 nixops set-args --unset nixpkgsNext
15} 16}
16 17
17trap finish EXIT 18trap finish EXIT
@@ -27,6 +28,7 @@ for file in $files; do
27 pass show "$NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files/$file" > $TEMP/$file 28 pass show "$NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files/$file" > $TEMP/$file
28done 29done
29nixops set-args --argstr privateFiles "$TEMP" 30nixops set-args --argstr privateFiles "$TEMP"
31nixops set-args --argstr nixpkgsNext "$HOME/.nix-defexpr/channels/immaeNixpkgsNext"
30 32
31export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs:immaeNixpkgsNext=$HOME/.nix-defexpr/channels/immaeNixpkgsNext" 33export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs"
32nixops "$@" 34nixops "$@"