Merge pull request ocaml#23717 from Leonidas-from-XIV/release-yojson-2.1.0

kit-ty-kate · web-flow · commit 4311636a16e1 · 2023-05-02T15:08:38.000+01:00
[new release] yojson (2.1.0)
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
diff --git a/packages/yojson/yojson.2.1.0/opam b/packages/yojson/yojson.2.1.0/opam
@@ -0,0 +1,48 @@
+opam-version: "2.0"
+synopsis:
+  "Yojson is an optimized parsing and printing library for the JSON format"
+description: """
+Yojson is an optimized parsing and printing library for the JSON format.
+
+ydump is a pretty-printing command-line program provided with the
+yojson package."""
+maintainer: [
+  "paul-elliot@tarides.com" "nathan@tarides.com" "marek@tarides.com"
+]
+authors: ["Martin Jambon"]
+license: "BSD-3-Clause"
+homepage: "https://github.com/ocaml-community/yojson"
+doc: "https://ocaml-community.github.io/yojson"
+bug-reports: "https://github.com/ocaml-community/yojson/issues"
+depends: [
+  "dune" {>= "2.7"}
+  "ocaml" {>= "4.02.3"}
+  "cppo" {build}
+  "alcotest" {with-test & >= "0.8.5"}
+  "seq" {>= "0.2.2"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/ocaml-community/yojson.git"
+url {
+  src:
+    "https://github.com/ocaml-community/yojson/releases/download/2.1.0/yojson-2.1.0.tbz"
+  checksum: [
+    "sha256=9fcb1ff2db58ab259f9228796b0ada4794eae97177b1833371380c4e4f90b15d"
+    "sha512=31ab8580e0e4e8a05459fbec2fb9424a3df4cf5aef6df21fc577dbe3d32e81103a632c6a511c4dcf1f51819e88b38d2ce7d6888545bc3f359e69e070f8d2e69c"
+  ]
+}
+x-commit-hash: "42fa0887cb870bdbd1751d98cd23f99d6b29751d"

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`