Merge staging-next into staging

2021-03-26 12:06:44 +00:00
parent 83f3d96db8 eddd1a74ec
commit 219312a10b
64 changed files with 806 additions and 387 deletions
@@ -1,16 +1,16 @@
 { lib, fetchurl, buildDunePackage
-, cmdliner, cppo, yojson, ppxlib
+, ocaml, cmdliner, cppo, yojson, ppxlib
 , menhir
 }:

 buildDunePackage rec {
  pname = "js_of_ocaml-compiler";
-  version = "3.8.0";
+  version = "3.9.1";
  useDune2 = true;

  src = fetchurl {
    url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
-    sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy";
+    sha256 = "0ib551kfsjlp9vr3fk36hrbq7xxyl8bj6vcn3ccr0s370bsmgpm6";
  };

  nativeBuildInputs = [ cppo menhir ];