Skip to content

Restrict ppx_deriving_yojson dependency to yojson < 1.6 #13356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kit-ty-kate merged 10 commits into from
Feb 7, 2019
Merged

Restrict ppx_deriving_yojson dependency to yojson < 1.6 #13356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b5f133c
Restrict ppx_deriving_yojson dependency to yojson < 1.6
Feb 1, 2019
c126765
Fix opam lint issues and ounit dependencies
Feb 1, 2019
06b128a
Add upper bound on ppx_import dependency
Feb 4, 2019
036ff43
ppx_deriving_yojson.2.2: fix opam format typo
kit-ty-kate Feb 6, 2019
a452a11
ppx_deriving_yojson.2.4: fix opam format typo
kit-ty-kate Feb 6, 2019
3989f2c
ppx_deriving_yojson.2.3: fix opam format typo
kit-ty-kate Feb 6, 2019
62d5549
ppx_deriving_yojson.1.0: Add missing test dependency
kit-ty-kate Feb 6, 2019
c4adddf
ppx_deriving_yojson.1.1: Add missing test dependency
Feb 7, 2019
eb3e229
ppx_deriving_yojson1.1: Disable broken tests
Feb 7, 2019
4208249
ppx_deriving_yojson2.x: remove broken test builds
Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ authors: [ "Peter Zotov <whitequark@whitequark.org>" ]
license: "MIT"
homepage: "https://github.com/whitequark/ppx_deriving_yojson"
doc: "http://whitequark.github.io/ppx_deriving_yojson"
#bug-reports: "https://github.com/whitequark/ppx_deriving_yojson/issues"
#dev-repo: "git://github.com/whitequark/ppx_deriving_yojson.git"
bug-reports: "https://github.com/whitequark/ppx_deriving_yojson/issues"
dev-repo: "git://github.com/whitequark/ppx_deriving_yojson.git"
Comment thread
NathanReb marked this conversation as resolved.
tags: [ "syntax" "json" ]
build: [
["ocaml" "pkg/build.ml" "native=true" "native-dynlink=true"]
Expand All @@ -20,11 +20,12 @@ build: [
]
depends: [
"ocaml"
"yojson"
"yojson" {< "1.6.0"}
"ppx_deriving" {>= "0.2" & < "1.0"}
"ocamlbuild" {build}
"ounit" {with-test & >= "2.0.0"}
"ppx_import" {with-test & <= "1.5"}
]
dev-repo: "git://github.com/whitequark/ppx_deriving_yojson"
synopsis: "JSON codec generator for OCaml >=4.02"
url {
src:
Expand Down
16 changes: 5 additions & 11 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,21 @@ authors: [ "Peter Zotov <whitequark@whitequark.org>" ]
license: "MIT"
homepage: "https://github.com/whitequark/ppx_deriving_yojson"
doc: "http://whitequark.github.io/ppx_deriving_yojson"
#bug-reports: "https://github.com/whitequark/ppx_deriving_yojson/issues"
#dev-repo: "git://github.com/whitequark/ppx_deriving_yojson.git"
bug-reports: "https://github.com/whitequark/ppx_deriving_yojson/issues"
dev-repo: "git://github.com/whitequark/ppx_deriving_yojson.git"
Comment thread
NathanReb marked this conversation as resolved.
tags: [ "syntax" "json" ]
build: [
["ocaml" "pkg/build.ml" "native=true" "native-dynlink=true"]
[
"ocamlbuild"
"-classic-display"
"-use-ocamlfind"
"src_test/test_ppx_yojson.byte"
"--"
] {with-test}
[make "doc"] {with-doc}
]
depends: [
"ocaml"
"yojson"
"yojson" {< "1.6.0"}
"ppx_deriving" {>= "0.2" & < "1.0"}
"ocamlbuild" {build}
"ounit" {with-test & >= "2.0.0"}
"ppx_import" {with-test & <= "1.5"}
]
dev-repo: "git://github.com/whitequark/ppx_deriving_yojson"
synopsis: "JSON codec generator for OCaml >=4.02"
url {
src:
Expand Down
6 changes: 3 additions & 3 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ build: [
]
depends: [
"ocaml"
"yojson"
"yojson" {< "1.6.0"}
"ppx_deriving" {>= "1.0" & < "2.0"}
"ocamlfind" {build}
"ounit" {with-test}
"ppx_import" {with-test}
"ounit" {with-test & >= "2.0.0"}
"ppx_import" {with-test & <= "1.5"}
"ocamlbuild" {build}
]
synopsis: "JSON codec generator for OCaml >=4.02"
Expand Down
6 changes: 3 additions & 3 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ build: [
]
depends: [
"ocaml"
"yojson"
"yojson" {< "1.6.0"}
"ppx_deriving" {>= "1.0" & < "2.0"}
"ocamlfind" {build}
"ounit" {with-test}
"ppx_import" {with-test}
"ounit" {with-test & >= "2.0.0"}
"ppx_import" {with-test & <= "1.5"}
"ocamlbuild" {build}
]
synopsis: "JSON codec generator for OCaml >=4.02"
Expand Down
13 changes: 3 additions & 10 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,14 @@ build: [
"native=%{ocaml:native}%"
"native-dynlink=%{ocaml:native-dynlink}%"
]
[
"ocamlbuild"
"-classic-display"
"-use-ocamlfind"
"src_test/test_ppx_yojson.byte"
"--"
] {with-test}
]
depends: [
"ocaml"
"yojson"
"yojson" {< "1.6.0"}
"ppx_deriving" {>= "2.0" & < "3.0"}
"ocamlfind" {build}
"ounit" {with-test}
"ppx_import" {with-test}
"ounit" {with-test & >= "2.0.0"}
"ppx_import" {with-test & <= "1.5"}
"ocamlbuild" {build}
]
synopsis: "JSON codec generator for OCaml >=4.02"
Expand Down
13 changes: 3 additions & 10 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,14 @@ build: [
"native=%{ocaml:native}%"
"native-dynlink=%{ocaml:native-dynlink}%"
]
[
"ocamlbuild"
"-classic-display"
"-use-ocamlfind"
"src_test/test_ppx_yojson.byte"
"--"
] {with-test}
]
depends: [
"ocaml" {< "4.03.0"}
"yojson"
"yojson" {< "1.6.0"}
"ppx_deriving" {>= "1.0"}
"ocamlfind" {build}
"ounit" {with-test}
"ppx_import" {with-test}
"ounit" {with-test & >= "2.0.0"}
"ppx_import" {with-test & <= "1.5"}
"ocamlbuild" {build}
]
synopsis: "JSON codec generator for OCaml >=4.02"
Expand Down
13 changes: 3 additions & 10 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,14 @@ build: [
"native=%{ocaml:native}%"
"native-dynlink=%{ocaml:native-dynlink}%"
]
[
"ocamlbuild"
"-classic-display"
"-use-ocamlfind"
"src_test/test_ppx_yojson.byte"
"--"
] {with-test}
]
depends: [
"ocaml" {< "4.03.0"}
"yojson"
"yojson" {< "1.6.0"}
"ppx_deriving" {>= "2.0" & < "4.0"}
"ocamlfind" {build}
"ounit" {with-test}
"ppx_import" {with-test}
"ounit" {with-test & >= "2.0.0"}
"ppx_import" {with-test & <= "1.5"}
"ocamlbuild" {build}
]
synopsis: "JSON codec generator for OCaml >=4.02"
Expand Down
6 changes: 3 additions & 3 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ build: [
]
depends: [
"ocaml" {< "4.05.0"}
"yojson"
"yojson" {< "1.6.0"}
"result"
"ppx_deriving" {>= "4.0" & < "5.0"}
"ocamlfind" {build}
"cppo" {build}
"cppo_ocamlbuild" {build}
"ounit" {with-test}
"ppx_import" {with-test & >= "1.1"}
"ounit" {with-test & >= "2.0.0"}
"ppx_import" {with-test & >= "1.1" & <= "1.5"}
]
synopsis: "JSON codec generator for OCaml >=4.02"
description: """
Expand Down
6 changes: 3 additions & 3 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ build: [
]
depends: [
"ocaml"
"yojson"
"yojson" {< "1.6.0"}
"result"
"ppx_deriving" {>= "4.0" & < "5.0"}
"ocamlfind" {build}
"ocamlbuild" {build}
"cppo" {build}
"cppo_ocamlbuild" {build}
"ounit" {with-test}
"ppx_import" {with-test & >= "1.1"}
"ounit" {with-test & >= "2.0.0"}
"ppx_import" {with-test & >= "1.1" & <= "1.5"}
]
conflicts: [
"ppx_deriving" {= "4.2"}
Expand Down
4 changes: 2 additions & 2 deletions packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ build: [
]
depends: [
"ocaml" {>= "4.04.0"}
"yojson"
"yojson" {< "1.6.0"}
"result"
"ppx_deriving" {>= "4.0" & < "5.0"}
"ppx_tools" {build}
"ppxfind" {build}
"dune" {build & >= "1.2"}
"cppo" {build}
"ounit" {with-test}
"ounit" {with-test & >= "2.0.0"}
]
conflicts: [
"ppx_deriving" {= "4.2"}
Expand Down