Merge pull request #26328 from mseri/fix-smtml

mseri · web-flow · commit 6f0c0039d298 · 2024-08-02T17:26:26.000+02:00
smtml is not compatible with upcoming cvc5
diff --git a/packages/smtml/smtml.0.1.1/opam b/packages/smtml/smtml.0.1.1/opam
@@ -48,3 +48,6 @@ url {
     "sha512=63e057f40c8d5261493b5d7a03bcf073598dfa10c43b22b177fb24f8292e78753a051ae28e1d5a62d3c6725a7a32a9f1431f4c5f256f679d1a4b2b4c875f084b"
   ]
 }
+conflicts: [
+  "cvc5" {>= "1.1.3~"}
+]
diff --git a/packages/smtml/smtml.0.1.2/opam b/packages/smtml/smtml.0.1.2/opam
@@ -48,3 +48,6 @@ url {
     "sha512=2bc57afd4c61725743ff774e1c80f0c5e389623712695f80665ef190aff79d635d82ca972df4ac6399145f4845e2028b0df332bb8c603821d98c38e5a52d417b"
   ]
 }
+conflicts: [
+  "cvc5" {>= "1.1.3~"}
+]
diff --git a/packages/smtml/smtml.0.2.0/opam b/packages/smtml/smtml.0.2.0/opam
@@ -48,3 +48,6 @@ url {
     "sha512=e17831796ffdcff0cecc7456a02dbfcd7c6f9c5cccdc1dc728948060e03161c4b96d9d567ff6ad732f93b11cd346f080e831969ddf2562748e6eb5f69c56d0da"
   ]
 }
+conflicts: [
+  "cvc5" {>= "1.1.3~"}
+]
diff --git a/packages/smtml/smtml.0.2.1/opam b/packages/smtml/smtml.0.2.1/opam
@@ -28,6 +28,7 @@ depopts: [
 conflicts: [
   "z3" {< "4.12.2" | >= "4.14"}
   "bitwuzla-cxx" {< "0.4.0"}
+  "cvc5" {>= "1.1.3~"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/smtml/smtml.0.2.2/opam b/packages/smtml/smtml.0.2.2/opam
@@ -29,6 +29,7 @@ depopts: [
 conflicts: [
   "z3" {< "4.12.2" | >= "4.14"}
   "bitwuzla-cxx" {< "0.4.0"}
+  "cvc5" {>= "1.1.3~"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/smtml/smtml.0.2.3/opam b/packages/smtml/smtml.0.2.3/opam
@@ -32,6 +32,7 @@ depopts: [
 conflicts: [
   "z3" {< "4.12.2" | >= "4.14"}
   "bitwuzla-cxx" {< "0.4.0"}
+  "cvc5" {>= "1.1.3~"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/smtml/smtml.0.2.4/opam b/packages/smtml/smtml.0.2.4/opam
@@ -32,6 +32,7 @@ depopts: [
 conflicts: [
   "z3" {< "4.12.2" | >= "4.14"}
   "bitwuzla-cxx" {< "0.4.0"}
+  "cvc5" {>= "1.1.3~"}
 ]
 build: [
   ["dune" "subst"] {dev}

Original file line number	Diff line number	Diff line change
`@@ -48,3 +48,6 @@ url {`
`48`	`48`	`"sha512=63e057f40c8d5261493b5d7a03bcf073598dfa10c43b22b177fb24f8292e78753a051ae28e1d5a62d3c6725a7a32a9f1431f4c5f256f679d1a4b2b4c875f084b"`
`49`	`49`	`]`
`50`	`50`	`}`
	`51`	`+conflicts: [`
	`52`	`+ "cvc5" {>= "1.1.3~"}`
	`53`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ depopts: [`
`28`	`28`	`conflicts: [`
`29`	`29`	`"z3" {< "4.12.2" \| >= "4.14"}`
`30`	`30`	`"bitwuzla-cxx" {< "0.4.0"}`
	`31`	`+ "cvc5" {>= "1.1.3~"}`
`31`	`32`	`]`
`32`	`33`	`build: [`
`33`	`34`	`["dune" "subst"] {dev}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ depopts: [`
`29`	`29`	`conflicts: [`
`30`	`30`	`"z3" {< "4.12.2" \| >= "4.14"}`
`31`	`31`	`"bitwuzla-cxx" {< "0.4.0"}`
	`32`	`+ "cvc5" {>= "1.1.3~"}`
`32`	`33`	`]`
`33`	`34`	`build: [`
`34`	`35`	`["dune" "subst"] {dev}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ depopts: [`
`32`	`32`	`conflicts: [`
`33`	`33`	`"z3" {< "4.12.2" \| >= "4.14"}`
`34`	`34`	`"bitwuzla-cxx" {< "0.4.0"}`
	`35`	`+ "cvc5" {>= "1.1.3~"}`
`35`	`36`	`]`
`36`	`37`	`build: [`
`37`	`38`	`["dune" "subst"] {dev}`