Introduce DerivationOptions
#12292
Open
Introduce DerivationOptions
#12292
+661
−276
Conversation
This file contains 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
Ericson2314
force-pushed
the
derivation-options
branch
3 times, most recently
from
3555ae5 to
6b6529b
Compare
roberth
reviewed
Jan 20, 2025
| * format), we have the option of instead storing the options | ||
| * separately. That would be nice to separate concerns, and not make any | ||
| * environment variable names magical. | ||
| */ |
There was a problem hiding this comment.
Is it meant to be a lossless representation of part of the derivation, or is it supposed to represent part of the derivation semantically uniquely?
There was a problem hiding this comment.
Ah yes it is supposed to reflect the semantics, not the syntax.
In other words, there will not be a DerivationOptions -> Env function; instead, the ATerm logic will (eventually):
- Check that the options are implied by the rest of the
Derivation - Since the check passed, safely ignore the (eventual new)
DerivationOptions options;field of the derivation as superfluous - Serialize as today
So yes let's do these changes.
src/libstore/derivation-options.hh
Outdated
| * A value of `nullopt` indicates that the check is skipped. | ||
| * This means that there are no disallowed references. | ||
| */ | ||
| std::optional<Strings> disallowedReferences = std::nullopt; |
There was a problem hiding this comment.
Suggested change
| std::optional<Strings> disallowedReferences = std::nullopt; | |
| Strings disallowedReferences = std::nullopt; |
Depending on answer to the preceding question.
Comment on lines
-2866
to
-2872
| struct Checks | ||
| { | ||
| bool ignoreSelfRefs = false; | ||
| std::optional<uint64_t> maxSize, maxClosureSize; | ||
| std::optional<Strings> allowedReferences, allowedRequisites, disallowedReferences, disallowedRequisites; | ||
| }; | ||
|
|
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2024-01-20-nix-team-meeting-minutes-209/59119/1 |
This is a first step towards PR NixOS#10760, and the issues it addresses. See the Doxygen for details. Thanks to these changes, we are able to drastically restrict how the rest of the code-base uses `ParseDerivation`. Co-Authored-By: HaeNoe <[email protected]>
Ericson2314
force-pushed
the
derivation-options
branch
from
6b6529b to
5e9e7d7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 the Doxygen for details.
Thanks to these changes, we are able to drastically restrict how the rest of the code-base uses
ParseDerivation.Context
This is a first step towards PR #10760, and the issues it addresses.
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.
CC @haenoe, who co-authored this.