diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2017-05-22 20:06:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-22 20:06:31 +0300 |
| commit | 37c89aaaa7948574529e05a88d42d5343d1053c9 (patch) | |
| tree | aee2e922d487c64504ebffc30cd1d198e138d2f2 /pkgs/top-level | |
| parent | 2ddcec98856cf3dc77f242d705f71b3358d26953 (diff) | |
| parent | 5f04a61d4fe8fac31dfb4b1d58f599a1067017c6 (diff) | |
| download | nixlib-37c89aaaa7948574529e05a88d42d5343d1053c9.tar nixlib-37c89aaaa7948574529e05a88d42d5343d1053c9.tar.gz nixlib-37c89aaaa7948574529e05a88d42d5343d1053c9.tar.bz2 nixlib-37c89aaaa7948574529e05a88d42d5343d1053c9.tar.lz nixlib-37c89aaaa7948574529e05a88d42d5343d1053c9.tar.xz nixlib-37c89aaaa7948574529e05a88d42d5343d1053c9.tar.zst nixlib-37c89aaaa7948574529e05a88d42d5343d1053c9.zip | |
Merge pull request #25826 from Zimmi48/patch-1
coqPackages: default version 8.4pl6 -> 8.6
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a61dd0f8f11..84f15fccfecd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17700,20 +17700,13 @@ with pkgs; camlp5 = ocamlPackages_3_12_1.camlp5_transitional; lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; }; - coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { - inherit (ocamlPackages_4_02) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_02.camlp5_transitional; - }; - coq_8_5 = callPackage ../applications/science/logic/coq { - version = "8.5pl3"; - }; - coq_8_6 = callPackage ../applications/science/logic/coq {}; - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; - coq = coq_8_6; mkCoqPackages_8_4 = self: let callPackage = newScope self; in { inherit callPackage; - coq = coq_8_4; + coq = callPackage ../applications/science/logic/coq/8.4.nix { + inherit (ocamlPackages_4_02) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_02.camlp5_transitional; + }; coqPackages = coqPackages_8_4; contribs = @@ -17745,7 +17738,9 @@ with pkgs; mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec { inherit callPackage; - coq = coq_8_5; + coq = callPackage ../applications/science/logic/coq { + version = "8.5pl3"; + }; coqPackages = coqPackages_8_5; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; @@ -17762,7 +17757,7 @@ with pkgs; mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec { inherit callPackage; - coq = coq_8_6; + coq = callPackage ../applications/science/logic/coq {}; coqPackages = coqPackages_8_6; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; @@ -17779,7 +17774,13 @@ with pkgs; coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4; coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; - coqPackages = coqPackages_8_4; + coqPackages = coqPackages_8_6; + + coq_8_4 = coqPackages_8_4.coq; + coq_8_5 = coqPackages_8_5.coq; + coq_8_6 = coqPackages_8_6.coq; + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; + coq = coqPackages.coq; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; |