diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 9ff482b83f3a..346d3ffcef5a 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -46,15 +46,10 @@ rec { powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; riscv32-linux = "${qemuPkg}/bin/qemu-system-riscv32 -machine virt"; riscv64-linux = "${qemuPkg}/bin/qemu-system-riscv64 -machine virt"; - x86_64-darwin = "${qemuPkg}/bin/qemu-system-x86_64 -machine accel=${accel "kvm"} -cpu max"; }; otherHostGuestMatrix = { aarch64-darwin = { aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=2,accel=${accel "hvf"} -cpu max"; - inherit (otherHostGuestMatrix.x86_64-darwin) x86_64-linux; - }; - x86_64-darwin = { - x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine type=q35,accel=${accel "hvf"} -cpu max"; }; }; diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index f83f268c88b3..6a90990b1829 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -27,7 +27,6 @@ let else let hostToGuest = { - "x86_64-darwin" = "x86_64-linux"; "aarch64-darwin" = "aarch64-linux"; }; diff --git a/nixos/modules/misc/nixpkgs/test.nix b/nixos/modules/misc/nixpkgs/test.nix index 1d4eff6a72cd..96c461cf795b 100644 --- a/nixos/modules/misc/nixpkgs/test.nix +++ b/nixos/modules/misc/nixpkgs/test.nix @@ -36,7 +36,7 @@ let nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.buildPlatform = "aarch64-darwin"; nixpkgs.system = "x86_64-linux"; - nixpkgs.localSystem.system = "x86_64-darwin"; + nixpkgs.localSystem.system = "x86_64-freebsd"; nixpkgs.crossSystem.system = "i686-linux"; imports = [ { diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 8d2817c23bf0..d99a491b8579 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -740,7 +740,7 @@ in default = pkgs; defaultText = literalExpression "pkgs"; example = literalExpression '' - import pkgs.path { system = "x86_64-darwin"; } + import pkgs.path { system = "aarch64-darwin"; } ''; description = '' Package set to use for the host-specific packages of the VM runner. diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 76b3b62c0389..e3d184c42a15 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -677,7 +677,6 @@ let # non-EFI tests can only run on x86 platforms = mkIf (!isEfi) [ "x86_64-linux" - "x86_64-darwin" "i686-linux" ]; inherit broken;