diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc index 3dec28ee..fd728205 100644 --- a/src/hydra-queue-runner/build-remote.cc +++ b/src/hydra-queue-runner/build-remote.cc @@ -224,7 +224,7 @@ void State::buildRemote(ref destStore, a no-op for regular stores, but for the binary cache store, this will copy the inputs to the binary cache from the local store. */ - copyClosure(ref(localStore), destStore, step->drv.inputSrcs, false, true); + copyClosure(ref(localStore), destStore, step->drv.inputSrcs, NoRepair, NoCheckSigs); /* Copy the input closure. */ if (/* machine->sshName != "localhost" */ true) { @@ -416,7 +416,7 @@ void State::buildRemote(ref destStore, to << cmdExportPaths << 0 << outputs; to.flush(); - destStore->importPaths(from, result.accessor, true); + destStore->importPaths(from, result.accessor, NoCheckSigs); /* Release the tokens pertaining to NAR compression. After this we only have the uncompressed diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc index 1aa89663..808033a0 100644 --- a/src/hydra-queue-runner/hydra-queue-runner.cc +++ b/src/hydra-queue-runner/hydra-queue-runner.cc @@ -435,8 +435,8 @@ void State::markSucceededBuild(pqxx::work & txn, Build::ptr build, (product.type) (product.subtype) (product.fileSize, product.isRegular) - (printHash(product.sha1hash), product.isRegular) - (printHash(product.sha256hash), product.isRegular) + (product.sha1hash.to_string(Base16, false), product.isRegular) + (product.sha256hash.to_string(Base16, false), product.isRegular) (product.path) (product.name) (product.defaultPath).exec(); diff --git a/src/hydra-queue-runner/queue-monitor.cc b/src/hydra-queue-runner/queue-monitor.cc index 4b3eebf1..09d07342 100644 --- a/src/hydra-queue-runner/queue-monitor.cc +++ b/src/hydra-queue-runner/queue-monitor.cc @@ -629,9 +629,9 @@ BuildOutput State::getBuildOutputCached(Connection & conn, nix::ref product.fileSize = row[2].as(); } if (!row[3].is_null()) - product.sha1hash = parseHash(htSHA1, row[3].as()); + product.sha1hash = Hash(row[3].as(), htSHA1); if (!row[4].is_null()) - product.sha256hash = parseHash(htSHA256, row[4].as()); + product.sha256hash = Hash(row[4].as(), htSHA256); if (!row[5].is_null()) product.path = row[5].as(); product.name = row[6].as();