coqPackages.contribs: recurse into the nested set

This commit is contained in:
Vincent Laporte 2017-12-22 16:56:20 +00:00
parent 16467a0ff7
commit 25576df64c
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F

View File

@ -1,4 +1,4 @@
{ lib, callPackage, newScope { lib, callPackage, newScope, recurseIntoAttrs
, gnumake3 , gnumake3
, ocamlPackages_3_12_1 , ocamlPackages_3_12_1
, ocamlPackages_4_02 , ocamlPackages_4_02
@ -10,6 +10,9 @@ let
inherit callPackage coq; inherit callPackage coq;
coqPackages = self; coqPackages = self;
contribs = recurseIntoAttrs
(callPackage ../development/coq-modules/contribs {});
autosubst = callPackage ../development/coq-modules/autosubst {}; autosubst = callPackage ../development/coq-modules/autosubst {};
bignums = if lib.versionAtLeast coq.coq-version "8.6" bignums = if lib.versionAtLeast coq.coq-version "8.6"
then callPackage ../development/coq-modules/bignums {} then callPackage ../development/coq-modules/bignums {}
@ -33,11 +36,10 @@ let
paco = callPackage ../development/coq-modules/paco {}; paco = callPackage ../development/coq-modules/paco {};
QuickChick = callPackage ../development/coq-modules/QuickChick {}; QuickChick = callPackage ../development/coq-modules/QuickChick {};
ssreflect = callPackage ../development/coq-modules/ssreflect { }; ssreflect = callPackage ../development/coq-modules/ssreflect { };
contribs = callPackage ../development/coq-modules/contribs { };
}; };
filterCoqPackages = coq: filterCoqPackages = coq:
lib.filterAttrs lib.filterAttrsRecursive
(_: p: (_: p:
let pred = p.compatibleCoqVersions or (_: true); let pred = p.compatibleCoqVersions or (_: true);
in pred coq.coq-version in pred coq.coq-version