237 files changed, 2 insertions, 6 deletions

diff --git a/third_party/nix/tests/lang/binary-data b/third_party/nix/src/tests/lang/binary-data
index 06d740502001..06d740502001 100644
--- a/third_party/nix/tests/lang/binary-data
+++ b/third_party/nix/src/tests/lang/binary-data
Binary files differdiff --git a/third_party/nix/tests/lang/data b/third_party/nix/src/tests/lang/data
index 257cc5642cb1..257cc5642cb1 100644
--- a/third_party/nix/tests/lang/data
+++ b/third_party/nix/src/tests/lang/data
diff --git a/third_party/nix/tests/lang/dir1/a.nix b/third_party/nix/src/tests/lang/dir1/a.nix
index 231f150c579c..231f150c579c 100644
--- a/third_party/nix/tests/lang/dir1/a.nix
+++ b/third_party/nix/src/tests/lang/dir1/a.nix
diff --git a/third_party/nix/tests/lang/dir2/a.nix b/third_party/nix/src/tests/lang/dir2/a.nix
index 170df520ab68..170df520ab68 100644
--- a/third_party/nix/tests/lang/dir2/a.nix
+++ b/third_party/nix/src/tests/lang/dir2/a.nix
diff --git a/third_party/nix/tests/lang/dir2/b.nix b/third_party/nix/src/tests/lang/dir2/b.nix
index 19010cc35ca6..19010cc35ca6 100644
--- a/third_party/nix/tests/lang/dir2/b.nix
+++ b/third_party/nix/src/tests/lang/dir2/b.nix
diff --git a/third_party/nix/tests/lang/dir3/a.nix b/third_party/nix/src/tests/lang/dir3/a.nix
index 170df520ab68..170df520ab68 100644
--- a/third_party/nix/tests/lang/dir3/a.nix
+++ b/third_party/nix/src/tests/lang/dir3/a.nix
diff --git a/third_party/nix/tests/lang/dir3/b.nix b/third_party/nix/src/tests/lang/dir3/b.nix
index 170df520ab68..170df520ab68 100644
--- a/third_party/nix/tests/lang/dir3/b.nix
+++ b/third_party/nix/src/tests/lang/dir3/b.nix
diff --git a/third_party/nix/tests/lang/dir3/c.nix b/third_party/nix/src/tests/lang/dir3/c.nix
index cdf158597eef..cdf158597eef 100644
--- a/third_party/nix/tests/lang/dir3/c.nix
+++ b/third_party/nix/src/tests/lang/dir3/c.nix
diff --git a/third_party/nix/tests/lang/dir4/a.nix b/third_party/nix/src/tests/lang/dir4/a.nix
index 170df520ab68..170df520ab68 100644
--- a/third_party/nix/tests/lang/dir4/a.nix
+++ b/third_party/nix/src/tests/lang/dir4/a.nix
diff --git a/third_party/nix/tests/lang/dir4/c.nix b/third_party/nix/src/tests/lang/dir4/c.nix
index 170df520ab68..170df520ab68 100644
--- a/third_party/nix/tests/lang/dir4/c.nix
+++ b/third_party/nix/src/tests/lang/dir4/c.nix
diff --git a/third_party/nix/tests/lang/eval-fail-abort.nix b/third_party/nix/src/tests/lang/eval-fail-abort.nix
index 75c51bceb540..75c51bceb540 100644
--- a/third_party/nix/tests/lang/eval-fail-abort.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-abort.nix
diff --git a/third_party/nix/tests/lang/eval-fail-antiquoted-path.nix b/third_party/nix/src/tests/lang/eval-fail-antiquoted-path.nix
index f2f08107b516..f2f08107b516 100644
--- a/third_party/nix/tests/lang/eval-fail-antiquoted-path.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-antiquoted-path.nix
diff --git a/third_party/nix/tests/lang/eval-fail-assert.nix b/third_party/nix/src/tests/lang/eval-fail-assert.nix
index 3b7a1e8bf0c2..3b7a1e8bf0c2 100644
--- a/third_party/nix/tests/lang/eval-fail-assert.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-assert.nix
diff --git a/third_party/nix/tests/lang/eval-fail-bad-antiquote-1.nix b/third_party/nix/src/tests/lang/eval-fail-bad-antiquote-1.nix
index ffe9c983c26b..ffe9c983c26b 100644
--- a/third_party/nix/tests/lang/eval-fail-bad-antiquote-1.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-bad-antiquote-1.nix
diff --git a/third_party/nix/tests/lang/eval-fail-bad-antiquote-2.nix b/third_party/nix/src/tests/lang/eval-fail-bad-antiquote-2.nix
index 3745235ce95e..3745235ce95e 100644
--- a/third_party/nix/tests/lang/eval-fail-bad-antiquote-2.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-bad-antiquote-2.nix
diff --git a/third_party/nix/tests/lang/eval-fail-bad-antiquote-3.nix b/third_party/nix/src/tests/lang/eval-fail-bad-antiquote-3.nix
index 65b9d4f505b1..65b9d4f505b1 100644
--- a/third_party/nix/tests/lang/eval-fail-bad-antiquote-3.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-bad-antiquote-3.nix
diff --git a/third_party/nix/tests/lang/eval-fail-blackhole.nix b/third_party/nix/src/tests/lang/eval-fail-blackhole.nix
index 81133b511c95..81133b511c95 100644
--- a/third_party/nix/tests/lang/eval-fail-blackhole.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-blackhole.nix
diff --git a/third_party/nix/tests/lang/eval-fail-deepseq.nix b/third_party/nix/src/tests/lang/eval-fail-deepseq.nix
index 9baa49b063ec..9baa49b063ec 100644
--- a/third_party/nix/tests/lang/eval-fail-deepseq.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-deepseq.nix
diff --git a/third_party/nix/tests/lang/eval-fail-hashfile-missing.nix b/third_party/nix/src/tests/lang/eval-fail-hashfile-missing.nix
index ce098b82380a..ce098b82380a 100644
--- a/third_party/nix/tests/lang/eval-fail-hashfile-missing.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-hashfile-missing.nix
diff --git a/third_party/nix/tests/lang/eval-fail-missing-arg.nix b/third_party/nix/src/tests/lang/eval-fail-missing-arg.nix
index c4be9797c534..c4be9797c534 100644
--- a/third_party/nix/tests/lang/eval-fail-missing-arg.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-missing-arg.nix
diff --git a/third_party/nix/tests/lang/eval-fail-remove.nix b/third_party/nix/src/tests/lang/eval-fail-remove.nix
index 539e0eb0a6f6..539e0eb0a6f6 100644
--- a/third_party/nix/tests/lang/eval-fail-remove.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-remove.nix
diff --git a/third_party/nix/tests/lang/eval-fail-scope-5.nix b/third_party/nix/src/tests/lang/eval-fail-scope-5.nix
index f89a65a99be3..f89a65a99be3 100644
--- a/third_party/nix/tests/lang/eval-fail-scope-5.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-scope-5.nix
diff --git a/third_party/nix/tests/lang/eval-fail-seq.nix b/third_party/nix/src/tests/lang/eval-fail-seq.nix
index cddbbfd3261e..cddbbfd3261e 100644
--- a/third_party/nix/tests/lang/eval-fail-seq.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-seq.nix
diff --git a/third_party/nix/tests/lang/eval-fail-substring.nix b/third_party/nix/src/tests/lang/eval-fail-substring.nix
index f37c2bc0a160..f37c2bc0a160 100644
--- a/third_party/nix/tests/lang/eval-fail-substring.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-substring.nix
diff --git a/third_party/nix/tests/lang/eval-fail-to-path.nix b/third_party/nix/src/tests/lang/eval-fail-to-path.nix
index 5e322bc31369..5e322bc31369 100644
--- a/third_party/nix/tests/lang/eval-fail-to-path.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-to-path.nix
diff --git a/third_party/nix/tests/lang/eval-fail-undeclared-arg.nix b/third_party/nix/src/tests/lang/eval-fail-undeclared-arg.nix
index cafdf1636272..cafdf1636272 100644
--- a/third_party/nix/tests/lang/eval-fail-undeclared-arg.nix
+++ b/third_party/nix/src/tests/lang/eval-fail-undeclared-arg.nix
diff --git a/third_party/nix/tests/lang/eval-okay-any-all.exp b/third_party/nix/src/tests/lang/eval-okay-any-all.exp
index eb273f45b2a6..eb273f45b2a6 100644
--- a/third_party/nix/tests/lang/eval-okay-any-all.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-any-all.exp
diff --git a/third_party/nix/tests/lang/eval-okay-any-all.nix b/third_party/nix/src/tests/lang/eval-okay-any-all.nix
index a3f26ea2aa83..a3f26ea2aa83 100644
--- a/third_party/nix/tests/lang/eval-okay-any-all.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-any-all.nix
diff --git a/third_party/nix/tests/lang/eval-okay-arithmetic.exp b/third_party/nix/src/tests/lang/eval-okay-arithmetic.exp
index 5c54d10b7b47..5c54d10b7b47 100644
--- a/third_party/nix/tests/lang/eval-okay-arithmetic.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-arithmetic.exp
diff --git a/third_party/nix/tests/lang/eval-okay-arithmetic.nix b/third_party/nix/src/tests/lang/eval-okay-arithmetic.nix
index 7e9e6a0b666e..7e9e6a0b666e 100644
--- a/third_party/nix/tests/lang/eval-okay-arithmetic.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-arithmetic.nix
diff --git a/third_party/nix/tests/lang/eval-okay-attrnames.exp b/third_party/nix/src/tests/lang/eval-okay-attrnames.exp
index b4aa387e07b8..b4aa387e07b8 100644
--- a/third_party/nix/tests/lang/eval-okay-attrnames.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-attrnames.exp
diff --git a/third_party/nix/tests/lang/eval-okay-attrnames.nix b/third_party/nix/src/tests/lang/eval-okay-attrnames.nix
index e5b26e9f2e39..e5b26e9f2e39 100644
--- a/third_party/nix/tests/lang/eval-okay-attrnames.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-attrnames.nix
diff --git a/third_party/nix/tests/lang/eval-okay-attrs.exp b/third_party/nix/src/tests/lang/eval-okay-attrs.exp
index 45b0f829eb33..45b0f829eb33 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs.exp
diff --git a/third_party/nix/tests/lang/eval-okay-attrs.nix b/third_party/nix/src/tests/lang/eval-okay-attrs.nix
index 810b31a5da96..810b31a5da96 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs.nix
diff --git a/third_party/nix/tests/lang/eval-okay-attrs2.exp b/third_party/nix/src/tests/lang/eval-okay-attrs2.exp
index 45b0f829eb33..45b0f829eb33 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs2.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs2.exp
diff --git a/third_party/nix/tests/lang/eval-okay-attrs2.nix b/third_party/nix/src/tests/lang/eval-okay-attrs2.nix
index 9e06b83ac1fd..9e06b83ac1fd 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs2.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs2.nix
diff --git a/third_party/nix/tests/lang/eval-okay-attrs3.exp b/third_party/nix/src/tests/lang/eval-okay-attrs3.exp
index 19de4fdf79f7..19de4fdf79f7 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs3.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs3.exp
diff --git a/third_party/nix/tests/lang/eval-okay-attrs3.nix b/third_party/nix/src/tests/lang/eval-okay-attrs3.nix
index f29de11fe660..f29de11fe660 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs3.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs3.nix
diff --git a/third_party/nix/tests/lang/eval-okay-attrs4.exp b/third_party/nix/src/tests/lang/eval-okay-attrs4.exp
index 1851731442d3..1851731442d3 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs4.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs4.exp
diff --git a/third_party/nix/tests/lang/eval-okay-attrs4.nix b/third_party/nix/src/tests/lang/eval-okay-attrs4.nix
index 43ec81210f38..43ec81210f38 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs4.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs4.nix
diff --git a/third_party/nix/tests/lang/eval-okay-attrs5.exp b/third_party/nix/src/tests/lang/eval-okay-attrs5.exp
index ce0430d78081..ce0430d78081 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs5.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs5.exp
diff --git a/third_party/nix/tests/lang/eval-okay-attrs5.nix b/third_party/nix/src/tests/lang/eval-okay-attrs5.nix
index a4584cd3b398..a4584cd3b398 100644
--- a/third_party/nix/tests/lang/eval-okay-attrs5.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-attrs5.nix
diff --git a/third_party/nix/tests/lang/eval-okay-autoargs.exp b/third_party/nix/src/tests/lang/eval-okay-autoargs.exp
index 7a8391786a09..7a8391786a09 100644
--- a/third_party/nix/tests/lang/eval-okay-autoargs.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-autoargs.exp
diff --git a/third_party/nix/tests/lang/eval-okay-autoargs.flags b/third_party/nix/src/tests/lang/eval-okay-autoargs.flags
index ae3762254460..ae3762254460 100644
--- a/third_party/nix/tests/lang/eval-okay-autoargs.flags
+++ b/third_party/nix/src/tests/lang/eval-okay-autoargs.flags
diff --git a/third_party/nix/tests/lang/eval-okay-autoargs.nix b/third_party/nix/src/tests/lang/eval-okay-autoargs.nix
index 815f51b1d67a..815f51b1d67a 100644
--- a/third_party/nix/tests/lang/eval-okay-autoargs.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-autoargs.nix
diff --git a/third_party/nix/tests/lang/eval-okay-backslash-newline-1.exp b/third_party/nix/src/tests/lang/eval-okay-backslash-newline-1.exp
index 3e754364cc9c..3e754364cc9c 100644
--- a/third_party/nix/tests/lang/eval-okay-backslash-newline-1.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-backslash-newline-1.exp
diff --git a/third_party/nix/tests/lang/eval-okay-backslash-newline-1.nix b/third_party/nix/src/tests/lang/eval-okay-backslash-newline-1.nix
index 7fef3dddd4dd..7fef3dddd4dd 100644
--- a/third_party/nix/tests/lang/eval-okay-backslash-newline-1.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-backslash-newline-1.nix
diff --git a/third_party/nix/tests/lang/eval-okay-backslash-newline-2.exp b/third_party/nix/src/tests/lang/eval-okay-backslash-newline-2.exp
index 3e754364cc9c..3e754364cc9c 100644
--- a/third_party/nix/tests/lang/eval-okay-backslash-newline-2.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-backslash-newline-2.exp
diff --git a/third_party/nix/tests/lang/eval-okay-backslash-newline-2.nix b/third_party/nix/src/tests/lang/eval-okay-backslash-newline-2.nix
index 35ddf495c63b..35ddf495c63b 100644
--- a/third_party/nix/tests/lang/eval-okay-backslash-newline-2.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-backslash-newline-2.nix
diff --git a/third_party/nix/tests/lang/eval-okay-builtins-add.exp b/third_party/nix/src/tests/lang/eval-okay-builtins-add.exp
index 0350b518a7ec..0350b518a7ec 100644
--- a/third_party/nix/tests/lang/eval-okay-builtins-add.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-builtins-add.exp
diff --git a/third_party/nix/tests/lang/eval-okay-builtins-add.nix b/third_party/nix/src/tests/lang/eval-okay-builtins-add.nix
index c841816222a5..c841816222a5 100644
--- a/third_party/nix/tests/lang/eval-okay-builtins-add.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-builtins-add.nix
diff --git a/third_party/nix/tests/lang/eval-okay-builtins.exp b/third_party/nix/src/tests/lang/eval-okay-builtins.exp
index 0661686d611d..0661686d611d 100644
--- a/third_party/nix/tests/lang/eval-okay-builtins.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-builtins.exp
diff --git a/third_party/nix/tests/lang/eval-okay-builtins.nix b/third_party/nix/src/tests/lang/eval-okay-builtins.nix
index e9d65e88a817..e9d65e88a817 100644
--- a/third_party/nix/tests/lang/eval-okay-builtins.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-builtins.nix
diff --git a/third_party/nix/tests/lang/eval-okay-callable-attrs.exp b/third_party/nix/src/tests/lang/eval-okay-callable-attrs.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-callable-attrs.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-callable-attrs.exp
diff --git a/third_party/nix/tests/lang/eval-okay-callable-attrs.nix b/third_party/nix/src/tests/lang/eval-okay-callable-attrs.nix
index 310a030df004..310a030df004 100644
--- a/third_party/nix/tests/lang/eval-okay-callable-attrs.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-callable-attrs.nix
diff --git a/third_party/nix/tests/lang/eval-okay-catattrs.exp b/third_party/nix/src/tests/lang/eval-okay-catattrs.exp
index b4a1e66d6b8a..b4a1e66d6b8a 100644
--- a/third_party/nix/tests/lang/eval-okay-catattrs.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-catattrs.exp
diff --git a/third_party/nix/tests/lang/eval-okay-catattrs.nix b/third_party/nix/src/tests/lang/eval-okay-catattrs.nix
index 2c3dc10da528..2c3dc10da528 100644
--- a/third_party/nix/tests/lang/eval-okay-catattrs.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-catattrs.nix
diff --git a/third_party/nix/tests/lang/eval-okay-closure.exp.xml b/third_party/nix/src/tests/lang/eval-okay-closure.exp.xml
index dffc03a99891..dffc03a99891 100644
--- a/third_party/nix/tests/lang/eval-okay-closure.exp.xml
+++ b/third_party/nix/src/tests/lang/eval-okay-closure.exp.xml
diff --git a/third_party/nix/tests/lang/eval-okay-closure.nix b/third_party/nix/src/tests/lang/eval-okay-closure.nix
index cccd4dc35730..cccd4dc35730 100644
--- a/third_party/nix/tests/lang/eval-okay-closure.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-closure.nix
diff --git a/third_party/nix/tests/lang/eval-okay-comments.exp b/third_party/nix/src/tests/lang/eval-okay-comments.exp
index 7182dc2f9b8e..7182dc2f9b8e 100644
--- a/third_party/nix/tests/lang/eval-okay-comments.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-comments.exp
diff --git a/third_party/nix/tests/lang/eval-okay-comments.nix b/third_party/nix/src/tests/lang/eval-okay-comments.nix
index cb2cce218029..cb2cce218029 100644
--- a/third_party/nix/tests/lang/eval-okay-comments.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-comments.nix
diff --git a/third_party/nix/tests/lang/eval-okay-concat.exp b/third_party/nix/src/tests/lang/eval-okay-concat.exp
index bb4bbd577410..bb4bbd577410 100644
--- a/third_party/nix/tests/lang/eval-okay-concat.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-concat.exp
diff --git a/third_party/nix/tests/lang/eval-okay-concat.nix b/third_party/nix/src/tests/lang/eval-okay-concat.nix
index d158a9bf05b9..d158a9bf05b9 100644
--- a/third_party/nix/tests/lang/eval-okay-concat.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-concat.nix
diff --git a/third_party/nix/tests/lang/eval-okay-concatmap.exp b/third_party/nix/src/tests/lang/eval-okay-concatmap.exp
index 3b8be7739deb..3b8be7739deb 100644
--- a/third_party/nix/tests/lang/eval-okay-concatmap.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-concatmap.exp
diff --git a/third_party/nix/tests/lang/eval-okay-concatmap.nix b/third_party/nix/src/tests/lang/eval-okay-concatmap.nix
index 97da5d37a412..97da5d37a412 100644
--- a/third_party/nix/tests/lang/eval-okay-concatmap.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-concatmap.nix
diff --git a/third_party/nix/tests/lang/eval-okay-concatstringssep.exp b/third_party/nix/src/tests/lang/eval-okay-concatstringssep.exp
index 93987647ffe6..93987647ffe6 100644
--- a/third_party/nix/tests/lang/eval-okay-concatstringssep.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-concatstringssep.exp
diff --git a/third_party/nix/tests/lang/eval-okay-concatstringssep.nix b/third_party/nix/src/tests/lang/eval-okay-concatstringssep.nix
index adc4c41bd551..adc4c41bd551 100644
--- a/third_party/nix/tests/lang/eval-okay-concatstringssep.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-concatstringssep.nix
diff --git a/third_party/nix/tests/lang/eval-okay-context-introspection.exp b/third_party/nix/src/tests/lang/eval-okay-context-introspection.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-context-introspection.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-context-introspection.exp
diff --git a/third_party/nix/tests/lang/eval-okay-context-introspection.nix b/third_party/nix/src/tests/lang/eval-okay-context-introspection.nix
index 43178bd2eef9..43178bd2eef9 100644
--- a/third_party/nix/tests/lang/eval-okay-context-introspection.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-context-introspection.nix
diff --git a/third_party/nix/tests/lang/eval-okay-context.exp b/third_party/nix/src/tests/lang/eval-okay-context.exp
index 2f535bdbc454..2f535bdbc454 100644
--- a/third_party/nix/tests/lang/eval-okay-context.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-context.exp
diff --git a/third_party/nix/tests/lang/eval-okay-context.nix b/third_party/nix/src/tests/lang/eval-okay-context.nix
index 7b9531cfe9e1..7b9531cfe9e1 100644
--- a/third_party/nix/tests/lang/eval-okay-context.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-context.nix
diff --git a/third_party/nix/tests/lang/eval-okay-curpos.exp b/third_party/nix/src/tests/lang/eval-okay-curpos.exp
index 65fd65b4d01f..65fd65b4d01f 100644
--- a/third_party/nix/tests/lang/eval-okay-curpos.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-curpos.exp
diff --git a/third_party/nix/tests/lang/eval-okay-curpos.nix b/third_party/nix/src/tests/lang/eval-okay-curpos.nix
index b79553df0bd3..b79553df0bd3 100644
--- a/third_party/nix/tests/lang/eval-okay-curpos.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-curpos.nix
diff --git a/third_party/nix/tests/lang/eval-okay-deepseq.exp b/third_party/nix/src/tests/lang/eval-okay-deepseq.exp
index 8d38505c1686..8d38505c1686 100644
--- a/third_party/nix/tests/lang/eval-okay-deepseq.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-deepseq.exp
diff --git a/third_party/nix/tests/lang/eval-okay-deepseq.nix b/third_party/nix/src/tests/lang/eval-okay-deepseq.nix
index 53aa4b1dc251..53aa4b1dc251 100644
--- a/third_party/nix/tests/lang/eval-okay-deepseq.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-deepseq.nix
diff --git a/third_party/nix/tests/lang/eval-okay-delayed-with-inherit.exp b/third_party/nix/src/tests/lang/eval-okay-delayed-with-inherit.exp
index eaacb55c1aff..eaacb55c1aff 100644
--- a/third_party/nix/tests/lang/eval-okay-delayed-with-inherit.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-delayed-with-inherit.exp
diff --git a/third_party/nix/tests/lang/eval-okay-delayed-with-inherit.nix b/third_party/nix/src/tests/lang/eval-okay-delayed-with-inherit.nix
index 84b388c27130..84b388c27130 100644
--- a/third_party/nix/tests/lang/eval-okay-delayed-with-inherit.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-delayed-with-inherit.nix
diff --git a/third_party/nix/tests/lang/eval-okay-delayed-with.exp b/third_party/nix/src/tests/lang/eval-okay-delayed-with.exp
index 8e7c61ab8e77..8e7c61ab8e77 100644
--- a/third_party/nix/tests/lang/eval-okay-delayed-with.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-delayed-with.exp
diff --git a/third_party/nix/tests/lang/eval-okay-delayed-with.nix b/third_party/nix/src/tests/lang/eval-okay-delayed-with.nix
index 3fb023e1cd42..3fb023e1cd42 100644
--- a/third_party/nix/tests/lang/eval-okay-delayed-with.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-delayed-with.nix
diff --git a/third_party/nix/tests/lang/eval-okay-dynamic-attrs-2.exp b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs-2.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-dynamic-attrs-2.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs-2.exp
diff --git a/third_party/nix/tests/lang/eval-okay-dynamic-attrs-2.nix b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs-2.nix
index 6d57bf854908..6d57bf854908 100644
--- a/third_party/nix/tests/lang/eval-okay-dynamic-attrs-2.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs-2.nix
diff --git a/third_party/nix/tests/lang/eval-okay-dynamic-attrs-bare.exp b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs-bare.exp
index df8750afc036..df8750afc036 100644
--- a/third_party/nix/tests/lang/eval-okay-dynamic-attrs-bare.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs-bare.exp
diff --git a/third_party/nix/tests/lang/eval-okay-dynamic-attrs-bare.nix b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs-bare.nix
index 0dbe15e6384c..0dbe15e6384c 100644
--- a/third_party/nix/tests/lang/eval-okay-dynamic-attrs-bare.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs-bare.nix
diff --git a/third_party/nix/tests/lang/eval-okay-dynamic-attrs.exp b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs.exp
index df8750afc036..df8750afc036 100644
--- a/third_party/nix/tests/lang/eval-okay-dynamic-attrs.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs.exp
diff --git a/third_party/nix/tests/lang/eval-okay-dynamic-attrs.nix b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs.nix
index ee02ac7e6579..ee02ac7e6579 100644
--- a/third_party/nix/tests/lang/eval-okay-dynamic-attrs.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-dynamic-attrs.nix
diff --git a/third_party/nix/tests/lang/eval-okay-elem.exp b/third_party/nix/src/tests/lang/eval-okay-elem.exp
index 3cf6c0e962f0..3cf6c0e962f0 100644
--- a/third_party/nix/tests/lang/eval-okay-elem.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-elem.exp
diff --git a/third_party/nix/tests/lang/eval-okay-elem.nix b/third_party/nix/src/tests/lang/eval-okay-elem.nix
index 71ea7a4ed03d..71ea7a4ed03d 100644
--- a/third_party/nix/tests/lang/eval-okay-elem.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-elem.nix
diff --git a/third_party/nix/tests/lang/eval-okay-empty-args.exp b/third_party/nix/src/tests/lang/eval-okay-empty-args.exp
index cb5537d5d7ce..cb5537d5d7ce 100644
--- a/third_party/nix/tests/lang/eval-okay-empty-args.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-empty-args.exp
diff --git a/third_party/nix/tests/lang/eval-okay-empty-args.nix b/third_party/nix/src/tests/lang/eval-okay-empty-args.nix
index 78c133afdd94..78c133afdd94 100644
--- a/third_party/nix/tests/lang/eval-okay-empty-args.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-empty-args.nix
diff --git a/third_party/nix/tests/lang/eval-okay-eq-derivations.exp b/third_party/nix/src/tests/lang/eval-okay-eq-derivations.exp
index ec04aab6aeec..ec04aab6aeec 100644
--- a/third_party/nix/tests/lang/eval-okay-eq-derivations.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-eq-derivations.exp
diff --git a/third_party/nix/tests/lang/eval-okay-eq-derivations.nix b/third_party/nix/src/tests/lang/eval-okay-eq-derivations.nix
index d526cb4a2161..d526cb4a2161 100644
--- a/third_party/nix/tests/lang/eval-okay-eq-derivations.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-eq-derivations.nix
diff --git a/third_party/nix/tests/lang/eval-okay-eq.exp.disabled b/third_party/nix/src/tests/lang/eval-okay-eq.exp.disabled
index 2015847b65e7..2015847b65e7 100644
--- a/third_party/nix/tests/lang/eval-okay-eq.exp.disabled
+++ b/third_party/nix/src/tests/lang/eval-okay-eq.exp.disabled
diff --git a/third_party/nix/tests/lang/eval-okay-eq.nix b/third_party/nix/src/tests/lang/eval-okay-eq.nix
index 73d200b38141..73d200b38141 100644
--- a/third_party/nix/tests/lang/eval-okay-eq.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-eq.nix
diff --git a/third_party/nix/tests/lang/eval-okay-filter.exp b/third_party/nix/src/tests/lang/eval-okay-filter.exp
index 355d51c27d8f..355d51c27d8f 100644
--- a/third_party/nix/tests/lang/eval-okay-filter.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-filter.exp
diff --git a/third_party/nix/tests/lang/eval-okay-filter.nix b/third_party/nix/src/tests/lang/eval-okay-filter.nix
index 85109b0d0eb8..85109b0d0eb8 100644
--- a/third_party/nix/tests/lang/eval-okay-filter.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-filter.nix
diff --git a/third_party/nix/tests/lang/eval-okay-flatten.exp b/third_party/nix/src/tests/lang/eval-okay-flatten.exp
index b979b2b8b9bc..b979b2b8b9bc 100644
--- a/third_party/nix/tests/lang/eval-okay-flatten.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-flatten.exp
diff --git a/third_party/nix/tests/lang/eval-okay-flatten.nix b/third_party/nix/src/tests/lang/eval-okay-flatten.nix
index fe911e9683e2..fe911e9683e2 100644
--- a/third_party/nix/tests/lang/eval-okay-flatten.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-flatten.nix
diff --git a/third_party/nix/tests/lang/eval-okay-float.exp b/third_party/nix/src/tests/lang/eval-okay-float.exp
index 3c50a8adce86..3c50a8adce86 100644
--- a/third_party/nix/tests/lang/eval-okay-float.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-float.exp
diff --git a/third_party/nix/tests/lang/eval-okay-float.nix b/third_party/nix/src/tests/lang/eval-okay-float.nix
index b2702c7b1668..b2702c7b1668 100644
--- a/third_party/nix/tests/lang/eval-okay-float.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-float.nix
diff --git a/third_party/nix/tests/lang/eval-okay-fromTOML.exp b/third_party/nix/src/tests/lang/eval-okay-fromTOML.exp
index d0dd3af2c814..d0dd3af2c814 100644
--- a/third_party/nix/tests/lang/eval-okay-fromTOML.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-fromTOML.exp
diff --git a/third_party/nix/tests/lang/eval-okay-fromTOML.nix b/third_party/nix/src/tests/lang/eval-okay-fromTOML.nix
index 963932689942..963932689942 100644
--- a/third_party/nix/tests/lang/eval-okay-fromTOML.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-fromTOML.nix
diff --git a/third_party/nix/tests/lang/eval-okay-fromjson.exp b/third_party/nix/src/tests/lang/eval-okay-fromjson.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-fromjson.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-fromjson.exp
diff --git a/third_party/nix/tests/lang/eval-okay-fromjson.nix b/third_party/nix/src/tests/lang/eval-okay-fromjson.nix
index 102ee82b5e6b..102ee82b5e6b 100644
--- a/third_party/nix/tests/lang/eval-okay-fromjson.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-fromjson.nix
diff --git a/third_party/nix/tests/lang/eval-okay-functionargs.exp.xml b/third_party/nix/src/tests/lang/eval-okay-functionargs.exp.xml
index 651f54c36341..651f54c36341 100644
--- a/third_party/nix/tests/lang/eval-okay-functionargs.exp.xml
+++ b/third_party/nix/src/tests/lang/eval-okay-functionargs.exp.xml
diff --git a/third_party/nix/tests/lang/eval-okay-functionargs.nix b/third_party/nix/src/tests/lang/eval-okay-functionargs.nix
index 68dca62ee18d..68dca62ee18d 100644
--- a/third_party/nix/tests/lang/eval-okay-functionargs.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-functionargs.nix
diff --git a/third_party/nix/tests/lang/eval-okay-getattrpos-undefined.exp b/third_party/nix/src/tests/lang/eval-okay-getattrpos-undefined.exp
index 19765bd501b6..19765bd501b6 100644
--- a/third_party/nix/tests/lang/eval-okay-getattrpos-undefined.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-getattrpos-undefined.exp
diff --git a/third_party/nix/tests/lang/eval-okay-getattrpos-undefined.nix b/third_party/nix/src/tests/lang/eval-okay-getattrpos-undefined.nix
index 14dd38f7734c..14dd38f7734c 100644
--- a/third_party/nix/tests/lang/eval-okay-getattrpos-undefined.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-getattrpos-undefined.nix
diff --git a/third_party/nix/tests/lang/eval-okay-getattrpos.exp b/third_party/nix/src/tests/lang/eval-okay-getattrpos.exp
index 469249bbc646..469249bbc646 100644
--- a/third_party/nix/tests/lang/eval-okay-getattrpos.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-getattrpos.exp
diff --git a/third_party/nix/tests/lang/eval-okay-getattrpos.nix b/third_party/nix/src/tests/lang/eval-okay-getattrpos.nix
index ca6b07961547..ca6b07961547 100644
--- a/third_party/nix/tests/lang/eval-okay-getattrpos.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-getattrpos.nix
diff --git a/third_party/nix/tests/lang/eval-okay-getenv.exp b/third_party/nix/src/tests/lang/eval-okay-getenv.exp
index 14e24d419005..14e24d419005 100644
--- a/third_party/nix/tests/lang/eval-okay-getenv.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-getenv.exp
diff --git a/third_party/nix/tests/lang/eval-okay-getenv.nix b/third_party/nix/src/tests/lang/eval-okay-getenv.nix
index 4cfec5f553d9..4cfec5f553d9 100644
--- a/third_party/nix/tests/lang/eval-okay-getenv.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-getenv.nix
diff --git a/third_party/nix/tests/lang/eval-okay-hash.exp b/third_party/nix/src/tests/lang/eval-okay-hash.exp
index e69de29bb2d1..e69de29bb2d1 100644
--- a/third_party/nix/tests/lang/eval-okay-hash.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-hash.exp
diff --git a/third_party/nix/tests/lang/eval-okay-hashfile.exp b/third_party/nix/src/tests/lang/eval-okay-hashfile.exp
index ff1e8293ef22..ff1e8293ef22 100644
--- a/third_party/nix/tests/lang/eval-okay-hashfile.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-hashfile.exp
diff --git a/third_party/nix/tests/lang/eval-okay-hashfile.nix b/third_party/nix/src/tests/lang/eval-okay-hashfile.nix
index aff5a1856814..aff5a1856814 100644
--- a/third_party/nix/tests/lang/eval-okay-hashfile.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-hashfile.nix
diff --git a/third_party/nix/tests/lang/eval-okay-hashstring.exp b/third_party/nix/src/tests/lang/eval-okay-hashstring.exp
index d720a082ddb3..d720a082ddb3 100644
--- a/third_party/nix/tests/lang/eval-okay-hashstring.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-hashstring.exp
diff --git a/third_party/nix/tests/lang/eval-okay-hashstring.nix b/third_party/nix/src/tests/lang/eval-okay-hashstring.nix
index b0f62b245ca8..b0f62b245ca8 100644
--- a/third_party/nix/tests/lang/eval-okay-hashstring.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-hashstring.nix
diff --git a/third_party/nix/tests/lang/eval-okay-if.exp b/third_party/nix/src/tests/lang/eval-okay-if.exp
index 00750edc07d6..00750edc07d6 100644
--- a/third_party/nix/tests/lang/eval-okay-if.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-if.exp
diff --git a/third_party/nix/tests/lang/eval-okay-if.nix b/third_party/nix/src/tests/lang/eval-okay-if.nix
index 23e4c74d5016..23e4c74d5016 100644
--- a/third_party/nix/tests/lang/eval-okay-if.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-if.nix
diff --git a/third_party/nix/tests/lang/eval-okay-import.exp b/third_party/nix/src/tests/lang/eval-okay-import.exp
index c508125b55be..c508125b55be 100644
--- a/third_party/nix/tests/lang/eval-okay-import.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-import.exp
diff --git a/third_party/nix/tests/lang/eval-okay-import.nix b/third_party/nix/src/tests/lang/eval-okay-import.nix
index 0b18d9413122..0b18d9413122 100644
--- a/third_party/nix/tests/lang/eval-okay-import.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-import.nix
diff --git a/third_party/nix/tests/lang/eval-okay-ind-string.exp b/third_party/nix/src/tests/lang/eval-okay-ind-string.exp
index 9cf4bd2ee78a..9cf4bd2ee78a 100644
--- a/third_party/nix/tests/lang/eval-okay-ind-string.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-ind-string.exp
diff --git a/third_party/nix/tests/lang/eval-okay-ind-string.nix b/third_party/nix/src/tests/lang/eval-okay-ind-string.nix
index 1669dc0648ea..1669dc0648ea 100644
--- a/third_party/nix/tests/lang/eval-okay-ind-string.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-ind-string.nix
diff --git a/third_party/nix/tests/lang/eval-okay-let.exp b/third_party/nix/src/tests/lang/eval-okay-let.exp
index 14e24d419005..14e24d419005 100644
--- a/third_party/nix/tests/lang/eval-okay-let.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-let.exp
diff --git a/third_party/nix/tests/lang/eval-okay-let.nix b/third_party/nix/src/tests/lang/eval-okay-let.nix
index fe118c5282e3..fe118c5282e3 100644
--- a/third_party/nix/tests/lang/eval-okay-let.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-let.nix
diff --git a/third_party/nix/tests/lang/eval-okay-list.exp b/third_party/nix/src/tests/lang/eval-okay-list.exp
index f784f26d83f4..f784f26d83f4 100644
--- a/third_party/nix/tests/lang/eval-okay-list.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-list.exp
diff --git a/third_party/nix/tests/lang/eval-okay-list.nix b/third_party/nix/src/tests/lang/eval-okay-list.nix
index d433bcf908ba..d433bcf908ba 100644
--- a/third_party/nix/tests/lang/eval-okay-list.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-list.nix
diff --git a/third_party/nix/tests/lang/eval-okay-listtoattrs.exp b/third_party/nix/src/tests/lang/eval-okay-listtoattrs.exp
index 74abef7bc6ed..74abef7bc6ed 100644
--- a/third_party/nix/tests/lang/eval-okay-listtoattrs.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-listtoattrs.exp
diff --git a/third_party/nix/tests/lang/eval-okay-listtoattrs.nix b/third_party/nix/src/tests/lang/eval-okay-listtoattrs.nix
index 4186e029b538..4186e029b538 100644
--- a/third_party/nix/tests/lang/eval-okay-listtoattrs.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-listtoattrs.nix
diff --git a/third_party/nix/tests/lang/eval-okay-logic.exp b/third_party/nix/src/tests/lang/eval-okay-logic.exp
index d00491fd7e5b..d00491fd7e5b 100644
--- a/third_party/nix/tests/lang/eval-okay-logic.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-logic.exp
diff --git a/third_party/nix/tests/lang/eval-okay-logic.nix b/third_party/nix/src/tests/lang/eval-okay-logic.nix
index fbb12794401f..fbb12794401f 100644
--- a/third_party/nix/tests/lang/eval-okay-logic.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-logic.nix
diff --git a/third_party/nix/tests/lang/eval-okay-map.exp b/third_party/nix/src/tests/lang/eval-okay-map.exp
index dbb64f717b96..dbb64f717b96 100644
--- a/third_party/nix/tests/lang/eval-okay-map.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-map.exp
diff --git a/third_party/nix/tests/lang/eval-okay-map.nix b/third_party/nix/src/tests/lang/eval-okay-map.nix
index a76c1d811454..a76c1d811454 100644
--- a/third_party/nix/tests/lang/eval-okay-map.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-map.nix
diff --git a/third_party/nix/tests/lang/eval-okay-mapattrs.exp b/third_party/nix/src/tests/lang/eval-okay-mapattrs.exp
index 3f113f17bab1..3f113f17bab1 100644
--- a/third_party/nix/tests/lang/eval-okay-mapattrs.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-mapattrs.exp
diff --git a/third_party/nix/tests/lang/eval-okay-mapattrs.nix b/third_party/nix/src/tests/lang/eval-okay-mapattrs.nix
index f075b6275e5a..f075b6275e5a 100644
--- a/third_party/nix/tests/lang/eval-okay-mapattrs.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-mapattrs.nix
diff --git a/third_party/nix/tests/lang/eval-okay-nested-with.exp b/third_party/nix/src/tests/lang/eval-okay-nested-with.exp
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/third_party/nix/tests/lang/eval-okay-nested-with.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-nested-with.exp
diff --git a/third_party/nix/tests/lang/eval-okay-nested-with.nix b/third_party/nix/src/tests/lang/eval-okay-nested-with.nix
index ba9d79aa79b1..ba9d79aa79b1 100644
--- a/third_party/nix/tests/lang/eval-okay-nested-with.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-nested-with.nix
diff --git a/third_party/nix/tests/lang/eval-okay-new-let.exp b/third_party/nix/src/tests/lang/eval-okay-new-let.exp
index f98b388071c2..f98b388071c2 100644
--- a/third_party/nix/tests/lang/eval-okay-new-let.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-new-let.exp
diff --git a/third_party/nix/tests/lang/eval-okay-new-let.nix b/third_party/nix/src/tests/lang/eval-okay-new-let.nix
index 738123141508..738123141508 100644
--- a/third_party/nix/tests/lang/eval-okay-new-let.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-new-let.nix
diff --git a/third_party/nix/tests/lang/eval-okay-null-dynamic-attrs.exp b/third_party/nix/src/tests/lang/eval-okay-null-dynamic-attrs.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-null-dynamic-attrs.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-null-dynamic-attrs.exp
diff --git a/third_party/nix/tests/lang/eval-okay-null-dynamic-attrs.nix b/third_party/nix/src/tests/lang/eval-okay-null-dynamic-attrs.nix
index b060c0bc9850..b060c0bc9850 100644
--- a/third_party/nix/tests/lang/eval-okay-null-dynamic-attrs.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-null-dynamic-attrs.nix
diff --git a/third_party/nix/tests/lang/eval-okay-partition.exp b/third_party/nix/src/tests/lang/eval-okay-partition.exp
index cd8b8b020c05..cd8b8b020c05 100644
--- a/third_party/nix/tests/lang/eval-okay-partition.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-partition.exp
diff --git a/third_party/nix/tests/lang/eval-okay-partition.nix b/third_party/nix/src/tests/lang/eval-okay-partition.nix
index 846d2ce49486..846d2ce49486 100644
--- a/third_party/nix/tests/lang/eval-okay-partition.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-partition.nix
diff --git a/third_party/nix/tests/lang/eval-okay-path.nix b/third_party/nix/src/tests/lang/eval-okay-path.nix
index e67168cf3edf..e67168cf3edf 100644
--- a/third_party/nix/tests/lang/eval-okay-path.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-path.nix
diff --git a/third_party/nix/tests/lang/eval-okay-pathexists.exp b/third_party/nix/src/tests/lang/eval-okay-pathexists.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-pathexists.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-pathexists.exp
diff --git a/third_party/nix/tests/lang/eval-okay-pathexists.nix b/third_party/nix/src/tests/lang/eval-okay-pathexists.nix
index 50c28ee0cd30..50c28ee0cd30 100644
--- a/third_party/nix/tests/lang/eval-okay-pathexists.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-pathexists.nix
diff --git a/third_party/nix/tests/lang/eval-okay-patterns.exp b/third_party/nix/src/tests/lang/eval-okay-patterns.exp
index a4304010fe80..a4304010fe80 100644
--- a/third_party/nix/tests/lang/eval-okay-patterns.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-patterns.exp
diff --git a/third_party/nix/tests/lang/eval-okay-patterns.nix b/third_party/nix/src/tests/lang/eval-okay-patterns.nix
index 96fd25a01517..96fd25a01517 100644
--- a/third_party/nix/tests/lang/eval-okay-patterns.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-patterns.nix
diff --git a/third_party/nix/tests/lang/eval-okay-readDir.exp b/third_party/nix/src/tests/lang/eval-okay-readDir.exp
index bf8d2c14ea4f..bf8d2c14ea4f 100644
--- a/third_party/nix/tests/lang/eval-okay-readDir.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-readDir.exp
diff --git a/third_party/nix/tests/lang/eval-okay-readDir.nix b/third_party/nix/src/tests/lang/eval-okay-readDir.nix
index a7ec9292aae2..a7ec9292aae2 100644
--- a/third_party/nix/tests/lang/eval-okay-readDir.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-readDir.nix
diff --git a/third_party/nix/tests/lang/eval-okay-readfile.exp b/third_party/nix/src/tests/lang/eval-okay-readfile.exp
index a2c87d0c439f..a2c87d0c439f 100644
--- a/third_party/nix/tests/lang/eval-okay-readfile.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-readfile.exp
diff --git a/third_party/nix/tests/lang/eval-okay-readfile.nix b/third_party/nix/src/tests/lang/eval-okay-readfile.nix
index 82f7cb17435a..82f7cb17435a 100644
--- a/third_party/nix/tests/lang/eval-okay-readfile.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-readfile.nix
diff --git a/third_party/nix/tests/lang/eval-okay-redefine-builtin.exp b/third_party/nix/src/tests/lang/eval-okay-redefine-builtin.exp
index c508d5366f70..c508d5366f70 100644
--- a/third_party/nix/tests/lang/eval-okay-redefine-builtin.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-redefine-builtin.exp
diff --git a/third_party/nix/tests/lang/eval-okay-redefine-builtin.nix b/third_party/nix/src/tests/lang/eval-okay-redefine-builtin.nix
index df9fc3f37d22..df9fc3f37d22 100644
--- a/third_party/nix/tests/lang/eval-okay-redefine-builtin.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-redefine-builtin.nix
diff --git a/third_party/nix/tests/lang/eval-okay-regex-match.exp b/third_party/nix/src/tests/lang/eval-okay-regex-match.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-regex-match.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-regex-match.exp
diff --git a/third_party/nix/tests/lang/eval-okay-regex-match.nix b/third_party/nix/src/tests/lang/eval-okay-regex-match.nix
index 273e2590713e..273e2590713e 100644
--- a/third_party/nix/tests/lang/eval-okay-regex-match.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-regex-match.nix
diff --git a/third_party/nix/tests/lang/eval-okay-regex-split.exp b/third_party/nix/src/tests/lang/eval-okay-regex-split.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-regex-split.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-regex-split.exp
diff --git a/third_party/nix/tests/lang/eval-okay-regex-split.nix b/third_party/nix/src/tests/lang/eval-okay-regex-split.nix
index 0073e057787d..0073e057787d 100644
--- a/third_party/nix/tests/lang/eval-okay-regex-split.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-regex-split.nix
diff --git a/third_party/nix/tests/lang/eval-okay-remove.exp b/third_party/nix/src/tests/lang/eval-okay-remove.exp
index 8d38505c1686..8d38505c1686 100644
--- a/third_party/nix/tests/lang/eval-okay-remove.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-remove.exp
diff --git a/third_party/nix/tests/lang/eval-okay-remove.nix b/third_party/nix/src/tests/lang/eval-okay-remove.nix
index 4ad5ba897fa7..4ad5ba897fa7 100644
--- a/third_party/nix/tests/lang/eval-okay-remove.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-remove.nix
diff --git a/third_party/nix/tests/lang/eval-okay-replacestrings.exp b/third_party/nix/src/tests/lang/eval-okay-replacestrings.exp
index 72e8274d8c58..72e8274d8c58 100644
--- a/third_party/nix/tests/lang/eval-okay-replacestrings.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-replacestrings.exp
diff --git a/third_party/nix/tests/lang/eval-okay-replacestrings.nix b/third_party/nix/src/tests/lang/eval-okay-replacestrings.nix
index bd8031fc004e..bd8031fc004e 100644
--- a/third_party/nix/tests/lang/eval-okay-replacestrings.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-replacestrings.nix
diff --git a/third_party/nix/tests/lang/eval-okay-scope-1.exp b/third_party/nix/src/tests/lang/eval-okay-scope-1.exp
index 00750edc07d6..00750edc07d6 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-1.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-1.exp
diff --git a/third_party/nix/tests/lang/eval-okay-scope-1.nix b/third_party/nix/src/tests/lang/eval-okay-scope-1.nix
index fa38a7174e03..fa38a7174e03 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-1.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-1.nix
diff --git a/third_party/nix/tests/lang/eval-okay-scope-2.exp b/third_party/nix/src/tests/lang/eval-okay-scope-2.exp
index d00491fd7e5b..d00491fd7e5b 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-2.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-2.exp
diff --git a/third_party/nix/tests/lang/eval-okay-scope-2.nix b/third_party/nix/src/tests/lang/eval-okay-scope-2.nix
index eb8b02bc4994..eb8b02bc4994 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-2.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-2.nix
diff --git a/third_party/nix/tests/lang/eval-okay-scope-3.exp b/third_party/nix/src/tests/lang/eval-okay-scope-3.exp
index b8626c4cff28..b8626c4cff28 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-3.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-3.exp
diff --git a/third_party/nix/tests/lang/eval-okay-scope-3.nix b/third_party/nix/src/tests/lang/eval-okay-scope-3.nix
index 10d6bc04d830..10d6bc04d830 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-3.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-3.nix
diff --git a/third_party/nix/tests/lang/eval-okay-scope-4.exp b/third_party/nix/src/tests/lang/eval-okay-scope-4.exp
index 00ff03a46c9b..00ff03a46c9b 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-4.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-4.exp
diff --git a/third_party/nix/tests/lang/eval-okay-scope-4.nix b/third_party/nix/src/tests/lang/eval-okay-scope-4.nix
index dc8243bc8546..dc8243bc8546 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-4.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-4.nix
diff --git a/third_party/nix/tests/lang/eval-okay-scope-6.exp b/third_party/nix/src/tests/lang/eval-okay-scope-6.exp
index 00ff03a46c9b..00ff03a46c9b 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-6.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-6.exp
diff --git a/third_party/nix/tests/lang/eval-okay-scope-6.nix b/third_party/nix/src/tests/lang/eval-okay-scope-6.nix
index 0995d4e7e7e0..0995d4e7e7e0 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-6.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-6.nix
diff --git a/third_party/nix/tests/lang/eval-okay-scope-7.exp b/third_party/nix/src/tests/lang/eval-okay-scope-7.exp
index d00491fd7e5b..d00491fd7e5b 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-7.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-7.exp
diff --git a/third_party/nix/tests/lang/eval-okay-scope-7.nix b/third_party/nix/src/tests/lang/eval-okay-scope-7.nix
index 4da02968f6b7..4da02968f6b7 100644
--- a/third_party/nix/tests/lang/eval-okay-scope-7.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-scope-7.nix
diff --git a/third_party/nix/tests/lang/eval-okay-search-path.exp b/third_party/nix/src/tests/lang/eval-okay-search-path.exp
index 4519bc406db5..4519bc406db5 100644
--- a/third_party/nix/tests/lang/eval-okay-search-path.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-search-path.exp
diff --git a/third_party/nix/tests/lang/eval-okay-search-path.flags b/third_party/nix/src/tests/lang/eval-okay-search-path.flags
index a28e6821004a..a28e6821004a 100644
--- a/third_party/nix/tests/lang/eval-okay-search-path.flags
+++ b/third_party/nix/src/tests/lang/eval-okay-search-path.flags
diff --git a/third_party/nix/tests/lang/eval-okay-search-path.nix b/third_party/nix/src/tests/lang/eval-okay-search-path.nix
index cca41f821f83..cca41f821f83 100644
--- a/third_party/nix/tests/lang/eval-okay-search-path.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-search-path.nix
diff --git a/third_party/nix/tests/lang/eval-okay-seq.exp b/third_party/nix/src/tests/lang/eval-okay-seq.exp
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/third_party/nix/tests/lang/eval-okay-seq.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-seq.exp
diff --git a/third_party/nix/tests/lang/eval-okay-seq.nix b/third_party/nix/src/tests/lang/eval-okay-seq.nix
index 0a9a21c03b62..0a9a21c03b62 100644
--- a/third_party/nix/tests/lang/eval-okay-seq.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-seq.nix
diff --git a/third_party/nix/tests/lang/eval-okay-sort.exp b/third_party/nix/src/tests/lang/eval-okay-sort.exp
index 148b93516394..148b93516394 100644
--- a/third_party/nix/tests/lang/eval-okay-sort.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-sort.exp
diff --git a/third_party/nix/tests/lang/eval-okay-sort.nix b/third_party/nix/src/tests/lang/eval-okay-sort.nix
index 8299c3a4a3aa..8299c3a4a3aa 100644
--- a/third_party/nix/tests/lang/eval-okay-sort.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-sort.nix
diff --git a/third_party/nix/tests/lang/eval-okay-splitversion.exp b/third_party/nix/src/tests/lang/eval-okay-splitversion.exp
index 153ceb8186a0..153ceb8186a0 100644
--- a/third_party/nix/tests/lang/eval-okay-splitversion.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-splitversion.exp
diff --git a/third_party/nix/tests/lang/eval-okay-splitversion.nix b/third_party/nix/src/tests/lang/eval-okay-splitversion.nix
index 9e5c99d2e7f6..9e5c99d2e7f6 100644
--- a/third_party/nix/tests/lang/eval-okay-splitversion.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-splitversion.nix
diff --git a/third_party/nix/tests/lang/eval-okay-string.exp b/third_party/nix/src/tests/lang/eval-okay-string.exp
index 63f650f73a3a..63f650f73a3a 100644
--- a/third_party/nix/tests/lang/eval-okay-string.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-string.exp
diff --git a/third_party/nix/tests/lang/eval-okay-string.nix b/third_party/nix/src/tests/lang/eval-okay-string.nix
index 47cc989ad46a..47cc989ad46a 100644
--- a/third_party/nix/tests/lang/eval-okay-string.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-string.nix
diff --git a/third_party/nix/tests/lang/eval-okay-strings-as-attrs-names.exp b/third_party/nix/src/tests/lang/eval-okay-strings-as-attrs-names.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-strings-as-attrs-names.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-strings-as-attrs-names.exp
diff --git a/third_party/nix/tests/lang/eval-okay-strings-as-attrs-names.nix b/third_party/nix/src/tests/lang/eval-okay-strings-as-attrs-names.nix
index 5e40928dbe31..5e40928dbe31 100644
--- a/third_party/nix/tests/lang/eval-okay-strings-as-attrs-names.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-strings-as-attrs-names.nix
diff --git a/third_party/nix/tests/lang/eval-okay-substring.exp b/third_party/nix/src/tests/lang/eval-okay-substring.exp
index 6aace04b0f57..6aace04b0f57 100644
--- a/third_party/nix/tests/lang/eval-okay-substring.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-substring.exp
diff --git a/third_party/nix/tests/lang/eval-okay-substring.nix b/third_party/nix/src/tests/lang/eval-okay-substring.nix
index 424af00d9b3b..424af00d9b3b 100644
--- a/third_party/nix/tests/lang/eval-okay-substring.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-substring.nix
diff --git a/third_party/nix/tests/lang/eval-okay-tail-call-1.exp-disabled b/third_party/nix/src/tests/lang/eval-okay-tail-call-1.exp-disabled
index f7393e847d34..f7393e847d34 100644
--- a/third_party/nix/tests/lang/eval-okay-tail-call-1.exp-disabled
+++ b/third_party/nix/src/tests/lang/eval-okay-tail-call-1.exp-disabled
diff --git a/third_party/nix/tests/lang/eval-okay-tail-call-1.nix b/third_party/nix/src/tests/lang/eval-okay-tail-call-1.nix
index a3962ce3fdb5..a3962ce3fdb5 100644
--- a/third_party/nix/tests/lang/eval-okay-tail-call-1.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-tail-call-1.nix
diff --git a/third_party/nix/tests/lang/eval-okay-tojson.exp b/third_party/nix/src/tests/lang/eval-okay-tojson.exp
index e92aae3235f2..e92aae3235f2 100644
--- a/third_party/nix/tests/lang/eval-okay-tojson.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-tojson.exp
diff --git a/third_party/nix/tests/lang/eval-okay-tojson.nix b/third_party/nix/src/tests/lang/eval-okay-tojson.nix
index ce67943bead5..ce67943bead5 100644
--- a/third_party/nix/tests/lang/eval-okay-tojson.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-tojson.nix
diff --git a/third_party/nix/tests/lang/eval-okay-toxml.exp b/third_party/nix/src/tests/lang/eval-okay-toxml.exp
index 828220890ecd..828220890ecd 100644
--- a/third_party/nix/tests/lang/eval-okay-toxml.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-toxml.exp
diff --git a/third_party/nix/tests/lang/eval-okay-toxml.nix b/third_party/nix/src/tests/lang/eval-okay-toxml.nix
index 068c97a6c1b3..068c97a6c1b3 100644
--- a/third_party/nix/tests/lang/eval-okay-toxml.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-toxml.nix
diff --git a/third_party/nix/tests/lang/eval-okay-toxml2.exp b/third_party/nix/src/tests/lang/eval-okay-toxml2.exp
index 634a841eb190..634a841eb190 100644
--- a/third_party/nix/tests/lang/eval-okay-toxml2.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-toxml2.exp
diff --git a/third_party/nix/tests/lang/eval-okay-toxml2.nix b/third_party/nix/src/tests/lang/eval-okay-toxml2.nix
index ff1791b30eb5..ff1791b30eb5 100644
--- a/third_party/nix/tests/lang/eval-okay-toxml2.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-toxml2.nix
diff --git a/third_party/nix/tests/lang/eval-okay-tryeval.exp b/third_party/nix/src/tests/lang/eval-okay-tryeval.exp
index 2b2e6fa711f4..2b2e6fa711f4 100644
--- a/third_party/nix/tests/lang/eval-okay-tryeval.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-tryeval.exp
diff --git a/third_party/nix/tests/lang/eval-okay-tryeval.nix b/third_party/nix/src/tests/lang/eval-okay-tryeval.nix
index 629bc440a85a..629bc440a85a 100644
--- a/third_party/nix/tests/lang/eval-okay-tryeval.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-tryeval.nix
diff --git a/third_party/nix/tests/lang/eval-okay-types.exp b/third_party/nix/src/tests/lang/eval-okay-types.exp
index 92a15329935a..92a15329935a 100644
--- a/third_party/nix/tests/lang/eval-okay-types.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-types.exp
diff --git a/third_party/nix/tests/lang/eval-okay-types.nix b/third_party/nix/src/tests/lang/eval-okay-types.nix
index 9b58be5d1dd4..9b58be5d1dd4 100644
--- a/third_party/nix/tests/lang/eval-okay-types.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-types.nix
diff --git a/third_party/nix/tests/lang/eval-okay-versions.exp b/third_party/nix/src/tests/lang/eval-okay-versions.exp
index 27ba77ddaf61..27ba77ddaf61 100644
--- a/third_party/nix/tests/lang/eval-okay-versions.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-versions.exp
diff --git a/third_party/nix/tests/lang/eval-okay-versions.nix b/third_party/nix/src/tests/lang/eval-okay-versions.nix
index e63c36586bb6..e63c36586bb6 100644
--- a/third_party/nix/tests/lang/eval-okay-versions.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-versions.nix
diff --git a/third_party/nix/tests/lang/eval-okay-with.exp b/third_party/nix/src/tests/lang/eval-okay-with.exp
index 378c8dc80403..378c8dc80403 100644
--- a/third_party/nix/tests/lang/eval-okay-with.exp
+++ b/third_party/nix/src/tests/lang/eval-okay-with.exp
diff --git a/third_party/nix/tests/lang/eval-okay-with.nix b/third_party/nix/src/tests/lang/eval-okay-with.nix
index 033e8d3aba57..033e8d3aba57 100644
--- a/third_party/nix/tests/lang/eval-okay-with.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-with.nix
diff --git a/third_party/nix/tests/lang/eval-okay-xml.exp.xml b/third_party/nix/src/tests/lang/eval-okay-xml.exp.xml
index 92b75e0b8b17..92b75e0b8b17 100644
--- a/third_party/nix/tests/lang/eval-okay-xml.exp.xml
+++ b/third_party/nix/src/tests/lang/eval-okay-xml.exp.xml
diff --git a/third_party/nix/tests/lang/eval-okay-xml.nix b/third_party/nix/src/tests/lang/eval-okay-xml.nix
index 9ee9f8a0b4f5..9ee9f8a0b4f5 100644
--- a/third_party/nix/tests/lang/eval-okay-xml.nix
+++ b/third_party/nix/src/tests/lang/eval-okay-xml.nix
diff --git a/third_party/nix/tests/lang/imported.nix b/third_party/nix/src/tests/lang/imported.nix
index fb39ee4efacd..fb39ee4efacd 100644
--- a/third_party/nix/tests/lang/imported.nix
+++ b/third_party/nix/src/tests/lang/imported.nix
diff --git a/third_party/nix/tests/lang/imported2.nix b/third_party/nix/src/tests/lang/imported2.nix
index 6d0a2992b732..6d0a2992b732 100644
--- a/third_party/nix/tests/lang/imported2.nix
+++ b/third_party/nix/src/tests/lang/imported2.nix
diff --git a/third_party/nix/tests/lang/lib.nix b/third_party/nix/src/tests/lang/lib.nix
index 028a538314b7..028a538314b7 100644
--- a/third_party/nix/tests/lang/lib.nix
+++ b/third_party/nix/src/tests/lang/lib.nix
diff --git a/third_party/nix/tests/lang/parse-fail-dup-attrs-1.nix b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-1.nix
index 2c02317d2a19..e590e8a04e5a 100644
--- a/third_party/nix/tests/lang/parse-fail-dup-attrs-1.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-1.nix
@@ -1,4 +1,5 @@
-{ x = 123;
+{
+  x = 123;
   y = 456;
   x = 789;
 }
diff --git a/third_party/nix/tests/lang/parse-fail-dup-attrs-2.nix b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-2.nix
index 864d9865e07d..864d9865e07d 100644
--- a/third_party/nix/tests/lang/parse-fail-dup-attrs-2.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-2.nix
diff --git a/third_party/nix/tests/lang/parse-fail-dup-attrs-3.nix b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-3.nix
index 114d19779f86..114d19779f86 100644
--- a/third_party/nix/tests/lang/parse-fail-dup-attrs-3.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-3.nix
diff --git a/third_party/nix/tests/lang/parse-fail-dup-attrs-4.nix b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-4.nix
index 77417432b347..77417432b347 100644
--- a/third_party/nix/tests/lang/parse-fail-dup-attrs-4.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-4.nix
diff --git a/third_party/nix/tests/lang/parse-fail-dup-attrs-7.nix b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-7.nix
index bbc3eb08c0f6..bbc3eb08c0f6 100644
--- a/third_party/nix/tests/lang/parse-fail-dup-attrs-7.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-dup-attrs-7.nix
diff --git a/third_party/nix/tests/lang/parse-fail-dup-formals.nix b/third_party/nix/src/tests/lang/parse-fail-dup-formals.nix
index a0edd91a9666..a0edd91a9666 100644
--- a/third_party/nix/tests/lang/parse-fail-dup-formals.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-dup-formals.nix
diff --git a/third_party/nix/tests/lang/parse-fail-mixed-nested-attrs1.nix b/third_party/nix/src/tests/lang/parse-fail-mixed-nested-attrs1.nix
index 11e40e66fd1b..11e40e66fd1b 100644
--- a/third_party/nix/tests/lang/parse-fail-mixed-nested-attrs1.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-mixed-nested-attrs1.nix
diff --git a/third_party/nix/tests/lang/parse-fail-mixed-nested-attrs2.nix b/third_party/nix/src/tests/lang/parse-fail-mixed-nested-attrs2.nix
index 17da82e5f0c7..17da82e5f0c7 100644
--- a/third_party/nix/tests/lang/parse-fail-mixed-nested-attrs2.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-mixed-nested-attrs2.nix
diff --git a/third_party/nix/tests/lang/eval-fail-path-slash.nix b/third_party/nix/src/tests/lang/parse-fail-path-slash.nix
index 8c2e104c788f..8c2e104c788f 100644
--- a/third_party/nix/tests/lang/eval-fail-path-slash.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-path-slash.nix
diff --git a/third_party/nix/tests/lang/parse-fail-patterns-1.nix b/third_party/nix/src/tests/lang/parse-fail-patterns-1.nix
index 7b40616417b8..7b40616417b8 100644
--- a/third_party/nix/tests/lang/parse-fail-patterns-1.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-patterns-1.nix
diff --git a/third_party/nix/tests/lang/parse-fail-regression-20060610.nix b/third_party/nix/src/tests/lang/parse-fail-regression-20060610.nix
index b1934f7e1e82..b1934f7e1e82 100644
--- a/third_party/nix/tests/lang/parse-fail-regression-20060610.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-regression-20060610.nix
diff --git a/third_party/nix/tests/lang/parse-fail-uft8.nix b/third_party/nix/src/tests/lang/parse-fail-uft8.nix
index 34948d48aed2..34948d48aed2 100644
--- a/third_party/nix/tests/lang/parse-fail-uft8.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-uft8.nix
diff --git a/third_party/nix/tests/lang/parse-fail-undef-var-2.nix b/third_party/nix/src/tests/lang/parse-fail-undef-var-2.nix
index c10a52b1ea42..c10a52b1ea42 100644
--- a/third_party/nix/tests/lang/parse-fail-undef-var-2.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-undef-var-2.nix
diff --git a/third_party/nix/tests/lang/parse-fail-undef-var.nix b/third_party/nix/src/tests/lang/parse-fail-undef-var.nix
index 7b63008110db..7b63008110db 100644
--- a/third_party/nix/tests/lang/parse-fail-undef-var.nix
+++ b/third_party/nix/src/tests/lang/parse-fail-undef-var.nix
diff --git a/third_party/nix/tests/lang/parse-okay-1.nix b/third_party/nix/src/tests/lang/parse-okay-1.nix
index 23a58ed109b1..23a58ed109b1 100644
--- a/third_party/nix/tests/lang/parse-okay-1.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-1.nix
diff --git a/third_party/nix/tests/lang/parse-okay-crlf.nix b/third_party/nix/src/tests/lang/parse-okay-crlf.nix
index 21518d4c6d80..21518d4c6d80 100644
--- a/third_party/nix/tests/lang/parse-okay-crlf.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-crlf.nix
diff --git a/third_party/nix/tests/lang/parse-okay-dup-attrs-5.nix b/third_party/nix/src/tests/lang/parse-okay-dup-attrs-5.nix
index f4b9efd0c596..f4b9efd0c596 100644
--- a/third_party/nix/tests/lang/parse-okay-dup-attrs-5.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-dup-attrs-5.nix
diff --git a/third_party/nix/tests/lang/parse-okay-dup-attrs-6.nix b/third_party/nix/src/tests/lang/parse-okay-dup-attrs-6.nix
index ae6d7a769305..ae6d7a769305 100644
--- a/third_party/nix/tests/lang/parse-okay-dup-attrs-6.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-dup-attrs-6.nix
diff --git a/third_party/nix/tests/lang/parse-okay-mixed-nested-attrs-1.nix b/third_party/nix/src/tests/lang/parse-okay-mixed-nested-attrs-1.nix
index fd1001c8cafc..fd1001c8cafc 100644
--- a/third_party/nix/tests/lang/parse-okay-mixed-nested-attrs-1.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-mixed-nested-attrs-1.nix
diff --git a/third_party/nix/tests/lang/parse-okay-mixed-nested-attrs-2.nix b/third_party/nix/src/tests/lang/parse-okay-mixed-nested-attrs-2.nix
index ad066b680384..ad066b680384 100644
--- a/third_party/nix/tests/lang/parse-okay-mixed-nested-attrs-2.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-mixed-nested-attrs-2.nix
diff --git a/third_party/nix/tests/lang/parse-okay-mixed-nested-attrs-3.nix b/third_party/nix/src/tests/lang/parse-okay-mixed-nested-attrs-3.nix
index 45a33e480373..45a33e480373 100644
--- a/third_party/nix/tests/lang/parse-okay-mixed-nested-attrs-3.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-mixed-nested-attrs-3.nix
diff --git a/third_party/nix/tests/lang/parse-okay-regression-20041027.nix b/third_party/nix/src/tests/lang/parse-okay-regression-20041027.nix
index ae2e256eeaaa..ae2e256eeaaa 100644
--- a/third_party/nix/tests/lang/parse-okay-regression-20041027.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-regression-20041027.nix
diff --git a/third_party/nix/tests/lang/parse-okay-regression-751.nix b/third_party/nix/src/tests/lang/parse-okay-regression-751.nix
index 05c78b3016d3..05c78b3016d3 100644
--- a/third_party/nix/tests/lang/parse-okay-regression-751.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-regression-751.nix
diff --git a/third_party/nix/tests/lang/parse-okay-subversion.nix b/third_party/nix/src/tests/lang/parse-okay-subversion.nix
index 356272815d26..356272815d26 100644
--- a/third_party/nix/tests/lang/parse-okay-subversion.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-subversion.nix
diff --git a/third_party/nix/tests/lang/parse-okay-url.nix b/third_party/nix/src/tests/lang/parse-okay-url.nix
index fce3b13ee64b..fce3b13ee64b 100644
--- a/third_party/nix/tests/lang/parse-okay-url.nix
+++ b/third_party/nix/src/tests/lang/parse-okay-url.nix
diff --git a/third_party/nix/tests/lang/readDir/bar b/third_party/nix/src/tests/lang/readDir/bar
index e69de29bb2d1..e69de29bb2d1 100644
--- a/third_party/nix/tests/lang/readDir/bar
+++ b/third_party/nix/src/tests/lang/readDir/bar
diff --git a/third_party/nix/tests/lang/readDir/foo/git-hates-directories b/third_party/nix/src/tests/lang/readDir/foo/git-hates-directories
index e69de29bb2d1..e69de29bb2d1 100644
--- a/third_party/nix/tests/lang/readDir/foo/git-hates-directories
+++ b/third_party/nix/src/tests/lang/readDir/foo/git-hates-directories
diff --git a/third_party/nix/tests/meson.build b/third_party/nix/tests/meson.build
deleted file mode 100644
index c45e00f3aca6..000000000000
--- a/third_party/nix/tests/meson.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# nix doc build file
-#============================================================================
-
-
-# TODO: all of this :|
\ No newline at end of file