Add buildbot

[perso/Immae/Config/Nix.git] / nixops / scripts / nixops_wrap

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 2d61ed5ee5d599ab0a4da00f71173c60fec5d521..914f2cc79faf84d0225884a155f72fa4d7a43258 100755 (executable)
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -12,6 +12,7 @@ chmod go-rwx $TEMP
 finish() {
   rm -rf "$TEMP"
   nixops set-args --unset privateFiles
+  nixops set-args --unset nixpkgsNext
 }
 
 trap finish EXIT
@@ -27,6 +28,7 @@ for file in $files; do
   pass show "$NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files/$file" > $TEMP/$file
 done
 nixops set-args --argstr privateFiles "$TEMP"
+nixops set-args --argstr nixpkgsNext "$HOME/.nix-defexpr/channels/immaeNixpkgsNext"
 
-export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs:immaeNixpkgsNext=$HOME/.nix-defexpr/channels/immaeNixpkgsNext"
+export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs"
 nixops "$@"