0
0
Fork 0
forked from lix-project/hydra

Bump Nix version

This commit is contained in:
Shea Levy 2021-03-10 12:42:19 -05:00
parent b9fb66401b
commit 930f05c38e
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
3 changed files with 14 additions and 9 deletions

View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1613747933, "lastModified": 1615194819,
"narHash": "sha256-Q6VuNRdr87B4F3ILiM6IlQ+bkIYbQTs6EEAtwNrvl1Y=", "narHash": "sha256-LfPUsgeFRBzRgTp+828E7UhiVItSYH+CK6IJcjmlcZ4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "548437c2347159c4c79352283dd12ce58324f1d6", "rev": "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -19,11 +19,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1602702596, "lastModified": 1614309161,
"narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", "narHash": "sha256-93kRxDPyEW9QIpxU71kCaV1r+hgOgP6/aVgC7vvO8IU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad0d20345219790533ebe06571f82ed6b034db31", "rev": "0e499fde7af3c28d63e9b13636716b86c3162b93",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -264,8 +264,11 @@ void State::buildRemote(ref<Store> destStore,
a no-op for regular stores, but for the binary cache store, a no-op for regular stores, but for the binary cache store,
this will copy the inputs to the binary cache from the local this will copy the inputs to the binary cache from the local
store. */ store. */
if (localStore != std::shared_ptr<Store>(destStore)) if (localStore != std::shared_ptr<Store>(destStore)) {
copyClosure(ref<Store>(localStore), destStore, step->drv->inputSrcs, NoRepair, NoCheckSigs); StorePathSet closure;
localStore->computeFSClosure(step->drv->inputSrcs, closure);
copyPaths(ref<Store>(localStore), destStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
}
/* Copy the input closure. */ /* Copy the input closure. */
if (!machine->isLocalhost()) { if (!machine->isLocalhost()) {

View file

@ -500,7 +500,9 @@ Step::ptr State::createStep(ref<Store> destStore,
// FIXME: should copy directly from substituter to destStore. // FIXME: should copy directly from substituter to destStore.
} }
copyClosure(ref<Store>(localStore), destStore, {*path}); StorePathSet closure;
localStore->computeFSClosure({*path}, closure);
copyPaths(ref<Store>(localStore), destStore, closure, NoRepair, CheckSigs, NoSubstitute);
time_t stopTime = time(0); time_t stopTime = time(0);