lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #994 from NixOS/update-nix

Browse source 
Update nix
This commit is contained in:
Eelco Dolstra 2021-08-10 14:35:30 +02:00 committed by GitHub
parent 429be3ed44 5edb58b314
commit 9bce425c33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.lock
View file

@ -1,15 +1,33 @@
{ {
"nodes": { "nodes": {
"lowdown-src": {
"flake": false,
"locked": {
"lastModified": 1617481909,
"narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=",
"owner": "kristapsdz",
"repo": "lowdown",
"rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d",
"type": "github"
},
"original": {
"owner": "kristapsdz",
"ref": "VERSION_0_8_4",
"repo": "lowdown",
"type": "github"
}
},
"nix": { "nix": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1619080380, "lastModified": 1628586117,
"narHash": "sha256-DKXtLoiSMuNaq5km6FAWqJOpilSCFJQ0or8btfWH6mo=", "narHash": "sha256-8hS4xy7fq3z9XZIMYm4sQi9SzhcYqEJfdbwgDePoWuc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "d9864be4b757468d33bc49edddce5e4f04ef4b90", "rev": "a6ba313a0aac3b6e2fef434cb42d190a0849238e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -19,16 +37,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1614309161, "lastModified": 1624862269,
"narHash": "sha256-93kRxDPyEW9QIpxU71kCaV1r+hgOgP6/aVgC7vvO8IU=", "narHash": "sha256-JFcsh2+7QtfKdJFoPibLFPLgIW6Ycnv8Bts9a7RYme0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e499fde7af3c28d63e9b13636716b86c3162b93", "rev": "f77036342e2b690c61c97202bf48f2ce13acc022",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-20.09-small", "ref": "nixos-21.05-small",
"type": "indirect" "type": "indirect"
} }
}, },

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

@ -267,7 +267,7 @@ void State::buildRemote(ref<Store> destStore,
if (localStore != std::shared_ptr<Store>(destStore)) { if (localStore != std::shared_ptr<Store>(destStore)) {
StorePathSet closure; StorePathSet closure;
localStore->computeFSClosure(step->drv->inputSrcs, closure); localStore->computeFSClosure(step->drv->inputSrcs, closure);
copyPaths(ref<Store>(localStore), destStore, closure, NoRepair, NoCheckSigs, NoSubstitute); copyPaths(*localStore, *destStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
} }
/* Copy the input closure. */ /* Copy the input closure. */

2
src/hydra-queue-runner/queue-monitor.cc
View file

@ -511,7 +511,7 @@ Step::ptr State::createStep(ref<Store> destStore,
StorePathSet closure; StorePathSet closure;
localStore->computeFSClosure({*path}, closure); localStore->computeFSClosure({*path}, closure);
copyPaths(ref<Store>(localStore), destStore, closure, NoRepair, CheckSigs, NoSubstitute); copyPaths(*localStore, *destStore, closure, NoRepair, CheckSigs, NoSubstitute);
time_t stopTime = time(0); time_t stopTime = time(0);