diff options
Diffstat (limited to 'pkgs/development/tools/misc/hydra/eval.patch')
| -rw-r--r-- | pkgs/development/tools/misc/hydra/eval.patch | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/pkgs/development/tools/misc/hydra/eval.patch b/pkgs/development/tools/misc/hydra/eval.patch index a1b7599cc2b47..0be856ee75706 100644 --- a/pkgs/development/tools/misc/hydra/eval.patch +++ b/pkgs/development/tools/misc/hydra/eval.patch @@ -1,34 +1,11 @@ ---- a/src/hydra-eval-jobs/hydra-eval-jobs.cc -+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc -@@ -64,11 +64,11 @@ - - static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const string & name, const string & subAttribute) - { -- Strings res; -+ std::list<std::string_view> res; - std::function<void(Value & v)> rec; - - rec = [&](Value & v) { -- state.forceValue(v); -+ state.forceValue(v, noPos); - if (v.type() == nString) - res.push_back(v.string.s); - else if (v.isList()) -@@ -112,7 +112,7 @@ - callFlake(state, lockedFlake, *vFlake); - - auto vOutputs = vFlake->attrs->get(state.symbols.create("outputs"))->value; -- state.forceValue(*vOutputs); -+ state.forceValue(*vOutputs, noPos); - - auto aHydraJobs = vOutputs->attrs->get(state.symbols.create("hydraJobs")); - if (!aHydraJobs) -@@ -191,7 +191,7 @@ - state.forceList(*a->value, *a->pos); - for (unsigned int n = 0; n < a->value->listSize(); ++n) { - auto v = a->value->listElems()[n]; -- state.forceValue(*v); -+ state.forceValue(*v, noPos); - if (v->type() == nString) - job["namedConstituents"].push_back(state.forceStringNoCtx(*v)); - } +diff --git a/src/hydra-eval-jobs/Makefile.am b/src/hydra-eval-jobs/Makefile.am +index 7a4e9c91..90742a30 100644 +--- a/src/hydra-eval-jobs/Makefile.am ++++ b/src/hydra-eval-jobs/Makefile.am +@@ -1,5 +1,5 @@ + bin_PROGRAMS = hydra-eval-jobs + + hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc +-hydra_eval_jobs_LDADD = $(NIX_LIBS) ++hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixcmd + hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra |