filterCoqPackages: honor recurseIntoAttrs
This commit is contained in:
parent
a2aa3dc0bd
commit
83d84c08b9
@ -43,11 +43,17 @@ let
|
|||||||
Verdi = callPackage ../development/coq-modules/Verdi {};
|
Verdi = callPackage ../development/coq-modules/Verdi {};
|
||||||
};
|
};
|
||||||
|
|
||||||
filterCoqPackages = coq:
|
filterCoqPackages = coq: set:
|
||||||
lib.filterAttrsRecursive
|
lib.listToAttrs (
|
||||||
(_: p:
|
lib.concatMap (name:
|
||||||
let pred = p.compatibleCoqVersions or (_: true);
|
let v = set.${name}; in
|
||||||
in pred coq.coq-version
|
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 {
|
in rec {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user