Skip to content

nix-env: Use pname and version attrs in -q #4463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtojnar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nix-env: Use pname and version attrs in -q #4463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/libexpr/get-drvs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,36 @@ std::string DrvInfo::queryName() const
}


std::optional<std::string> DrvInfo::queryPname() const
{
if (!attrs) {
pname = std::optional<std::string>{std::nullopt};
} else if (!pname.has_value()) {
auto i = attrs->find(state->symbols.create("pname"));
if (i != attrs->end() && i->value->type() == nString)
pname = state->forceStringNoCtx(*i->value);
else
pname = std::optional<std::string>{std::nullopt};
}
return *pname;
}


std::optional<std::string> DrvInfo::queryVersion() const
{
if (!attrs) {
version = std::optional<std::string>{std::nullopt};
} else if (!version.has_value()) {
auto i = attrs->find(state->symbols.create("version"));
if (i != attrs->end() && i->value->type() == nString)
version = state->forceStringNoCtx(*i->value);
else
version = std::optional<std::string>{std::nullopt};
}
return *version;
}


std::string DrvInfo::querySystem() const
{
if (system == "" && attrs) {
Expand Down
4 changes: 4 additions & 0 deletions src/libexpr/get-drvs.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ private:
EvalState * state;

mutable std::string name;
mutable std::optional<std::optional<std::string>> pname;
mutable std::optional<std::optional<std::string>> version;
mutable std::string system;
mutable std::optional<std::optional<StorePath>> drvPath;
mutable std::optional<StorePath> outPath;
Expand All @@ -41,6 +43,8 @@ public:
DrvInfo(EvalState & state, ref<Store> store, const std::string & drvPathWithOutputs);

std::string queryName() const;
std::optional<std::string> queryPname() const;
std::optional<std::string> queryVersion() const;
std::string querySystem() const;
std::optional<StorePath> queryDrvPath() const;
StorePath requireDrvPath() const;
Expand Down
8 changes: 4 additions & 4 deletions src/nix-env/nix-env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,8 +920,8 @@ static void queryJSON(Globals & globals, std::vector<DrvInfo> & elems, bool prin

auto drvName = DrvName(i.queryName());
pkgObj.attr("name", drvName.fullName);
pkgObj.attr("pname", drvName.name);
pkgObj.attr("version", drvName.version);
pkgObj.attr("pname", i.queryPname() ? *i.queryPname() : drvName.name);
pkgObj.attr("version", i.queryVersion() ? *i.queryVersion() : drvName.version);
pkgObj.attr("system", i.querySystem());
pkgObj.attr("outputName", i.queryOutputName());

Expand Down Expand Up @@ -1115,8 +1115,8 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
if (xmlOutput) {
auto drvName = DrvName(i.queryName());
attrs["name"] = drvName.fullName;
attrs["pname"] = drvName.name;
attrs["version"] = drvName.version;
attrs["pname"] = i.queryPname() ? *i.queryPname() : drvName.name;
attrs["version"] = i.queryVersion() ? *i.queryVersion() : drvName.version;
} else if (printName) {
columns.push_back(i.queryName());
}
Expand Down