aboutsummaryrefslogtreecommitdiff
path: root/src/nix-env
diff options
context:
space:
mode:
Diffstat (limited to 'src/nix-env')
-rw-r--r--src/nix-env/nix-env.cc144
-rw-r--r--src/nix-env/user-env.cc10
2 files changed, 82 insertions, 72 deletions
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index 40c3c5d65..9a68899cd 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -128,7 +128,12 @@ static void getAllExprs(EvalState & state,
if (hasSuffix(attrName, ".nix"))
attrName = std::string(attrName, 0, attrName.size() - 4);
if (!seen.insert(attrName).second) {
- printError("warning: name collision in input Nix expressions, skipping '%1%'", path2);
+ std::string suggestionMessage = "";
+ if (path2.find("channels") != std::string::npos && path.find("channels") != std::string::npos) {
+ suggestionMessage = fmt("\nsuggestion: remove '%s' from either the root channels or the user channels", attrName);
+ }
+ printError("warning: name collision in input Nix expressions, skipping '%1%'"
+ "%2%", path2, suggestionMessage);
continue;
}
/* Load the expression on demand. */
@@ -918,12 +923,17 @@ static void queryJSON(Globals & globals, std::vector<DrvInfo> & elems, bool prin
pkgObj.attr("pname", drvName.name);
pkgObj.attr("version", drvName.version);
pkgObj.attr("system", i.querySystem());
+ pkgObj.attr("outputName", i.queryOutputName());
- if (printOutPath) {
- DrvInfo::Outputs outputs = i.queryOutputs();
+ {
+ DrvInfo::Outputs outputs = i.queryOutputs(printOutPath);
JSONObject outputObj = pkgObj.object("outputs");
- for (auto & j : outputs)
- outputObj.attr(j.first, globals.state->store->printStorePath(j.second));
+ for (auto & j : outputs) {
+ if (j.second)
+ outputObj.attr(j.first, globals.state->store->printStorePath(*j.second));
+ else
+ outputObj.attr(j.first, nullptr);
+ }
}
if (printMeta) {
@@ -1052,6 +1062,7 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
/* Print the desired columns, or XML output. */
if (jsonOutput) {
queryJSON(globals, elems, printOutPath, printMeta);
+ cout << '\n';
return;
}
@@ -1154,13 +1165,16 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
columns.push_back(drvPath ? store.printStorePath(*drvPath) : "-");
}
+ if (xmlOutput)
+ attrs["outputName"] = i.queryOutputName();
+
if (printOutPath && !xmlOutput) {
DrvInfo::Outputs outputs = i.queryOutputs();
std::string s;
for (auto & j : outputs) {
if (!s.empty()) s += ';';
if (j.first != "out") { s += j.first; s += "="; }
- s += store.printStorePath(j.second);
+ s += store.printStorePath(*j.second);
}
columns.push_back(s);
}
@@ -1174,71 +1188,67 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
}
if (xmlOutput) {
- if (printOutPath || printMeta) {
- XMLOpenElement item(xml, "item", attrs);
- if (printOutPath) {
- DrvInfo::Outputs outputs = i.queryOutputs();
- for (auto & j : outputs) {
- XMLAttrs attrs2;
- attrs2["name"] = j.first;
- attrs2["path"] = store.printStorePath(j.second);
- xml.writeEmptyElement("output", attrs2);
- }
- }
- if (printMeta) {
- StringSet metaNames = i.queryMetaNames();
- for (auto & j : metaNames) {
- XMLAttrs attrs2;
- attrs2["name"] = j;
- Value * v = i.queryMeta(j);
- if (!v)
- printError(
- "derivation '%s' has invalid meta attribute '%s'",
- i.queryName(), j);
- else {
- if (v->type() == nString) {
- attrs2["type"] = "string";
- attrs2["value"] = v->string.s;
- xml.writeEmptyElement("meta", attrs2);
- } else if (v->type() == nInt) {
- attrs2["type"] = "int";
- attrs2["value"] = (format("%1%") % v->integer).str();
- xml.writeEmptyElement("meta", attrs2);
- } else if (v->type() == nFloat) {
- attrs2["type"] = "float";
- attrs2["value"] = (format("%1%") % v->fpoint).str();
- xml.writeEmptyElement("meta", attrs2);
- } else if (v->type() == nBool) {
- attrs2["type"] = "bool";
- attrs2["value"] = v->boolean ? "true" : "false";
- xml.writeEmptyElement("meta", attrs2);
- } else if (v->type() == nList) {
- attrs2["type"] = "strings";
- XMLOpenElement m(xml, "meta", attrs2);
- for (auto elem : v->listItems()) {
- if (elem->type() != nString) continue;
- XMLAttrs attrs3;
- attrs3["value"] = elem->string.s;
- xml.writeEmptyElement("string", attrs3);
- }
- } else if (v->type() == nAttrs) {
- attrs2["type"] = "strings";
- XMLOpenElement m(xml, "meta", attrs2);
- Bindings & attrs = *v->attrs;
- for (auto &i : attrs) {
- Attr & a(*attrs.find(i.name));
- if(a.value->type() != nString) continue;
- XMLAttrs attrs3;
- attrs3["type"] = i.name;
- attrs3["value"] = a.value->string.s;
- xml.writeEmptyElement("string", attrs3);
+ XMLOpenElement item(xml, "item", attrs);
+ DrvInfo::Outputs outputs = i.queryOutputs(printOutPath);
+ for (auto & j : outputs) {
+ XMLAttrs attrs2;
+ attrs2["name"] = j.first;
+ if (j.second)
+ attrs2["path"] = store.printStorePath(*j.second);
+ xml.writeEmptyElement("output", attrs2);
+ }
+ if (printMeta) {
+ StringSet metaNames = i.queryMetaNames();
+ for (auto & j : metaNames) {
+ XMLAttrs attrs2;
+ attrs2["name"] = j;
+ Value * v = i.queryMeta(j);
+ if (!v)
+ printError(
+ "derivation '%s' has invalid meta attribute '%s'",
+ i.queryName(), j);
+ else {
+ if (v->type() == nString) {
+ attrs2["type"] = "string";
+ attrs2["value"] = v->string.s;
+ xml.writeEmptyElement("meta", attrs2);
+ } else if (v->type() == nInt) {
+ attrs2["type"] = "int";
+ attrs2["value"] = (format("%1%") % v->integer).str();
+ xml.writeEmptyElement("meta", attrs2);
+ } else if (v->type() == nFloat) {
+ attrs2["type"] = "float";
+ attrs2["value"] = (format("%1%") % v->fpoint).str();
+ xml.writeEmptyElement("meta", attrs2);
+ } else if (v->type() == nBool) {
+ attrs2["type"] = "bool";
+ attrs2["value"] = v->boolean ? "true" : "false";
+ xml.writeEmptyElement("meta", attrs2);
+ } else if (v->type() == nList) {
+ attrs2["type"] = "strings";
+ XMLOpenElement m(xml, "meta", attrs2);
+ for (auto elem : v->listItems()) {
+ if (elem->type() != nString) continue;
+ XMLAttrs attrs3;
+ attrs3["value"] = elem->string.s;
+ xml.writeEmptyElement("string", attrs3);
}
- }
+ } else if (v->type() == nAttrs) {
+ attrs2["type"] = "strings";
+ XMLOpenElement m(xml, "meta", attrs2);
+ Bindings & attrs = *v->attrs;
+ for (auto &i : attrs) {
+ Attr & a(*attrs.find(i.name));
+ if(a.value->type() != nString) continue;
+ XMLAttrs attrs3;
+ attrs3["type"] = i.name;
+ attrs3["value"] = a.value->string.s;
+ xml.writeEmptyElement("string", attrs3);
+ }
}
}
}
- } else
- xml.writeEmptyElement("item", attrs);
+ }
} else
table.push_back(columns);
diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc
index b30ccc7f6..927dd6d97 100644
--- a/src/nix-env/user-env.cc
+++ b/src/nix-env/user-env.cc
@@ -56,7 +56,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
output paths, and optionally the derivation path, as well
as the meta attributes. */
std::optional<StorePath> drvPath = keepDerivations ? i.queryDrvPath() : std::nullopt;
- DrvInfo::Outputs outputs = i.queryOutputs(true);
+ DrvInfo::Outputs outputs = i.queryOutputs(true, true);
StringSet metaNames = i.queryMetaNames();
auto attrs = state.buildBindings(7 + outputs.size());
@@ -76,15 +76,15 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
for (const auto & [m, j] : enumerate(outputs)) {
(vOutputs.listElems()[m] = state.allocValue())->mkString(j.first);
auto outputAttrs = state.buildBindings(2);
- outputAttrs.alloc(state.sOutPath).mkString(state.store->printStorePath(j.second));
+ outputAttrs.alloc(state.sOutPath).mkString(state.store->printStorePath(*j.second));
attrs.alloc(j.first).mkAttrs(outputAttrs);
/* This is only necessary when installing store paths, e.g.,
`nix-env -i /nix/store/abcd...-foo'. */
- state.store->addTempRoot(j.second);
- state.store->ensurePath(j.second);
+ state.store->addTempRoot(*j.second);
+ state.store->ensurePath(*j.second);
- references.insert(j.second);
+ references.insert(*j.second);
}
// Copy the meta attributes.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 10:42:18 +0000