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

coq: default version is the one of coqPackages

Browse Source 
This clean-up is supposed to avoid the mistake made in 83a50c2 and fixed in 6b8da80 in the future.
This commit is contained in:
Théo Zimmermann 2017-05-16 13:36:33 +02:00
parent 6b8da80466
commit 5f04a61d4f
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17635,20 +17635,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 =
@ -17680,7 +17673,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 {};
@ -17697,7 +17692,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 {};
@ -17715,6 +17710,12 @@ with pkgs;
coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6;
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 { };