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

Use latest nixUnstable

Browse source
This commit is contained in:
Eelco Dolstra 2017-02-03 14:39:18 +01:00
parent 63d8c8d631
commit a366f362e1
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
release.nix
View file

@ -42,18 +42,12 @@ rec {
let let
aws-sdk-cpp' = aws-sdk-cpp' =
lib.overrideDerivation (aws-sdk-cpp.override { aws-sdk-cpp.override {
apis = ["s3"]; apis = ["s3"];
customMemoryManagement = false; customMemoryManagement = false;
}) (attrs: {
src = fetchFromGitHub {
owner = "edolstra";
repo = "aws-sdk-cpp";
rev = "d1e2479f79c24e2a1df8a3f3ef3278a1c6383b1e";
sha256 = "1vhgsxkhpai9a7dk38q4r239l6dsz2jvl8hii24c194lsga3g84h";
}; };
});
/*
nix = overrideDerivation nixUnstable (attrs: { nix = overrideDerivation nixUnstable (attrs: {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
@ -66,6 +60,8 @@ rec {
configureFlags = attrs.configureFlags + " --disable-doc-gen"; configureFlags = attrs.configureFlags + " --disable-doc-gen";
preConfigure = "./bootstrap.sh; mkdir -p $doc $man"; preConfigure = "./bootstrap.sh; mkdir -p $doc $man";
}); });
*/
nix = nixUnstable;
perlDeps = buildEnv { perlDeps = buildEnv {
name = "hydra-perl-deps"; name = "hydra-perl-deps";

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

@ -184,7 +184,7 @@ void State::buildRemote(ref<Store> destStore,
throw Error("machine ‘%1%’ does not support repeating a build; please upgrade it to Nix 1.12", machine->sshName); throw Error("machine ‘%1%’ does not support repeating a build; please upgrade it to Nix 1.12", machine->sshName);
} catch (EndOfFile & e) { } catch (EndOfFile & e) {
child.pid.wait(true); child.pid.wait();
string s = chomp(readFile(result.logFile)); string s = chomp(readFile(result.logFile));
throw Error(format("cannot connect to ‘%1%’: %2%") % machine->sshName % s); throw Error(format("cannot connect to ‘%1%’: %2%") % machine->sshName % s);
} }
@ -428,7 +428,7 @@ void State::buildRemote(ref<Store> destStore,
/* Shut down the connection. */ /* Shut down the connection. */
child.to = -1; child.to = -1;
child.pid.wait(true); child.pid.wait();
} catch (Error & e) { } catch (Error & e) {
/* Disable this machine until a certain period of time has /* Disable this machine until a certain period of time has

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

@ -459,7 +459,7 @@ void State::logCompressor()
throw SysError("cannot start bzip2"); throw SysError("cannot start bzip2");
}); });
int res = pid.wait(true); int res = pid.wait();
if (res != 0) if (res != 0)
throw Error(format("bzip2 returned exit code %1% while compressing ‘%2%’") throw Error(format("bzip2 returned exit code %1% while compressing ‘%2%’")
@ -521,7 +521,7 @@ void State::notificationSender()
throw SysError("cannot start hydra-notify"); throw SysError("cannot start hydra-notify");
}); });
int res = pid.wait(true); int res = pid.wait();
if (res != 0) if (res != 0)
throw Error(format("hydra-build returned exit code %1% notifying about build %2%") throw Error(format("hydra-build returned exit code %1% notifying about build %2%")