wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Change types to prepare the way for CA derivations

Browse source 
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.
This commit is contained in:
John Ericson 2020-07-12 16:12:21 +00:00
parent fedfc913ad
commit 230c9b4329
3 changed files with 71 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libstore/derivations.hh
View file

@ -15,6 +15,8 @@ namespace nix {
struct DerivationOutputInputAddressed
{
/* Will need to become `std::optional<StorePath>` once input-addressed
derivations are allowed to depend on cont-addressed derivations */
StorePath path;
};
@ -23,13 +25,28 @@ struct DerivationOutputFixed
FixedOutputHash hash; /* hash used for expected hash computation */
};
struct DerivationOutputFloating
{
/* information used for expected hash computation */
FileIngestionMethod method;
HashType hashType;
};
struct DerivationOutput
{
std::variant<
DerivationOutputInputAddressed,
DerivationOutputFixed
DerivationOutputFixed,
DerivationOutputFloating
> output;
StorePath path(const Store & store, std::string_view drvName) const;
std::optional<HashType> hashAlgoOpt(const Store & store) const;
std::optional<StorePath> pathOpt(const Store & store, std::string_view drvName) const;
/* DEPRECATED: Remove after CA drvs are fully implemented */
StorePath path(const Store & store, std::string_view drvName) const {
auto p = pathOpt(store, drvName);
if (!p) throw Error("floating content-addressed derivations are not yet implemented");
return *p;
}
};
typedef std::map<string, DerivationOutput> DerivationOutputs;