treewide: move to ocaml-ng system

2016-09-26 02:36:49 +03:00
parent 8967a3f798
commit e61663a233
21 changed files with 804 additions and 762 deletions
@@ -1,7 +1,10 @@
-{ stdenv, fetchurl, coq, ocamlPackages
+{ stdenv, lib, fetchurl
+, coq, ocaml, findlib, menhir
 , tools ? stdenv.cc
 }:

+assert lib.versionAtLeast ocaml.version "4.02";
+
 stdenv.mkDerivation rec {
  name    = "compcert-${version}";
  version = "2.7.1";
@@ -11,7 +14,7 @@ stdenv.mkDerivation rec {
    sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4";
  };

-  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);
+  buildInputs = [ coq ocaml findlib menhir ];

  enableParallelBuilding = true;