diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-03-23 20:43:19 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-03-25 17:36:51 +0100 |
| commit | 92a1b57bb14d48311df9c1b98a60cd4e0b8408dc (patch) | |
| tree | 181a5e6e6dd8542370c711befc46cde98a869d60 /pkgs/top-level | |
| parent | 53a56c9887f20e8c1b8d86ac7747b1de68d6d577 (diff) | |
ocamlPackages.ppxlib: default to 0.22.0
ocamlPackages.base_quickcheck 0.14.0 → 0.14.1
ocamlPackages.ppx_custom_printf: 0.14.0 → 0.14.1
ocamlPackages.ppx_expect: 0.14.0 → 0.14.1
ocamlPackages.ppx_optcomp: 0.14.0 → 0.14.1
ocamlPackages.ppx_sexp_conv: 0.14.1 → 0.14.3
ocamlPackages.ppx_sexp_message: 0.14.1 → 0.14.2
ocamlPackages.ppx_typerep_conv: 0.14.1 → 0.14.2
ocamlPackages.visitors: 20210127 → 20210316
ocamlPackages.pgocaml: 4.2.2 → 4.2.2-dev-20210111
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 30f6dca5f16b..f319d678e132 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -317,7 +317,15 @@ let eliom = callPackage ../development/ocaml-modules/eliom { }; - elpi = callPackage ../development/ocaml-modules/elpi { }; + elpi = callPackage ../development/ocaml-modules/elpi ( + let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15" + then ppxlib.override { version = "0.15.0"; } + else ppxlib; in + { + ppx_deriving = ppx_deriving.override { ppxlib = ppxlib_0_15; }; + ppxlib = ppxlib_0_15; + } + ); encore = callPackage ../development/ocaml-modules/encore { }; @@ -1031,13 +1039,23 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { }; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { + ppxlib = ppxlib.override { version = "0.15.0"; }; + }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {}; - ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; + ppx_import = callPackage ../development/ocaml-modules/ppx_import ( + let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15" + then ppxlib.override { version = "0.15.0"; } + else ppxlib; in + { + ppx_deriving = ppx_deriving.override { ppxlib = ppxlib_0_15; }; + ppxlib = ppxlib_0_15; + } + ); ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; |