Replace fetchgitPrivate by its builtins counterpart

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

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index e4f5dc5e94c51f9df2f5f34c90ba5189a11e47f5..9cf33886183f8e8c78c05d4c8366908b8df5d029 100755 (executable)
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -5,13 +5,15 @@ if [ -z "$NIXOPS_CONFIG_PASS_SUBTREE_PATH" ]; then
   echo "Please set NIXOPS_CONFIG_PASS_SUBTREE_PATH to the password-store subtree path"
   exit 1;
 fi
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
+export NIXOPS_DEPLOYMENT="$DeploymentUuid"
+source $(dirname $(dirname $DIR))/nix_path_env
+nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops"
 
 TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
 chmod go-rwx $TEMP
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
-
 finish() {
   rm -rf "$TEMP"
   $nixops set-args --unset privateFiles
@@ -19,9 +21,6 @@ finish() {
 
 trap finish EXIT
 
-export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
-export NIXOPS_DEPLOYMENT="$DeploymentUuid"
-
 # pass cannot "just" list files in a directory without showing a tree :(
 files=$(pass ls $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files | sed -e '1d' -e 's/^.* //')
 
@@ -30,7 +29,4 @@ for file in $files; do
 done
 $nixops set-args --argstr privateFiles "$TEMP"
 
-source $(dirname $(dirname $DIR))/nix_path_env
-# __noChroot: ssh-config-file requires relaxed
-export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH"
 $nixops "$@"