mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-13 09:46:16 +02:00
showForeign -> showAllSystems
This commit is contained in:
parent
02bff90e7b
commit
6da4cc92d8
1 changed files with 7 additions and 7 deletions
|
@ -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())
|
||||||
|
|
Loading…
Reference in a new issue