diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-10-13 03:46:41 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-10-13 03:46:41 +0000 |
| commit | d8d7f50f6283285bea56da53b6b662310127412f (patch) | |
| tree | a2e1db4e644a20dbac55ea292f66b2a038e07ad9 /src | |
| parent | a4e5de1b9d26584615946057430df9e63d842f53 (diff) | |
| parent | 39c11c5c01de9c18bf1b0bc3928fc28393fd0ca9 (diff) | |
Merge remote-tracking branch 'obsidian/path-info' into ca-drv-exotic
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/content-address.hh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libstore/content-address.hh b/src/libstore/content-address.hh index 1fdd16e92..eb56fe571 100644 --- a/src/libstore/content-address.hh +++ b/src/libstore/content-address.hh @@ -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 |