Unverified Commit a59093ce authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #241418 from vbgl/ocaml-jsoo-5.2.0 

ocamlPackages.js_of_ocaml: 4.1.0 → 5.3.0
parents 5a181658 ab551093

pkgs/development/ocaml-modules/gen_js_api/default.nix

+2 −2
Original line number Diff line number Diff line 
{ buildDunePackage

, ocaml

, lib

, ppxlib

, fetchFromGitHub
@@ -10,7 +11,6 @@ 
buildDunePackage rec {

  pname = "gen_js_api";

  version = "1.1.1";

  duneVersion = "3";



  src = fetchFromGitHub {

    owner = "LexiFi";
@@ -23,7 +23,7 @@ buildDunePackage rec { 


  propagatedBuildInputs = [ ojs ppxlib ];

  nativeCheckInputs = [ js_of_ocaml-compiler nodejs ];

  doCheck = true;

  doCheck = lib.versionAtLeast ocaml.version "4.13";



  meta = {

    homepage = "https://github.com/LexiFi/gen_js_api";

pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix

+4 −6
Original line number Diff line number Diff line 
{ 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";

pkgs/development/tools/ocaml/js_of_ocaml/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ buildDunePackage { 
  pname = "js_of_ocaml";



  inherit (js_of_ocaml-compiler) version src;

  duneVersion = "3";



  buildInputs = [ ppxlib ];

pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ buildDunePackage { 
  pname = "js_of_ocaml-lwt";



  inherit (js_of_ocaml-compiler) version src;

  duneVersion = "3";



  buildInputs = [ js_of_ocaml-ppx ];

pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix

+0 −1
Original line number Diff line number Diff line
@@ -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 ];