libexpr: Canonicalize TOML timestamps for toml11 > 4.0 (backport #13741)#13746
Merged
Mic92 merged 5 commits into2.29-maintenancefrom Aug 29, 2025
Merged
libexpr: Canonicalize TOML timestamps for toml11 > 4.0 (backport #13741)#13746Mic92 merged 5 commits into2.29-maintenancefrom
Mic92 merged 5 commits into2.29-maintenancefrom
Conversation
mergify
bot
added
automatic backport
github-actions
bot
added
the
with-tests
xokdvium
force-pushed
the
mergify/bp/2.29-maintenance/pr-13741
branch
from
0e2238f to
20c9a79
Compare
Current test suite doesn't cover the subsecond formatting at all and toml11 is quite finicky with that. We should at the very least test its behavior to avoid silent breakages on updates. (cherry picked from commit 7ed0229)
This looks really weird after the reformat. (cherry picked from commit df4e55f)
There's no reason to use a std::function for recursive lambdas since there are polymorphic lambdas. (cherry picked from commit a80a5c4)
(cherry picked from commit d8fc55a)
This addresses several changes from toml11 4.0 bump in nixpkgs [1]. 1. Added more regression tests for timestamp formats. Special attention needs to be paid to the precision of the subsecond range for local-time. Prior versions select the closest (upwards) multiple of 3 with a hard cap of 9 digits. 2. Normalize local datetime and offset datetime to always use the uppercase separator `T`. This is actually the issue surfaced in [2]. This canonicalization is basically a requirement by (a certain reading) of rfc3339 section 5.6 [3]. 3. If using toml11 >= 4.0 also keep the old behavior wrt to the number of digits used for subsecond part of the local-time. Newer versions cap it at 6 digits unconditionally. [1]: https://www.github.com/NixOS/nixpkgs/pull/331649 [2]: https://www.github.com/NixOS/nix/issues/11441 [3]: https://datatracker.ietf.org/doc/html/rfc3339 (cherry picked from commit dc769d7)
xokdvium
force-pushed
the
mergify/bp/2.29-maintenance/pr-13741
branch
from
20c9a79 to
a5ab03c
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
This addresses several changes from toml11 4.0 bump in
nixpkgs 1.
Added more regression tests for timestamp formats.
Special attention needs to be paid to the precision
of the subsecond range for local-time. Prior versions select the closest
(upwards) multiple of 3 with a hard cap of 9 digits.
Normalize local datetime and offset datetime to always
use the uppercase separator
T. This is actually the issuesurfaced in 2. This canonicalization is basically a requirement
by (a certain reading) of rfc3339 section 5.6 3.
If using toml11 >= 4.0 also keep the old behavior wrt
to the number of digits used for subsecond part of the local-time.
Newer versions
cap it at 6 digits unconditionallypreserve the input.Context
Fixes #11441
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.
This is an automatic backport of pull request #13741 done by [Mergify](https://mergify.com).