eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Implemented json flag for nix flake info

Browse source
This commit is contained in:
Nick Van den Broeck 2019-02-27 19:54:18 +01:00
parent cfb6ab80ce
commit 9ff1a9ea65
5 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops/flake.cc
View file

@ -141,7 +141,7 @@ static FlakeSourceInfo fetchFlake(EvalState & state, const FlakeRef & flakeRef)
else abort();
}
static Flake getFlake(EvalState & state, const FlakeRef & flakeRef)
Flake getFlake(EvalState & state, const FlakeRef & flakeRef)
{
auto sourceInfo = fetchFlake(state, flakeRef);
debug("got flake source '%s' with revision %s",

2
src/libexpr/primops/flake.hh
View file

@ -34,5 +34,5 @@ struct Flake
// content hash
};
static Flake getFlake(EvalState & state, const FlakeRef & flakeRef);
Flake getFlake(EvalState & state, const FlakeRef & flakeRef);
}

9
src/nix/command.cc
View file

@ -27,6 +27,15 @@ void StoreCommand::run()
run(getStore());
}
JsonFormattable::JsonFormattable()
{
mkFlag()
.longName("json-formattable")
.shortName('j')
.description("output will be printed as json")
.handler([&]() { jsonFormatting = true; });
}
StorePathsCommand::StorePathsCommand(bool recursive)
: recursive(recursive)
{

7
src/nix/command.hh
View file

@ -26,6 +26,13 @@ private:
std::shared_ptr<Store> _store;
};
struct JsonFormattable : virtual Command
{
bool jsonFormatting = false;;
JsonFormattable();
};
struct Buildable
{
Path drvPath; // may be empty

14
src/nix/flake.cc
View file

@ -4,6 +4,7 @@
#include "shared.hh"
#include "progress-bar.hh"
#include "eval.hh"
#include <nlohmann/json.hpp>
using namespace nix;
@ -33,7 +34,7 @@ struct CmdFlakeList : StoreCommand, MixEvalArgs
}
};
struct CmdFlakeInfo : FlakeCommand
struct CmdFlakeInfo : FlakeCommand, JsonFormattable
{
std::string name() override
{
@ -49,8 +50,15 @@ struct CmdFlakeInfo : FlakeCommand
{
auto evalState = std::make_shared<EvalState>(searchPath, store);
nix::Flake flake = nix::getFlake(*evalState, FlakeRef(flakeUri));
std::cout << "Location: " << flake.path << "\n";
std::cout << "Description: " << flake.description << "\n";
if (jsonFormatting) {
nlohmann::json j;
j["location"] = flake.path;
j["description"] = flake.description;
std::cout << j.dump(4) << std::endl;
} else {
std::cout << "Location: " << flake.path << "\n";
std::cout << "Description: " << flake.description << "\n";
}
}
};