From 5f49eeb935112e69f8992083ca173728a90cbf8c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 31 Oct 2016 19:10:39 +0100 Subject: coq: move out of ocamlPackages --- pkgs/top-level/ocaml-packages.nix | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'pkgs/top-level/ocaml-packages.nix') diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 58e9512e31c..d4ca17f6dbd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -612,7 +612,7 @@ let then { tools = pkgs.pkgsi686Linux.stdenv.cc; } else {} ) // { - coq = coq_8_5; + coq = pkgs.coq_8_5; }); haxe = callPackage ../development/compilers/haxe { }; @@ -654,24 +654,6 @@ let 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 { camlp5 = camlp5_strict; }; -- cgit 1.4.1