diff --git a/checks/flash/flake-module.nix b/checks/flash/flake-module.nix index be293a68..c21d46e8 100644 --- a/checks/flash/flake-module.nix +++ b/checks/flash/flake-module.nix @@ -1,49 +1,33 @@ -{ self, ... }: +{ ... }: { perSystem = + { ... }: { - 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"; + # 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 f69703bc..58e2ad53 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714103775, - "narHash": "sha256-kcBiIrmqzt3bNTr2GMBfAyA+on8BEKO1iKzzDFQZkjI=", - "owner": "nix-community", + "lastModified": 1714400597, + "narHash": "sha256-AA1TCyEl4O6+6F5man/V5VH9Zl9HPBpK91tSkZ16i2E=", + "owner": "Qubasa", "repo": "disko", - "rev": "285e26465a0bae510897ca04da26ce6307c652b4", + "rev": "58785136b8c37aeb2f67081387b48f663b166331", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixos-2311": { "locked": { - "lastModified": 1713397591, - "narHash": "sha256-1P6Plf9a9KwgERtuijPpET/s4AwIZUYqIu1nuVJqPPU=", + "lastModified": 1715543463, + "narHash": "sha256-n3MLdwfCqQT0HtiE2QHCkvyxfaX7wgnO4HkOE1qkNuU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "392320f29b07e74131d4e4a7b435e8e9b9b85adf", + "rev": "6eccabe980dcb2048aab7f97f862fb6d79b98abe", "type": "github" }, "original": { @@ -100,11 +100,11 @@ ] }, "locked": { - "lastModified": 1713523007, - "narHash": "sha256-kEnwogkcBn0omgIsGo3zbfAP9nJTDUhp+Q9QWXxsUd0=", + "lastModified": 1715566953, + "narHash": "sha256-c49CNk3L1QO0C6urknHCr5+pjmMaVDqBGmt+ECcunv4=", "owner": "nix-community", "repo": "nixos-images", - "rev": "f064936faf1d12452212030c38e8c325f5b4dfe5", + "rev": "81e709ca1da9c5c31b65cc8f82a97181f78ec076", "type": "github" }, "original": { @@ -115,11 +115,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714290118, - "narHash": "sha256-6PzUtOvU7hMQxZV579B04CHE1HXSq/loh9E+d/4fKZY=", + "lastModified": 1715777523, + "narHash": "sha256-S6g1OWbKXswOMoTssq3aOm4OhxhlKoIwEAXWmU57vts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30ddacc06345a478f9528fa29e2c8857b90381b2", + "rev": "c029b7f004009923bbfc90bbc31263cd4b08759f", "type": "github" }, "original": { @@ -148,11 +148,11 @@ "nixpkgs-stable": [] }, "locked": { - "lastModified": 1713892811, - "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", + "lastModified": 1715482972, + "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", + "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", "type": "github" }, "original": {