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

Merge pull request #1185 from DeterminateSystems/revert-from-nix-2.6

Browse source 
Revert to Nix 2.5.1
This commit is contained in:
Graham Christensen 2022-03-28 14:45:15 -04:00 committed by GitHub
parent 962bf36939 921e27d6c0
commit 47c7170c52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
flake.lock
View file

@ -19,20 +19,19 @@
"nix": { "nix": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src", "lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1643066034, "lastModified": 1639739069,
"narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", "narHash": "sha256-GOsiqy9EaTwDn2PLZ4eFj1VkXcBUbqrqHehRE9GuGdU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", "rev": "b4f250417ab64f237c8b51439fe1f427193ab23b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "2.6.0", "ref": "2.5.1",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }
@ -52,21 +51,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-regression": {
"locked": {
"lastModified": 1643052045,
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
},
"original": {
"id": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "indirect"
}
},
"root": { "root": {
"inputs": { "inputs": {
"nix": "nix", "nix": "nix",

2
flake.nix
View file

@ -2,7 +2,7 @@
description = "A Nix-based continuous build system"; description = "A Nix-based continuous build system";
inputs.nixpkgs.follows = "nix/nixpkgs"; inputs.nixpkgs.follows = "nix/nixpkgs";
inputs.nix.url = github:NixOS/nix/2.6.0; inputs.nix.url = "github:NixOS/nix/2.5.1";
outputs = { self, nixpkgs, nix }: outputs = { self, nixpkgs, nix }:
let let

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

@ -287,9 +287,9 @@ void State::buildRemote(ref<Store> destStore,
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(*localStore, *destStore, StorePathSet closure;
step->drv->inputSrcs, localStore->computeFSClosure(step->drv->inputSrcs, closure);
NoRepair, NoCheckSigs, NoSubstitute); copyPaths(*localStore, *destStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
} }
{ {

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

@ -513,9 +513,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(*localStore, *destStore, StorePathSet closure;
StorePathSet { *path }, localStore->computeFSClosure({*path}, closure);
NoRepair, CheckSigs, NoSubstitute); copyPaths(*localStore, *destStore, closure, NoRepair, CheckSigs, NoSubstitute);
time_t stopTime = time(0); time_t stopTime = time(0);