diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-05 16:43:30 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-05 16:43:30 +0000 |
commit | cf939055c867492306178f951b2f244d1f3f5062 (patch) | |
tree | 1a2a874e1a5b4d69b7e771290c2a3439952b0dcc /src/libstore/daemon.cc | |
parent | 16c98bf57c52dee59c06e0e8911800943a468962 (diff) | |
parent | b3e73547a03f068ae4dd9cca4bc865cde85c8dec (diff) |
Merge remote-tracking branch 'upstream/master' into drv-outputs-map-allow-missing
Diffstat (limited to 'src/libstore/daemon.cc')
-rw-r--r-- | src/libstore/daemon.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index 9f7be6e1a..e18f793c8 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -698,7 +698,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store, auto deriver = readString(from); if (deriver != "") info.deriver = store->parseStorePath(deriver); - info.narHash = Hash(readString(from), htSHA256); + info.narHash = Hash::parseAny(readString(from), htSHA256); info.references = readStorePaths<StorePathSet>(*store, from); from >> info.registrationTime >> info.narSize >> info.ultimate; info.sigs = readStrings<StringSet>(from); |