checks/installation: don't require privateInputs for eval

checks/flash/flake-module.nix

@@ -2,7 +2,6 @@
   config,
   self,
   lib,
-  privateInputs,
   ...
 }:
 {
@@ -14,8 +13,6 @@
         fileSystems."/".device = lib.mkDefault "/dev/vda";
         boot.loader.grub.device = lib.mkDefault "/dev/vda";
 
-        # We need to use `mkForce` because we inherit from `test-install-machine`
-        # which currently hardcodes `nixpkgs.hostPlatform`
         nixpkgs.hostPlatform = lib.mkForce system;
 
         imports = [ self.nixosModules.test-flash-machine ];
@@ -69,8 +66,7 @@
         self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript
         self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript.drvPath
       ]
-      ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
+      ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
-      ++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
       closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
     in
     {

checks/installation/flake-module.nix

@@ -28,12 +28,20 @@
     lib.map (
       system:
       lib.nameValuePair "test-install-machine-${system}" {
+        imports = [
+          self.nixosModules.test-install-machine-without-system
+          (
+            if privateInputs ? test-fixtures then
+              {
                 facter.reportPath = privateInputs.test-fixtures + /nixos-vm-facter-json/${system}.json;
+              }
+            else
+              { nixpkgs.hostPlatform = system; }
+          )
+        ];
 
         fileSystems."/".device = lib.mkDefault "/dev/vda";
         boot.loader.grub.device = lib.mkDefault "/dev/vda";
-
-        imports = [ self.nixosModules.test-install-machine-without-system ];
       }
     ) (lib.filter (lib.hasSuffix "linux") config.systems)
   ));
@@ -151,6 +159,7 @@
         let
           closureInfo = pkgs.closureInfo {
             rootPaths = [
+              privateInputs.clan-core-for-checks
               self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.toplevel
               self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.initialRamdisk
               self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript
@@ -158,8 +167,7 @@
               pkgs.bash.drvPath
               pkgs.buildPackages.xorg.lndir
             ]
-            ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
+            ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
-            ++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
           };
         in
         pkgs.lib.mkIf (pkgs.stdenv.isLinux && !pkgs.stdenv.isAarch64) {

checks/morph/flake-module.nix

@@ -1,6 +1,5 @@
 {
   self,
-  privateInputs,
   ...
 }:
 {
@@ -37,8 +36,7 @@
                   pkgs.stdenvNoCC
                   self.nixosConfigurations.test-morph-machine.config.system.build.toplevel
                 ]
-                ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
+                ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
-                ++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
                 closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
               in
 

checks/update/flake-module.nix

@@ -1,4 +1,4 @@
-{ self, privateInputs, ... }:
+{ self, ... }:
 {
   # Machine for update test
   clan.machines.test-update-machine = {
@@ -123,8 +123,7 @@
                     pkgs.buildPackages.xorg.lndir
                     pkgs.bubblewrap
                   ]
-                  ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
+                  ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
-                  ++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
                 };
               in
               self.clanLib.test.containerTest {