swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib.types.deferredModule: Allow path-typed module references

Browse source
This commit is contained in:
Robert Hensing 2022-05-19 16:31:47 +02:00
parent a2c29561e7
commit 781c2e0789
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/tests/modules/deferred-module.nix
View file

@ -34,9 +34,7 @@ in
{
_file = "default-a-is-b.nix";
default = { config, ... }: {
settingsDict.a = config.settingsDict.b;
};
default = ./define-settingsDict-a-is-b.nix;
}
{

3
lib/tests/modules/define-settingsDict-a-is-b.nix Normal file
View file

@ -0,0 +1,3 @@
{ config, ... }: {
settingsDict.a = config.settingsDict.b;
}

2
lib/types.nix
View file

@ -543,7 +543,7 @@ rec {
deferredModule = mkOptionType {
name = "deferredModule";
description = "module";
check = t: isAttrs t || isFunction t;
check = x: isAttrs x || isFunction x || path.check x;
merge = loc: defs: map (def: lib.setDefaultModuleLocation "${def.file}, via option ${showOption loc}" def.value) defs;
};