diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-07-27 10:55:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 10:55:08 +0200 |
| commit | 19f1d7da06cb4553a05cd1759b667bc7adf405fa (patch) | |
| tree | 38487ae5fd4a3b112ca332edb0e99edc96aa7b16 /lib/modules.nix | |
| parent | f705094eac9feaafa7c35ad525fe454d4fabc5c8 (diff) | |
| parent | 9c35f44999b38f07b674ff25cde17452ab4a1969 (diff) | |
| download | nixpkgs-19f1d7da06cb4553a05cd1759b667bc7adf405fa.tar nixpkgs-19f1d7da06cb4553a05cd1759b667bc7adf405fa.tar.gz nixpkgs-19f1d7da06cb4553a05cd1759b667bc7adf405fa.tar.bz2 nixpkgs-19f1d7da06cb4553a05cd1759b667bc7adf405fa.tar.lz nixpkgs-19f1d7da06cb4553a05cd1759b667bc7adf405fa.tar.xz nixpkgs-19f1d7da06cb4553a05cd1759b667bc7adf405fa.tar.zst nixpkgs-19f1d7da06cb4553a05cd1759b667bc7adf405fa.zip | |
Merge pull request #245271 from sternenseemann/module-system-merge-no-type
lib/modules: handle typeless options in mergeModules
Diffstat (limited to 'lib/modules.nix')
| -rw-r--r-- | lib/modules.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index f16df20425e..4966619f663 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -639,7 +639,7 @@ let unmatchedDefns = []; } else if optionDecls != [] then - if all (x: x.options.type.name == "submodule") optionDecls + if all (x: x.options.type.name or null == "submodule") optionDecls # Raw options can only be merged into submodules. Merging into # attrsets might be nice, but ambiguous. Suppose we have # attrset as a `attrsOf submodule`. User declares option |