diff options
Diffstat (limited to 'src/libstore/derivations.hh')
| -rw-r--r-- | src/libstore/derivations.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index ccdde36ca..65901ec6d 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/derivations.hh @@ -36,9 +36,9 @@ struct DerivationOutputInputAddressed struct DerivationOutputCAFixed { /** - * hash used for expected hash computation + * hash and refs used for expected hash computation */ - FixedOutputHash hash; + ContentAddressWithReferences ca; /* hash and refs used for validating output */ /** * Return the \ref StorePath "store path" corresponding to this output @@ -48,7 +48,7 @@ struct DerivationOutputCAFixed */ StorePath path(const Store & store, std::string_view drvName, std::string_view outputName) const; - GENERATE_CMP(DerivationOutputCAFixed, me->hash); + GENERATE_CMP(DerivationOutputCAFixed, me->ca); }; /** @@ -61,7 +61,7 @@ struct DerivationOutputCAFloating /** * How the file system objects will be serialized for hashing */ - FileIngestionMethod method; + ContentAddressMethod method; /** * How the serialization will be hashed @@ -88,7 +88,7 @@ struct DerivationOutputImpure /** * How the file system objects will be serialized for hashing */ - FileIngestionMethod method; + ContentAddressMethod method; /** * How the serialization will be hashed |