deployment/check/data-model/nixosTest.nix

@@ -77,23 +77,18 @@ in
               import ${pathToRoot}/deployment/nixos.nix { inherit configuration; }
               '
             )
-            # instantiate the config in /nix/store
-            "''${command[@]}" -A out_path
-            # get the other info
-            json="$("''${command[@]}" --eval --strict --json)"
 
             # DEPLOY
-            declare drv_path
-            # set our variables using the json object
-            eval "export $(echo $json | jq -r 'to_entries | map("\(.key)=\(.value)") | @sh')"
             host="root@${nodeName}"
             sshOpts=(
               -o StrictHostKeyChecking=no
               -o "ConnectTimeout=1"
               -o "ServerAliveInterval=1"
             )
+            # instantiate the config in /nix/store
+            "''${command[@]}" -A out_path
             # get the realized derivation to deploy
-            outPath=$(nix-store --realize "$drv_path")
+            outPath=$(nix-store --realize "$("''${command[@]}" --eval --strict --json | jq -r '.drv_path')")
             # deploy the config by nix-copy-closure
             NIX_SSHOPTS="''${sshOpts[*]}" nix-copy-closure --to "$host" "$outPath" --gzip --use-substitutes
             # switch the remote host to the config