diff --git a/non-broken.nix b/non-broken.nix index 35778c207769e11cc758be656b1f8461bd05576c..b9a2cf9c6501ea634a8dd95428f855501b436b61 100644 --- a/non-broken.nix +++ b/non-broken.nix @@ -4,23 +4,24 @@ # broken your CI will not try to build them and the non-broken packages will # be added to the cache. { pkgs ? import {} }: -let - filterSet = - (f: g: s: builtins.listToAttrs - (map - (n: { name = n; value = builtins.getAttr n s; }) - (builtins.filter - (n: f n && g (builtins.getAttr n s)) - (builtins.attrNames s) +let filterSet = + (f: g: s: builtins.listToAttrs + (map + (n: { name = n; value = builtins.getAttr n s; }) + (builtins.filter + (n: f n && g (builtins.getAttr n s)) + (builtins.attrNames s) + ) ) - ) - ); - isReserved = n: builtins.elem n ["lib" "overlays" "modules"]; - isBroken = p: ({ meta.broken = false; } // p).meta.broken; + ); in filterSet - (n: !(isReserved n)) # filter out non-packages + (n: !(n=="lib"||n=="overlays"||n=="modules")) # filter out non-packages (p: (builtins.isAttrs p) - && !(isBroken p) + && !( + (builtins.hasAttr "meta" p) + && (builtins.hasAttr "broken" p.meta) + && (p.meta.broken) + ) ) (import ./default.nix { inherit pkgs; }) diff --git a/overlay.nix b/overlay.nix index bda4332a081fcd8c713733a27a02f0dc312cd32c..082b03836fd169bc00f6093001bf9c51459c999c 100644 --- a/overlay.nix +++ b/overlay.nix @@ -4,20 +4,18 @@ # to your configuration. self: super: -let - filterSet = - (f: g: s: builtins.listToAttrs - (map - (n: { name = n; value = builtins.getAttr n s; }) - (builtins.filter - (n: f n && g (builtins.getAttr n s)) - (builtins.attrNames s) +let filterSet = + (f: g: s: builtins.listToAttrs + (map + (n: { name = n; value = builtins.getAttr n s; }) + (builtins.filter + (n: f n && g (builtins.getAttr n s)) + (builtins.attrNames s) + ) ) - ) - ); - isReserved = n: builtins.elem n ["lib" "overlays" "modules"]; + ); in filterSet - (n: !(isReserved n)) # filter out non-packages + (n: !(n=="lib"||n=="overlays"||n=="modules")) # filter out non-packages (p: true) # all packages are ok (import ./default.nix { pkgs = super; })