From db716d192192beb206a320a4c7e38e0596f7571c Mon Sep 17 00:00:00 2001 From: David Arnold Date: Thu, 18 Mar 2021 20:58:55 -0500 Subject: [PATCH] lib: ensure path type in mkProfileAttrs This is required so that filtering via lib.remove works against modules.core and similar which are of path type. It is also a prerequisite for disabledModules to match by module.key instead of path string relative to nixpkgs' modulePath. --- lib/devos/mkProfileAttrs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/devos/mkProfileAttrs.nix b/lib/devos/mkProfileAttrs.nix index 214df26..b502629 100644 --- a/lib/devos/mkProfileAttrs.nix +++ b/lib/devos/mkProfileAttrs.nix @@ -27,7 +27,7 @@ let mkProfileAttrs = f = n: _: lib.optionalAttrs (lib.pathExists "${dir}/${n}/default.nix") - { default = "${dir}/${n}"; } + { default = /. + "${dir}/${n}"; } // mkProfileAttrs "${dir}/${n}"; in lib.mapAttrs f imports;