diff --git a/checks/flash/flake-module.nix b/checks/flash/flake-module.nix index c21d46e8..be293a68 100644 --- a/checks/flash/flake-module.nix +++ b/checks/flash/flake-module.nix @@ -1,33 +1,49 @@ -{ ... }: +{ self, ... }: { perSystem = - { ... }: { - # checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux) { - # flash = (import ../lib/test-base.nix) { - # name = "flash"; - # nodes.target = { - # virtualisation.emptyDiskImages = [ 4096 ]; - # virtualisation.memorySize = 3000; - # environment.systemPackages = [ self.packages.${pkgs.system}.clan-cli ]; - # environment.etc."install-closure".source = "${closureInfo}/store-paths"; + nodes, + pkgs, + lib, + ... + }: + let + dependencies = [ + self + pkgs.stdenv.drvPath + self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.build.toplevel + self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.build.diskoScript + self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.clan.deployment.file + self.inputs.nixpkgs.legacyPackages.${pkgs.hostPlatform.system}.disko + ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs); + closureInfo = pkgs.closureInfo { rootPaths = dependencies; }; + in + { + checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux) { + flash = (import ../lib/test-base.nix) { + name = "flash"; + nodes.target = { + virtualisation.emptyDiskImages = [ 4096 ]; + virtualisation.memorySize = 3000; + environment.systemPackages = [ self.packages.${pkgs.system}.clan-cli ]; + environment.etc."install-closure".source = "${closureInfo}/store-paths"; - # nix.settings = { - # substituters = lib.mkForce [ ]; - # hashed-mirrors = null; - # connect-timeout = lib.mkForce 3; - # flake-registry = pkgs.writeText "flake-registry" ''{"flakes":[],"version":2}''; - # experimental-features = [ - # "nix-command" - # "flakes" - # ]; - # }; - # }; - # testScript = '' - # start_all() - # machine.succeed("clan --debug --flake ${../..} flash --yes --disk main /dev/vdb test_install_machine") - # ''; - # } { inherit pkgs self; }; - # }; + nix.settings = { + substituters = lib.mkForce [ ]; + hashed-mirrors = null; + connect-timeout = lib.mkForce 3; + flake-registry = pkgs.writeText "flake-registry" ''{"flakes":[],"version":2}''; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + }; + testScript = '' + start_all() + machine.succeed("clan --debug --flake ${../..} flash --yes --disk main /dev/vdb test_install_machine") + ''; + } { inherit pkgs self; }; + }; }; } diff --git a/flake.lock b/flake.lock index 00ba773c..f687d009 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ }, "nixos-2311": { "locked": { - "lastModified": 1715818734, - "narHash": "sha256-WvAJWCwPj/6quKcsgsvQYyZRxV8ho/yUzj0HZQ34DVU=", + "lastModified": 1716142481, + "narHash": "sha256-Lwjwn/iTgq7gXgpM2wzv8t49ZHNX+1GLc8QxCbACD2U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95742536dc6debb5a8b8b78b27001c38f369f1e7", + "rev": "52bdc131bc8d724993eb57fd654c3a8cab457988", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1716123454, - "narHash": "sha256-U2o4UPM/UsEyIX2p11+YEQgR9HY3PmjZ2mRl/x5e4xo=", + "lastModified": 1716210724, + "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "a63e0c83dd83fe28cc571b97129e13373436bd82", + "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "type": "github" }, "original": { @@ -100,11 +100,11 @@ ] }, "locked": { - "lastModified": 1716132123, - "narHash": "sha256-rATSWbPaKQfZGaemu0tHL2xfCzVIVwpuTjk+KSBC+k4=", + "lastModified": 1716200250, + "narHash": "sha256-fOb9sHT85JEKxlwrLLBcbvGgbwodvxU4g/rFtf7bhjY=", "owner": "nix-community", "repo": "nixos-images", - "rev": "8c9cab8c44434c12dafc465fbf61a710c5bceb08", + "rev": "aca977f151b09f7cd9df8b8381a53f900016a79d", "type": "github" }, "original": { @@ -115,11 +115,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716127062, - "narHash": "sha256-2rk8FqB/iQV2d0vQLs684/Tj5PUHaS1sFwG7fng5vXE=", + "lastModified": 1716395399, + "narHash": "sha256-X+99WjSwbxQ7X+CTyqZQZqeqGe8nbfAFz+tgK2r3O/g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2555763c48e2410054de3f52f7310ce3241ec5", + "rev": "bc5dc89513caa16788f6379962e50383cf3f70b0", "type": "github" }, "original": { @@ -148,11 +148,11 @@ "nixpkgs-stable": [] }, "locked": { - "lastModified": 1716087663, - "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", + "lastModified": 1716400300, + "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", + "rev": "b549832718b8946e875c016a4785d204fcfc2e53", "type": "github" }, "original": {