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

Fix building against nix master

Browse source
This commit is contained in:
Eelco Dolstra 2018-10-30 14:41:21 +01:00
parent e0f204f3da
commit 8d26144121
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
release.nix
View file

@ -1,5 +1,5 @@
{ hydraSrc ? builtins.fetchGit ./. { hydraSrc ? builtins.fetchGit ./.
, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.03-small"; } , nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.09-small"; }
, officialRelease ? false , officialRelease ? false
, shell ? false , shell ? false
}: }:
@ -111,6 +111,7 @@ rec {
perlDeps perl nix perlDeps perl nix
postgresql95 # for running the tests postgresql95 # for running the tests
boost boost
nlohmann_json
]; ];
hydraPath = lib.makeBinPath ( hydraPath = lib.makeBinPath (

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

@ -428,8 +428,9 @@ Step::ptr State::createStep(ref<Store> destStore,
it's not runnable yet, and other threads won't make it it's not runnable yet, and other threads won't make it
runnable while step->created == false. */ runnable while step->created == false. */
step->drv = readDerivation(drvPath); step->drv = readDerivation(drvPath);
step->parsedDrv = std::make_unique<ParsedDerivation>(drvPath, step->drv);
step->preferLocalBuild = step->drv.willBuildLocally(); step->preferLocalBuild = step->parsedDrv->willBuildLocally();
step->isDeterministic = get(step->drv.env, "isDetermistic", "0") == "1"; step->isDeterministic = get(step->drv.env, "isDetermistic", "0") == "1";
step->systemType = step->drv.platform; step->systemType = step->drv.platform;

3
src/hydra-queue-runner/state.hh
View file

@ -10,7 +10,7 @@
#include "db.hh" #include "db.hh"
#include "token-server.hh" #include "token-server.hh"
#include "derivations.hh" #include "parsed-derivations.hh"
#include "pathlocks.hh" #include "pathlocks.hh"
#include "pool.hh" #include "pool.hh"
#include "store-api.hh" #include "store-api.hh"
@ -152,6 +152,7 @@ struct Step
nix::Path drvPath; nix::Path drvPath;
nix::Derivation drv; nix::Derivation drv;
std::unique_ptr<nix::ParsedDerivation> parsedDrv;
std::set<std::string> requiredSystemFeatures; std::set<std::string> requiredSystemFeatures;
bool preferLocalBuild; bool preferLocalBuild;
bool isDeterministic; bool isDeterministic;