Merge pull request #26199 from mseri/fix-apron-ub

mseri · web-flow · commit ca7f74d62402 · 2024-07-05T11:36:18.000+02:00
goblint and apronext are not compatible with new apron
diff --git a/packages/apronext/apronext.1.0.1/opam b/packages/apronext/apronext.1.0.1/opam
@@ -14,7 +14,7 @@ run-test: [
 depends: [
   "dune"  {>= "2.1"}
   "ocaml" {>= "4.08"}
-  "apron"
+  "apron" {< "0.9.15"}
 ]
 synopsis: "Apron extension"
 description: "An extension for the OCaml interface of the Apron library"
diff --git a/packages/apronext/apronext.1.0.2/opam b/packages/apronext/apronext.1.0.2/opam
@@ -14,7 +14,7 @@ run-test: [
 depends: [
   "dune"  {>= "2.1"}
   "ocaml" {>= "4.08"}
-  "apron"
+  "apron" {< "0.9.15"}
 ]
 synopsis: "Apron extension"
 description: "An extension for the OCaml interface of the Apron library"
diff --git a/packages/apronext/apronext.1.0.3/opam b/packages/apronext/apronext.1.0.3/opam
@@ -14,7 +14,7 @@ run-test: [
 depends: [
   "dune"  {>= "2.1"}
   "ocaml" {>= "4.08"}
-  "apron"
+  "apron" {< "0.9.15"}
 ]
 synopsis: "Apron extension"
 description: "An extension for the OCaml interface of the Apron library"
diff --git a/packages/apronext/apronext.1.0.4/opam b/packages/apronext/apronext.1.0.4/opam
@@ -14,7 +14,7 @@ run-test: [
 depends: [
   "dune"  {>= "2.1"}
   "ocaml" {>= "4.08"}
-  "apron"
+  "apron" {< "0.9.15"}
 ]
 synopsis: "Apron extension"
 description: "An extension for the OCaml interface of the Apron library"
diff --git a/packages/apronext/apronext.1.0/opam b/packages/apronext/apronext.1.0/opam
@@ -14,7 +14,7 @@ run-test: [
 depends: [
   "dune" {>= "2.1"}
   "ocaml" {>= "4.08"}
-  "apron"
+  "apron" {< "0.9.15"}
 ]
 synopsis: "Apron extension"
 description: "An extension for the OCaml interface of the Apron library"
diff --git a/packages/goblint/goblint.1.1.1/opam b/packages/goblint/goblint.1.1.1/opam
@@ -64,6 +64,9 @@ url {
   ]
 }
 x-commit-hash: "c35cb34d985a98308e65666cfb547f2447045ce9"
+conflicts: [
+  "apron" {>= "0.9.15"}
+]
 # on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
 # also remember to generate/adjust goblint.opam.locked!
 # pin-depends: [
diff --git a/packages/goblint/goblint.2.0.0/opam b/packages/goblint/goblint.2.0.0/opam
@@ -51,6 +51,7 @@ depopts: ["apron"]
 conflicts: [
   "result" {< "1.5"}
   "z3"
+  "apron" {>= "0.9.15"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/goblint/goblint.2.0.1/opam b/packages/goblint/goblint.2.0.1/opam
@@ -50,6 +50,7 @@ depends: [
 depopts: ["apron" "z3"]
 conflicts: [
   "result" {< "1.5"}
+  "apron" {>= "0.9.15"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/goblint/goblint.2.1.0/opam b/packages/goblint/goblint.2.1.0/opam
@@ -52,6 +52,7 @@ depends: [
 depopts: ["apron" "z3"]
 conflicts: [
   "result" {< "1.5"}
+  "apron" {>= "0.9.15"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/goblint/goblint.2.2.1/opam b/packages/goblint/goblint.2.2.1/opam
@@ -52,6 +52,7 @@ depends: [
 depopts: ["apron" "z3"]
 conflicts: [
   "result" {< "1.5"}
+  "apron" {>= "0.9.15"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/goblint/goblint.2.3.0/opam b/packages/goblint/goblint.2.3.0/opam
@@ -52,6 +52,7 @@ depends: [
 depopts: ["apron" "z3"]
 conflicts: [
   "result" {< "1.5"}
+  "apron" {>= "0.9.15"}
 ]
 build: [
   ["dune" "subst"] {dev}

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ run-test: [`
`14`	`14`	`depends: [`
`15`	`15`	`"dune" {>= "2.1"}`
`16`	`16`	`"ocaml" {>= "4.08"}`
`17`		`- "apron"`
	`17`	`+ "apron" {< "0.9.15"}`
`18`	`18`	`]`
`19`	`19`	`synopsis: "Apron extension"`
`20`	`20`	`description: "An extension for the OCaml interface of the Apron library"`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,9 @@ url {`
`64`	`64`	`]`
`65`	`65`	`}`
`66`	`66`	`x-commit-hash: "c35cb34d985a98308e65666cfb547f2447045ce9"`
	`67`	`+conflicts: [`
	`68`	`+ "apron" {>= "0.9.15"}`
	`69`	`+]`
`67`	`70`	# on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
`68`	`71`	`# also remember to generate/adjust goblint.opam.locked!`
`69`	`72`	`# pin-depends: [`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ depopts: ["apron"]`
`51`	`51`	`conflicts: [`
`52`	`52`	`"result" {< "1.5"}`
`53`	`53`	`"z3"`
	`54`	`+ "apron" {>= "0.9.15"}`
`54`	`55`	`]`
`55`	`56`	`build: [`
`56`	`57`	`["dune" "subst"] {dev}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ depends: [`
`50`	`50`	`depopts: ["apron" "z3"]`
`51`	`51`	`conflicts: [`
`52`	`52`	`"result" {< "1.5"}`
	`53`	`+ "apron" {>= "0.9.15"}`
`53`	`54`	`]`
`54`	`55`	`build: [`
`55`	`56`	`["dune" "subst"] {dev}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ depends: [`
`52`	`52`	`depopts: ["apron" "z3"]`
`53`	`53`	`conflicts: [`
`54`	`54`	`"result" {< "1.5"}`
	`55`	`+ "apron" {>= "0.9.15"}`
`55`	`56`	`]`
`56`	`57`	`build: [`
`57`	`58`	`["dune" "subst"] {dev}`