From 57dc1d31b1445e35ee65e6a8ed48719f8ab67228 Mon Sep 17 00:00:00 2001 From: camlspotter Date: Tue, 21 Nov 2017 14:55:27 +0900 Subject: [PATCH] Added camlon > 2.0.0 to ppx_meta_convs (#10790) --- packages/ppx_meta_conv/ppx_meta_conv.2.6.0/opam | 7 +++---- packages/ppx_meta_conv/ppx_meta_conv.2.7.0/opam | 7 +++---- packages/ppx_meta_conv/ppx_meta_conv.2.8.0/opam | 3 ++- packages/ppx_meta_conv/ppx_meta_conv.3.0.0/opam | 6 ++---- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/packages/ppx_meta_conv/ppx_meta_conv.2.6.0/opam b/packages/ppx_meta_conv/ppx_meta_conv.2.6.0/opam index 46f5359f5bf..63c3bf356a9 100644 --- a/packages/ppx_meta_conv/ppx_meta_conv.2.6.0/opam +++ b/packages/ppx_meta_conv/ppx_meta_conv.2.6.0/opam @@ -20,10 +20,8 @@ available: [ ocaml-version >= "4.04.0" & ocaml-version < "4.05.0" ] depends: [ - "ocamlfind" - { build } - "omake" - { build } + "ocamlfind" { build } + "omake" { build & < "0.10" } "ppx_deriving" { >= "3.3" & < "5.0" } "spotlib" { >= "3.0.0" } "ppxx" { >= "1.4.0" & < "1.5.0" } @@ -36,4 +34,5 @@ depopts: [ conflicts: [ "tiny_json" { < "1.1.0" } "sexplib" { < "112.24.01" } + "camlon" { >= "2.0.0" } ] diff --git a/packages/ppx_meta_conv/ppx_meta_conv.2.7.0/opam b/packages/ppx_meta_conv/ppx_meta_conv.2.7.0/opam index 056705384a3..228f9536895 100644 --- a/packages/ppx_meta_conv/ppx_meta_conv.2.7.0/opam +++ b/packages/ppx_meta_conv/ppx_meta_conv.2.7.0/opam @@ -20,10 +20,8 @@ available: [ ocaml-version >= "4.04.0" & ocaml-version < "4.05.0" ] depends: [ - "ocamlfind" - { build } - "omake" - { build } + "ocamlfind" { build } + "omake" { build & < "0.10" } "ppx_deriving" { >= "3.3" & < "5.0" } "spotlib" { >= "3.0.0" } "ppxx" { >= "1.4.0" & < "1.5.0" } @@ -36,4 +34,5 @@ depopts: [ conflicts: [ "tiny_json" { < "1.1.0" } "sexplib" { < "112.24.01" } + "camlon" { >= "2.0.0" } ] diff --git a/packages/ppx_meta_conv/ppx_meta_conv.2.8.0/opam b/packages/ppx_meta_conv/ppx_meta_conv.2.8.0/opam index 144116eb4f1..08343c2ed69 100644 --- a/packages/ppx_meta_conv/ppx_meta_conv.2.8.0/opam +++ b/packages/ppx_meta_conv/ppx_meta_conv.2.8.0/opam @@ -21,7 +21,7 @@ available: [ ] depends: [ "ocamlfind" { build } - "omake" { build } + "omake" { build & < "0.10" } "ppx_deriving" { >= "4.0" & < "5.0" } "spotlib" { >= "4.0.0" } "ppxx" { >= "2.0.0" } @@ -34,4 +34,5 @@ depopts: [ conflicts: [ "tiny_json" { < "1.1.0" } "sexplib" { < "112.24.01" } + "camlon" { >= "2.0.0" } ] diff --git a/packages/ppx_meta_conv/ppx_meta_conv.3.0.0/opam b/packages/ppx_meta_conv/ppx_meta_conv.3.0.0/opam index e00c5c8a298..62df5aecaad 100644 --- a/packages/ppx_meta_conv/ppx_meta_conv.3.0.0/opam +++ b/packages/ppx_meta_conv/ppx_meta_conv.3.0.0/opam @@ -21,10 +21,7 @@ available: [ ] depends: [ "ocamlfind" { build } - "omake" { build - & - < - "0.10" } + "omake" { build & < "0.10" } "ppx_deriving" { >= "4.0" & < "5.0" } "spotlib" { >= "4.0.0" } "ppxx" { >= "2.3.0" & < "2.4.0" } @@ -37,4 +34,5 @@ depopts: [ conflicts: [ "tiny_json" { < "1.1.0" } "sexplib" { < "112.24.01" } + "camlon" { >= "2.0.0" } ]