nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-25 02:10:54 +01:00
Code Activity

Merge remote-tracking branch 'upstream/master' into drv-outputs-map-allow-missing

Browse source
This commit is contained in:
John Ericson 2020-08-05 16:43:30 +00:00
commit cf939055c8
36 changed files with 673 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/remote-store.cc
View file

@ -410,7 +410,7 @@ void RemoteStore::queryPathInfoUncached(const StorePath & path,
info = std::make_shared<ValidPathInfo>(StorePath(path));
auto deriver = readString(conn->from);
if (deriver != "") info->deriver = parseStorePath(deriver);
info->narHash = Hash(readString(conn->from), htSHA256);
info->narHash = Hash::parseAny(readString(conn->from), htSHA256);
info->references = readStorePaths<StorePathSet>(*this, conn->from);
conn->from >> info->registrationTime >> info->narSize;
if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 16) {