diff --git a/default.nix b/default.nix index cd2b9f83..e6266566 100644 --- a/default.nix +++ b/default.nix @@ -18,7 +18,7 @@ let filterAttrNamesToList = filter: set: lib.foldl' (a: b: a ++ b) [ ] (map (e: if (filter e set.${e}) then [ e ] else [ ]) (lib.attrNames set)); - depotNames = lib.unique ((filterAttrNamesToList (name: type: name != "trusted" && type == "directory") (builtins.readDir ./config)) ++ (filterAttrNamesToList (name: type: name != "trusted" && name != "pkgs" && type == "directory") (builtins.readDir ./config/trusted))); + depotNames = lib.unique ((filterAttrNamesToList (name: type: name != "trusted" && type == "directory") (builtins.readDir ./config)) ++ (filterAttrNamesToList (name: type: name != "pkgs" && type == "directory") (builtins.readDir ./config/trusted))); depot = lib.mapListToAttrs (folder: lib.nameValuePair folder (lib.domainMerge { inherit folder; })) depotNames; /* diff --git a/wiki b/wiki index cb57c329..2a44d2e0 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit cb57c32945af30651438c69055745929bbd2fd34 +Subproject commit 2a44d2e0bdf70c6942be1576b7cc7efa58ea326a