From bd4fdde80baf23dd0389083f7218f4539290ee5d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 25 May 2023 15:50:53 -0400
Subject: lib: fixup pkgs/hm ci functions

---
 lib/ci.nix | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/ci.nix b/lib/ci.nix
index 1911a11..e4be846 100644
--- a/lib/ci.nix
+++ b/lib/ci.nix
@@ -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);
 }
-- 
cgit v1.2.3