diff options
author | lassulus <lassulus@lassul.us> | 2022-12-12 16:45:39 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2022-12-12 16:45:39 +0100 |
commit | 1775e867524d47b5055034bedadc7a96a4c7da6f (patch) | |
tree | 0073823803b051c31491937a621ca53e65adbb9c /tv/5pkgs/default.nix | |
parent | ea72339343115c141b432a4f6cd97cfbb0eb1223 (diff) | |
parent | 54ddded30dfc02c53baf33c078fafdd9aaf3c70d (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/5pkgs/default.nix')
-rw-r--r-- | tv/5pkgs/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 5a018a166..245d0542b 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -1,4 +1,4 @@ -with import ../../lib; +with import ./lib; let pushBack = x: xs: if elem x xs then @@ -14,7 +14,6 @@ fix (foldl' (flip extends) (_: super) (map (name: import (./. + "/${name}")) - (filter - (name: name != "default.nix" && !hasPrefix "." name) - (pushBack "override" - (attrNames (readDir ./.)))))) + (pushBack "override" + (attrNames + (filterAttrs isNixDirEntry (readDir ./.)))))) |