cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/eval-config: Layer on top of nixos/eval-config-minimal

Browse source
This commit is contained in:
Robert Hensing 2022-01-04 22:00:00 +01:00
parent e31e096b66
commit 25caf736d5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/lib/eval-config-minimal.nix
View file

@ -4,7 +4,7 @@ let
inherit (nonExtendedLib) warn; inherit (nonExtendedLib) warn;
nonExtendedLib = import ../../lib; nonExtendedLib = import ../../lib;
in in
{ lib ? nonExtendedLib, ... }: { lib ? nonExtendedLib, bypassEvalModulesWarning ? false, ... }:
let let
/* /*
@ -43,5 +43,5 @@ let
in in
{ {
evalModules = builtins.seq experimentalWarning evalModules; evalModules = builtins.seq (if bypassEvalModulesWarning then null else experimentalWarning) evalModules;
} }

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

@ -33,6 +33,8 @@ let pkgs_ = pkgs;
in in
let let
evalModulesMinimal = (import ./eval-config-minimal.nix { inherit lib; bypassEvalModulesWarning = true; }).evalModules;
pkgsModule = rec { pkgsModule = rec {
_file = ./eval-config.nix; _file = ./eval-config.nix;
key = _file; key = _file;
@ -70,11 +72,9 @@ let
}; };
allUserModules = modules ++ legacyModules; allUserModules = modules ++ legacyModules;
noUserModules = lib.evalModules ({ noUserModules = evalModulesMinimal ({
inherit prefix; inherit prefix specialArgs;
modules = baseModules ++ extraModules ++ [ pkgsModule modulesModule ]; modules = baseModules ++ extraModules ++ [ pkgsModule modulesModule ];
specialArgs =
{ modulesPath = builtins.toString ../modules; } // specialArgs;
}); });
# Extra arguments that are useful for constructing a similar configuration. # Extra arguments that are useful for constructing a similar configuration.