X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fsetup;h=793b7c3f1553b763dad322b6fa0fa2a71e51c888;hb=e83ec9612cf3dd7ecb4348c5b186cd0626a6d801;hp=72b19c073d00207056a2e2b7e5cc782913012b49;hpb=db4f87d640a090c4b469595737503f4189923c45;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 72b19c0..793b7c3 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -82,21 +82,25 @@ done
 
 if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
   cat <<-EOF
-	There are some impure derivations in the repo currently (grep __noChroot), please put
+	There used to be some impure derivations (grep __noChroot), you may need
 	  sandbox = "relaxed"
 	in /etc/nix/nix.conf
 	you may also want to add
 	  keep-outputs = true
 	  keep-derivations = true
 	to prevent garbage collector from deleting build dependencies (they take a lot of time to build)
+        and
+	  allow-import-from-derivation = false
+	as an attempt to avoid having build-time derivations (doesn’t work for all packages)
+	press key to continue
 	EOF
-  exit 1
+  read y
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source $(dirname $(dirname $DIR))/nix_path_env
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
+source $(dirname $(dirname $DIR))/scripts/nix_env
 
 if ! nixops_custom info 2>/dev/null >/dev/null; then
   cat <<-EOF
@@ -107,14 +111,14 @@ if ! nixops_custom info 2>/dev/null >/dev/null; then
   if [ "$y" = "y" -o "$y" = "Y" ]; then
     deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
     echo "$deployment" | nixops_custom import
-
-    nixops_custom modify "$(dirname $DIR)/eldiron.nix"
   else
     echo "Aborting"
     exit 1
   fi
 fi
 
+nixops_custom modify "$(dirname $DIR)/default.nix"
+
 cat <<-EOF
 	All set up.
 	Please make sure you’re using scripts/nixops_wrap when deploying