From 2df9e4811008fca085d15f67b51cd7bc497a17bb Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 3 Feb 2025 19:32:13 +0000 Subject: [PATCH] nixpkgs: use less confusing example systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit system and config shouldn't both be specified — each will be filled in based on the other when the system is elaborated. Backport of Nixpkgs commit a3ba0495452cd8e72735ebd4472838e96902a259. Co-authored-by: Alyssa Ross --- modules/nix/nixpkgs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nix/nixpkgs.nix b/modules/nix/nixpkgs.nix index 4e876be..6c54c82 100644 --- a/modules/nix/nixpkgs.nix +++ b/modules/nix/nixpkgs.nix @@ -162,7 +162,7 @@ in hostPlatform = mkOption { type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform - example = { system = "aarch64-darwin"; config = "aarch64-apple-darwin"; }; + example = { system = "aarch64-darwin"; }; # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; @@ -178,7 +178,7 @@ in buildPlatform = mkOption { type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform default = cfg.hostPlatform; - example = { system = "x86_64-darwin"; config = "x86_64-apple-darwin"; }; + example = { system = "x86_64-darwin"; }; # Make sure that the final value has all fields for sake of other modules # referring to this. apply = lib.systems.elaborate;