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

Copy deriver field to the binary cache

Browse source 
Fixes https://github.com/NixOS/nixos-org-configurations/issues/129.
This commit is contained in:
Eelco Dolstra 2020-11-02 17:08:02 +01:00
parent d50f9a242f
commit 73dfef364b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hydra-queue-runner/build-remote.cc
View file

@ -449,7 +449,7 @@ void State::buildRemote(ref<Store> destStore,
while (true) { while (true) {
auto storePathS = readString(from); auto storePathS = readString(from);
if (storePathS == "") break; if (storePathS == "") break;
readString(from); // deriver auto deriver = readString(from); // deriver
auto references = worker_proto::read(*localStore, from, Phantom<StorePathSet> {}); auto references = worker_proto::read(*localStore, from, Phantom<StorePathSet> {});
readLongLong(from); // download size readLongLong(from); // download size
auto narSize = readLongLong(from); auto narSize = readLongLong(from);
@ -463,6 +463,8 @@ void State::buildRemote(ref<Store> destStore,
totalNarSize += info.narSize; totalNarSize += info.narSize;
info.narHash = narHash; info.narHash = narHash;
info.ca = ca; info.ca = ca;
if (deriver != "")
info.deriver = localStore->parseStorePath(deriver);
infos.insert_or_assign(info.path, info); infos.insert_or_assign(info.path, info);
} }