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

coq: move out of ocamlPackages

Browse Source
This commit is contained in:
Vincent Laporte 2016-10-31 19:10:39 +01:00
parent 7c53518663
commit 5f49eeb935
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16470,13 +16470,27 @@ in
aspino = callPackage ../applications/science/logic/aspino {}; aspino = callPackage ../applications/science/logic/aspino {};
inherit (ocaml-ng.ocamlPackages_4_01_0) coq; coq = callPackage ../applications/science/logic/coq {
inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
};
inherit (ocamlPackages) coq_HEAD; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
inherit (ocamlPackages) ocaml findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional;
};
inherit (ocamlPackages) coq_8_5; coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix {
inherit (ocamlPackages) ocaml findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional;
};
inherit (ocaml-ng.ocamlPackages_3_12_1) coq_8_3; coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
make = pkgs.gnumake3;
inherit (ocamlPackages_3_12_1) ocaml findlib;
camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
};
mkCoqPackages_8_4 = self: let callPackage = newScope self; in { mkCoqPackages_8_4 = self: let callPackage = newScope self; in {

20
pkgs/top-level/ocaml-packages.nix
View File

@ -612,7 +612,7 @@ let
then { tools = pkgs.pkgsi686Linux.stdenv.cc; } then { tools = pkgs.pkgsi686Linux.stdenv.cc; }
else {} else {}
) // { ) // {
coq = coq_8_5; coq = pkgs.coq_8_5;
}); });
haxe = callPackage ../development/compilers/haxe { }; haxe = callPackage ../development/compilers/haxe { };
@ -654,24 +654,6 @@ let
enableX11 = config.unison.enableX11 or true; enableX11 = config.unison.enableX11 or true;
}; };
coq = callPackage ../applications/science/logic/coq {
camlp5 = camlp5_transitional;
};
coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
camlp5 = camlp5_transitional;
};
coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix {
camlp5 = camlp5_transitional;
};
coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
make = pkgs.gnumake3;
camlp5 = camlp5_transitional;
lablgtk = lablgtk_2_14;
};
hol_light = callPackage ../applications/science/logic/hol_light { hol_light = callPackage ../applications/science/logic/hol_light {
camlp5 = camlp5_strict; camlp5 = camlp5_strict;
}; };