diff options
| author | John Wiegley <johnw@newartisans.com> | 2017-12-22 10:06:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-22 10:06:12 -0800 |
| commit | 25ef9fa8756108fc2a6dc015c93717ea0106ebdc (patch) | |
| tree | 043752b5b40692c3b900e180f2f73b6610c291bd | |
| parent | 5e8a0786b0565f4941dbd836550eabfc7c8fa3f3 (diff) | |
| parent | 24474528e42acedb96e5464a3270ce1c07e18a8a (diff) | |
| download | nixlib-25ef9fa8756108fc2a6dc015c93717ea0106ebdc.tar nixlib-25ef9fa8756108fc2a6dc015c93717ea0106ebdc.tar.gz nixlib-25ef9fa8756108fc2a6dc015c93717ea0106ebdc.tar.bz2 nixlib-25ef9fa8756108fc2a6dc015c93717ea0106ebdc.tar.lz nixlib-25ef9fa8756108fc2a6dc015c93717ea0106ebdc.tar.xz nixlib-25ef9fa8756108fc2a6dc015c93717ea0106ebdc.tar.zst nixlib-25ef9fa8756108fc2a6dc015c93717ea0106ebdc.zip | |
Merge pull request #32985 from vbgl/coq-contribs-recurse
coqPackages.contribs: recurse into the nested set
| -rw-r--r-- | pkgs/development/coq-modules/contribs/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index e7ea6f9a911e..88ef8011aa8e 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -189,10 +189,10 @@ let mkContrib = repo: revs: param: sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33"; }; - containers = mkContrib "containers" [ ] { - version = "v8.6.0-10-g2432994"; - rev = "2432994b4a0a63f28b21aad23d0c3c90c7630890"; - sha256 = "1q0i20qag2c8jh6jw63s09d8nr6m1zaz4hqblg5mmmp5zh6fllk6"; + containers = mkContrib "containers" [ "8.6" ] { + version = "8.6.0"; + rev = "fa1fec7"; + sha256 = "1ns0swlr8hzb1zc7fsyd3vws1vbq0vvfxcf0lszqnca9c9hfkfy4"; }; continuations = mkContrib "continuations" [ ] { 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 |