diff options
author | Graham Christensen <graham@grahamc.com> | 2018-09-08 09:16:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-08 09:16:41 -0400 |
commit | ca7391daf235222f220b582d43ffbbf803121779 (patch) | |
tree | 12f7c7d639fa44e057574cb1ceb9b15175158719 /nixos | |
parent | bcedf59d84201679939836b5997c024497e10b1d (diff) | |
parent | 9f9723b179961e7235d8e808c4ee8eaf52e05086 (diff) | |
download | nixpkgs-ca7391daf235222f220b582d43ffbbf803121779.tar nixpkgs-ca7391daf235222f220b582d43ffbbf803121779.tar.gz nixpkgs-ca7391daf235222f220b582d43ffbbf803121779.tar.bz2 nixpkgs-ca7391daf235222f220b582d43ffbbf803121779.tar.lz nixpkgs-ca7391daf235222f220b582d43ffbbf803121779.tar.xz nixpkgs-ca7391daf235222f220b582d43ffbbf803121779.tar.zst nixpkgs-ca7391daf235222f220b582d43ffbbf803121779.zip |
Merge pull request #46341 from obsidiansystems/fix-46320
nixpkgs module: Fix defaulting of `localSystem` and `system`
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/lib/eval-config.nix | 6 | ||||
-rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index d005fc61dc4..f71e264c347 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -36,7 +36,11 @@ let _file = ./eval-config.nix; key = _file; config = { - nixpkgs.localSystem = lib.mkDefault { inherit system; }; + # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override + # this. Since the latter defaults to the former, the former should + # default to the argument. That way this new default could propagate all + # they way through, but has the last priority behind everything else. + nixpkgs.system = lib.mkDefault system; _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); }; }; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 8fbe218b232..7f9833e184a 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -62,12 +62,11 @@ in pkgs = mkOption { defaultText = literalExample ''import "''${nixos}/.." { - inherit (config.nixpkgs) config overlays localSystem crossSystem; + inherit (cfg) config overlays localSystem crossSystem; } ''; default = import ../../.. { - localSystem = { inherit (cfg) system; } // cfg.localSystem; - inherit (cfg) config overlays crossSystem; + inherit (cfg) config overlays localSystem crossSystem; }; type = pkgsType; example = literalExample ''import <nixpkgs> {}''; @@ -140,8 +139,11 @@ in localSystem = mkOption { type = types.attrs; # TODO utilize lib.systems.parsedPlatform - default = { system = builtins.currentSystem; }; + default = { inherit (cfg) system; }; example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + # 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; defaultText = literalExample ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' @@ -180,6 +182,7 @@ in system = mkOption { type = types.str; example = "i686-linux"; + default = { system = builtins.currentSystem; }; description = '' Specifies the Nix platform type on which NixOS should be built. It is better to specify <code>nixpkgs.localSystem</code> instead. @@ -196,6 +199,7 @@ in </programlisting> See <code>nixpkgs.localSystem</code> for more information. + Ignored when <code>nixpkgs.localSystem</code> is set. Ignored when <code>nixpkgs.pkgs</code> is set. ''; }; |