From 294634ec62f0c6b0803596b971b3e07f24c29467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Sep 2024 19:51:41 +0200 Subject: [PATCH] fix nixos machines without hostPlatform --- checks/backups/flake-module.nix | 2 +- checks/installation/flake-module.nix | 2 +- checks/nixos-documentation/flake-module.nix | 1 + lib/build-clan/tests.nix | 1 + machines/test-inventory-machine/facter.json | 4 ++++ 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 machines/test-inventory-machine/facter.json diff --git a/checks/backups/flake-module.nix b/checks/backups/flake-module.nix index d237cb138..a48a3bd21 100644 --- a/checks/backups/flake-module.nix +++ b/checks/backups/flake-module.nix @@ -10,7 +10,6 @@ { pkgs, lib, - config, ... }: let @@ -30,6 +29,7 @@ clan.core.networking.targetHost = "machine"; networking.hostName = "machine"; services.openssh.settings.UseDns = false; + nixpkgs.hostPlatform = "x86_64-linux"; programs.ssh.knownHosts = { machine.hostNames = [ "machine" ]; diff --git a/checks/installation/flake-module.nix b/checks/installation/flake-module.nix index 3ab30c8be..dd39b94ed 100644 --- a/checks/installation/flake-module.nix +++ b/checks/installation/flake-module.nix @@ -20,13 +20,13 @@ environment.etc."install-successful".text = "ok"; + nixpkgs.hostPlatform = "x86_64-linux"; boot.consoleLogLevel = lib.mkForce 100; boot.kernelParams = [ "boot.shell_on_fail" ]; }; }; perSystem = { - nodes, pkgs, lib, ... diff --git a/checks/nixos-documentation/flake-module.nix b/checks/nixos-documentation/flake-module.nix index 743d97c19..b8351ac67 100644 --- a/checks/nixos-documentation/flake-module.nix +++ b/checks/nixos-documentation/flake-module.nix @@ -18,6 +18,7 @@ in # Dummy file system fileSystems."/".device = "/dev/null"; boot.loader.grub.device = "/dev/null"; + nixpkgs.hostPlatform = "x86_64-linux"; imports = [ documentationModule ]; diff --git a/lib/build-clan/tests.nix b/lib/build-clan/tests.nix index 5bfe6aab5..f7617a783 100644 --- a/lib/build-clan/tests.nix +++ b/lib/build-clan/tests.nix @@ -146,6 +146,7 @@ in { foo, ... }: { networking.hostName = foo; + nixpkgs.hostPlatform = "x86_64-linux"; }; }; in diff --git a/machines/test-inventory-machine/facter.json b/machines/test-inventory-machine/facter.json new file mode 100644 index 000000000..7b6fc7a61 --- /dev/null +++ b/machines/test-inventory-machine/facter.json @@ -0,0 +1,4 @@ +{ + "version": 1, + "system": "x86_64-linux" +}