nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos: move default module location logic to eval-config.nix

Browse Source
This commit is contained in:
Naïm Favier 2021-12-17 15:30:32 +01:00
parent 5a07097772
commit 5ab62e17b5
No known key found for this signature in database
GPG Key ID: 49B07322580B7EE2
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
flake.nix
View File

@ -21,35 +21,13 @@
nixos = import ./nixos/lib { lib = final; }; nixos = import ./nixos/lib { lib = final; };
nixosSystem = { modules, ... } @ args: nixosSystem = args:
import ./nixos/lib/eval-config.nix (args // { import ./nixos/lib/eval-config.nix (args // {
modules = modules = args.modules ++ [ {
let system.nixos.versionSuffix =
moduleDeclarationFile = ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
let system.nixos.revision = final.mkIf (self ? rev) self.rev;
# Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't } ];
# mean that the evaluator always keeps track of its position. If there
# are too many levels of indirection, the position gets lost at some point.
intermediatePos = builtins.unsafeGetAttrPos "modules" args;
in
if intermediatePos == null then null else intermediatePos.file;
# Add the invoking file as error message location for modules
# that don't have their own locations; presumably inline modules.
addModuleDeclarationFile =
m: if moduleDeclarationFile == null then m else {
_file = moduleDeclarationFile;
imports = [ m ];
};
in
map addModuleDeclarationFile modules ++ [
{
system.nixos.versionSuffix =
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
system.nixos.revision = final.mkIf (self ? rev) self.rev;
}
];
}); });
}); });

14
nixos/lib/eval-config.nix
View File

@ -21,6 +21,7 @@ evalConfigArgs@
, # !!! See comment about args in lib/modules.nix , # !!! See comment about args in lib/modules.nix
specialArgs ? {} specialArgs ? {}
, modules , modules
, modulesLocation ? (builtins.unsafeGetAttrPos "modules" evalConfigArgs).file or null
, # !!! See comment about check in lib/modules.nix , # !!! See comment about check in lib/modules.nix
check ? true check ? true
, prefix ? [] , prefix ? []
@ -74,7 +75,18 @@ let
_module.check = lib.mkDefault check; _module.check = lib.mkDefault check;
}; };
}; };
allUserModules = modules ++ legacyModules;
allUserModules =
let
# Add the invoking file (or specified modulesLocation) as error message location
# for modules that don't have their own locations; presumably inline modules.
locatedModules =
if modulesLocation == null then
modules
else
map (lib.setDefaultModuleLocation modulesLocation) modules;
in
locatedModules ++ legacyModules;
noUserModules = evalModulesMinimal ({ noUserModules = evalModulesMinimal ({
inherit prefix specialArgs; inherit prefix specialArgs;