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

nix profile list: Add --json flag

Browse source 
This just dumps the profile manifest to stdout.
This commit is contained in:
Eelco Dolstra 2022-05-04 10:44:26 +02:00 committed by Felix Uhl
parent b8e8f27159
commit a353412c43
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/nix/profile.cc
View file

@ -168,7 +168,7 @@ struct ProfileManifest
} }
} }
std::string toJSON(Store & store) const nlohmann::json toJSON(Store & store) const
{ {
auto array = nlohmann::json::array(); auto array = nlohmann::json::array();
for (auto & element : elements) { for (auto & element : elements) {
@ -190,7 +190,7 @@ struct ProfileManifest
nlohmann::json json; nlohmann::json json;
json["version"] = 2; json["version"] = 2;
json["elements"] = array; json["elements"] = array;
return json.dump(); return json;
} }
StorePath build(ref<Store> store) StorePath build(ref<Store> store)
@ -210,7 +210,7 @@ struct ProfileManifest
buildProfile(tempDir, std::move(pkgs)); buildProfile(tempDir, std::move(pkgs));
writeFile(tempDir + "/manifest.json", toJSON(*store)); writeFile(tempDir + "/manifest.json", toJSON(*store).dump());
/* Add the symlink tree to the store. */ /* Add the symlink tree to the store. */
StringSink sink; StringSink sink;
@ -635,7 +635,7 @@ struct CmdProfileUpgrade : virtual SourceExprCommand, MixDefaultProfile, MixProf
} }
}; };
struct CmdProfileList : virtual EvalCommand, virtual StoreCommand, MixDefaultProfile struct CmdProfileList : virtual EvalCommand, virtual StoreCommand, MixDefaultProfile, MixJSON
{ {
std::string description() override std::string description() override
{ {
@ -653,18 +653,22 @@ struct CmdProfileList : virtual EvalCommand, virtual StoreCommand, MixDefaultPro
{ {
ProfileManifest manifest(*getEvalState(), *profile); ProfileManifest manifest(*getEvalState(), *profile);
for (size_t i = 0; i < manifest.elements.size(); ++i) { if (json) {
auto & element(manifest.elements[i]); std::cout << manifest.toJSON(*store).dump() << "\n";
if (i) logger->cout(""); } else {
logger->cout("Index: " ANSI_BOLD "%s" ANSI_NORMAL "%s", for (size_t i = 0; i < manifest.elements.size(); ++i) {
i, auto & element(manifest.elements[i]);
element.active ? "" : " " ANSI_RED "(inactive)" ANSI_NORMAL); if (i) logger->cout("");
if (element.source) { logger->cout("Index: " ANSI_BOLD "%s" ANSI_NORMAL "%s",
logger->cout("Flake attribute: %s%s", element.source->attrPath, element.source->outputs.to_string()); i,
logger->cout("Original flake URL: %s", element.source->originalRef.to_string()); element.active ? "" : " " ANSI_RED "(inactive)" ANSI_NORMAL);
logger->cout("Locked flake URL: %s", element.source->lockedRef.to_string()); if (element.source) {
logger->cout("Flake attribute: %s%s", element.source->attrPath, element.source->outputs.to_string());
logger->cout("Original flake URL: %s", element.source->originalRef.to_string());
logger->cout("Locked flake URL: %s", element.source->lockedRef.to_string());
}
logger->cout("Store paths: %s", concatStringsSep(" ", store->printStorePathSet(element.storePaths)));
} }
logger->cout("Store paths: %s", concatStringsSep(" ", store->printStorePathSet(element.storePaths)));
} }
} }
}; };