diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-23 11:28:10 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-23 11:28:10 +0100 |
commit | 30a783364abd0afe8399d8f39a251c499451c986 (patch) | |
tree | 8a72e45187bdc8db32f3b3559b004a86e9a2ecde /nixops/scripts/nixops_wrap | |
parent | e2b96bf56f536b3a8db732294ac13977e96cf322 (diff) | |
download | Nix-30a783364abd0afe8399d8f39a251c499451c986.tar.gz Nix-30a783364abd0afe8399d8f39a251c499451c986.tar.zst Nix-30a783364abd0afe8399d8f39a251c499451c986.zip |
Remove dependency on immaeNixpkg in nix-path
Diffstat (limited to 'nixops/scripts/nixops_wrap')
-rwxr-xr-x | nixops/scripts/nixops_wrap | 6 |
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 | |||
12 | finish() { | 12 | finish() { |
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 | ||
18 | trap finish EXIT | 17 | trap 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 |
29 | done | 28 | done |
30 | nixops set-args --argstr privateFiles "$TEMP" | 29 | nixops set-args --argstr privateFiles "$TEMP" |
31 | nixops set-args --argstr nixpkgsNext "$HOME/.nix-defexpr/channels/immaeNixpkgsNext" | ||
32 | 30 | ||
33 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs" | 31 | nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171477.5847485e3ec/nixexprs.tar.xz" |
32 | nixpkgs="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz" | ||
33 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext" | ||
34 | nixops "$@" | 34 | nixops "$@" |