raito/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Bump Nix

Browse source
This commit is contained in:
Eelco Dolstra 2016-10-26 15:09:16 +02:00
parent a0c8e2b055
commit 3b84d4711b
2 changed files with 4 additions and 2 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 = "fdbbcc44924cb4d9028fa68b2f7d423fb5d8670f"; rev = "d2c58ba60572e4248bd52f82fac57d6e0c79773d";
sha256 = "0g420z3n0yspks0zy5ky529gbwriyrp702glslwq27ndl38aiiza"; sha256 = "195f23xcndzrzg3n4wk0884qa6k4gm9mq1pkhzd7rn30vkn564dc";
}; };
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 ];

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

@ -119,6 +119,8 @@ void State::buildRemote(ref<Store> destStore,
unsigned int maxSilentTime, unsigned int buildTimeout, unsigned int maxSilentTime, unsigned int buildTimeout,
RemoteResult & result) RemoteResult & result)
{ {
assert(BuildResult::TimedOut == 8);
string base = baseNameOf(step->drvPath); string base = baseNameOf(step->drvPath);
result.logFile = logDir + "/" + string(base, 0, 2) + "/" + string(base, 2); result.logFile = logDir + "/" + string(base, 0, 2) + "/" + string(base, 2);
AutoDelete autoDelete(result.logFile, false); AutoDelete autoDelete(result.logFile, false);