test-fixtures: move to devFlake

checks/flash/flake-module.nix

@@ -2,6 +2,7 @@
   config,
   self,
   lib,
+  privateInputs,
   ...
 }:
 {
@@ -69,9 +70,7 @@
         self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript.drvPath
       ]
       ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
-      ++ builtins.map (import ../installation/facter-report.nix) (
+      ++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
-        lib.filter (lib.hasSuffix "linux") config.systems
-      );
       closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
     in
     {

checks/installation/facter-report.nix

@@ -1,10 +0,0 @@
-system:
-builtins.fetchurl {
-  url = "https://git.clan.lol/clan/test-fixtures/raw/commit/4a2bc56d886578124b05060d3fb7eddc38c019f8/nixos-vm-facter-json/${system}.json";
-  sha256 =
-    {
-      aarch64-linux = "sha256:1rlfymk03rmfkm2qgrc8l5kj5i20srx79n1y1h4nzlpwaz0j7hh2";
-      x86_64-linux = "sha256:16myh0ll2gdwsiwkjw5ba4dl23ppwbsanxx214863j7nvzx42pws";
-    }
-    .${system};
-}

checks/installation/flake-module.nix

@@ -28,7 +28,7 @@
     lib.map (
       system:
       lib.nameValuePair "test-install-machine-${system}" {
-        facter.reportPath = import ./facter-report.nix system;
+        facter.reportPath = privateInputs.test-fixtures + /nixos-vm-facter-json/${system}.json;
 
         fileSystems."/".device = lib.mkDefault "/dev/vda";
         boot.loader.grub.device = lib.mkDefault "/dev/vda";
@@ -151,7 +151,6 @@
         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
@@ -160,7 +159,7 @@
               pkgs.buildPackages.xorg.lndir
             ]
             ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
-            ++ builtins.map (import ./facter-report.nix) (lib.filter (lib.hasSuffix "linux") config.systems);
+            ++ 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,6 @@
 {
   self,
-  config,
+  privateInputs,
   ...
 }:
 {
@@ -30,7 +30,7 @@
 
           nodes = {
             actual =
-              { pkgs, lib, ... }:
+              { pkgs, ... }:
               let
                 dependencies = [
                   pkgs.stdenv.drvPath
@@ -38,9 +38,7 @@
                   self.nixosConfigurations.test-morph-machine.config.system.build.toplevel
                 ]
                 ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
-                ++ builtins.map (import ../installation/facter-report.nix) (
+                ++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
-                  lib.filter (lib.hasSuffix "linux") config.systems
-                );
                 closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
               in
 

checks/update/flake-module.nix

@@ -1,4 +1,4 @@
-{ self, config, ... }:
+{ self, privateInputs, ... }:
 {
   # Machine for update test
   clan.machines.test-update-machine = {
@@ -105,7 +105,6 @@
   perSystem =
     {
       pkgs,
-      lib,
       ...
     }:
     {
@@ -125,9 +124,7 @@
                     pkgs.bubblewrap
                   ]
                   ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
-                  ++ builtins.map (import ../installation/facter-report.nix) (
+                  ++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
-                    lib.filter (lib.hasSuffix "linux") config.systems
-                  );
                 };
               in
               self.clanLib.test.containerTest {

devFlake/flake.lock

@@ -18,6 +18,27 @@
         "url": "https://git.clan.lol/clan/clan-core"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "test-fixtures",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741352980,
+        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": [
@@ -127,6 +148,7 @@
         "nixpkgs-dev": "nixpkgs-dev",
         "nuschtos": "nuschtos",
         "systems": "systems_2",
+        "test-fixtures": "test-fixtures",
         "treefmt-nix": "treefmt-nix"
       }
     },
@@ -160,6 +182,27 @@
         "type": "github"
       }
     },
+    "test-fixtures": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs-dev"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742806412,
+        "narHash": "sha256-ZoAN0/sHEHY+ymJnkdkBAuZ/6sc66RYR4xMHpLf7++E=",
+        "ref": "refs/heads/main",
+        "rev": "4a2bc56d886578124b05060d3fb7eddc38c019f8",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://git.clan.lol/clan/test-fixtures"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.clan.lol/clan/test-fixtures"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": []

devFlake/flake.nix

@@ -18,5 +18,8 @@
   inputs.clan-core-for-checks.url = "git+https://git.clan.lol/clan/clan-core?ref=main&shallow=1";
   inputs.clan-core-for-checks.flake = false;
 
+  inputs.test-fixtures.url = "git+https://git.clan.lol/clan/test-fixtures";
+  inputs.test-fixtures.inputs.nixpkgs.follows = "nixpkgs-dev";
+
   outputs = inputs: inputs;
 }

flake.nix

@@ -58,53 +58,57 @@
             src = ./devFlake;
           }).outputs.inputs;
     in
-    flake-parts.lib.mkFlake { inherit inputs; } (
+    flake-parts.lib.mkFlake
-      { ... }:
       {
-        _module.args = {
+        inherit inputs;
+        specialArgs = {
           inherit privateInputs;
         };
-        clan = {
+      }
-          meta.name = "clan-core";
+      (
-          inventory = {
+        { ... }:
-            machines = {
+        {
-              "test-darwin-machine" = {
+          clan = {
-                machineClass = "darwin";
+            meta.name = "clan-core";
+            inventory = {
+              machines = {
+                "test-darwin-machine" = {
+                  machineClass = "darwin";
+                };
               };
             };
           };
-        };
+          systems = import systems;
-        systems = import systems;
+          imports = [
-        imports = [
+            flake-parts.flakeModules.modules
-          flake-parts.flakeModules.modules
-        ]
-        ++
-          # only importing existing paths allows to minimize the flake for test
-          # by removing files
-          filter pathExists [
-            ./checks/flake-module.nix
-            ./clanModules/flake-module.nix
-            ./clanServices/flake-module.nix
-            ./devShell.nix
-            ./docs/nix/flake-module.nix
-            ./flakeModules/demo_iso.nix
-            ./flakeModules/flake-module.nix
-            ./lib/filter-clan-core/flake-module.nix
-            ./lib/flake-module.nix
-            ./lib/flake-parts/clan-nixos-test.nix
-            ./nixosModules/clanCore/vars/flake-module.nix
-            ./nixosModules/flake-module.nix
-            ./pkgs/clan-cli/clan_cli/tests/flake-module.nix
-            ./pkgs/flake-module.nix
-            ./templates/flake-module.nix
           ]
-        ++ [
+          ++
-          (if pathExists ./flakeModules/clan.nix then import ./flakeModules/clan.nix inputs.self else { })
+            # only importing existing paths allows to minimize the flake for test
-        ]
+            # by removing files
-        # Make treefmt-nix optional
+            filter pathExists [
-        # This only works if you set inputs.clan-core.inputs.treefmt-nix.follows
+              ./checks/flake-module.nix
-        # to a non-empty input that doesn't export a flakeModule
+              ./clanModules/flake-module.nix
-        ++ optional (pathExists ./formatter.nix && inputs.treefmt-nix ? flakeModule) ./formatter.nix;
+              ./clanServices/flake-module.nix
-      }
+              ./devShell.nix
-    );
+              ./docs/nix/flake-module.nix
+              ./flakeModules/demo_iso.nix
+              ./flakeModules/flake-module.nix
+              ./lib/filter-clan-core/flake-module.nix
+              ./lib/flake-module.nix
+              ./lib/flake-parts/clan-nixos-test.nix
+              ./nixosModules/clanCore/vars/flake-module.nix
+              ./nixosModules/flake-module.nix
+              ./pkgs/clan-cli/clan_cli/tests/flake-module.nix
+              ./pkgs/flake-module.nix
+              ./templates/flake-module.nix
+            ]
+          ++ [
+            (if pathExists ./flakeModules/clan.nix then import ./flakeModules/clan.nix inputs.self else { })
+          ]
+          # Make treefmt-nix optional
+          # This only works if you set inputs.clan-core.inputs.treefmt-nix.follows
+          # to a non-empty input that doesn't export a flakeModule
+          ++ optional (pathExists ./formatter.nix && inputs.treefmt-nix ? flakeModule) ./formatter.nix;
+        }
+      );
 }