diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-09-01 15:26:19 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2022-09-01 15:26:19 +0200 |
| commit | a8b3d777fbdaf0b732f129e5be62cd2a1227674b (patch) | |
| tree | 5212f343e1b0f083fadc7032cac17114ed874c3e /tests | |
| parent | c530cda345377370c52a616d608de88b9d67cd40 (diff) | |
Revert "Merge pull request #6621 from Kha/nested-follows"
This reverts commit c530cda345377370c52a616d608de88b9d67cd40, reversing
changes made to 4adcdff5c1d5f9f135c4ec61d690890443c19e6a.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/flakes/follow-paths.sh | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/tests/flakes/follow-paths.sh b/tests/flakes/follow-paths.sh index c12dbe0f6..19cc1bafa 100644 --- a/tests/flakes/follow-paths.sh +++ b/tests/flakes/follow-paths.sh @@ -148,63 +148,3 @@ git -C $flakeFollowsA add flake.nix nix flake lock $flakeFollowsA 2>&1 | grep "warning: input 'B' has an override for a non-existent input 'invalid'" nix flake lock $flakeFollowsA 2>&1 | grep "warning: input 'B' has an override for a non-existent input 'invalid2'" - -# Test nested flake overrides: A overrides B/C/D - -cat <<EOF > $flakeFollowsD/flake.nix -{ outputs = _: {}; } -EOF -cat <<EOF > $flakeFollowsC/flake.nix -{ - inputs.D.url = "path:nosuchflake"; - outputs = _: {}; -} -EOF -cat <<EOF > $flakeFollowsB/flake.nix -{ - inputs.C.url = "path:$flakeFollowsC"; - outputs = _: {}; -} -EOF -cat <<EOF > $flakeFollowsA/flake.nix -{ - inputs.B.url = "path:$flakeFollowsB"; - inputs.D.url = "path:$flakeFollowsD"; - inputs.B.inputs.C.inputs.D.follows = "D"; - outputs = _: {}; -} -EOF - -nix flake lock $flakeFollowsA - -[[ $(jq -c .nodes.C.inputs.D $flakeFollowsA/flake.lock) = '["D"]' ]] - -# Test overlapping flake follows: B has D follow C/D, while A has B/C follow C - -cat <<EOF > $flakeFollowsC/flake.nix -{ - inputs.D.url = "path:$flakeFollowsD"; - outputs = _: {}; -} -EOF -cat <<EOF > $flakeFollowsB/flake.nix -{ - inputs.C.url = "path:nosuchflake"; - inputs.D.url = "path:nosuchflake"; - inputs.D.follows = "C/D"; - outputs = _: {}; -} -EOF -cat <<EOF > $flakeFollowsA/flake.nix -{ - inputs.B.url = "path:$flakeFollowsB"; - inputs.C.url = "path:$flakeFollowsC"; - inputs.B.inputs.C.follows = "C"; - outputs = _: {}; -} -EOF - -# bug was not triggered without recreating the lockfile -nix flake lock $flakeFollowsA --recreate-lock-file - -[[ $(jq -c .nodes.B.inputs.D $flakeFollowsA/flake.lock) = '["B","C","D"]' ]] |