about summary refs log tree commit diff
path: root/src/nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-04-24T12·21+0200
committerEelco Dolstra <edolstra@gmail.com>2017-04-24T12·21+0200
commit66577a1c64ac5d9f07aa2c207c96e13077576a4e (patch)
treea4c55d9b74df73cefe28eb2f26cdb6968f250e06 /src/nix
parent9b63bb88c8873d192b8b01608e5d230817dd3375 (diff)
Factor out --json
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/path-info.cc5
-rw-r--r--src/nix/show-config.cc5
2 files changed, 3 insertions, 7 deletions
diff --git a/src/nix/path-info.cc b/src/nix/path-info.cc
index 0f9a1125f2e9..30b193798f69 100644
--- a/src/nix/path-info.cc
+++ b/src/nix/path-info.cc
@@ -2,25 +2,24 @@
 #include "shared.hh"
 #include "store-api.hh"
 #include "json.hh"
+#include "common-args.hh"
 
 #include <iomanip>
 #include <algorithm>
 
 using namespace nix;
 
-struct CmdPathInfo : StorePathsCommand
+struct CmdPathInfo : StorePathsCommand, MixJSON
 {
     bool showSize = false;
     bool showClosureSize = false;
     bool showSigs = false;
-    bool json = false;
 
     CmdPathInfo()
     {
         mkFlag('s', "size", "print size of the NAR dump of each path", &showSize);
         mkFlag('S', "closure-size", "print sum size of the NAR dumps of the closure of each path", &showClosureSize);
         mkFlag(0, "sigs", "show signatures", &showSigs);
-        mkFlag(0, "json", "produce JSON output", &json);
     }
 
     std::string name() override
diff --git a/src/nix/show-config.cc b/src/nix/show-config.cc
index aade2adeace4..e354891a82e4 100644
--- a/src/nix/show-config.cc
+++ b/src/nix/show-config.cc
@@ -7,13 +7,10 @@
 
 using namespace nix;
 
-struct CmdShowConfig : Command
+struct CmdShowConfig : Command, MixJSON
 {
-    bool json = false;
-
     CmdShowConfig()
     {
-        mkFlag(0, "json", "produce JSON output", &json);
     }
 
     std::string name() override