From 25576df64c30480df91844af019d626e0385c106 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 22 Dec 2017 16:56:20 +0000
Subject: [PATCH] coqPackages.contribs: recurse into the nested set

---
 pkgs/top-level/coq-packages.nix | 8 +++++---
 1 file 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