diff options
author | David Arnold <david.arnold@iohk.io> | 2022-05-26 20:00:05 -0500 |
---|---|---|
committer | David Arnold <david.arnold@iohk.io> | 2022-05-26 20:00:05 -0500 |
commit | 646e214e114a0965d1b38313de5d221f55f0f787 (patch) | |
tree | d14c1e3bd8e35f166d81cae4a650c619768ba3c3 /nixos | |
parent | 26b3864c6b355131a015e8f7e06b122175d7c43d (diff) |
nixos: remove effect-less nixpgks.initialSystem
- initialSystem was keeping track of the evaluating system - it had been used by `nesting.children` - since, 20.09, `nesting.children` has been replaced with named specializations It appears that this option was left over and not cleand up properly.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/lib/eval-config.nix | 5 | ||||
-rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 9 |
2 files changed, 1 insertions, 13 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 2daaa8a118632..3b58ef297973e 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -50,11 +50,6 @@ let # they way through, but has the last priority behind everything else. nixpkgs.system = lib.mkDefault system; - # Stash the value of the `system` argument. When using `nesting.children` - # we want to have the same default value behavior (immediately above) - # without any interference from the user's configuration. - nixpkgs.initialSystem = 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 69967c8a7601e..866bb35160091 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -67,6 +67,7 @@ in imports = [ ./assertions.nix ./meta.nix + (mkRemovedOptionModule [ "nixpkgs" "initialSystem" ] "The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named specialisation. Therefore `nixpgks.initialSystem` has no effect anymore.") ]; options.nixpkgs = { @@ -219,14 +220,6 @@ in Ignored when <code>nixpkgs.pkgs</code> is set. ''; }; - - initialSystem = mkOption { - type = types.str; - internal = true; - description = '' - Preserved value of <literal>system</literal> passed to <literal>eval-config.nix</literal>. - ''; - }; }; config = { |