From 066219edf1edd3fce0c08635fd343ff4d487aba2 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 24 Apr 2023 21:48:59 -0400
Subject: ci: evaluate systems during job

---
 flake.nix | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index d854abe..c7ad4a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -97,6 +97,7 @@
     agenix,
     haumea,
     getchoo,
+    hercules-ci-effects,
     nixpkgs,
     nixinate,
     openwrt-imagebuilder,
@@ -119,7 +120,7 @@
   in
     flake-parts.lib.mkFlake {inherit inputs;} {
       imports = [
-        inputs.hercules-ci-effects.flakeModule
+        hercules-ci-effects.flakeModule
       ];
 
       flake = {
@@ -139,16 +140,28 @@
       };
 
       herculesCI = let
-        inherit (import (inputs.hercules-ci-effects + "/vendor/hercules-ci-agent/default-herculesCI-for-flake.nix")) flakeToOutputs;
+        inherit (import (hercules-ci-effects + "/vendor/hercules-ci-agent/default-herculesCI-for-flake.nix")) flakeToOutputs;
       in rec {
         ciSystems = ["x86_64-linux"];
         onPush = {
           default = {
-            outputs = with nixpkgs.lib;
-            # use defaults, but don't build hosts
-              mkForce (builtins.removeAttrs
-                (flakeToOutputs self {ciSystems = genAttrs ciSystems (_: {});})
-                ["nixosConfigurations" "packages"]);
+            outputs = with builtins;
+            with nixpkgs.lib; let
+              # use defaults, but only evaluate hosts
+              defaults =
+                removeAttrs
+                (flakeToOutputs self {
+                  ciSystems = genAttrs ciSystems (_: {});
+                })
+                ["nixosConfigurations" "packages"];
+
+              evaluate = mapAttrs (_: v:
+                seq
+                v.config.system.build.toplevel
+                v._module.args.pkgs.emptyFile)
+              self.nixosConfigurations;
+            in
+              mkForce (defaults // evaluate);
           };
         };
       };
-- 
cgit v1.2.3