Remove superflous meta fields from output

Since meta is now included in it's entirety we no longer need to output them separately.
This commit is contained in:
adisbladis 2021-08-23 18:31:24 -05:00
parent 19823c899d
commit 1774f874ee
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7

View file

@ -100,31 +100,6 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
static MyArgs myArgs; static MyArgs myArgs;
static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const string & name, const string & subAttribute)
{
Strings res;
std::function<void(Value & v)> rec;
rec = [&](Value & v) {
state.forceValue(v);
if (v.type() == nString)
res.push_back(v.string.s);
else if (v.isList())
for (unsigned int n = 0; n < v.listSize(); ++n)
rec(*v.listElems()[n]);
else if (v.type() == nAttrs) {
auto a = v.attrs->find(state.symbols.create(subAttribute));
if (a != v.attrs->end())
res.push_back(state.forceString(*a->value));
}
};
Value * v = drv.queryMeta(name);
if (v) rec(*v);
return concatStringsSep(", ", res);
}
static nlohmann::json serializeStorePathSet(StorePathSet &paths, LocalFSStore &store) { static nlohmann::json serializeStorePathSet(StorePathSet &paths, LocalFSStore &store) {
auto array = nlohmann::json::array(); auto array = nlohmann::json::array();
for (auto & p : paths) { for (auto & p : paths) {
@ -210,14 +185,6 @@ static void worker(
job["nixName"] = drv->queryName(); job["nixName"] = drv->queryName();
job["system"] =drv->querySystem(); job["system"] =drv->querySystem();
job["drvPath"] = drvPath; job["drvPath"] = drvPath;
job["description"] = drv->queryMetaString("description");
job["license"] = queryMetaStrings(state, *drv, "license", "shortName");
job["homepage"] = drv->queryMetaString("homepage");
job["maintainers"] = queryMetaStrings(state, *drv, "maintainers", "email");
job["schedulingPriority"] = drv->queryMetaInt("schedulingPriority", 100);
job["timeout"] = drv->queryMetaInt("timeout", 36000);
job["maxSilent"] = drv->queryMetaInt("maxSilent", 7200);
job["isChannel"] = drv->queryMetaBool("isHydraChannel", false);
nlohmann::json meta; nlohmann::json meta;
for (auto & name : drv->queryMetaNames()) { for (auto & name : drv->queryMetaNames()) {