diff options
| author | Alexander Bantyev <balsoft@balsoft.ru> | 2021-12-02 11:35:50 +0300 |
|---|---|---|
| committer | Alexander Bantyev <balsoft@balsoft.ru> | 2021-12-02 12:02:34 +0300 |
| commit | 8cbf862e6f6e8250d59491fdb88dfc11a805a970 (patch) | |
| tree | 29a7029ecfd1df6e84acbd9f4b44aa6c40edf85e /tests | |
| parent | f3f32f0c30f197af2fd5a90702f7002ae74b2dfb (diff) | |
Flakes: computeLocks: pass correct LockParent when reusing oldLock
Previously, when we were attempting to reuse the old lockfile
information in the computeLocks function, we have passed the parent of
the current input to the next computeLocks call. This was incorrect,
since the follows are resolved relative to the parent. This caused
issues when we tried to reuse oldLock but couldn't for some
reason (read: mustRefetch is true), in that case the follows were
resolved incorrectly.
Fix this by passing the correct parent, and adding some tests to
prevent this particular regression from happening again.
Closes https://github.com/NixOS/nix/issues/5697
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/flakes.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/flakes.sh b/tests/flakes.sh index 9e10322b9..20966ab2a 100644 --- a/tests/flakes.sh +++ b/tests/flakes.sh @@ -722,6 +722,7 @@ cat > $flakeFollowsB/flake.nix <<EOF inputs = { foobar.url = "path:$flakeFollowsA/flakeE"; nonFlake.url = "path:$nonFlakeDir"; + goodoo.follows = "C/goodoo"; C = { url = "path:./flakeC"; inputs.foobar.follows = "foobar"; @@ -736,6 +737,7 @@ cat > $flakeFollowsC/flake.nix <<EOF description = "Flake C"; inputs = { foobar.url = "path:$flakeFollowsA/flakeE"; + goodoo.follows = "foobar"; }; outputs = { ... }: {}; } @@ -760,8 +762,18 @@ EOF git -C $flakeFollowsA add flake.nix flakeB/flake.nix \ flakeB/flakeC/flake.nix flakeD/flake.nix flakeE/flake.nix +nix flake update $flakeFollowsA + +oldLock="$(cat "$flakeFollowsA/flake.lock")" + +# Ensure that locking twice doesn't change anything + nix flake lock $flakeFollowsA +newLock="$(cat "$flakeFollowsA/flake.lock")" + +diff <(echo "$newLock") <(echo "$oldLock") + [[ $(jq -c .nodes.B.inputs.C $flakeFollowsA/flake.lock) = '"C"' ]] [[ $(jq -c .nodes.B.inputs.foobar $flakeFollowsA/flake.lock) = '["D"]' ]] [[ $(jq -c .nodes.C.inputs.foobar $flakeFollowsA/flake.lock) = '["B","foobar"]' ]] |