aboutsummaryrefslogtreecommitdiff
path: root/nixops/scripts/nixops_wrap
diff options
context:
space:
mode:
Diffstat (limited to 'nixops/scripts/nixops_wrap')
-rwxr-xr-xnixops/scripts/nixops_wrap6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 914f2cc..f61bdf4 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -12,7 +12,6 @@ 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
16} 15}
17 16
18trap finish EXIT 17trap finish EXIT
@@ -28,7 +27,8 @@ for file in $files; do
28 pass show "$NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files/$file" > $TEMP/$file 27 pass show "$NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files/$file" > $TEMP/$file
29done 28done
30nixops set-args --argstr privateFiles "$TEMP" 29nixops set-args --argstr privateFiles "$TEMP"
31nixops set-args --argstr nixpkgsNext "$HOME/.nix-defexpr/channels/immaeNixpkgsNext"
32 30
33export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs" 31nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171477.5847485e3ec/nixexprs.tar.xz"
32nixpkgs="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz"
33export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext"
34nixops "$@" 34nixops "$@"