Merge pull request 'test-fixtures: move to devFlake' (#5277) from push-mmqvttmrxtlk into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5277
2025-10-05 21:52:33 +00:00
parent dd0acfb628 3295e1561d
commit 2a67b09f51
8 changed files with 113 additions and 79 deletions
--- a/checks/flash/flake-module.nix
+++ b/checks/flash/flake-module.nix
@@ -13,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 ];
@@ -68,10 +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 (import ../installation/facter-report.nix) (
-        lib.filter (lib.hasSuffix "linux") config.systems
-      );
+      ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
      closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
    in
    {
--- a/checks/installation/facter-report.nix
+++ b/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};
-}
--- a/checks/installation/flake-module.nix
+++ b/checks/installation/flake-module.nix
@@ -28,12 +28,20 @@
    lib.map (
      system:
      lib.nameValuePair "test-install-machine-${system}" {
-        facter.reportPath = import ./facter-report.nix 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)
  ));
@@ -159,8 +167,7 @@
              pkgs.bash.drvPath
              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 self.inputs);
          };
        in
        pkgs.lib.mkIf (pkgs.stdenv.isLinux && !pkgs.stdenv.isAarch64) {
--- a/checks/morph/flake-module.nix
+++ b/checks/morph/flake-module.nix
@@ -1,6 +1,5 @@
 {
  self,
-  config,
  ...
 }:
 {
@@ -30,17 +29,14 @@

          nodes = {
            actual =
-              { pkgs, lib, ... }:
+              { pkgs, ... }:
              let
                dependencies = [
                  pkgs.stdenv.drvPath
                  pkgs.stdenvNoCC
                  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) (
-                  lib.filter (lib.hasSuffix "linux") config.systems
-                );
+                ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
                closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
              in

--- a/checks/update/flake-module.nix
+++ b/checks/update/flake-module.nix
@@ -1,4 +1,4 @@
-{ self, config, ... }:
+{ self, ... }:
 {
  # Machine for update test
  clan.machines.test-update-machine = {
@@ -105,7 +105,6 @@
  perSystem =
    {
      pkgs,
-      lib,
      ...
    }:
    {
@@ -124,10 +123,7 @@
                    pkgs.buildPackages.xorg.lndir
                    pkgs.bubblewrap
                  ]
-                  ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
-                  ++ builtins.map (import ../installation/facter-report.nix) (
-                    lib.filter (lib.hasSuffix "linux") config.systems
-                  );
+                  ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
                };
              in
              self.clanLib.test.containerTest {
--- a/devFlake/flake.lock
+++ b/devFlake/flake.lock
@@ -3,10 +3,10 @@
    "clan-core-for-checks": {
      "flake": false,
      "locked": {
-        "lastModified": 1759676877,
-        "narHash": "sha256-HNkfhYUo3QyzepUq+bb4oASNcA8bTQABG6N4jimF/c0=",
+        "lastModified": 1759699593,
+        "narHash": "sha256-6J/iZFJ3nv5ciioISitb8DK32aQmRQV7dfpR8mO7+6Y=",
        "ref": "main",
-        "rev": "b681737dceae23c8f241d34700211e85c5ed216b",
+        "rev": "9d0cec1422273b020c196f840e959bc7dd5cf4ac",
        "shallow": true,
        "type": "git",
        "url": "https://git.clan.lol/clan/clan-core"
@@ -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": []
--- a/devFlake/flake.nix
+++ b/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;
 }
--- a/flake.nix
+++ b/flake.nix
@@ -56,55 +56,59 @@
        else
          (import ./devFlake/flake-compat.nix {
            src = ./devFlake;
-          }).outputs;
+          }).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" = {
-                machineClass = "darwin";
+      }
+      (
+        { ... }:
+        {
+          clan = {
+            meta.name = "clan-core";
+            inventory = {
+              machines = {
+                "test-darwin-machine" = {
+                  machineClass = "darwin";
+                };
              };
            };
          };
-        };
-        systems = import systems;
-        imports = [
-          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
+          systems = import systems;
+          imports = [
+            flake-parts.flakeModules.modules
          ]
-        ++ [
-          (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;
-      }
-    );
+          ++
+            # 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 { })
+          ]
+          # 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;
+        }
+      );
 }