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

Bump Nix

Browse source 
Fixes #398.
This commit is contained in:
Eelco Dolstra 2016-11-09 19:15:13 +01:00
parent e2a012de8c
commit cb5e438a08
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
release.nix
View file

@ -58,8 +58,8 @@ rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "d2c58ba60572e4248bd52f82fac57d6e0c79773d"; rev = "2af5d35fdc1171a9bdab7e2fc005673d76417c06";
sha256 = "195f23xcndzrzg3n4wk0884qa6k4gm9mq1pkhzd7rn30vkn564dc"; sha256 = "1q2s4r895qn6sws048j7xwfdpyxm0dwkh52c55535w7x46am33wa";
}; };
buildInputs = attrs.buildInputs ++ [ autoreconfHook bison flex ]; buildInputs = attrs.buildInputs ++ [ autoreconfHook bison flex ];
nativeBuildInputs = attrs.nativeBuildInputs ++ [ aws-sdk-cpp' autoconf-archive ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [ aws-sdk-cpp' autoconf-archive ];

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

@ -220,7 +220,7 @@ 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. */
copyClosure(ref<Store>(localStore), destStore, step->drv.inputSrcs); copyClosure(ref<Store>(localStore), destStore, step->drv.inputSrcs, false, true);
/* Copy the input closure. */ /* Copy the input closure. */
if (/* machine->sshName != "localhost" */ true) { if (/* machine->sshName != "localhost" */ true) {
@ -388,7 +388,7 @@ void State::buildRemote(ref<Store> destStore,
to << cmdExportPaths << 0 << outputs; to << cmdExportPaths << 0 << outputs;
to.flush(); to.flush();
destStore->importPaths(from, result.accessor); destStore->importPaths(from, result.accessor, true);
auto now2 = std::chrono::steady_clock::now(); auto now2 = std::chrono::steady_clock::now();

8
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -799,11 +799,9 @@ void State::run(BuildID buildOne)
localStore = openStore(); localStore = openStore();
if (hydraConfig["store_uri"] == "") { _destStore = hydraConfig["store_uri"] == ""
_destStore = localStore; ? localStore
} else { : openStore(hydraConfig["store_uri"]);
_destStore = openStoreAt(hydraConfig["store_uri"]);
}
auto isTrue = [](const std::string & s) { auto isTrue = [](const std::string & s) {
return s == "1" || s == "true"; return s == "1" || s == "true";