lix-project/lix
20
55
Fork 31
Code Issues 346 Code Review (Gerrit) Projects 3 Releases Wiki Activity

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