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

showForeign -> showAllSystems

Browse source
This commit is contained in:
Max 2022-09-07 20:28:30 +02:00
parent 02bff90e7b
commit 6da4cc92d8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nix/flake.cc
View file

@ -957,7 +957,7 @@ struct CmdFlakeArchive : FlakeCommand, MixJSON, MixDryRun
struct CmdFlakeShow : FlakeCommand, MixJSON struct CmdFlakeShow : FlakeCommand, MixJSON
{ {
bool showLegacy = false; bool showLegacy = false;
bool showForeign = false; bool showAllSystems = false;
CmdFlakeShow() CmdFlakeShow()
{ {
@ -967,9 +967,9 @@ struct CmdFlakeShow : FlakeCommand, MixJSON
.handler = {&showLegacy, true} .handler = {&showLegacy, true}
}); });
addFlag({ addFlag({
.longName = "foreign", .longName = "all-systems",
.description = "Show the contents of outputs for foreign systems.", .description = "Show the contents of outputs for all systems.",
.handler = {&showForeign, true} .handler = {&showAllSystems, true}
}); });
} }
@ -1082,11 +1082,11 @@ struct CmdFlakeShow : FlakeCommand, MixJSON
|| (attrPath.size() == 3 && (attrPathS[0] == "checks" || attrPathS[0] == "packages" || attrPathS[0] == "devShells")) || (attrPath.size() == 3 && (attrPathS[0] == "checks" || attrPathS[0] == "packages" || attrPathS[0] == "devShells"))
) )
{ {
if (!showForeign && std::string(attrPathS[1]) != localSystem) { if (!showAllSystems && std::string(attrPathS[1]) != localSystem) {
if (!json) if (!json)
logger->cout(fmt("%s " ANSI_WARNING "omitted" ANSI_NORMAL " (use '--foreign' to show)", headerPrefix)); logger->cout(fmt("%s " ANSI_WARNING "omitted" ANSI_NORMAL " (use '--all-systems' to show)", headerPrefix));
else { else {
logger->warn(fmt("%s omitted (use '--foreign' to show)", concatStringsSep(".", attrPathS))); logger->warn(fmt("%s omitted (use '--all-systems' to show)", concatStringsSep(".", attrPathS)));
} }
} else { } else {
if (visitor.isDerivation()) if (visitor.isDerivation())