mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): update identifier quoting to match cppnix 2.17

Browse source 
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
This commit is contained in:
Adam Joseph 2023-09-08 23:38:28 -07:00 • committed by clbot
parent 95ee688f03
commit 9256621009
13 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tvix/verify-lang-tests/default.nix
View file

@ -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).