diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-09-09T06·38-0700 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-09-15T00·00+0000 |
| commit | 92566210097bf301e7f6651c161115a51598f20d (patch) | |
| tree | 4bb119876e5214324b51203e2f18be8bd91cd159 /tvix/verify-lang-tests | |
| parent | 95ee688f0338a080b039de6e971bc91ba133a863 (diff) | |
fix(tvix/eval): update identifier quoting to match cppnix 2.17 r/6589
In cppnix 2.17, commit b72bc4a972fe568744d98b89d63adcd504cb586c, the libexpr pretty-printing routine was fixed so that it would no longer pretty-print attrsets with keywords in their attrnames incorrectly. This commit implements the corresponding fix for tvix, fixes our tests to work with cppnix>=2.17 oracles, and expands our test cases to cover all the keywords. Change-Id: I4b51389cd3a9c44babc8ab2a84b383b7b0b116ca Reviewed-on: https://cl.tvl.fyi/c/depot/+/9283 Autosubmit: Adam Joseph <adam@westernsemico.com> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/verify-lang-tests')
| -rw-r--r-- | tvix/verify-lang-tests/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/verify-lang-tests/default.nix b/tvix/verify-lang-tests/default.nix index caf7235b8b..3c3fcb53fd 100644 --- a/tvix/verify-lang-tests/default.nix +++ b/tvix/verify-lang-tests/default.nix @@ -70,9 +70,9 @@ let "eval-okay-readFileType.nix" = [ nix ]; # builtins.fromTOML gains support for timestamps in Nix 2.16 "eval-okay-fromTOML-timestamps.nix" = [ nix ]; - # identifier formatting seems to have changed in Nix 2.17 - # TODO: figure out why, this is just to get the bump in cl/9125 working. - "eval-okay-identifier-formatting.nix" = [ nix_latest ]; + # identifier formatting changed in Nix 2.17 due to cppnix commit + # b72bc4a972fe568744d98b89d63adcd504cb586c + "eval-okay-identifier-formatting.nix" = [ nix ]; # TODO(sterni): support diffing working directory and home relative paths # like C++ Nix test suite (using string replacement). |