🔨 builder: no emulation

This commit is contained in:
James Walker 2023-07-01 16:27:52 -04:00
parent 11d76e31c0
commit 4f1f81e425
Signed by: walkah
GPG Key ID: 3C127179D6086E93
2 changed files with 11 additions and 12 deletions

View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1687691275,
"narHash": "sha256-VVywT8ubStvDPF5TscDBokT3T0l3zsOzCW056noh5zc=",
"lastModified": 1688145780,
"narHash": "sha256-dNUINvO7qM7fItWSeqL2nE/F3IHCGZEeERMkm1i4pP4=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "25ae710ba3cd448c5d5678788d37f3d149378bc0",
"rev": "43587cdb726f73b962f12028055520dbd1d7233f",
"type": "github"
},
"original": {
@ -158,11 +158,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1687969886,
"narHash": "sha256-tC2qFLmuM0PFaw0tMHVcFmzsG/351q09qa1EpuL2n1U=",
"lastModified": 1688220547,
"narHash": "sha256-cNKKLPaEOxd6t22Mt3tHGubyylbKGdoi2A3QkMTKes0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a7002d6bfca54742d5fc9b485a1879953b4585b9",
"rev": "89d10f8adce369a80e046c2fd56d1e7b7507bb5b",
"type": "github"
},
"original": {
@ -257,11 +257,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1687977148,
"narHash": "sha256-gUcXiU2GgjYIc65GOIemdBJZ+lkQxuyIh7OkR9j0gCo=",
"lastModified": 1688188316,
"narHash": "sha256-CXuQllDKCxtZaB/umnZOvoJ/d4kJguYgffeTA9l1B3o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "60a783e00517fce85c42c8c53fe0ed05ded5b2a4",
"rev": "8277b539d371bf4308fc5097911aa58bfac1794f",
"type": "github"
},
"original": {

View File

@ -8,7 +8,6 @@ let
modules = [
"${nixpkgs}/nixos/modules/profiles/macos-builder.nix"
{
boot.binfmt.emulatedSystems = [ "x86_64-linux" ];
system.nixos.revision = nixpkgs.lib.mkForce null;
virtualisation.host.pkgs = pkgs;
virtualisation.darwin-builder.hostPort = port;
@ -22,14 +21,14 @@ in
nix.buildMachines = [
{
hostName = "builder";
systems = [ "aarch64-linux" "x86_64-linux" ];
systems = [ "aarch64-linux" ];
maxJobs = 4;
speedFactor = 2;
supportedFeatures = [ "kvm" "benchmark" "big-parallel" ];
}
{
hostName = "plato";
systems = [ "x86_64-linux" "aarch64-linux" ];
systems = [ "x86_64-linux" ];
maxJobs = 6;
supportedFeatures = [ "benchmark" "big-parallel" "kvm" ];
}