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

Revert "coq: default version is the one of coqPackages"

Browse Source 
This reverts commit 5f04a61d4fe8fac31dfb4b1d58f599a1067017c6.

That way, the Coq that is used to build other coq packages
can be overridden.

The top-level `coq` attribute is `coqPackages.coq` thus both
“un-versioned” attributes are consistent.
This commit is contained in:
Vincent Laporte 2017-08-23 08:24:20 +00:00
parent 2afb096e83
commit 9d4b711908
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18071,13 +18071,19 @@ 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 {};
mkCoqPackages_8_4 = self: let callPackage = newScope self; in { mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
inherit callPackage; inherit callPackage;
coq = callPackage ../applications/science/logic/coq/8.4.nix { coq = coq_8_4;
inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
camlp5 = ocamlPackages_4_02.camlp5_transitional;
};
coqPackages = coqPackages_8_4; coqPackages = coqPackages_8_4;
contribs = contribs =
@ -18109,9 +18115,7 @@ 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 = callPackage ../applications/science/logic/coq { coq = coq_8_5;
version = "8.5pl3";
};
coqPackages = coqPackages_8_5; coqPackages = coqPackages_8_5;
autosubst = callPackage ../development/coq-modules/autosubst {}; autosubst = callPackage ../development/coq-modules/autosubst {};
@ -18130,7 +18134,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 = callPackage ../applications/science/logic/coq {}; coq = coq_8_6;
coqPackages = coqPackages_8_6; coqPackages = coqPackages_8_6;
autosubst = callPackage ../development/coq-modules/autosubst {}; autosubst = callPackage ../development/coq-modules/autosubst {};
@ -18153,11 +18157,6 @@ with pkgs;
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_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; coq = coqPackages.coq;
coq2html = callPackage ../applications/science/logic/coq2html { coq2html = callPackage ../applications/science/logic/coq2html {