Nick Cao
2 years ago
parent
c319f76223
commit
e9e0ab3a03
@ -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
|
||||
|
||||
@ -1,61 +0,0 @@ |
||||
diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc
|
||||
index acffe1d..53f2630 100644
|
||||
--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc
|
||||
+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc
|
||||
@@ -63,7 +63,7 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
|
||||
|
||||
static MyArgs myArgs;
|
||||
|
||||
-static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const string & name, const string & subAttribute)
|
||||
+static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const std::string & name, const std::string & subAttribute)
|
||||
{
|
||||
Strings res;
|
||||
std::function<void(Value & v)> rec;
|
||||
@@ -186,7 +186,7 @@ static void worker(
|
||||
for (auto & i : context)
|
||||
if (i.at(0) == '!') {
|
||||
size_t index = i.find("!", 1);
|
||||
- job["constituents"].push_back(string(i, index + 1));
|
||||
+ job["constituents"].push_back(std::string(i, index + 1));
|
||||
}
|
||||
|
||||
state.forceList(*a->value, *a->pos);
|
||||
diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc
|
||||
index 62eb572..a957bef 100644
|
||||
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
|
||||
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
|
||||
@@ -87,7 +87,7 @@ void State::parseMachines(const std::string & contents)
|
||||
}
|
||||
|
||||
for (auto line : tokenizeString<Strings>(contents, "\n")) {
|
||||
- line = trim(string(line, 0, line.find('#')));
|
||||
+ line = trim(std::string(line, 0, line.find('#')));
|
||||
auto tokens = tokenizeString<std::vector<std::string>>(line);
|
||||
if (tokens.size() < 3) continue;
|
||||
tokens.resize(8);
|
||||
diff --git a/src/libhydra/db.hh b/src/libhydra/db.hh
|
||||
index 7d5bdc5..00e8f40 100644
|
||||
--- a/src/libhydra/db.hh
|
||||
+++ b/src/libhydra/db.hh
|
||||
@@ -18,7 +18,7 @@ struct Connection : pqxx::connection
|
||||
std::string upper_prefix = "DBI:Pg:";
|
||||
|
||||
if (hasPrefix(s, lower_prefix) || hasPrefix(s, upper_prefix)) {
|
||||
- return concatStringsSep(" ", tokenizeString<Strings>(string(s, lower_prefix.size()), ";"));
|
||||
+ return concatStringsSep(" ", tokenizeString<Strings>(std::string(s, lower_prefix.size()), ";"));
|
||||
}
|
||||
|
||||
throw Error("$HYDRA_DBI does not denote a PostgreSQL database");
|
||||
diff --git a/src/libhydra/hydra-config.hh b/src/libhydra/hydra-config.hh
|
||||
index bc989f7..1688c27 100644
|
||||
--- a/src/libhydra/hydra-config.hh
|
||||
+++ b/src/libhydra/hydra-config.hh
|
||||
@@ -17,7 +17,7 @@ struct HydraConfig
|
||||
if (hydraConfigFile && pathExists(*hydraConfigFile)) {
|
||||
|
||||
for (auto line : tokenizeString<Strings>(readFile(*hydraConfigFile), "\n")) {
|
||||
- line = trim(string(line, 0, line.find('#')));
|
||||
+ line = trim(std::string(line, 0, line.find('#')));
|
||||
|
||||
auto eq = line.find('=');
|
||||
if (eq == std::string::npos) continue;
|
||||
Loading…
Reference in new issue