Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/hydra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d50f9a242ffb
Choose a base ref
...
head repository: NixOS/hydra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 73dfef364bb7
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 2, 2020

  1. Copy deriver field to the binary cache 

    Fixes NixOS/infra#129.
    @edolstra
    edolstra committed Nov 2, 2020
    Copy the full SHA
    73dfef3 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/hydra-queue-runner/build-remote.cc
4 changes: 3 additions & 1 deletion src/hydra-queue-runner/build-remote.cc
View file
Original file line number Diff line number Diff line change
@@ -449,7 +449,7 @@ void State::buildRemote(ref<Store> destStore,
while (true) {
auto storePathS = readString(from);
if (storePathS == "") break;
readString(from); // deriver
auto deriver = readString(from); // deriver
auto references = worker_proto::read(*localStore, from, Phantom<StorePathSet> {});
readLongLong(from); // download size
auto narSize = readLongLong(from);
@@ -463,6 +463,8 @@ void State::buildRemote(ref<Store> destStore,
totalNarSize += info.narSize;
info.narHash = narHash;
info.ca = ca;
if (deriver != "")
info.deriver = localStore->parseStorePath(deriver);
infos.insert_or_assign(info.path, info);
}