nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib.modules: avoid filtering disabled modules if they're empty

Browse Source
This commit is contained in:
Eman Resu
2026-06-03 21:50:29 -04:00
committed by Eman Resu
parent 47e958cd9a
commit 91da5d6b41
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/modules.nix
View File

@@ -567,10 +567,20 @@ let
isDisabledModule = isDisabled modulesPath disabled;
keyFilter = filter (attrs: !isDisabledModule attrs);
in
catAttrs "module" (genericClosure {
startSet = keyFilter modules;
operator = attrs: keyFilter attrs.modules;
});
catAttrs "module" (
genericClosure (
if disabled == [ ] then
{
startSet = modules;
operator = attrs: attrs.modules;
}
else
{
startSet = keyFilter modules;
operator = attrs: keyFilter attrs.modules;
}
)
);
toGraph =
modulesPath: