From bd9078e14e73c290564748bf136729a8e206803c Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 24 Mar 2025 13:03:10 +0900 Subject: [PATCH 1/2] checks/backups: don't hardcode `system` --- checks/backups/flake-module.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/checks/backups/flake-module.nix b/checks/backups/flake-module.nix index 58510a171..9ad4a1d37 100644 --- a/checks/backups/flake-module.nix +++ b/checks/backups/flake-module.nix @@ -42,7 +42,6 @@ clan.core.networking.targetHost = "machine"; networking.hostName = "machine"; - nixpkgs.hostPlatform = "x86_64-linux"; programs.ssh.knownHosts = { machine.hostNames = [ "machine" ]; @@ -173,10 +172,7 @@ }; in { - # Needs investigation on aarch64-linux - # vm-test-run-test-backups> qemu-kvm: No machine specified, and there is no default - # vm-test-run-test-backups> Use -machine help to list supported machines - checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux && !pkgs.stdenv.isAarch64) { + checks = pkgs.lib.mkIf pkgs.stdenv.isLinux { test-backups = (import ../lib/container-test.nix) { name = "test-backups"; nodes.machine = { From 82509e9d17eff29d2b72246e7d432bb63393d7ff Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 24 Mar 2025 13:16:10 +0900 Subject: [PATCH 2/2] checks: don't build test machines as they may be `system`-less now --- checks/flake-module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/flake-module.nix b/checks/flake-module.nix index 0052d2e06..1c7dd42ab 100644 --- a/checks/flake-module.nix +++ b/checks/flake-module.nix @@ -50,7 +50,7 @@ in flakeOutputs = lib.mapAttrs' ( name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel - ) (lib.filterAttrs (n: _v: n != "test-install-machine-without-system") self.nixosConfigurations) + ) (lib.filterAttrs (n: _: !lib.hasPrefix "test-" n) self.nixosConfigurations) // lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages // lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells // lib.mapAttrs' (name: config: lib.nameValuePair "home-manager-${name}" config.activation-script) (