summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseth <[email protected]>2023-08-18 23:29:11 -0400
committerseth <[email protected]>2023-08-19 04:33:09 -0400
commit9a69717d667db4307396c2569a983e193aa1c318 (patch)
treec3eff75d42e59e3323a0a2c4927587fb1bd357df
parentba7bd0d256a93b032557711c780e8cf19e3e5272 (diff)
ci: fixup onPush job
-rw-r--r--parts/ci.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/parts/ci.nix b/parts/ci.nix
index 1f74d15..9fb1950 100644
--- a/parts/ci.nix
+++ b/parts/ci.nix
@@ -18,21 +18,22 @@ in {
inherit ciSystems;
onPush.default = let
- inherit (builtins) elem seq;
+ inherit (builtins) elem;
inherit (lib) filterAttrs mapAttrs mkForce;
- findCompatible = filterAttrs (s: _: elem s ciSystems);
+ #findCompatible = filterAttrs (s: _: elem s ciSystems);
findCompatible' = filterAttrs (_: v: elem v.pkgs.system ciSystems);
findSystem = system: filterAttrs (s: _: s == system);
- #buildCfgs = mapAttrs (_: v: v.config.system.build.toplevel);
- evalCfgs = mapAttrs (_: v: seq v.config.system.build.toplevel v.pkgs.emptyFile);
+ buildCfgs = mapAttrs (_: v: v.config.system.build.toplevel);
+ buildHMUsers = mapAttrs (_: mapAttrs (_: v: v.activationPackage));
+ #evalCfgs = mapAttrs (_: v: seq v.config.system.build.toplevel v.pkgs.emptyFile);
in
mkForce {
outputs = {
- checks = findCompatible self.checks;
+ checks = findSystem "x86_64-linux" self.checks;
devShells = findSystem "x86_64-linux" self.devShells;
- homeConfigurations = findSystem "x86_64-linux" self.homeConfigurations;
- nixosConfigurations = evalCfgs (findCompatible' self.nixosConfigurations);
+ homeConfigurations = buildHMUsers (findSystem "x86_64-linux" self.homeConfigurations);
+ nixosConfigurations = buildCfgs (findCompatible' self.nixosConfigurations);
};
};