Add upper constraint on Frama-C

Leonidas-from-XIV · Leonidas-from-XIV · commit a51bbf5c5de1 · 2023-04-28T20:29:29.000+02:00
diff --git a/packages/frama-c/frama-c.23.0/opam b/packages/frama-c/frama-c.23.0/opam
@@ -117,7 +117,7 @@ depends: [
   "ocamlfind" # needed beyond build stage, used by -load-module
   "ocamlgraph" { >= "1.8.8" }
   "why3" { >= "1.4.0" & < "1.5~" }
-  "yojson" {>= "1.6.0" & ( < "2.0.0" | ! with-test)}
+  "yojson" {>= "1.6.0" & < "2.1.0" & ( < "2.0.0" | ! with-test)}
   "zarith" {>= "1.5"}
 ]
 
diff --git a/packages/frama-c/frama-c.23.1/opam b/packages/frama-c/frama-c.23.1/opam
@@ -117,7 +117,7 @@ depends: [
   "ocamlfind" # needed beyond build stage, used by -load-module
   "ocamlgraph" { >= "1.8.8" }
   "why3" { >= "1.4.0" & < "1.5~" }
-  "yojson" {>= "1.6.0" & ( < "2.0.0" | ! with-test)}
+  "yojson" {>= "1.6.0" & < "2.1.0" & ( < "2.0.0" | ! with-test)}
   "zarith" {>= "1.5"}
 ]
 
diff --git a/packages/frama-c/frama-c.24.0/opam b/packages/frama-c/frama-c.24.0/opam
@@ -119,7 +119,7 @@ depends: [
   "ocamlfind" # needed beyond build stage, used by -load-module
   "ocamlgraph" { >= "1.8.8" }
   "why3" { >= "1.4.0" & < "1.5~" }
-  "yojson" {>= "1.6.0" & ( < "2.0.0" | ! with-test)}
+  "yojson" {>= "1.6.0" & < "2.1.0" & ( < "2.0.0" | ! with-test)}
   "zarith" {>= "1.5"}
 ]
 
diff --git a/packages/frama-c/frama-c.25.0/opam b/packages/frama-c/frama-c.25.0/opam
@@ -122,7 +122,7 @@ depends: [
   "ppx_deriving_yojson"
   "ppx_import" {>= "1.8.0" & < "2.0"}
   "why3" {>= "1.5.0" & < "1.6~"}
-  "yojson" {>= "1.6.0" & ( < "2.0.0" | ! with-test) }
+  "yojson" {>= "1.6.0" & < "2.1.0" & ( < "2.0.0" | ! with-test) }
   "zarith" {>= "1.5"}
 ]
 
diff --git a/packages/frama-c/frama-c.25.0~beta/opam b/packages/frama-c/frama-c.25.0~beta/opam
@@ -119,7 +119,7 @@ depends: [
   "ocamlfind" # needed beyond build stage, used by -load-module
   "ocamlgraph" { >= "1.8.8" }
   "why3" {>= "1.5.0" & < "1.6~"}
-  "yojson" {>= "1.6.0" & ( < "2.0.0" | ! with-test)}
+  "yojson" {>= "1.6.0" & < "2.1.0" & ( < "2.0.0" | ! with-test)}
   "zarith" {>= "1.5"}
   "ppx_deriving"
   "ppx_import" {>= "1.8.0" & < "2.0"}
diff --git a/packages/frama-c/frama-c.26.0/opam b/packages/frama-c/frama-c.26.0/opam
@@ -119,7 +119,7 @@ depends: [
   "ocamlfind" # needed beyond build stage, used by -load-module
   "ocamlgraph" { >= "1.8.8" }
   "why3" {>= "1.5.1" & < "1.6~"}
-  "yojson" {>= "1.6.0" & (< "2.0.0" | !with-test)}
+  "yojson" {>= "1.6.0" & < "2.1.0" & (< "2.0.0" | !with-test)}
   "zarith" { >= "1.5" }
 
   # PPXs
diff --git a/packages/frama-c/frama-c.26.0~beta/opam b/packages/frama-c/frama-c.26.0~beta/opam
@@ -121,7 +121,7 @@ depends: [
   "ocamlfind" # needed beyond build stage, used by -load-module
   "ocamlgraph" { >= "1.8.8" }
   "why3" {>= "1.5.1" & < "1.6~"}
-  "yojson" {>= "1.6.0" & ( < "2.0.0" | ! with-test)}
+  "yojson" {>= "1.6.0" & < "2.1.0" & ( < "2.0.0" | ! with-test)}
   "zarith" { >= "1.5" }
 
   # PPXs
diff --git a/packages/frama-c/frama-c.26.1/opam b/packages/frama-c/frama-c.26.1/opam
@@ -120,7 +120,7 @@ depends: [
   "ocamlfind" # needed beyond build stage, used by -load-module
   "ocamlgraph" { >= "1.8.8" }
   "why3" {>= "1.5.1" & < "1.6~"}
-  "yojson" {>= "1.6.0" & (< "2.0.0" | !with-test)}
+  "yojson" {>= "1.6.0" & < "2.1.0" & (< "2.0.0" | !with-test)}
   "zarith" { >= "1.5" }
 
   # PPXs

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ depends: [`
`117`	`117`	`"ocamlfind" # needed beyond build stage, used by -load-module`
`118`	`118`	`"ocamlgraph" { >= "1.8.8" }`
`119`	`119`	`"why3" { >= "1.4.0" & < "1.5~" }`
`120`		`- "yojson" {>= "1.6.0" & ( < "2.0.0" \| ! with-test)}`
	`120`	`+ "yojson" {>= "1.6.0" & < "2.1.0" & ( < "2.0.0" \| ! with-test)}`
`121`	`121`	`"zarith" {>= "1.5"}`
`122`	`122`	`]`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ depends: [`
`119`	`119`	`"ocamlfind" # needed beyond build stage, used by -load-module`
`120`	`120`	`"ocamlgraph" { >= "1.8.8" }`
`121`	`121`	`"why3" { >= "1.4.0" & < "1.5~" }`
`122`		`- "yojson" {>= "1.6.0" & ( < "2.0.0" \| ! with-test)}`
	`122`	`+ "yojson" {>= "1.6.0" & < "2.1.0" & ( < "2.0.0" \| ! with-test)}`
`123`	`123`	`"zarith" {>= "1.5"}`
`124`	`124`	`]`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ depends: [`
`122`	`122`	`"ppx_deriving_yojson"`
`123`	`123`	`"ppx_import" {>= "1.8.0" & < "2.0"}`
`124`	`124`	`"why3" {>= "1.5.0" & < "1.6~"}`
`125`		`- "yojson" {>= "1.6.0" & ( < "2.0.0" \| ! with-test) }`
	`125`	`+ "yojson" {>= "1.6.0" & < "2.1.0" & ( < "2.0.0" \| ! with-test) }`
`126`	`126`	`"zarith" {>= "1.5"}`
`127`	`127`	`]`
`128`	`128`