mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 00:53:12 +03:00
filterCoqPackages: honor recurseIntoAttrs
This commit is contained in:
parent
a2aa3dc0bd
commit
83d84c08b9
@ -43,11 +43,17 @@ let
|
||||
Verdi = callPackage ../development/coq-modules/Verdi {};
|
||||
};
|
||||
|
||||
filterCoqPackages = coq:
|
||||
lib.filterAttrsRecursive
|
||||
(_: p:
|
||||
let pred = p.compatibleCoqVersions or (_: true);
|
||||
in pred coq.coq-version
|
||||
filterCoqPackages = coq: set:
|
||||
lib.listToAttrs (
|
||||
lib.concatMap (name:
|
||||
let v = set.${name}; in
|
||||
let p = v.compatibleCoqVersions or (_: true); in
|
||||
lib.optional (p coq.coq-version)
|
||||
(lib.nameValuePair name (
|
||||
if lib.isAttrs v && v.recurseForDerivations or false
|
||||
then filterCoqPackages coq v
|
||||
else v))
|
||||
) (lib.attrNames set)
|
||||
);
|
||||
|
||||
in rec {
|
||||
|
Loading…
Reference in New Issue
Block a user