axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

flake: remove apps to reduce complexity

Browse source 
As pointed out here numtide/flake-utils#17, apps are somewhat redundant
and, for the sake of simplicity, should be removed for now.
This commit is contained in:
Timothy DeHerrera 2021-01-11 18:10:48 -07:00
parent 5558959869
commit 25293a7ea8
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
1 changed files with 21 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
flake.nix
View file

@ -61,6 +61,7 @@
defaultTemplate = self.templates.flk; defaultTemplate = self.templates.flk;
}; };
in in
recursiveUpdate
(eachDefaultSystem (eachDefaultSystem
(system: (system:
let let
@ -70,15 +71,10 @@
overlays = [ devshell.overlay ]; overlays = [ devshell.overlay ];
}; };
packages = filterAttrs packages = flattenTreeSystem system
(_: drv: drv.meta.broken != true)
(flattenTreeSystem system
(genPackages { (genPackages {
inherit self pkgs; inherit self pkgs;
}) });
);
in in
{ {
inherit packages; inherit packages;
@ -86,24 +82,8 @@
devShell = import ./shell.nix { devShell = import ./shell.nix {
inherit pkgs; inherit pkgs;
}; };
}
apps = )
let )
validApps = attrNames (filterAttrs outputs;
(_: drv:
drv.meta.broken != true
&& pathExists "${drv}/bin"
)
self.packages."${osSystem}"
);
validSystems = attrNames packages;
filterBins = filterAttrs
(n: _: elem n validSystems && elem n validApps)
packages;
in
mapAttrs (_: drv: mkApp { inherit drv; }) filterBins;
})) // outputs;
} }