JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/modules: Fix store imports

Browse Source 
This fixes imports from the store not being possible, which was caused by
https://github.com/NixOS/nixpkgs/pull/76857

E.g. such a case:

  imports = [ "${home-manager}/nixos" ];
This commit is contained in:
Silvan Mosberger 2020-01-10 04:00:33 +01:00
parent e116b4b331
commit e0ea5f4d9b
No known key found for this signature in database
GPG Key ID: E8F1E9EAD284E17D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/modules.nix
View File

@ -151,8 +151,8 @@ rec {
filterModules = modulesPath: { disabled, modules }: filterModules = modulesPath: { disabled, modules }:
let let
moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m; moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m;
disabledKeys = listToAttrs (map (k: nameValuePair (moduleKey k) null) disabled); disabledKeys = map moduleKey disabled;
keyFilter = filter (attrs: ! disabledKeys ? ${attrs.key}); keyFilter = filter (attrs: ! elem attrs.key disabledKeys);
in map (attrs: attrs.module) (builtins.genericClosure { in map (attrs: attrs.module) (builtins.genericClosure {
startSet = keyFilter modules; startSet = keyFilter modules;
operator = attrs: keyFilter attrs.modules; operator = attrs: keyFilter attrs.modules;