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

nix flake show: Support apps

Browse source
This commit is contained in:
Eelco Dolstra 2020-04-17 01:21:24 +02:00
parent a6c4fd044c
commit 9ea4f93f88
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nix/flake.cc
View file

@ -1065,10 +1065,12 @@ struct CmdFlakeShow : FlakeCommand
attrPath[0] == "defaultPackage" attrPath[0] == "defaultPackage"
|| attrPath[0] == "devShell" || attrPath[0] == "devShell"
|| attrPath[0] == "nixosConfigurations" || attrPath[0] == "nixosConfigurations"
|| attrPath[0] == "nixosModules")) || attrPath[0] == "nixosModules"
|| attrPath[0] == "defaultApp"))
|| ((attrPath.size() == 1 || attrPath.size() == 2) || ((attrPath.size() == 1 || attrPath.size() == 2)
&& (attrPath[0] == "checks" && (attrPath[0] == "checks"
|| attrPath[0] == "packages")) || attrPath[0] == "packages"
|| attrPath[0] == "apps"))
) )
{ {
recurse(); recurse();
@ -1106,6 +1108,16 @@ struct CmdFlakeShow : FlakeCommand
} }
} }
else if (
(attrPath.size() == 2 && attrPath[0] == "defaultApp") ||
(attrPath.size() == 3 && attrPath[0] == "apps"))
{
auto aType = visitor.maybeGetAttr("type");
if (!aType || aType->getString() != "app")
throw EvalError("not an app definition");
logger->stdout("%s: app", headerPrefix);
}
else { else {
logger->stdout("%s: %s", logger->stdout("%s: %s",
headerPrefix, headerPrefix,