diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2020-03-06 07:42:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 07:42:04 +0100 |
| commit | 2d2a5a9b634e39dec752b112a380055990c3cd35 (patch) | |
| tree | 9d351f8d2fa1e6fcd56c66540f357c3ae04f6ac3 /pkgs/development/tools | |
| parent | e8243467b97cb1cb027d03596ec3e4709e140ee2 (diff) | |
| download | nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.gz nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.bz2 nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.lz nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.xz nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.zst nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.zip | |
js_of_ocaml: 3.4.0 -> 3.5.2 (#75766)
drive-by contributions, as I was playing around with this (it has better support for the `num` library, it seems.) js_of_ocaml: 3.4.0 -> 3.5.2 ocamlPackages.js_of_ocaml-ppx_deriving_json: use ppxlib-0.12.0 ocamlPackages.eliom: 6.8.0 → 6.10.1 ocamlPackages.ocsigen-toolkit: 2.2.0 → 2.5.0 ocamlPackages.ocsigen-start: 2.7.0 → 2.16.1 Co-authored-by: Vincent Laporte <Vincent.Laporte@gmail.com>
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 801e41427804..90e0a7935de5 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,23 +1,23 @@ { lib, fetchFromGitHub, buildDunePackage -, ocaml, findlib, cmdliner, dune, cppo, yojson +, ocaml, findlib, cmdliner, dune, cppo, yojson, ocaml-migrate-parsetree }: buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.4.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj"; + sha256 = "1fm855iavljx7rf9hii2qb7ky920zv082d9zlcl504by1bxp1yg8"; }; nativeBuildInputs = [ ocaml findlib dune cppo ]; buildInputs = [ cmdliner ]; configurePlatforms = []; - propagatedBuildInputs = [ yojson ]; + propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ]; meta = { description = "Compiler from OCaml bytecode to Javascript"; 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 2ff9ddbcf9e1..47396829f8a0 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 @@ -1,5 +1,5 @@ { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler -, js_of_ocaml, ppx_deriving +, js_of_ocaml, ppxlib }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib dune ]; - propagatedBuildInputs = [ js_of_ocaml ppx_deriving ]; + propagatedBuildInputs = [ js_of_ocaml ppxlib ]; buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json"; } |