delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ca-derivations-prep

Browse source
This commit is contained in:
John Ericson 2023-12-07 15:01:35 -05:00
parent 11f8030b0f 91bbd5366f
commit 31ea6458ca
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -58,11 +58,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1687379288, "lastModified": 1701615100,
"narHash": "sha256-cSuwfiqYfeVyqzCRkU9AvLTysmEuSal8nh6CYr+xWog=", "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ef0bc3976340dab9a4e087a0bcff661a8b2e87f3", "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -113,7 +113,7 @@ static void copyClosureTo(
Machine::Connection & conn, Machine::Connection & conn,
Store & destStore, Store & destStore,
const StorePathSet & paths, const StorePathSet & paths,
bool useSubstitutes = false) SubstituteFlag useSubstitutes = NoSubstitute)
{ {
StorePathSet closure; StorePathSet closure;
destStore.computeFSClosure(paths, closure); destStore.computeFSClosure(paths, closure);
@ -290,7 +290,7 @@ static BasicDerivation sendInputs(
destStore.computeFSClosure(basicDrv.inputSrcs, closure); destStore.computeFSClosure(basicDrv.inputSrcs, closure);
copyPaths(destStore, localStore, closure, NoRepair, NoCheckSigs, NoSubstitute); copyPaths(destStore, localStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
} else { } else {
copyClosureTo(conn, destStore, basicDrv.inputSrcs, true); copyClosureTo(conn, destStore, basicDrv.inputSrcs, Substitute);
} }
auto now2 = std::chrono::steady_clock::now(); auto now2 = std::chrono::steady_clock::now();