From ff23d8ad203f7e4d429534e69268bae600627a7f Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Wed, 19 Nov 2025 23:26:07 -0500 Subject: [PATCH] Remove deprecated "system" parameter. --- nix/configuration/flake.nix | 4 +++- nix/configuration/hosts/hydra/hardware-configuration.nix | 1 - .../hosts/i_only_boot_zfs/hardware-configuration.nix | 1 - nix/configuration/hosts/neelix/hardware-configuration.nix | 1 - nix/configuration/hosts/odo/hardware-configuration.nix | 1 - nix/configuration/hosts/odowork/hardware-configuration.nix | 1 - nix/configuration/hosts/recovery/hardware-configuration.nix | 1 - nix/configuration/roles/optimized_build/default.nix | 1 - 8 files changed, 3 insertions(+), 8 deletions(-) diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix index 78ad7ae3..8da52e8d 100644 --- a/nix/configuration/flake.nix +++ b/nix/configuration/flake.nix @@ -63,7 +63,6 @@ nixosConfigs = builtins.mapAttrs ( hostname: nodeConfig: format: nixpkgs.lib.nixosSystem { - inherit (nodeConfig) system; specialArgs = { inherit self; @@ -84,6 +83,9 @@ ./configuration.nix (./. + "/hosts/${hostname}") (./. + "/formats/${format}.nix") + { + config.nixpkgs.hostPlatform.system = nodeConfig.system; + } ]; } ) nodes; diff --git a/nix/configuration/hosts/hydra/hardware-configuration.nix b/nix/configuration/hosts/hydra/hardware-configuration.nix index 9bf7cf94..15020cbf 100644 --- a/nix/configuration/hosts/hydra/hardware-configuration.nix +++ b/nix/configuration/hosts/hydra/hardware-configuration.nix @@ -31,6 +31,5 @@ networking.interfaces.enp0s2.useDHCP = lib.mkForce true; # systemd.network.enable = true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; }; } diff --git a/nix/configuration/hosts/i_only_boot_zfs/hardware-configuration.nix b/nix/configuration/hosts/i_only_boot_zfs/hardware-configuration.nix index 05c540b5..8a4c5961 100644 --- a/nix/configuration/hosts/i_only_boot_zfs/hardware-configuration.nix +++ b/nix/configuration/hosts/i_only_boot_zfs/hardware-configuration.nix @@ -28,7 +28,6 @@ # networking.interfaces.eno1.useDHCP = lib.mkDefault true; # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; } diff --git a/nix/configuration/hosts/neelix/hardware-configuration.nix b/nix/configuration/hosts/neelix/hardware-configuration.nix index 6871c5b6..678c5203 100644 --- a/nix/configuration/hosts/neelix/hardware-configuration.nix +++ b/nix/configuration/hosts/neelix/hardware-configuration.nix @@ -31,7 +31,6 @@ # networking.interfaces.eno1.useDHCP = lib.mkDefault true; # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; } diff --git a/nix/configuration/hosts/odo/hardware-configuration.nix b/nix/configuration/hosts/odo/hardware-configuration.nix index 479321e4..c87dfa52 100644 --- a/nix/configuration/hosts/odo/hardware-configuration.nix +++ b/nix/configuration/hosts/odo/hardware-configuration.nix @@ -28,7 +28,6 @@ # networking.interfaces.eno1.useDHCP = lib.mkDefault true; # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; } diff --git a/nix/configuration/hosts/odowork/hardware-configuration.nix b/nix/configuration/hosts/odowork/hardware-configuration.nix index 479321e4..c87dfa52 100644 --- a/nix/configuration/hosts/odowork/hardware-configuration.nix +++ b/nix/configuration/hosts/odowork/hardware-configuration.nix @@ -28,7 +28,6 @@ # networking.interfaces.eno1.useDHCP = lib.mkDefault true; # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; } diff --git a/nix/configuration/hosts/recovery/hardware-configuration.nix b/nix/configuration/hosts/recovery/hardware-configuration.nix index 05c540b5..8a4c5961 100644 --- a/nix/configuration/hosts/recovery/hardware-configuration.nix +++ b/nix/configuration/hosts/recovery/hardware-configuration.nix @@ -28,7 +28,6 @@ # networking.interfaces.eno1.useDHCP = lib.mkDefault true; # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; } diff --git a/nix/configuration/roles/optimized_build/default.nix b/nix/configuration/roles/optimized_build/default.nix index c61219b4..4b35549f 100644 --- a/nix/configuration/roles/optimized_build/default.nix +++ b/nix/configuration/roles/optimized_build/default.nix @@ -68,7 +68,6 @@ nixpkgs.hostPlatform = { gcc.arch = config.me.optimizations.arch; gcc.tune = config.me.optimizations.arch; - system = "x86_64-linux"; }; nixpkgs.overlays = [