philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge remote-tracking branch 'obsidian/path-info' into ca-drv-exotic

Browse source
This commit is contained in:
John Ericson 2020-10-13 03:46:41 +00:00
parent a4e5de1b9d 39c11c5c01
commit d8d7f50f62
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/content-address.hh
View file

@ -7,7 +7,7 @@
namespace nix { namespace nix {
/* /*
* Mini content address * Content addressing method
*/ */
/* We only have one way to hash text with references, so this is a single-value /* 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); std::pair<ContentAddressMethod, HashType> parseContentAddressMethod(std::string_view caMethod);
/*
* Mini content address
*/
struct TextHash { struct TextHash {
Hash hash; Hash hash;
}; };
@ -61,7 +65,6 @@ struct FixedOutputHash {
std::string printMethodAlgo() const; std::string printMethodAlgo() const;
}; };
/* /*
We've accumulated several types of content-addressed paths over the years; We've accumulated several types of content-addressed paths over the years;
fixed-output derivations support multiple hash algorithms and serialisation fixed-output derivations support multiple hash algorithms and serialisation