Clean up structured attrs parsing using JSON utils#14754
Merged
Ericson2314 merged 2 commits intomasterfrom Jan 16, 2026
Merged
Conversation
Ericson2314
commented
Dec 9, 2025
src/libstore/derivation-options.cc
Outdated
| res.insert(parseRef(s)); | ||
| return res; | ||
| } catch (Error & e) { | ||
| e.addTrace({}, "while parsing attribute 'outputChecks.\"%s\".%s'", outputName, name); |
Member
Author
There was a problem hiding this comment.
So we don't use context versus old throw
Ericson2314
commented
Dec 9, 2025
| for (auto & [outputName, output] : getObject(*udr)) | ||
| res.insert_or_assign(outputName, getBoolean(output)); | ||
| } catch (Error & e) { | ||
| e.addTrace({}, "while parsing attribute 'unsafeDiscardReferences'"); |
Member
Author
There was a problem hiding this comment.
So we don't loose context versus old throw
Ericson2314
commented
Dec 9, 2025
Ericson2314
force-pushed
the
structured-attrs-cleanup
branch
2 times, most recently
from
4218962 to
e912e1b
Compare
Ericson2314
commented
Jan 12, 2026
Comment on lines
+78
to
+79
| template<typename T> | ||
| static inline std::optional<T> ptrToOwned(const nlohmann::json * ptr) |
Member
Author
There was a problem hiding this comment.
moving it to the right namespace
Ericson2314
force-pushed
the
structured-attrs-cleanup
branch
from
e912e1b to
04d073f
Compare
Ericson2314
commented
Jan 13, 2026
xokdvium
reviewed
Jan 16, 2026
xokdvium
reviewed
Jan 16, 2026
xokdvium
reviewed
Jan 16, 2026
xokdvium
reviewed
Jan 16, 2026
Ericson2314
commented
Jan 16, 2026
Ericson2314
force-pushed
the
structured-attrs-cleanup
branch
from
04d073f to
eb653e5
Compare
xokdvium
approved these changes
Jan 16, 2026
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
3 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
Shorter, easier to read
Context
Pulled out of #14750
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.