nix flake update & disable checks.flash-installer

This commit is contained in:
Qubasa
2024-05-15 22:54:38 +02:00
parent cd915e171f
commit b3297532ad
2 changed files with 46 additions and 62 deletions

View File

@@ -1,49 +1,33 @@
{ self, ... }: { ... }:
{ {
perSystem = perSystem =
{ ... }:
{ {
nodes, # checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux) {
pkgs, # flash = (import ../lib/test-base.nix) {
lib, # name = "flash";
... # nodes.target = {
}: # virtualisation.emptyDiskImages = [ 4096 ];
let # virtualisation.memorySize = 3000;
dependencies = [ # environment.systemPackages = [ self.packages.${pkgs.system}.clan-cli ];
self # environment.etc."install-closure".source = "${closureInfo}/store-paths";
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 = { # nix.settings = {
substituters = lib.mkForce [ ]; # substituters = lib.mkForce [ ];
hashed-mirrors = null; # hashed-mirrors = null;
connect-timeout = lib.mkForce 3; # connect-timeout = lib.mkForce 3;
flake-registry = pkgs.writeText "flake-registry" ''{"flakes":[],"version":2}''; # flake-registry = pkgs.writeText "flake-registry" ''{"flakes":[],"version":2}'';
experimental-features = [ # experimental-features = [
"nix-command" # "nix-command"
"flakes" # "flakes"
]; # ];
}; # };
}; # };
testScript = '' # testScript = ''
start_all() # start_all()
machine.succeed("clan --debug --flake ${../..} flash --yes --disk main /dev/vdb test_install_machine") # machine.succeed("clan --debug --flake ${../..} flash --yes --disk main /dev/vdb test_install_machine")
''; # '';
} { inherit pkgs self; }; # } { inherit pkgs self; };
}; # };
}; };
} }

38
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714103775, "lastModified": 1714400597,
"narHash": "sha256-kcBiIrmqzt3bNTr2GMBfAyA+on8BEKO1iKzzDFQZkjI=", "narHash": "sha256-AA1TCyEl4O6+6F5man/V5VH9Zl9HPBpK91tSkZ16i2E=",
"owner": "nix-community", "owner": "Qubasa",
"repo": "disko", "repo": "disko",
"rev": "285e26465a0bae510897ca04da26ce6307c652b4", "rev": "58785136b8c37aeb2f67081387b48f663b166331",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1714641030,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -57,11 +57,11 @@
}, },
"nixos-2311": { "nixos-2311": {
"locked": { "locked": {
"lastModified": 1713397591, "lastModified": 1715543463,
"narHash": "sha256-1P6Plf9a9KwgERtuijPpET/s4AwIZUYqIu1nuVJqPPU=", "narHash": "sha256-n3MLdwfCqQT0HtiE2QHCkvyxfaX7wgnO4HkOE1qkNuU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "392320f29b07e74131d4e4a7b435e8e9b9b85adf", "rev": "6eccabe980dcb2048aab7f97f862fb6d79b98abe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -100,11 +100,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713523007, "lastModified": 1715566953,
"narHash": "sha256-kEnwogkcBn0omgIsGo3zbfAP9nJTDUhp+Q9QWXxsUd0=", "narHash": "sha256-c49CNk3L1QO0C6urknHCr5+pjmMaVDqBGmt+ECcunv4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-images", "repo": "nixos-images",
"rev": "f064936faf1d12452212030c38e8c325f5b4dfe5", "rev": "81e709ca1da9c5c31b65cc8f82a97181f78ec076",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -115,11 +115,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714290118, "lastModified": 1715777523,
"narHash": "sha256-6PzUtOvU7hMQxZV579B04CHE1HXSq/loh9E+d/4fKZY=", "narHash": "sha256-S6g1OWbKXswOMoTssq3aOm4OhxhlKoIwEAXWmU57vts=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30ddacc06345a478f9528fa29e2c8857b90381b2", "rev": "c029b7f004009923bbfc90bbc31263cd4b08759f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -148,11 +148,11 @@
"nixpkgs-stable": [] "nixpkgs-stable": []
}, },
"locked": { "locked": {
"lastModified": 1713892811, "lastModified": 1715482972,
"narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e",
"type": "github" "type": "github"
}, },
"original": { "original": {