remove x86_64-darwin

docs/community-builders.md

@@ -12,7 +12,7 @@ build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63r
 aarch64-build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG9uyfhyli+BRtk64y+niqtb+sKquRGGZ87f4YRc8EE1
 ```
 
-`aarch64-darwin`, `x86_64-darwin`
+`aarch64-darwin`
 
 ```
 darwin-build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMHhlcn7fUpUuiOFeIhDqBzBNFsbNqq+NpzuGX3e6zv

docs/continuous-integration.md

@@ -2,12 +2,11 @@ We provide CI for these platforms:
 
 - `aarch64-darwin`
 - `aarch64-linux`
-- `x86_64-darwin`
 - `x86_64-linux`
 
 Both `aarch64-linux` and `x86_64-linux` have support for `kvm`/`nixos-test`.
 
-We only have limited build capacity for `*-darwin` so please don't use it excessively.
+We only have limited build capacity for `aarch64-darwin` so please don't use it excessively.
 
 See [here](./infrastructure.md#continuous-integration) for details about the hardware.
 

docs/package-sets.md

@@ -22,7 +22,7 @@ Built on `nixos-unstable-small` for `aarch64-linux`, `x86_64-linux`:
 
 - [https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist](https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist)
 
-Built on `nixpkgs-unstable` for `aarch64-darwin`, `x86_64-darwin`:
+Built on `nixpkgs-unstable` for `aarch64-darwin`:
 
 - [https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist-darwin](https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist-darwin)
 

flake.nix

@@ -59,7 +59,12 @@
   outputs =
     inputs@{ flake-parts, self, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = import inputs.systems;
+      systems = [
+        "aarch64-darwin"
+        "aarch64-linux"
+        # "x86_64-darwin"
+        "x86_64-linux"
+      ];
 
       imports = [
         ./dev/dnscontrol.nix

hosts/darwin01/default.nix

@@ -10,7 +10,6 @@
   nixCommunity.darwin.ipv6 = "2a01:4f8:d1:5716::2 64 2a01:4f8:d1:5716::1";
 
   nix.settings.sandbox = "relaxed";
-  nix.settings.extra-platforms = [ "x86_64-darwin" ];
 
   # disable nixos-tests
   nix.settings.system-features = [ "big-parallel" ];

hosts/darwin02/default.nix

@@ -12,7 +12,6 @@
   nixCommunity.darwin.ipv6 = "2a01:4f8:d1:5715::2 64 2a01:4f8:d1:5715::1";
 
   nix.settings.sandbox = "relaxed";
-  nix.settings.extra-platforms = [ "x86_64-darwin" ];
 
   # disable nixos-tests
   nix.settings.system-features = [ "big-parallel" ];

modules/darwin/common/default.nix

@@ -3,7 +3,6 @@
   imports = [
     ../../shared/known-hosts.nix
     ../../shared/nix-daemon.nix
-    ./apfs-cleanup.nix
     ./builder.nix
     ./network.nix
     ./packages.nix

modules/darwin/common/software-update.nix

@@ -1,12 +1,4 @@
-{ lib, ... }:
 {
-  system.activationScripts.postActivation.text = lib.mkBefore ''
-    if ! pgrep -q oahd; then
-      echo installing rosetta... >&2
-      softwareupdate --install-rosetta --agree-to-license
-    fi
-  '';
-
   system.defaults.CustomSystemPreferences = {
     # check daily, install critical updates, disable macos updates
     "/Library/Preferences/com.apple.SoftwareUpdate" = {

terraform/hydra-nixpkgs.tf

@@ -53,7 +53,7 @@ locals {
       release_file      = "pkgs/top-level/release-unfree-redistributable.nix"
       check_interval    = 1800
       scheduling_shares = 5000
-      supported_systems = ["aarch64-darwin", "x86_64-darwin"]
+      supported_systems = ["aarch64-darwin"]
     }
     unfree_redist_full = {
       name              = "unfree-redist-full"