Expose and use checks for vmOptions and nixosConfigurations

.forgejo/workflows/ci.yaml

@@ -69,9 +69,16 @@ jobs:
       - uses: actions/checkout@v4
       - run: |
           set -euC
+          echo ==================== [ VM Options ] ====================
+          machines=$(nix eval --impure --raw --expr 'with builtins; toString (attrNames (getFlake (toString ./.)).vmOptions)')
+          for machine in $machines; do
+            echo ~~~~~~~~~~~~~~~~~~~~~: $machine :~~~~~~~~~~~~~~~~~~~~~
+            nix build .#checks.x86_64-linux.vmOptions-$machine
+          done
+          echo
+          echo ==================== [ NixOS Configurations ] ====================
           machines=$(nix eval --impure --raw --expr 'with builtins; toString (attrNames (getFlake (toString ./.)).nixosConfigurations)')
           for machine in $machines; do
-            echo ==================== [ $machine ] ====================
+            echo ~~~~~~~~~~~~~~~~~~~~~: $machine :~~~~~~~~~~~~~~~~~~~~~
-            nix eval .#vmOptions.$machine
+            nix build .#checks.x86_64-linux.nixosConfigurations-$machine
-            nix build .#nixosConfigurations.$machine.config.system.build.toplevel
           done

infra/flake-part.nix

@@ -14,6 +14,10 @@ let
     mkOption
     evalModules
     filterAttrs
+    attrsToList
+    map
+    listToAttrs
+    deepSeq
     ;
   inherit (lib.attrsets) genAttrs;
 
@@ -160,6 +164,13 @@ let
   machines = listSubdirectories ../machines/dev;
   testMachines = listSubdirectories ../machines/operator;
 
+  nixosConfigurations =
+    genAttrs machines (makeConfiguration false)
+    // genAttrs testMachines (makeConfiguration true);
+  vmOptions =
+    filterAttrs (_: value: value != null) # Filter out non-Fediversity VMs
+      (genAttrs machines (makeVmOptions false) // genAttrs testMachines (makeVmOptions true));
+
 in
 {
   _class = "flake";
@@ -183,10 +194,33 @@ in
       )
     );
   };
-  flake.nixosConfigurations =
+  flake = { inherit nixosConfigurations vmOptions; };
-    genAttrs machines (makeConfiguration false)
+
-    // genAttrs testMachines (makeConfiguration true);
+  perSystem =
-  flake.vmOptions =
+    { pkgs, ... }:
-    filterAttrs (_: value: value != null) # Filter out non-Fediversity VMs
+    {
-      (genAttrs machines (makeVmOptions false) // genAttrs testMachines (makeVmOptions true));
+      checks =
+        listToAttrs (
+          map (
+            { name, value }:
+            {
+              name = "nixosConfigurations-${name}";
+              value = value.config.system.build.toplevel;
+            }
+          ) (attrsToList nixosConfigurations)
+        )
+        // listToAttrs (
+          map (
+            { name, value }:
+            {
+              name = "vmOptions-${name}";
+              ## Check that VM options builds/evaluates correctly. `deepSeq e1
+              ## e2` evaluates `e1` strictly in depth before returning `e2`. We
+              ## use this trick because checks need to be derivations, which VM
+              ## options are not.
+              value = deepSeq value pkgs.hello;
+            }
+          ) (attrsToList vmOptions)
+        );
+    };
 }