maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't indent JSON output

Browse source
This commit is contained in:
Eelco Dolstra 2017-11-14 14:27:01 +01:00
parent bac8055652
commit c8155e9f5f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nix/ls.cc
View file

@ -76,7 +76,7 @@ struct MixLs : virtual Args, MixJSON
if (path == "/") path = ""; if (path == "/") path = "";
if (json) { if (json) {
JSONPlaceholder jsonRoot(std::cout, true); JSONPlaceholder jsonRoot(std::cout);
listNar(jsonRoot, accessor, path); listNar(jsonRoot, accessor, path);
} else } else
listText(accessor); listText(accessor);

2
src/nix/path-info.cc
View file

@ -65,7 +65,7 @@ struct CmdPathInfo : StorePathsCommand, MixJSON
pathLen = std::max(pathLen, storePath.size()); pathLen = std::max(pathLen, storePath.size());
if (json) { if (json) {
JSONPlaceholder jsonRoot(std::cout, true); JSONPlaceholder jsonRoot(std::cout);
store->pathInfoToJSON(jsonRoot, store->pathInfoToJSON(jsonRoot,
// FIXME: preserve order? // FIXME: preserve order?
PathSet(storePaths.begin(), storePaths.end()), PathSet(storePaths.begin(), storePaths.end()),

2
src/nix/search.cc
View file

@ -84,7 +84,7 @@ struct CmdSearch : SourceExprCommand, MixJSON
bool first = true; bool first = true;
auto jsonOut = json ? std::make_unique<JSONObject>(std::cout, true) : nullptr; auto jsonOut = json ? std::make_unique<JSONObject>(std::cout) : nullptr;
auto sToplevel = state->symbols.create("_toplevel"); auto sToplevel = state->symbols.create("_toplevel");
auto sRecurse = state->symbols.create("recurseForDerivations"); auto sRecurse = state->symbols.create("recurseForDerivations");

2
src/nix/show-config.cc
View file

@ -26,7 +26,7 @@ struct CmdShowConfig : Command, MixJSON
{ {
if (json) { if (json) {
// FIXME: use appropriate JSON types (bool, ints, etc). // FIXME: use appropriate JSON types (bool, ints, etc).
JSONObject jsonObj(std::cout, true); JSONObject jsonObj(std::cout);
settings.toJSON(jsonObj); settings.toJSON(jsonObj);
} else { } else {
for (auto & s : settings.getSettings()) for (auto & s : settings.getSettings())