Skip to content

nix-env.cc: make --query evaluate .outPaths #1771

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

Closed
oxij wants to merge 3 commits into from
Closed

nix-env.cc: make --query evaluate .outPaths #1771

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fd6f64
nix-env: filter `-qa` output explicitly
oxij Jan 2, 2018
a7e2049
nix-env: force `-i` to evaluate `.outPath`s too
oxij Jun 12, 2018
b6c847e
FIXME, WTF: manual fails to lint
oxij Jun 12, 2018
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
25 changes: 25 additions & 0 deletions src/nix-env/nix-env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,9 @@ static void installDerivations(Globals & globals,

StringSet newNames;
for (auto & i : newElems) {
/* Evaluate (and possibly fail) now before giving any mixed signals to the user. */
i.queryOutPath();

/* `forceName' is a hack to get package names right in some
one-click installs, namely those where the name used in the
path is not the one we want (e.g., `java-front' versus
Expand Down Expand Up @@ -897,6 +900,7 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
bool jsonOutput = false;

enum { sInstalled, sAvailable } source = sInstalled;
enum { eAll, eApproximate, eStrict } evaluate = eApproximate;

settings.readOnlyMode = true; /* makes evaluation a bit faster */

Expand All @@ -912,6 +916,9 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
else if (arg == "--meta") printMeta = true;
else if (arg == "--installed") source = sInstalled;
else if (arg == "--available" || arg == "-a") source = sAvailable;
else if (arg == "--all") evaluate = eAll;
else if (arg == "--approximate") evaluate = eApproximate;
else if (arg == "--strict") evaluate = eStrict;
else if (arg == "--xml") xmlOutput = true;
else if (arg == "--json") jsonOutput = true;
else if (arg == "--attr-path" || arg == "-P") printAttrPath = true;
Expand Down Expand Up @@ -993,6 +1000,24 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)

//Activity act(*logger, lvlDebug, format("outputting query result '%1%'") % i.attrPath);

/* Filter. */
if (!printStatus && !globals.prebuiltOnly && evaluate != eAll) {
if (evaluate == eStrict)
/* Force evaluation. The above `try` will skip this element
if this throws an exception. */
i.queryOutPath();
else {
/* Skip derivations based on `.meta.available`. */
Value * check = i.queryMeta("available");
if (!check || check->type != tBool)
/* Fallback to evaluation as above. */
i.queryOutPath();
else if (check->boolean == false)
/* Just skip it. */
continue;
}
}

if (globals.prebuiltOnly &&
validPaths.find(i.queryOutPath()) == validPaths.end() &&
substitutablePaths.find(i.queryOutPath()) == substitutablePaths.end())
Expand Down