mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix eval: Take only one argument

Browse source 
Thus --json no longer produces a list.
This commit is contained in:
Eelco Dolstra 2018-01-17 12:03:06 +01:00
parent cfeff3b273
commit 16e0287556
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/nix/eval.cc
View file

@ -8,7 +8,7 @@
using namespace nix; using namespace nix;
struct CmdEval : MixJSON, InstallablesCommand struct CmdEval : MixJSON, InstallableCommand
{ {
bool raw = false; bool raw = false;
@ -56,20 +56,16 @@ struct CmdEval : MixJSON, InstallablesCommand
auto state = getEvalState(); auto state = getEvalState();
auto jsonOut = json ? std::make_unique<JSONList>(std::cout) : nullptr; auto v = installable->toValue(*state);
PathSet context;
for (auto & i : installables) { if (raw) {
auto v = i->toValue(*state); std::cout << state->coerceToString(noPos, *v, context);
PathSet context; } else if (json) {
if (raw) { JSONPlaceholder jsonOut(std::cout);
std::cout << state->coerceToString(noPos, *v, context); printValueAsJSON(*state, true, *v, jsonOut, context);
} else if (json) { } else {
auto jsonElem = jsonOut->placeholder(); state->forceValueDeep(*v);
printValueAsJSON(*state, true, *v, jsonElem, context); std::cout << *v << "\n";
} else {
state->forceValueDeep(*v);
std::cout << *v << "\n";
}
} }
} }
}; };