common/optional/x86-64-v3.nix

@@ -1,9 +0,0 @@
-{
-  nixpkgs.hostPlatform = {
-    system = "x86_64-linux";
-    gcc = {
-      arch = "x86-64-v3";
-      tune = "generic";
-    };
-  };
-}

common/optional/x86-64-v3/default.nix

@@ -0,0 +1,15 @@
+{
+  nixpkgs = {
+    hostPlatform = {
+      system = "x86_64-linux";
+      gcc = {
+        arch = "x86-64-v3";
+        tune = "generic";
+      };
+    };
+
+    # These patches repair tests and bundled dependencies that are sensitive
+    # to the compiler flags used by the x86-64-v3 package set.
+    overlays = [ (import ./patches) ];
+  };
+}

common/optional/x86-64-v3/patches/README.md

@@ -27,11 +27,10 @@ change independently of Nix, and `default.nix` preserves existing patches.
 
 ## Local NixOS integration
 
-[`../default.nix`](../default.nix) imports this directory's
-[`default.nix`](default.nix), which wires each package's override into the
-package set. Abseil repairs several vendored copies and is gated on
-`x86-64-v3`; Prometheus patches its separate assets derivation; Python
-packages use `pythonPackagesExtensions`.
+The [`x86-64-v3` optional module](../../common/optional/x86-64-v3/default.nix)
+imports this directory's [`default.nix`](default.nix) directly, so the patch
+overlay applies only to hosts using that package set. Prometheus patches its
+separate assets derivation; Python packages use `pythonPackagesExtensions`.
 
 The [pytest-xdist directory](pytest-xdist/README.md) also owns its outer-worker
 limit and remote-worker event timeout. These package overrides add no skipped

overlays/default.nix

@@ -23,6 +23,4 @@
       config.allowUnfree = true;
     };
   };
-
-  patches = import ./patches;
 }

systems/bob/default.nix

@@ -13,7 +13,7 @@
     "${inputs.self}/common/optional/systemd-boot.nix"
     "${inputs.self}/common/optional/tailscale.nix"
     "${inputs.self}/common/optional/update.nix"
-    "${inputs.self}/common/optional/x86-64-v3.nix"
+    "${inputs.self}/common/optional/x86-64-v3"
     "${inputs.self}/common/optional/zfs"
     ./hardware.nix
     ./syncthing.nix

systems/brain/default.nix

@@ -9,7 +9,7 @@
     "${inputs.self}/common/optional/systemd-boot.nix"
     "${inputs.self}/common/optional/tailscale.nix"
     "${inputs.self}/common/optional/update.nix"
-    "${inputs.self}/common/optional/x86-64-v3.nix"
+    "${inputs.self}/common/optional/x86-64-v3"
     "${inputs.self}/common/optional/zfs"
     ./docker
     ./hardware.nix

systems/jeeves/default.nix

@@ -13,7 +13,7 @@ in
     "${inputs.self}/common/optional/syncthing_base.nix"
     "${inputs.self}/common/optional/tailscale.nix"
     "${inputs.self}/common/optional/update.nix"
-    "${inputs.self}/common/optional/x86-64-v3.nix"
+    "${inputs.self}/common/optional/x86-64-v3"
     "${inputs.self}/common/optional/zfs"
     ./monitoring
     ./docker

systems/portal-1/default.nix

@@ -10,7 +10,7 @@
     "${inputs.self}/users/richie"
     "${inputs.self}/common/global"
     "${inputs.self}/common/optional/tailscale.nix"
-    "${inputs.self}/common/optional/x86-64-v3.nix"
+    "${inputs.self}/common/optional/x86-64-v3"
     ./disk-config.nix
     ./haproxy
     ./monitoring.nix

systems/rhapsody-in-green/default.nix

@@ -9,7 +9,6 @@
     "${inputs.self}/common/optional/syncthing_base.nix"
     "${inputs.self}/common/optional/systemd-boot.nix"
     "${inputs.self}/common/optional/tailscale.nix"
-    "${inputs.self}/common/optional/x86-64-v3.nix"
     "${inputs.self}/common/optional/yubikey.nix"
     "${inputs.self}/common/optional/zfs"
     ./hardware.nix

users/richie/home/gui/comms.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs.x86-v1; [
+  home.packages = with pkgs; [
     discord-canary
     signal-desktop
     slack

users/richie/home/gui/default.nix

@@ -14,7 +14,7 @@
     gimp
     mediainfo
     obs-studio
-    x86-v1.obsidian
+    obsidian
     prismlauncher
     prusa-slicer
     qalculate-gtk

users/richie/home/gui/sweet.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs.x86-v1; [
+  home.packages = with pkgs; [
     sweet-nova
     candy-icons
   ];

users/richie/home/gui/vscode/default.nix

@@ -13,7 +13,7 @@ in
 
   programs.vscode = {
     enable = true;
-    package = pkgs.x86-v1.vscode;
+    package = pkgs.vscode;
     mutableExtensionsDir = true;
   };
 }