diff options
author | Matthew Kenigsberg <matthewkenigsberg@gmail.com> | 2020-10-22 23:59:01 -0500 |
---|---|---|
committer | Matthew Kenigsberg <matthewkenigsberg@gmail.com> | 2020-11-11 10:27:02 -0600 |
commit | 8abb80a478116b10bf37162c71f602262de412a9 (patch) | |
tree | 4abd6da99826d85b4e9d10167eab2b585c868ef3 /src | |
parent | 21830cb0447f2ad3d436a8b9df43222a787bb80e (diff) |
Print built derivations as json for build
Add --json option to nix build to allow machine readable output on
stdout with all built derivations
Fixes #1930
Diffstat (limited to 'src')
-rw-r--r-- | src/nix/build.cc | 6 | ||||
-rw-r--r-- | src/nix/installables.cc | 27 | ||||
-rw-r--r-- | src/nix/installables.hh | 5 |
3 files changed, 37 insertions, 1 deletions
diff --git a/src/nix/build.cc b/src/nix/build.cc index 65708e98b..67be4024b 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -5,9 +5,11 @@ #include "store-api.hh" #include "local-fs-store.hh" +#include <nlohmann/json.hpp> + using namespace nix; -struct CmdBuild : InstallablesCommand, MixDryRun, MixProfile +struct CmdBuild : InstallablesCommand, MixDryRun, MixJSON, MixProfile { Path outLink = "result"; BuildMode buildMode = bmNormal; @@ -86,6 +88,8 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixProfile }, buildables[i]); updateProfile(buildables); + + if (json) logger->cout("%s", buildablesToJSON(buildables, store).dump()); } }; diff --git a/src/nix/installables.cc b/src/nix/installables.cc index 7473c9758..f385289e5 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -16,8 +16,35 @@ #include <regex> #include <queue> +#include <nlohmann/json.hpp> + namespace nix { +nlohmann::json BuildableOpaque::toJSON(ref<Store> store) const { + nlohmann::json res; + res["path"] = store->printStorePath(path); + return res; +} + +nlohmann::json BuildableFromDrv::toJSON(ref<Store> store) const { + nlohmann::json res; + res["drvPath"] = store->printStorePath(drvPath); + for (const auto& [output, path] : outputs) { + res["outputs"][output] = path ? store->printStorePath(*path) : ""; + } + return res; +} + +nlohmann::json buildablesToJSON(const Buildables & buildables, ref<Store> store) { + auto res = nlohmann::json::array(); + for (const Buildable & buildable : buildables) { + std::visit([&res, store](const auto & buildable) { + res.push_back(buildable.toJSON(store)); + }, buildable); + } + return res; +} + void completeFlakeInputPath( ref<EvalState> evalState, const FlakeRef & flakeRef, diff --git a/src/nix/installables.hh b/src/nix/installables.hh index c7c2f8981..f37b3f829 100644 --- a/src/nix/installables.hh +++ b/src/nix/installables.hh @@ -7,6 +7,8 @@ #include <optional> +#include <nlohmann/json_fwd.hpp> + namespace nix { struct DrvInfo; @@ -16,11 +18,13 @@ namespace eval_cache { class EvalCache; class AttrCursor; } struct BuildableOpaque { StorePath path; + nlohmann::json toJSON(ref<Store> store) const; }; struct BuildableFromDrv { StorePath drvPath; std::map<std::string, std::optional<StorePath>> outputs; + nlohmann::json toJSON(ref<Store> store) const; }; typedef std::variant< @@ -29,6 +33,7 @@ typedef std::variant< > Buildable; typedef std::vector<Buildable> Buildables; +nlohmann::json buildablesToJSON(const Buildables & buildables, ref<Store> store); struct App { |