Merge fort-nix/nix-bitcoin#381: run-tests: Fix 'eval' command for newer versions of nix

32ce9d0ff4 run-tests: fix 'eval' command for newer versions of nix (Erik Arvstedt)
926f1febb7 make-container: update extra-container version (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 32ce9d0ff4

Tree-SHA512: 16665901eea84d8493c44a5334b02aa470820dfb76a186caa9e7e90b2c5688aea12348674e30c4b98b32b113e7613d956b36a40b23a7a4e94c8f57461ca92e0a

pkgs/extra-container/default.nix

@@ -4,6 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "extra-container";
+  # Update this file when changing the version: ../../test/lib/make-container.sh
   version = "0.7";
 
   src = builtins.fetchTarball {

test/lib/make-container.sh

@@ -77,8 +77,8 @@ while [[ $# > 0 ]]; do
 done
 
 containerBin=$(type -P extra-container) || true
-if [[ ! ($containerBin && $(realpath $containerBin) == *extra-container-0.6*) ]]; then
-    echo "Building extra-container. Skip this step by adding extra-container 0.6 to PATH."
+if [[ ! ($containerBin && $(realpath $containerBin) == *extra-container-0.7*) ]]; then
+    echo "Building extra-container. Skip this step by adding extra-container 0.7 to PATH."
     nix-build --out-link /tmp/extra-container "$scriptDir"/../pkgs -A extra-container >/dev/null
     export PATH="/tmp/extra-container/bin${PATH:+:}$PATH"
 fi

test/run-tests.sh

@@ -165,8 +165,7 @@ debug() {
 }
 
 evalTest() {
-    nix eval --raw "($(vmTestNixExpr)).outPath"
-    echo # nix eval doesn't print a newline
+    nix-instantiate --eval -E "($(vmTestNixExpr)).outPath"
 }
 
 instantiate() {