Change types to prepare the way for CA derivations --- contains #3795#3807
Merged
edolstra merged 9 commits intoNixOS:masterfrom Aug 5, 2020
Merged
Conversation
N.B. not using `std::visit` for fetchurl because there is no attempt to handle all the cases (e.g. no `else`) and lambda complicates early return.
We've added the variant to `DerivationOutput` to support them, but made `DerivationOutput::path` partial to avoid actually implementing them. With this chage, we can all collaborate on "just" removing `DerivationOutput::path` calls to implement CA derivations.
Ericson2314
changed the title
Member
Author
|
CC @regnat --- Sorry I forgot to ping! |
Ericson2314
commented
Jul 13, 2020
Comment on lines
+18
to
+19
| /* Will need to become `std::optional<StorePath>` once input-addressed | ||
| derivations are allowed to depend on cont-addressed derivations */ |
Member
Author
There was a problem hiding this comment.
I figure this is fine for now.
…idiansystems/nix into ca-derivation-data-types
…systems/nix into ca-derivation-data-types
Member
Author
|
Conflicts fixed. |
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.
This is a small changes on top of #3795. The idea is that PR does some other fixes and "boring things' such that the difference between it and this should be very readable.
Main commit:
We've added the variant to
DerivationOutputto support them, but madeDerivationOutput::pathpartial to avoid actually implementing them.With this chage, we can all collaborate on "just" removing
DerivationOutput::pathcalls to implement CA derivations.