jbuilder: 1.0.1 -> dune: 1.1.1

2018-09-15 19:32:32 +00:00
parent eb429c7c54
commit fc19401d67
69 changed files with 228 additions and 230 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, jbuilder
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, dune
 , cmdliner, astring, fmt, result
 }:

@@ -6,9 +6,9 @@ let param =
  if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
    version = "0.8.2";
    sha256 = "1zpg079v89mz2dpnh59f9hk5r03wl26skfn43llrv3kg24abjfpf";
-    buildInputs = [ jbuilder ];
-    buildPhase = "jbuilder build -p alcotest";
-    inherit (jbuilder) installPhase;
+    buildInputs = [ dune ];
+    buildPhase = "dune build -p alcotest";
+    inherit (dune) installPhase;
  } else {
    version = "0.7.2";
    sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md";