From 26a50ef1ef4c37ddb990f9d7ebb71da6896cfc1a Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel <erik.martin-dorel@irit.fr>
Date: Sat, 9 Oct 2021 16:46:15 +0200
Subject: [PATCH] fix(*.opam): Make common deps constraints uniform & Add
 missing deps

* This should solve the error spotted in
  PR https://github.com/ocaml/opam-repository/pull/19698
  (when learn-ocaml.0.13.0 is built in isolation).
---
 learn-ocaml-client.opam |  3 ++-
 learn-ocaml.opam        | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/learn-ocaml-client.opam b/learn-ocaml-client.opam
index 437db5388..af2a8a3d3 100644
--- a/learn-ocaml-client.opam
+++ b/learn-ocaml-client.opam
@@ -22,7 +22,7 @@ depends: [
   "cohttp-lwt-unix" {>= "2.0.0"}
   "cstruct" {>= "3.3.0"}
   "digestif" {>= "0.7.1"}
-  "dune"
+  "dune" {>= "1.11.4"}
   "ezjsonm"
   "gg"
   "ipaddr" {= "2.8.0" }
@@ -35,6 +35,7 @@ depends: [
   "ocp-ocamlres" {>= "0.4"}
   "omd" {<= "1.3.1"}
   "ppx_fields_conv"
+  "ppxlib"
   "ppx_sexp_conv"
   "ppx_tools"
   "ssl" {= "0.5.5"}
diff --git a/learn-ocaml.opam b/learn-ocaml.opam
index 05efbcfe9..5d14f21dd 100644
--- a/learn-ocaml.opam
+++ b/learn-ocaml.opam
@@ -14,7 +14,7 @@ homepage: "https://github.com/ocaml-sf/learn-ocaml"
 bug-reports: "https://github.com/ocaml-sf/learn-ocaml/issues"
 dev-repo: "git+https://github.com/ocaml-sf/learn-ocaml"
 depends: [
-  "asak" {>= "0.1"}
+  "asak"
   "base64"
   "base" {>= "v0.9.4"}
   "cmdliner"
@@ -43,14 +43,17 @@ depends: [
   "ocaml" {(>= "4.12") & (< "4.13~")}
   "ocamlfind" {build}
   "ocp-indent-nlfork"
-  "ocplib-json-typed" {>= "0.6"}
-  "ocplib-json-typed-browser" {>= "0.6"}
-  "ocp-ocamlres" {= "0.4"}
+  "ocplib-json-typed" {>= "0.7"}
+  "ocplib-json-typed-browser" {>= "0.7"}
+  "ocp-ocamlres" {>= "0.4"}
   "odoc" {build}
-  "omd"
+  "omd" {<= "1.3.1"}
   "pprint"
   "ppx_cstruct"
+  "ppxlib"
+  "ppx_sexp_conv"
   "ppx_tools"
+  "ppx_tools_versioned"
   "re"
   "ssl" {= "0.5.5"}
   "uutf" {>= "1.0" }