diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-12-22 16:56:20 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-12-22 16:56:20 +0000 |
| commit | 25576df64c30480df91844af019d626e0385c106 (patch) | |
| tree | e9580a4963f09a1b54e4f8943daede878b4fa291 | |
| parent | 16467a0ff77421866e46570ebdf35b6c9d372be1 (diff) | |
| download | nixlib-25576df64c30480df91844af019d626e0385c106.tar nixlib-25576df64c30480df91844af019d626e0385c106.tar.gz nixlib-25576df64c30480df91844af019d626e0385c106.tar.bz2 nixlib-25576df64c30480df91844af019d626e0385c106.tar.lz nixlib-25576df64c30480df91844af019d626e0385c106.tar.xz nixlib-25576df64c30480df91844af019d626e0385c106.tar.zst nixlib-25576df64c30480df91844af019d626e0385c106.zip | |
coqPackages.contribs: recurse into the nested set
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index fd960e03db61..fd6fc21c6804 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, newScope +{ lib, callPackage, newScope, recurseIntoAttrs , gnumake3 , ocamlPackages_3_12_1 , ocamlPackages_4_02 @@ -10,6 +10,9 @@ let inherit callPackage coq; coqPackages = self; + contribs = recurseIntoAttrs + (callPackage ../development/coq-modules/contribs {}); + autosubst = callPackage ../development/coq-modules/autosubst {}; bignums = if lib.versionAtLeast coq.coq-version "8.6" then callPackage ../development/coq-modules/bignums {} @@ -33,11 +36,10 @@ let paco = callPackage ../development/coq-modules/paco {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; ssreflect = callPackage ../development/coq-modules/ssreflect { }; - contribs = callPackage ../development/coq-modules/contribs { }; }; filterCoqPackages = coq: - lib.filterAttrs + lib.filterAttrsRecursive (_: p: let pred = p.compatibleCoqVersions or (_: true); in pred coq.coq-version |