From 9fb4205e2ceadb79a93cbe44bd77ebebe8c94625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 23 Mar 2019 00:21:59 +0100 Subject: Add buildbot Fixes https://git.immae.eu/mantisbt/view.php?id=74 --- nixops/scripts/nixops_wrap | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nixops/scripts') 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 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 "$@" -- cgit v1.2.3