aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xnixops/scripts/nixops_wrap1
-rwxr-xr-xnixops/scripts/setup13
2 files changed, 14 insertions, 0 deletions
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 2094924..3a894f9 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -29,5 +29,6 @@ done
29nixops set-args --argstr privateFiles "$TEMP" 29nixops set-args --argstr privateFiles "$TEMP"
30 30
31source $(dirname $(dirname $DIR))/nix_path_env 31source $(dirname $(dirname $DIR))/nix_path_env
32# __noChroot: ssh-config-file requires relaxed
32export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH" 33export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH"
33nixops "$@" 34nixops "$@"
diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 929b27a..38cee65 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -93,6 +93,19 @@ if [ ! -f /etc/ssh/ssh_rsa_key_nixops ]; then
93 fi 93 fi
94fi 94fi
95 95
96if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
97 cat <<-EOF
98 There are some impure derivations in the repo currently (grep __noChroot), please put
99 sandbox = "relaxed"
100 in /etc/nix/nix.conf
101 you may also want to add
102 keep-outputs = true
103 keep-derivations = true
104 to prevent garbage collector from deleting build dependencies (they take a lot of time to build)
105 EOF
106 exit 1
107fi
108
96if ! which nixops 2>/dev/null >/dev/null; then 109if ! which nixops 2>/dev/null >/dev/null; then
97 cat <<-EOF 110 cat <<-EOF
98 nixops is needed: 111 nixops is needed: