Misc prep changes for #13942#13975
Merged
Ericson2314 merged 3 commits intoNixOS:masterfrom Sep 13, 2025
Merged
Conversation
This is because we need it in declarations where we should not be including the full `nlohmann/json.hpp`. Already can clean up by moving the experimental feature "instance". Also, make the `std::map` instance better by allowing for other comparison functions.
Wrong number of arguments was causing a format assertion.
xokdvium
approved these changes
Sep 12, 2025
Contributor
xokdvium
left a comment
There was a problem hiding this comment.
Just test changes and moving code around. SGTM
xokdvium
reviewed
Sep 12, 2025
Comment on lines
+153
to
+154
| throw BadHash( | ||
| "invalid %s hash '%s', length %d != expected length %d", pair.encodingName, rest, d.size(), res.hashSize); |
Contributor
There was a problem hiding this comment.
This reminds me that I should dig up my std::format migration tool
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
See each commit for details.
Context
Overall goal is #13570, which #13942 will fix. Since that one has some back-compat subtitles, I want to land the prep work first.
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.