diff options
| author | seth <[email protected]> | 2023-05-25 15:50:53 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2023-05-25 15:50:53 -0400 |
| commit | bd4fdde80baf23dd0389083f7218f4539290ee5d (patch) | |
| tree | e9bd6bf6ab45cb8677e5967b348dbe41c70a6ecb | |
| parent | e4bf07e8d8c24966088268f750742dc77c5d5db1 (diff) | |
lib: fixup pkgs/hm ci functions
| -rw-r--r-- | lib/ci.nix | 21 |
1 files changed, 17 insertions, 4 deletions
@@ -19,7 +19,8 @@ in rec { # also needs to be editied in order to be picked up # by some ci systems mkCompatibleApps = apps: - mkCompatible (mapAttrs ( + mkCompatible + (mapAttrs ( _: mapAttrs (_: v: { program = let @@ -61,10 +62,22 @@ in rec { # to their activationPackage so they can be # picked up by hydra mkCompatibleHM = configs: - filterAttrs (system: _: check system) - (mapAttrs (_: mapAttrs (_: deriv: deriv.activationPackage or {})) configs); + mkCompatible + (mapAttrs (_: + mapAttrs (_: deriv: + deriv.activationPackage or {})) + configs); # mkCompatible, but for packages # meta.platforms is also checked to ensure compatibility - mkCompatiblePkgs = mapAttrs (system: filterAttrs (_: deriv: elem system (deriv.meta.platforms or []))); + mkCompatiblePkgs = pkgs: + mkCompatible + (mapAttrs ( + system: + filterAttrs ( + _: deriv: + elem system (deriv.meta.platforms or []) + ) + ) + pkgs); } |
