diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-23 00:21:59 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-23 00:21:59 +0100 |
commit | 9fb4205e2ceadb79a93cbe44bd77ebebe8c94625 (patch) | |
tree | b8e676c9a360eb47d78de6ec70f04f6c4dd0b546 /nixops/scripts | |
parent | 80a3e0559c86d4f1fc2523b30db8a3d568cf1888 (diff) | |
download | Nix-9fb4205e2ceadb79a93cbe44bd77ebebe8c94625.tar.gz Nix-9fb4205e2ceadb79a93cbe44bd77ebebe8c94625.tar.zst Nix-9fb4205e2ceadb79a93cbe44bd77ebebe8c94625.zip |
Add buildbot
Fixes https://git.immae.eu/mantisbt/view.php?id=74
Diffstat (limited to 'nixops/scripts')
-rwxr-xr-x | nixops/scripts/nixops_wrap | 4 |
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 | |||
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 | ||
15 | } | 16 | } |
16 | 17 | ||
17 | trap finish EXIT | 18 | trap 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 |
28 | done | 29 | done |
29 | nixops set-args --argstr privateFiles "$TEMP" | 30 | nixops set-args --argstr privateFiles "$TEMP" |
31 | nixops set-args --argstr nixpkgsNext "$HOME/.nix-defexpr/channels/immaeNixpkgsNext" | ||
30 | 32 | ||
31 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs:immaeNixpkgsNext=$HOME/.nix-defexpr/channels/immaeNixpkgsNext" | 33 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs" |
32 | nixops "$@" | 34 | nixops "$@" |