ocamlPackages.js_of_ocaml: 4.1.0 → 5.3.0

ocamlPackages.gen_js_api: disable checks with OCaml < 4.13

7 files changed, 4 insertions, 12 deletions

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index de8906dba44..80e19af292d 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -1,24 +1,22 @@
 { lib, fetchurl, buildDunePackage
 , cmdliner, yojson, ppxlib, findlib
-, menhir, menhirLib
+, menhir, menhirLib, sedlex
 }:
 
 buildDunePackage rec {
   pname = "js_of_ocaml-compiler";
-  version = "4.1.0";
-  duneVersion = "3";
+  version = "5.3.0";
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
-    sha256 = "sha256-kXk/KaWvPeq6P301zqsR5znP4KXMMFVvYgFGGm1CNu8=";
+    hash = "sha256-vp497rmOXSjxvLLZhHwE0ohfwH7VjM2LCKpLZijNZNI=";
   };
 
   nativeBuildInputs = [ menhir ];
   buildInputs = [ cmdliner ppxlib ];
 
-  configurePlatforms = [];
-  propagatedBuildInputs = [ menhirLib yojson findlib ];
+  propagatedBuildInputs = [ menhirLib yojson findlib sedlex ];
 
   meta = {
     description = "Compiler from OCaml bytecode to Javascript";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 9a86e52c65a..71e35f749e8 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -6,7 +6,6 @@ buildDunePackage {
   pname = "js_of_ocaml";
 
   inherit (js_of_ocaml-compiler) version src;
-  duneVersion = "3";
 
   buildInputs = [ ppxlib ];
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index 741dd1f6acd..90d92415a9f 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -6,7 +6,6 @@ buildDunePackage {
   pname = "js_of_ocaml-lwt";
 
   inherit (js_of_ocaml-compiler) version src;
-  duneVersion = "3";
 
   buildInputs = [ js_of_ocaml-ppx ];
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
index 8c473d90996..34aecbf10bf 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
@@ -7,7 +7,6 @@ buildDunePackage {
   pname = "js_of_ocaml-ppx";
 
   inherit (js_of_ocaml-compiler) version src;
-  duneVersion = "3";
 
   buildInputs = [ js_of_ocaml ];
   propagatedBuildInputs = [ ppxlib ];
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index 0bb0674d322..9ed0f5afcde 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
@@ -6,7 +6,6 @@ buildDunePackage {
   pname = "js_of_ocaml-ppx_deriving_json";
 
   inherit (js_of_ocaml-compiler) version src;
-  duneVersion = "3";
 
   propagatedBuildInputs = [ js_of_ocaml ppxlib ];
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix
index d7d1f6fbcfe..814aab16cb0 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix
@@ -1,7 +1,6 @@
 { lib, buildDunePackage, js_of_ocaml-compiler, ppxlib }:
 
 buildDunePackage {
-  duneVersion = "3";
   pname = "js_of_ocaml-toplevel";
   inherit (js_of_ocaml-compiler) src version;
   buildInputs = [ ppxlib ];
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
index 30d5af3d4b0..2dcde8bef45 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
@@ -7,7 +7,6 @@ buildDunePackage {
   pname = "js_of_ocaml-tyxml";
 
   inherit (js_of_ocaml-compiler) version src;
-  duneVersion = "3";
 
   buildInputs = [ js_of_ocaml-ppx ];