From 8a5486ddca74d93c41b4ceb16796735a9fb2977f Mon Sep 17 00:00:00 2001
From: xvw <xavier.vdw@gmail.com>
Date: Fri, 4 Oct 2024 21:59:49 +0200
Subject: [PATCH 1/2] Move to plain version of YOCaml

---
 dune-project       | 14 +++++++-------
 lib/resolver.ml    |  2 +-
 ring.opam          | 23 +++++++----------------
 ring.opam.template |  9 ---------
 4 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 ring.opam.template

diff --git a/dune-project b/dune-project
index fd96d81..c14a037 100644
--- a/dune-project
+++ b/dune-project
@@ -18,16 +18,16 @@
    (ocaml (>= 5.1.1))
    (dune (>= 3.16.0))
 
-   yocaml
-   yocaml_jingoo
-   yocaml_yaml
-   yocaml_omd
-   yocaml_eio
-   yocaml_syndication
+   (yocaml (>= 2.0.0))
+   (yocaml_jingoo (>= 2.0.0))
+   (yocaml_yaml (>= 2.0.0))
+   (yocaml_omd (>= 2.0.0))
+   (yocaml_eio (>= 2.0.0))
+   (yocaml_syndication (>= 2.0.0))
 
    (cmdliner (= 1.3.0))
 
-   (ppx_expect :with-test)
+   ppx_expect
 
    (ocamlformat :with-dev-setup)
    (ocp-indent :with-dev-setup)
diff --git a/lib/resolver.ml b/lib/resolver.ml
index 78afeed..c9e64a6 100644
--- a/lib/resolver.ml
+++ b/lib/resolver.ml
@@ -45,4 +45,4 @@ module Make (R : Sigs.RESOLVABLE) = struct
   end
 
   let track_common_dependencies = Yocaml.Pipeline.track_files Source.common_deps
-end
+end
\ No newline at end of file
diff --git a/ring.opam b/ring.opam
index 447289c..e0e9310 100644
--- a/ring.opam
+++ b/ring.opam
@@ -11,14 +11,14 @@ bug-reports: "https://github.com/muhokama/ring/issues"
 depends: [
   "ocaml" {>= "5.1.1"}
   "dune" {>= "3.16" & >= "3.16.0"}
-  "yocaml"
-  "yocaml_jingoo"
-  "yocaml_yaml"
-  "yocaml_omd"
-  "yocaml_eio"
-  "yocaml_syndication"
+  "yocaml" {>= "2.0.0"}
+  "yocaml_jingoo" {>= "2.0.0"}
+  "yocaml_yaml" {>= "2.0.0"}
+  "yocaml_omd" {>= "2.0.0"}
+  "yocaml_eio" {>= "2.0.0"}
+  "yocaml_syndication" {>= "2.0.0"}
   "cmdliner" {= "1.3.0"}
-  "ppx_expect" {with-test}
+  "ppx_expect"
   "ocamlformat" {with-dev-setup}
   "ocp-indent" {with-dev-setup}
   "merlin" {with-dev-setup}
@@ -42,12 +42,3 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/muhokama/ring.git"
-pin-depends: [
-  ["yocaml.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_runtime.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_jingoo.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_yaml.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_omd.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_eio.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_syndication.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-]
diff --git a/ring.opam.template b/ring.opam.template
deleted file mode 100644
index e435fc2..0000000
--- a/ring.opam.template
+++ /dev/null
@@ -1,9 +0,0 @@
-pin-depends: [
-  ["yocaml.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_runtime.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_jingoo.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_yaml.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_omd.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_eio.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-  ["yocaml_syndication.dev" "git+https://gitlab.com/funkywork/yocaml.git"]
-]

From 8ee85c6b2cc9218ea196cad07d0e92d8dfbebc54 Mon Sep 17 00:00:00 2001
From: xvw <xavier.vdw@gmail.com>
Date: Sat, 5 Oct 2024 15:33:42 +0200
Subject: [PATCH 2/2] Fix fmt

---
 lib/resolver.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/resolver.ml b/lib/resolver.ml
index c9e64a6..78afeed 100644
--- a/lib/resolver.ml
+++ b/lib/resolver.ml
@@ -45,4 +45,4 @@ module Make (R : Sigs.RESOLVABLE) = struct
   end
 
   let track_common_dependencies = Yocaml.Pipeline.track_files Source.common_deps
-end
\ No newline at end of file
+end