greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jonas Nick 2021-09-05 16:10:43 +00:00
commit fb2fec852b
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/extra-container/default.nix
View File

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

4
test/lib/make-container.sh
View File

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

3
test/run-tests.sh
View File

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