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

Sync with nixUnstable

Browse source
This commit is contained in:
Eelco Dolstra 2017-07-21 13:09:08 +02:00
parent 6fc851d376
commit b0432c7762
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/hydra-eval-jobs/hydra-eval-jobs.cc
View file

@ -106,29 +106,29 @@ static void findJobsWrapped(EvalState & state, JSONObject & top,
if (v.type == tAttrs) { if (v.type == tAttrs) {
DrvInfo drv(state); auto drv = getDerivation(state, v, false);
if (getDerivation(state, v, drv, false)) { if (drv) {
Path drvPath; Path drvPath;
DrvInfo::Outputs outputs = drv.queryOutputs(); DrvInfo::Outputs outputs = drv->queryOutputs();
if (drv.system == "unknown") if (drv->querySystem() == "unknown")
throw EvalError("derivation must have a ‘system’ attribute"); throw EvalError("derivation must have a ‘system’ attribute");
{ {
auto res = top.object(attrPath); auto res = top.object(attrPath);
res.attr("nixName", drv.name); res.attr("nixName", drv->queryName());
res.attr("system", drv.system); res.attr("system", drv->querySystem());
res.attr("drvPath", drvPath = drv.queryDrvPath()); res.attr("drvPath", drvPath = drv->queryDrvPath());
res.attr("description", drv.queryMetaString("description")); res.attr("description", drv->queryMetaString("description"));
res.attr("license", queryMetaStrings(state, drv, "license")); res.attr("license", queryMetaStrings(state, *drv, "license"));
res.attr("homepage", drv.queryMetaString("homepage")); res.attr("homepage", drv->queryMetaString("homepage"));
res.attr("maintainers", queryMetaStrings(state, drv, "maintainers")); res.attr("maintainers", queryMetaStrings(state, *drv, "maintainers"));
res.attr("schedulingPriority", drv.queryMetaInt("schedulingPriority", 100)); res.attr("schedulingPriority", drv->queryMetaInt("schedulingPriority", 100));
res.attr("timeout", drv.queryMetaInt("timeout", 36000)); res.attr("timeout", drv->queryMetaInt("timeout", 36000));
res.attr("maxSilent", drv.queryMetaInt("maxSilent", 7200)); res.attr("maxSilent", drv->queryMetaInt("maxSilent", 7200));
res.attr("isChannel", drv.queryMetaBool("isHydraChannel", false)); res.attr("isChannel", drv->queryMetaBool("isHydraChannel", false));
/* If this is an aggregate, then get its constituents. */ /* If this is an aggregate, then get its constituents. */
Bindings::iterator a = v.attrs->find(state.symbols.create("_hydraAggregate")); Bindings::iterator a = v.attrs->find(state.symbols.create("_hydraAggregate"));