nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 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

12
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,6 +653,9 @@ struct CmdProfileList : virtual EvalCommand, virtual StoreCommand, MixDefaultPro
{ {
ProfileManifest manifest(*getEvalState(), *profile); ProfileManifest manifest(*getEvalState(), *profile);
if (json) {
std::cout << manifest.toJSON(*store).dump() << "\n";
} else {
for (size_t i = 0; i < manifest.elements.size(); ++i) { for (size_t i = 0; i < manifest.elements.size(); ++i) {
auto & element(manifest.elements[i]); auto & element(manifest.elements[i]);
if (i) logger->cout(""); if (i) logger->cout("");
@ -667,6 +670,7 @@ struct CmdProfileList : virtual EvalCommand, virtual StoreCommand, MixDefaultPro
logger->cout("Store paths: %s", concatStringsSep(" ", store->printStorePathSet(element.storePaths))); logger->cout("Store paths: %s", concatStringsSep(" ", store->printStorePathSet(element.storePaths)));
} }
} }
}
}; };
struct CmdProfileDiffClosures : virtual StoreCommand, MixDefaultProfile struct CmdProfileDiffClosures : virtual StoreCommand, MixDefaultProfile