Skip to content

Commit 92571a7

Browse files
authored
Merge pull request #1759 from goblint/yojson-3
Add upper bound to yojson
2 parents 05d35cf + 3078b81 commit 92571a7

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Goblint includes analyses for assertions, overflows, deadlocks, etc and can be e
4040
(goblint-cil (>= 2.0.5)) ; TODO no way to define as pin-depends? Used goblint.opam.template to add it for now. https://github.com/ocaml/dune/issues/3231. Alternatively, removing this line and adding cil as a git submodule and `(vendored_dirs cil)` as ./dune also works. This way, no more need to reinstall the pinned cil opam package on changes. However, then cil is cleaned and has to be rebuild together with goblint.
4141
(batteries (>= 3.5.1))
4242
(zarith (>= 1.10))
43-
(yojson (>= 2.0.0))
43+
(yojson (and (>= 2.0.0) (< 3))) ; json-data-encoding has incompatible yojson representation for yojson 3
4444
(qcheck-core (>= 0.19))
4545
(ppx_deriving (>= 6.0.2))
4646
(ppx_deriving_hash (>= 0.1.2))

goblint.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ depends: [
4040
"goblint-cil" {>= "2.0.5"}
4141
"batteries" {>= "3.5.1"}
4242
"zarith" {>= "1.10"}
43-
"yojson" {>= "2.0.0"}
43+
"yojson" {>= "2.0.0" & < "3"}
4444
"qcheck-core" {>= "0.19"}
4545
"ppx_deriving" {>= "6.0.2"}
4646
"ppx_deriving_hash" {>= "0.1.2"}

0 commit comments

Comments
 (0)