alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #32985 from vbgl/coq-contribs-recurse

Browse source 
coqPackages.contribs: recurse into the nested set
This commit is contained in:
John Wiegley 2017-12-22 10:06:12 -08:00 committed by GitHub
parent 5e8a0786b0 24474528e4
commit 25ef9fa875
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/coq-modules/contribs/default.nix
View file

@ -189,10 +189,10 @@ let mkContrib = repo: revs: param:
sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33"; sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33";
}; };
containers = mkContrib "containers" [ ] { containers = mkContrib "containers" [ "8.6" ] {
version = "v8.6.0-10-g2432994"; version = "8.6.0";
rev = "2432994b4a0a63f28b21aad23d0c3c90c7630890"; rev = "fa1fec7";
sha256 = "1q0i20qag2c8jh6jw63s09d8nr6m1zaz4hqblg5mmmp5zh6fllk6"; sha256 = "1ns0swlr8hzb1zc7fsyd3vws1vbq0vvfxcf0lszqnca9c9hfkfy4";
}; };
continuations = mkContrib "continuations" [ ] { continuations = mkContrib "continuations" [ ] {

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