diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-01-04 08:43:44 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-01-07 08:40:26 +0100 |
| commit | 90d4109c23da03daeb7dece49f7f16492ae3d96c (patch) | |
| tree | cae8c31c028c8f795943837a33e5b0918ba63621 /pkgs/development/ocaml-modules | |
| parent | e65e269b5e2b2e06400d1be26ba3c8e6cc6b0abc (diff) | |
ocamlPackages.lwt_ppx: 2.0.1 → 2.0.2
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/eliom/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lwt/ppx.nix | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index de2955e57c92..5d3c53100449 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchzip, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_deriving, findlib +, ppx_tools_versioned , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml @@ -22,6 +23,7 @@ stdenv.mkDerivation rec }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline + ppx_tools_versioned ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix index f2707064f2af..2df17844d1a0 100644 --- a/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -1,8 +1,12 @@ -{ fetchzip, buildDunePackage, lwt, ppx_tools_versioned }: +{ fetchzip, buildDunePackage, lwt, ppxlib }: buildDunePackage { pname = "lwt_ppx"; - version = "2.0.1"; + version = "2.0.2"; + + useDune2 = true; + + minimumOCamlVersion = "4.04"; src = fetchzip { # `lwt_ppx` has a different release cycle than Lwt, but it's included in @@ -12,12 +16,11 @@ buildDunePackage { # # This is particularly useful for overriding Lwt without breaking `lwt_ppx`, # as new Lwt releases may contain broken `lwt_ppx` code. - url = "https://github.com/ocsigen/lwt/archive/5.2.0.tar.gz"; - sha256 = "1znw8ckwdmqsnrcgar4g33zgr659l4l904bllrz69bbwdnfmz2x3"; + url = "https://github.com/ocsigen/lwt/archive/5.4.0.tar.gz"; + sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d"; }; - - propagatedBuildInputs = [ lwt ppx_tools_versioned ]; + propagatedBuildInputs = [ lwt ppxlib ]; meta = { description = "Ppx syntax extension for Lwt"; |