c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

nixos: drop x86_64-darwin support (#535511)

Browse source
This commit is contained in:
Leona Maroni 2026-06-26 16:42:17 +00:00 • committed by GitHub
commit c6a94e42cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/lib/qemu-common.nix
View file

@ -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";
};
};

1
nixos/lib/testing/nodes.nix
View file

@ -27,7 +27,6 @@ let
else
let
hostToGuest = {
"x86_64-darwin" = "x86_64-linux";
"aarch64-darwin" = "aarch64-linux";
};

2
nixos/modules/misc/nixpkgs/test.nix
View file

@ -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 = [
{

2
nixos/modules/virtualisation/qemu-vm.nix
View file

@ -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.

1
nixos/tests/installer.nix
View file

@ -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;