Merge pull request #59217 from CohenCyril/coq-modules-fix

coqPackages: refactor
This commit is contained in:
Vincent Laporte 2019-04-16 11:37:12 +02:00 committed by GitHub
commit c46811b7a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,8 +2,9 @@
let
mkCoqPackages' = self: coq:
let callPackage = newScope self ; in rec {
inherit callPackage coq;
let newScope = self.newScope;
callPackage = self.callPackage; in {
inherit coq;
coqPackages = self;
contribs = recurseIntoAttrs
@ -75,7 +76,7 @@ in rec {
* a `dontFilter` attribute into the Coq derivation.
*/
mkCoqPackages = coq:
let self = mkCoqPackages' self coq; in
let self = lib.makeScope newScope (lib.flip mkCoqPackages' coq); in
if coq.dontFilter or false then self
else filterCoqPackages coq self;