chore(3p/nix/tests): Move language test files to src/tests r/1387

These files will be integrated into the evaluator unit tests instead
of running separately via a shell script.

Change-Id: I1d229e73b1d862777f5108c86891689900edefbe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1275
Tested-by: BuildkiteCI
Reviewed-by: Kane York <rikingcoding@gmail.com>
Reviewed-by: isomer <isomer@tvl.fyi>

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 06d7405020..06d7405020 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 257cc5642c..257cc5642c 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 231f150c57..231f150c57 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 170df520ab..170df520ab 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 19010cc35c..19010cc35c 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 170df520ab..170df520ab 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 170df520ab..170df520ab 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 cdf158597e..cdf158597e 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 170df520ab..170df520ab 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 170df520ab..170df520ab 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 75c51bceb5..75c51bceb5 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 f2f08107b5..f2f08107b5 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 3b7a1e8bf0..3b7a1e8bf0 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 ffe9c983c2..ffe9c983c2 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 3745235ce9..3745235ce9 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 65b9d4f505..65b9d4f505 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 81133b511c..81133b511c 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 9baa49b063..9baa49b063 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 ce098b8238..ce098b8238 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 c4be9797c5..c4be9797c5 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 539e0eb0a6..539e0eb0a6 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 f89a65a99b..f89a65a99b 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 cddbbfd326..cddbbfd326 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 f37c2bc0a1..f37c2bc0a1 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 5e322bc313..5e322bc313 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 cafdf16362..cafdf16362 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 eb273f45b2..eb273f45b2 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 a3f26ea2aa..a3f26ea2aa 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 5c54d10b7b..5c54d10b7b 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 7e9e6a0b66..7e9e6a0b66 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 b4aa387e07..b4aa387e07 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 e5b26e9f2e..e5b26e9f2e 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 45b0f829eb..45b0f829eb 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 810b31a5da..810b31a5da 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 45b0f829eb..45b0f829eb 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 9e06b83ac1..9e06b83ac1 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 19de4fdf79..19de4fdf79 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 f29de11fe6..f29de11fe6 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 1851731442..1851731442 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 43ec81210f..43ec81210f 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 ce0430d780..ce0430d780 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 a4584cd3b3..a4584cd3b3 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 7a8391786a..7a8391786a 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 ae37622544..ae37622544 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 815f51b1d6..815f51b1d6 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 3e754364cc..3e754364cc 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 7fef3dddd4..7fef3dddd4 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 3e754364cc..3e754364cc 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 35ddf495c6..35ddf495c6 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 0350b518a7..0350b518a7 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 c841816222..c841816222 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 0661686d61..0661686d61 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 e9d65e88a8..e9d65e88a8 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 27ba77ddaf..27ba77ddaf 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 310a030df0..310a030df0 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 b4a1e66d6b..b4a1e66d6b 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 2c3dc10da5..2c3dc10da5 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 dffc03a998..dffc03a998 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 cccd4dc357..cccd4dc357 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 7182dc2f9b..7182dc2f9b 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 cb2cce2180..cb2cce2180 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 bb4bbd5774..bb4bbd5774 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 d158a9bf05..d158a9bf05 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 3b8be7739d..3b8be7739d 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 97da5d37a4..97da5d37a4 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 93987647ff..93987647ff 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 adc4c41bd5..adc4c41bd5 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 27ba77ddaf..27ba77ddaf 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 43178bd2ee..43178bd2ee 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 2f535bdbc4..2f535bdbc4 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 7b9531cfe9..7b9531cfe9 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 65fd65b4d0..65fd65b4d0 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 b79553df0b..b79553df0b 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 8d38505c16..8d38505c16 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 53aa4b1dc2..53aa4b1dc2 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 eaacb55c1a..eaacb55c1a 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 84b388c271..84b388c271 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 8e7c61ab8e..8e7c61ab8e 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 3fb023e1cd..3fb023e1cd 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 27ba77ddaf..27ba77ddaf 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 6d57bf8549..6d57bf8549 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 df8750afc0..df8750afc0 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 0dbe15e638..0dbe15e638 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 df8750afc0..df8750afc0 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 ee02ac7e65..ee02ac7e65 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 3cf6c0e962..3cf6c0e962 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 71ea7a4ed0..71ea7a4ed0 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 cb5537d5d7..cb5537d5d7 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 78c133afdd..78c133afdd 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 ec04aab6ae..ec04aab6ae 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 d526cb4a21..d526cb4a21 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 2015847b65..2015847b65 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 73d200b381..73d200b381 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 355d51c27d..355d51c27d 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 85109b0d0e..85109b0d0e 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 b979b2b8b9..b979b2b8b9 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 fe911e9683..fe911e9683 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 3c50a8adce..3c50a8adce 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 b2702c7b16..b2702c7b16 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 d0dd3af2c8..d0dd3af2c8 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 9639326899..9639326899 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 27ba77ddaf..27ba77ddaf 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 102ee82b5e..102ee82b5e 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 651f54c363..651f54c363 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 68dca62ee1..68dca62ee1 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 19765bd501..19765bd501 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 14dd38f773..14dd38f773 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 469249bbc6..469249bbc6 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 ca6b079615..ca6b079615 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 14e24d4190..14e24d4190 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 4cfec5f553..4cfec5f553 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 e69de29bb2..e69de29bb2 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 ff1e8293ef..ff1e8293ef 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 aff5a18568..aff5a18568 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 d720a082dd..d720a082dd 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 b0f62b245c..b0f62b245c 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 00750edc07..00750edc07 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 23e4c74d50..23e4c74d50 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 c508125b55..c508125b55 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 0b18d94131..0b18d94131 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 9cf4bd2ee7..9cf4bd2ee7 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 1669dc0648..1669dc0648 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 14e24d4190..14e24d4190 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 fe118c5282..fe118c5282 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 f784f26d83..f784f26d83 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 d433bcf908..d433bcf908 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 74abef7bc6..74abef7bc6 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 4186e029b5..4186e029b5 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 d00491fd7e..d00491fd7e 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 fbb1279440..fbb1279440 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 dbb64f717b..dbb64f717b 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 a76c1d8114..a76c1d8114 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 3f113f17ba..3f113f17ba 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 f075b6275e..f075b6275e 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 0cfbf08886..0cfbf08886 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 ba9d79aa79..ba9d79aa79 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 f98b388071..f98b388071 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 7381231415..7381231415 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 27ba77ddaf..27ba77ddaf 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 b060c0bc98..b060c0bc98 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 cd8b8b020c..cd8b8b020c 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 846d2ce494..846d2ce494 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 e67168cf3e..e67168cf3e 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 27ba77ddaf..27ba77ddaf 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 50c28ee0cd..50c28ee0cd 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 a4304010fe..a4304010fe 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 96fd25a015..96fd25a015 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 bf8d2c14ea..bf8d2c14ea 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 a7ec9292aa..a7ec9292aa 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 a2c87d0c43..a2c87d0c43 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 82f7cb1743..82f7cb1743 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 c508d5366f..c508d5366f 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 df9fc3f37d..df9fc3f37d 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 27ba77ddaf..27ba77ddaf 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 273e259071..273e259071 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 27ba77ddaf..27ba77ddaf 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 0073e05778..0073e05778 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 8d38505c16..8d38505c16 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 4ad5ba897f..4ad5ba897f 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 72e8274d8c..72e8274d8c 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 bd8031fc00..bd8031fc00 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 00750edc07..00750edc07 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 fa38a7174e..fa38a7174e 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 d00491fd7e..d00491fd7e 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 eb8b02bc49..eb8b02bc49 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 b8626c4cff..b8626c4cff 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 10d6bc04d8..10d6bc04d8 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 00ff03a46c..00ff03a46c 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 dc8243bc85..dc8243bc85 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 00ff03a46c..00ff03a46c 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 0995d4e7e7..0995d4e7e7 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 d00491fd7e..d00491fd7e 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 4da02968f6..4da02968f6 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 4519bc406d..4519bc406d 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 a28e682100..a28e682100 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 cca41f821f..cca41f821f 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 0cfbf08886..0cfbf08886 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 0a9a21c03b..0a9a21c03b 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 148b935163..148b935163 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 8299c3a4a3..8299c3a4a3 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 153ceb8186..153ceb8186 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 9e5c99d2e7..9e5c99d2e7 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 63f650f73a..63f650f73a 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 47cc989ad4..47cc989ad4 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 27ba77ddaf..27ba77ddaf 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 5e40928dbe..5e40928dbe 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 6aace04b0f..6aace04b0f 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 424af00d9b..424af00d9b 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 f7393e847d..f7393e847d 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 a3962ce3fd..a3962ce3fd 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 e92aae3235..e92aae3235 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 ce67943bea..ce67943bea 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 828220890e..828220890e 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 068c97a6c1..068c97a6c1 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 634a841eb1..634a841eb1 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 ff1791b30e..ff1791b30e 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 2b2e6fa711..2b2e6fa711 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 629bc440a8..629bc440a8 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 92a1532993..92a1532993 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 9b58be5d1d..9b58be5d1d 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 27ba77ddaf..27ba77ddaf 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 e63c36586b..e63c36586b 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 378c8dc804..378c8dc804 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 033e8d3aba..033e8d3aba 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 92b75e0b8b..92b75e0b8b 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 9ee9f8a0b4..9ee9f8a0b4 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 fb39ee4efa..fb39ee4efa 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 6d0a2992b7..6d0a2992b7 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 028a538314..028a538314 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 2c02317d2a..e590e8a04e 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 864d9865e0..864d9865e0 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 114d19779f..114d19779f 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 77417432b3..77417432b3 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 bbc3eb08c0..bbc3eb08c0 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 a0edd91a96..a0edd91a96 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 11e40e66fd..11e40e66fd 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 17da82e5f0..17da82e5f0 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 8c2e104c78..8c2e104c78 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 7b40616417..7b40616417 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 b1934f7e1e..b1934f7e1e 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 34948d48ae..34948d48ae 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 c10a52b1ea..c10a52b1ea 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 7b63008110..7b63008110 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 23a58ed109..23a58ed109 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 21518d4c6d..21518d4c6d 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 f4b9efd0c5..f4b9efd0c5 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 ae6d7a7693..ae6d7a7693 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 fd1001c8ca..fd1001c8ca 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 ad066b6803..ad066b6803 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 45a33e4803..45a33e4803 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 ae2e256eea..ae2e256eea 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 05c78b3016..05c78b3016 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 356272815d..356272815d 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 fce3b13ee6..fce3b13ee6 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 e69de29bb2..e69de29bb2 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 e69de29bb2..e69de29bb2 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 c45e00f3ac..0000000000
--- 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