Skip to content

Commit

Permalink
Require yojson <= 1.5.0
Browse files Browse the repository at this point in the history
The newer version deprecates `json` which atdgen uses, and for
some reason Dune is treating that as an error.
  • Loading branch information
brendanlong committed Feb 21, 2019
1 parent f3bebc7 commit dbed098
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
30 changes: 16 additions & 14 deletions esy.lock/index.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "90af27292bd927f7d696a5e50681e682",
"checksum": "29055ac86130e3cd4aa19d2d83eb0c5a",
"root": "sentry-ocaml@link-dev:./sentry.opam",
"node": {
"sentry-ocaml@link-dev:./sentry.opam": {
Expand All @@ -13,6 +13,7 @@
},
"overrides": [ "package.json" ],
"dependencies": [
"@opam/yojson@opam:1.5.0@890db858",
"@opam/uuidm@opam:0.9.6@bcd0dcef", "@opam/uri@opam:2.2.0@8db9cce1",
"@opam/sexplib@opam:v0.11.0@bf5282c9",
"@opam/re2@opam:v0.11.0@4404e891",
Expand All @@ -28,6 +29,7 @@
"@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"@opam/yojson@opam:1.5.0@890db858",
"@opam/uuidm@opam:0.9.6@bcd0dcef", "@opam/uri@opam:2.2.0@8db9cce1",
"@opam/sexplib@opam:v0.11.0@bf5282c9",
"@opam/re2@opam:v0.11.0@4404e891", "@opam/ounit@opam:2.0.8@586bd5ee",
Expand All @@ -54,20 +56,20 @@
"dependencies": [],
"devDependencies": []
},
"@opam/yojson@opam:1.7.0@2d92307e": {
"id": "@opam/yojson@opam:1.7.0@2d92307e",
"@opam/yojson@opam:1.5.0@890db858": {
"id": "@opam/yojson@opam:1.5.0@890db858",
"name": "@opam/yojson",
"version": "opam:1.7.0",
"version": "opam:1.5.0",
"source": {
"type": "install",
"source": [
"archive:https://opam.ocaml.org/cache/md5/b8/b89d39ca3f8c532abe5f547ad3b8f84d#md5:b89d39ca3f8c532abe5f547ad3b8f84d",
"archive:https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz#md5:b89d39ca3f8c532abe5f547ad3b8f84d"
"archive:https://opam.ocaml.org/cache/md5/d8/d80de1bacdde292af42f7c78b323da7b#md5:d80de1bacdde292af42f7c78b323da7b",
"archive:https://github.com/ocaml-community/yojson/releases/download/1.5.0/yojson-1.5.0.tbz#md5:d80de1bacdde292af42f7c78b323da7b"
],
"opam": {
"name": "yojson",
"version": "1.7.0",
"path": "esy.lock/opam/yojson.1.7.0"
"version": "1.5.0",
"path": "esy.lock/opam/yojson.1.5.0"
}
},
"overrides": [],
Expand Down Expand Up @@ -1684,12 +1686,12 @@
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/ocamlfind@opam:1.8.0@96572762",
"@opam/dune@opam:1.7.1@6f40bfee", "@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/ocamlfind@opam:1.8.0@96572762"
]
},
Expand Down Expand Up @@ -2670,13 +2672,13 @@
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/jbuilder@opam:transition@58bdfe0a",
"@opam/biniou@opam:1.2.0@c8516f18",
"@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/biniou@opam:1.2.0@c8516f18"
]
},
Expand All @@ -2698,14 +2700,14 @@
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/jbuilder@opam:transition@58bdfe0a",
"@opam/biniou@opam:1.2.0@c8516f18",
"@opam/atdgen-runtime@opam:2.0.0@8a75c3bb",
"@opam/atd@opam:2.0.0@087614b7", "@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/biniou@opam:1.2.0@c8516f18",
"@opam/atdgen-runtime@opam:2.0.0@8a75c3bb",
"@opam/atd@opam:2.0.0@087614b7"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ build: [
["dune" "subst"] {pinned}
["dune" "build" "-p" name "-j" jobs]
]
run-test: [["dune" "runtest" "-p" name "-j" jobs]]
depends: [
"ocaml" {>= "4.02.3"}
"dune" {build}
"cppo" {build}
"easy-format"
"biniou" {>= "1.2.0"}
"alcotest" {with-test & >= "0.8.5"}
]
synopsis:
"Yojson is an optimized parsing and printing library for the JSON format"
Expand All @@ -33,6 +31,6 @@ The program atdgen can be used to derive OCaml-JSON serializers and
deserializers from type definitions."""
url {
src:
"https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz"
checksum: "md5=b89d39ca3f8c532abe5f547ad3b8f84d"
"https://github.com/ocaml-community/yojson/releases/download/1.5.0/yojson-1.5.0.tbz"
checksum: "md5=d80de1bacdde292af42f7c78b323da7b"
}
1 change: 1 addition & 0 deletions sentry.opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ depends: [
"sexplib" {>= "v0.10"}
"uuidm"
"uri"
"yojson" {<= "1.5.0"}

"dune" {build & >= "1.4.0"}
"ppx_jane" {build}
Expand Down

0 comments on commit dbed098

Please sign in to comment.