diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-02 11:29:43 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-25 08:33:14 +0000 |
commit | a3ba0495452cd8e72735ebd4472838e96902a259 (patch) | |
tree | 4bd6da721ef27d4b719ea8ccaed9b08c51a5b5ed | |
parent | 3974ef240075d040df8f6494176480891c5b8fcb (diff) | |
download | nixpkgs-a3ba0495452cd8e72735ebd4472838e96902a259.tar nixpkgs-a3ba0495452cd8e72735ebd4472838e96902a259.tar.gz nixpkgs-a3ba0495452cd8e72735ebd4472838e96902a259.tar.bz2 nixpkgs-a3ba0495452cd8e72735ebd4472838e96902a259.tar.lz nixpkgs-a3ba0495452cd8e72735ebd4472838e96902a259.tar.xz nixpkgs-a3ba0495452cd8e72735ebd4472838e96902a259.tar.zst nixpkgs-a3ba0495452cd8e72735ebd4472838e96902a259.zip |
nixos/nixpkgs.nix: use less confusing example systems
system and config shouldn't both be specified — each will be filled in based on the other when the system is elaborated.
-rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index bfcae9c7a93..da321a92344 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -187,7 +187,7 @@ in hostPlatform = mkOption { type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform - example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + example = { system = "aarch64-linux"; }; # 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; @@ -205,7 +205,7 @@ in buildPlatform = mkOption { type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform default = cfg.hostPlatform; - example = { system = "x86_64-linux"; config = "x86_64-unknown-linux-gnu"; }; + example = { system = "x86_64-linux"; }; # Make sure that the final value has all fields for sake of other modules # referring to this. apply = lib.systems.elaborate; @@ -228,7 +228,7 @@ in localSystem = mkOption { type = types.attrs; # TODO utilize lib.systems.parsedPlatform default = { inherit (cfg) system; }; - example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + example = { system = "aarch64-linux"; }; # 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; @@ -262,7 +262,7 @@ in crossSystem = mkOption { type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform default = null; - example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + example = { system = "aarch64-linux"; }; description = lib.mdDoc '' Systems with a recently generated `hardware-configuration.nix` may instead specify *only* {option}`nixpkgs.buildPlatform`, |