diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-04-17 19:02:45 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-04-17 19:02:45 -0400 |
commit | 668377f217c0fa4053d746f7094dfe887e07887c (patch) | |
tree | 40f1f7cc892b5f1bde41f1a2d105574c0bb5a716 /tests/ca | |
parent | f56c4a5bdfb0ec881b8cb0c06940abbea71b5f2b (diff) |
`TextHashMethod` -> `TextIngestionMethod`, gate with XP feature
I suppose we can use `dynamic-derivations` for the few things we neeed.
Diffstat (limited to 'tests/ca')
-rw-r--r-- | tests/ca/text-hashed-output.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/ca/text-hashed-output.sh b/tests/ca/text-hashed-output.sh index bbe5de763..dcb7e1e96 100644 --- a/tests/ca/text-hashed-output.sh +++ b/tests/ca/text-hashed-output.sh @@ -2,8 +2,10 @@ source common.sh -# Globally enable the ca derivations experimental flag -sed -i 's/experimental-features = .*/& ca-derivations ca-references/' "$NIX_CONF_DIR/nix.conf" +# Globally enable dynamic-derivations in addition to CA derivations +enableFeatures "dynamic-derivations" + +restartDaemon # 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 @@ -15,13 +17,13 @@ sed -i 's/experimental-features = .*/& ca-derivations ca-references/' "$NIX_CONF # - build the dependent derivation # - 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) +drv=$(nix-instantiate ./text-hashed-output.nix -A root) nix show-derivation "$drv" -drvDep=$(nix-instantiate --experimental-features ca-derivations ./text-hashed-output.nix -A dependent) +drvDep=$(nix-instantiate ./text-hashed-output.nix -A dependent) nix show-derivation "$drvDep" -out1=$(nix-build --experimental-features ca-derivations ./text-hashed-output.nix -A dependent --no-out-link) +out1=$(nix-build ./text-hashed-output.nix -A dependent --no-out-link) nix path-info $drv --derivation --json | jq nix path-info $out1 --derivation --json | jq |