Merge pull request #523 from kit-ty-kate/patch-4

NathanReb · web-flow · commit ac7fcfc88d57 · 2024-09-23T15:22:13.000+02:00
Update the opam file to allow OCaml &gt;= 5.3
diff --git a/dune-project b/dune-project
@@ -29,8 +29,7 @@
  (conflicts
   (ocaml-migrate-parsetree (< 2.0.0))
   (ocaml-base-compiler (= 5.1.0~alpha1))
-  (ocaml-variants (= 5.1.0~alpha1+options))
-  base-effects)
+  (ocaml-variants (= 5.1.0~alpha1+options)))
  (synopsis "Standard infrastructure for ppx rewriters")
  (description "Ppxlib is the standard infrastructure for ppx rewriters
 and other programs that manipulate the in-memory representation of
diff --git a/ppxlib.opam b/ppxlib.opam
@@ -37,7 +37,6 @@ conflicts: [
   "ocaml-migrate-parsetree" {< "2.0.0"}
   "ocaml-base-compiler" {= "5.1.0~alpha1"}
   "ocaml-variants" {= "5.1.0~alpha1+options"}
-  "base-effects"
 ]
 build: [
   ["dune" "subst"] {dev}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ conflicts: [`
`37`	`37`	`"ocaml-migrate-parsetree" {< "2.0.0"}`
`38`	`38`	`"ocaml-base-compiler" {= "5.1.0~alpha1"}`
`39`	`39`	`"ocaml-variants" {= "5.1.0~alpha1+options"}`
`40`		`- "base-effects"`
`41`	`40`	`]`
`42`	`41`	`build: [`
`43`	`42`	`["dune" "subst"] {dev}`