alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/eval-config: Remove statically known mkIf

Browse source 
mkIf is unnecessary when the condition is statically known - that is
knowable before entering the module evaluation.

By changing this to a precomputed module, we support changing the
defined options to readOnly options.
This commit is contained in:
Robert Hensing 2023-05-07 15:33:47 +02:00
parent 6e594fedb3
commit 693e2c3287
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nixos/lib/eval-config.nix
View file

@ -38,6 +38,8 @@ let pkgs_ = pkgs;
in in
let let
inherit (lib) optional;
evalModulesMinimal = (import ./default.nix { evalModulesMinimal = (import ./default.nix {
inherit lib; inherit lib;
# Implicit use of feature is noted in implementation. # Implicit use of feature is noted in implementation.
@ -47,15 +49,19 @@ let
pkgsModule = rec { pkgsModule = rec {
_file = ./eval-config.nix; _file = ./eval-config.nix;
key = _file; key = _file;
config = { config = lib.mkMerge (
(optional (system != null) {
# Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override
# this. Since the latter defaults to the former, the former should # this. Since the latter defaults to the former, the former should
# default to the argument. That way this new default could propagate all # default to the argument. That way this new default could propagate all
# they way through, but has the last priority behind everything else. # they way through, but has the last priority behind everything else.
nixpkgs.system = lib.mkIf (system != null) (lib.mkDefault system); nixpkgs.system = lib.mkDefault system;
})
_module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); ++
}; (optional (pkgs_ != null) {
_module.args.pkgs = lib.mkForce pkgs_;
})
);
}; };
withWarnings = x: withWarnings = x: