flake: remove apps to reduce complexity
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:
parent
5558959869
commit
25293a7ea8
62
flake.nix
62
flake.nix
@ -61,49 +61,29 @@
|
|||||||
defaultTemplate = self.templates.flk;
|
defaultTemplate = self.templates.flk;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
(eachDefaultSystem
|
recursiveUpdate
|
||||||
(system:
|
(eachDefaultSystem
|
||||||
let
|
(system:
|
||||||
pkgs = pkgImport {
|
let
|
||||||
inherit system;
|
pkgs = pkgImport {
|
||||||
pkgs = nixos;
|
inherit system;
|
||||||
overlays = [ devshell.overlay ];
|
pkgs = nixos;
|
||||||
};
|
overlays = [ devshell.overlay ];
|
||||||
|
};
|
||||||
|
|
||||||
packages = filterAttrs
|
packages = flattenTreeSystem system
|
||||||
(_: drv: drv.meta.broken != true)
|
|
||||||
(flattenTreeSystem system
|
|
||||||
(genPackages {
|
(genPackages {
|
||||||
inherit self pkgs;
|
inherit self pkgs;
|
||||||
})
|
});
|
||||||
);
|
in
|
||||||
|
{
|
||||||
|
inherit packages;
|
||||||
|
|
||||||
|
devShell = import ./shell.nix {
|
||||||
in
|
inherit pkgs;
|
||||||
{
|
};
|
||||||
inherit packages;
|
}
|
||||||
|
)
|
||||||
devShell = import ./shell.nix {
|
)
|
||||||
inherit pkgs;
|
outputs;
|
||||||
};
|
|
||||||
|
|
||||||
apps =
|
|
||||||
let
|
|
||||||
validApps = attrNames (filterAttrs
|
|
||||||
(_: 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;
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user