Merge remote-tracking branch 'obsidian/path-info' into ca-drv-exotic
This commit is contained in:
commit
d8d7f50f62
1 changed files with 5 additions and 2 deletions
|
@ -7,7 +7,7 @@
|
|||
namespace nix {
|
||||
|
||||
/*
|
||||
* Mini content address
|
||||
* Content addressing method
|
||||
*/
|
||||
|
||||
/* We only have one way to hash text with references, so this is a single-value
|
||||
|
@ -50,6 +50,10 @@ std::string renderContentAddressMethodAndHash(ContentAddressMethod cam, HashType
|
|||
std::pair<ContentAddressMethod, HashType> parseContentAddressMethod(std::string_view caMethod);
|
||||
|
||||
|
||||
/*
|
||||
* Mini content address
|
||||
*/
|
||||
|
||||
struct TextHash {
|
||||
Hash hash;
|
||||
};
|
||||
|
@ -61,7 +65,6 @@ struct FixedOutputHash {
|
|||
std::string printMethodAlgo() const;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
We've accumulated several types of content-addressed paths over the years;
|
||||
fixed-output derivations support multiple hash algorithms and serialisation
|
||||
|
|
Loading…
Reference in a new issue