diff options
| author | pennae <82953136+pennae@users.noreply.github.com> | 2022-05-25 11:55:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 11:55:13 +0000 |
| commit | b092afe77d514ddbab02e20f8adf0acc58fa4aaf (patch) | |
| tree | 13e9942f85a507525047d246ebd12ffaa3c813ac /tests/ca | |
| parent | d6d6bbd9ef1eed6443165866cd7bd27faa9586a1 (diff) | |
| parent | 09e55010f9c7d0e60d7c97d1881cc696df3644ae (diff) | |
Merge branch 'master' into lto
Diffstat (limited to 'tests/ca')
| -rw-r--r-- | tests/ca/content-addressed.nix | 2 | ||||
| -rw-r--r-- | tests/ca/substitute.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/ca/content-addressed.nix b/tests/ca/content-addressed.nix index 1be3eeb6e..31c144ae0 100644 --- a/tests/ca/content-addressed.nix +++ b/tests/ca/content-addressed.nix @@ -23,7 +23,7 @@ rec { }; rootCA = mkCADerivation { name = "rootCA"; - outputs = [ "out" "dev" "foo"]; + outputs = [ "out" "dev" "foo" ]; buildCommand = '' echo "building a CA derivation" echo "The seed is ${toString seed}" diff --git a/tests/ca/substitute.sh b/tests/ca/substitute.sh index 3d9001bb8..819f3fd85 100644 --- a/tests/ca/substitute.sh +++ b/tests/ca/substitute.sh @@ -25,7 +25,8 @@ buildDrvs --substitute --substituters $REMOTE_STORE --no-require-sigs -j0 transi # Check that the thing we’ve just substituted has its realisation stored nix realisation info --file ./content-addressed.nix transitivelyDependentCA # Check that its dependencies have it too -nix realisation info --file ./content-addressed.nix dependentCA rootCA +nix realisation info --file ./content-addressed.nix dependentCA +# nix realisation info --file ./content-addressed.nix rootCA --outputs out # Same thing, but # 1. With non-ca derivations |