public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25826 from Zimmi48/patch-1

Browse Source 
coqPackages: default version 8.4pl6 -> 8.6
This commit is contained in:
Arseniy Seroka 2017-05-22 20:06:31 +03:00 committed by GitHub
commit 37c89aaaa7
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/top-level/all-packages.nix
View File

@ -17700,20 +17700,13 @@ with pkgs;
camlp5 = ocamlPackages_3_12_1.camlp5_transitional; camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; 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 { mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
inherit callPackage; 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; coqPackages = coqPackages_8_4;
contribs = contribs =
@ -17745,7 +17738,9 @@ with pkgs;
mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec { mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec {
inherit callPackage; inherit callPackage;
coq = coq_8_5; coq = callPackage ../applications/science/logic/coq {
version = "8.5pl3";
};
coqPackages = coqPackages_8_5; coqPackages = coqPackages_8_5;
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; 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 { mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec {
inherit callPackage; inherit callPackage;
coq = coq_8_6; coq = callPackage ../applications/science/logic/coq {};
coqPackages = coqPackages_8_6; coqPackages = coqPackages_8_6;
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; 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_4 = mkCoqPackages_8_4 coqPackages_8_4;
coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; 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 { }; cryptoverif = callPackage ../applications/science/logic/cryptoverif { };