conflict ldp_tls with cohttp 6+

avsm · avsm · commit 710a6d5f72e3 · 2024-11-22T13:20:31.000Z
`refill` needed due to request parser rewrite
diff --git a/packages/ldp_tls/ldp_tls.0.2.0/opam b/packages/ldp_tls/ldp_tls.0.2.0/opam
@@ -15,6 +15,10 @@ depends: [
   "ppx_sexp_conv"
   "odoc" {with-doc}
 ]
+conflicts: [
+  "cohttp-lwt" {>="6.0.0~~"}
+]
+
 build: [
   ["dune" "subst"] {dev}
   [
@@ -38,4 +42,4 @@ url {
     "md5=7f82ccbdcb07a75f6d2bb7ca226d02df"
     "sha512=42f8e53d6634de4b19ac5249fcd8e3d2bde13de7a3963e6821eae9e7b46ff914458d3bfde201352fd18b6de14bb276705561d8fd09a09ddd16f001d0f25cf209"
   ]
-}
+}
diff --git a/packages/ldp_tls/ldp_tls.0.3.0/opam b/packages/ldp_tls/ldp_tls.0.3.0/opam
@@ -15,6 +15,10 @@ depends: [
   "ppx_sexp_conv"
   "odoc" {with-doc}
 ]
+conflicts: [
+  "cohttp-lwt" {>="6.0.0~~"}
+]
+
 build: [
   ["dune" "subst"] {dev}
   [
@@ -38,4 +42,4 @@ url {
     "md5=8903912748afccb622e88b52d1d89260"
     "sha512=4924c40cf5f80d7b46e93de848bc52cbe7fa0b864082f93c07c253cd0d81395160339e80533d6b5bd4779c93afd1e37754323e1ca4a5a0b5371c840ee1bf2f67"
   ]
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ depends: [`
`15`	`15`	`"ppx_sexp_conv"`
`16`	`16`	`"odoc" {with-doc}`
`17`	`17`	`]`
	`18`	`+conflicts: [`
	`19`	`+ "cohttp-lwt" {>="6.0.0~~"}`
	`20`	`+]`
	`21`	`+`
`18`	`22`	`build: [`
`19`	`23`	`["dune" "subst"] {dev}`
`20`	`24`	`[`
`@@ -38,4 +42,4 @@ url {`
`38`	`42`	`"md5=7f82ccbdcb07a75f6d2bb7ca226d02df"`
`39`	`43`	`"sha512=42f8e53d6634de4b19ac5249fcd8e3d2bde13de7a3963e6821eae9e7b46ff914458d3bfde201352fd18b6de14bb276705561d8fd09a09ddd16f001d0f25cf209"`
`40`	`44`	`]`
`41`		`-}`
	`45`	`+}`