From d6e0c511ec1201d212ce181ba0e3cd2b7774d3c0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 30 Sep 2021 23:57:07 +0000 Subject: [PATCH] Fix texted hash output test to work when testing daemon Need to get experiment features to daemon like with the other tests. --- tests/text-hashed-output.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/text-hashed-output.sh b/tests/text-hashed-output.sh index 2ee3d6590..1c4d3a438 100644 --- a/tests/text-hashed-output.sh +++ b/tests/text-hashed-output.sh @@ -2,6 +2,9 @@ source common.sh +# Globally enable the ca derivations experimental flag +sed -i 's/experimental-features = .*/& ca-derivations ca-references/' "$NIX_CONF_DIR/nix.conf" + # In the corresponding nix file, we have two derivations: the first, named root, # is a normal recursive derivation, while the second, named dependent, has the # new outputHashMode "text". Note that in "dependent", we don't refer to the @@ -13,14 +16,14 @@ source common.sh # - check that the path of the output coincides with that of the original derivation drv=$(nix-instantiate --experimental-features ca-derivations ./text-hashed-output.nix -A root) -nix --experimental-features 'nix-command ca-derivations' show-derivation --derivation "$drv" +nix show-derivation --derivation "$drv" drvDep=$(nix-instantiate --experimental-features ca-derivations ./text-hashed-output.nix -A dependent) -nix --experimental-features 'nix-command ca-derivations' show-derivation --derivation "$drvDep" +nix show-derivation --derivation "$drvDep" out1=$(nix-build --experimental-features ca-derivations ./text-hashed-output.nix -A dependent --no-out-link) -nix --experimental-features 'nix-command ca-derivations' path-info $drv --derivation --json | jq -nix --experimental-features 'nix-command ca-derivations' path-info $out1 --derivation --json | jq +nix path-info $drv --derivation --json | jq +nix path-info $out1 --derivation --json | jq test $out1 == $drv