From b5f133ca45fceeb882b3558c52ab45764a1bc9cd Mon Sep 17 00:00:00 2001 From: Nathan Rebours Date: Fri, 1 Feb 2019 11:31:59 +0100 Subject: [PATCH 01/10] Restrict ppx_deriving_yojson dependency to yojson < 1.6 Yojson 1.6 deprecates the type `json` in favor of the new type `t`. This shouldn't be an issue but users of ppx_deriving_yojson and dune are gonna have a hard time working with yojson 1.6 since warning 3 is fatal in the default dune profile and they can't change ppx_deriving_yojson output. --- packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam index 3cc3d08cc8f7..2e0135019652 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam @@ -20,7 +20,7 @@ build: [ ] depends: [ "ocaml" - "yojson" + "yojson" {< "1.6.0"} "ppx_deriving" {>= "0.2" & < "1.0"} "ocamlbuild" {build} ] diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam index 55cf4262588d..a4226a8b51af 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam @@ -20,7 +20,7 @@ build: [ ] depends: [ "ocaml" - "yojson" + "yojson" {< "1.6.0"} "ppx_deriving" {>= "0.2" & < "1.0"} "ocamlbuild" {build} ] diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam index 053dbd3b73bc..e2d6060756db 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam @@ -25,7 +25,7 @@ build: [ ] depends: [ "ocaml" - "yojson" + "yojson" {< "1.6.0"} "ppx_deriving" {>= "1.0" & < "2.0"} "ocamlfind" {build} "ounit" {with-test} diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam index 0fed2355a452..2158ada85bf6 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam @@ -28,7 +28,7 @@ build: [ ] depends: [ "ocaml" - "yojson" + "yojson" {< "1.6.0"} "ppx_deriving" {>= "1.0" & < "2.0"} "ocamlfind" {build} "ounit" {with-test} diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam index 2be385055ee7..8c37832d7d21 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam @@ -28,7 +28,7 @@ build: [ ] depends: [ "ocaml" - "yojson" + "yojson" {< "1.6.0"} "ppx_deriving" {>= "2.0" & < "3.0"} "ocamlfind" {build} "ounit" {with-test} diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam index 82b6cf93eec8..4eb399bf943c 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam @@ -28,7 +28,7 @@ build: [ ] depends: [ "ocaml" {< "4.03.0"} - "yojson" + "yojson" {< "1.6.0"} "ppx_deriving" {>= "1.0"} "ocamlfind" {build} "ounit" {with-test} diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam index 4d6ec13d677a..f2562f25b68f 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam @@ -25,7 +25,7 @@ build: [ ] depends: [ "ocaml" {< "4.03.0"} - "yojson" + "yojson" {< "1.6.0"} "ppx_deriving" {>= "2.0" & < "4.0"} "ocamlfind" {build} "ounit" {with-test} diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam index 4b9e300beb16..001a281f32ee 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam @@ -25,7 +25,7 @@ build: [ ] depends: [ "ocaml" {< "4.05.0"} - "yojson" + "yojson" {< "1.6.0"} "result" "ppx_deriving" {>= "4.0" & < "5.0"} "ocamlfind" {build} diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam index 29b992780e25..9f907d83aee8 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam @@ -25,7 +25,7 @@ build: [ ] depends: [ "ocaml" - "yojson" + "yojson" {< "1.6.0"} "result" "ppx_deriving" {>= "4.0" & < "5.0"} "ocamlfind" {build} diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam index 760cb9e4e4ce..dc6a9280c82e 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam @@ -14,7 +14,7 @@ build: [ ] depends: [ "ocaml" {>= "4.04.0"} - "yojson" + "yojson" {< "1.6.0"} "result" "ppx_deriving" {>= "4.0" & < "5.0"} "ppx_tools" {build} From c126765d2acb7f46b766bc5c7b4554c50b8df12a Mon Sep 17 00:00:00 2001 From: Nathan Rebours Date: Fri, 1 Feb 2019 14:34:08 +0100 Subject: [PATCH 02/10] Fix opam lint issues and ounit dependencies --- packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam | 6 +++--- packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam | 6 +++--- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam index 2e0135019652..ac775c39a4e0 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam @@ -4,8 +4,8 @@ authors: [ "Peter Zotov " ] 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" tags: [ "syntax" "json" ] build: [ ["ocaml" "pkg/build.ml" "native=true" "native-dynlink=true"] @@ -23,8 +23,8 @@ depends: [ "yojson" {< "1.6.0"} "ppx_deriving" {>= "0.2" & < "1.0"} "ocamlbuild" {build} + "ounit" {with-test & >= "2.0.0"} ] -dev-repo: "git://github.com/whitequark/ppx_deriving_yojson" synopsis: "JSON codec generator for OCaml >=4.02" url { src: diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam index a4226a8b51af..05ec9f2cdab5 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam @@ -4,8 +4,8 @@ authors: [ "Peter Zotov " ] 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" tags: [ "syntax" "json" ] build: [ ["ocaml" "pkg/build.ml" "native=true" "native-dynlink=true"] @@ -23,8 +23,8 @@ depends: [ "yojson" {< "1.6.0"} "ppx_deriving" {>= "0.2" & < "1.0"} "ocamlbuild" {build} + "ounit" {with-test & >= "2.0.0"} ] -dev-repo: "git://github.com/whitequark/ppx_deriving_yojson" synopsis: "JSON codec generator for OCaml >=4.02" url { src: diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam index e2d6060756db..a98b674872f4 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam @@ -28,7 +28,7 @@ depends: [ "yojson" {< "1.6.0"} "ppx_deriving" {>= "1.0" & < "2.0"} "ocamlfind" {build} - "ounit" {with-test} + "ounit" {with-test & >= "2.0.0"} "ppx_import" {with-test} "ocamlbuild" {build} ] diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam index 2158ada85bf6..36dbaa89be57 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam @@ -31,7 +31,7 @@ depends: [ "yojson" {< "1.6.0"} "ppx_deriving" {>= "1.0" & < "2.0"} "ocamlfind" {build} - "ounit" {with-test} + "ounit" {with-test & >= "2.0.0"} "ppx_import" {with-test} "ocamlbuild" {build} ] diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam index 8c37832d7d21..d464aef2a002 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam @@ -31,7 +31,7 @@ depends: [ "yojson" {< "1.6.0"} "ppx_deriving" {>= "2.0" & < "3.0"} "ocamlfind" {build} - "ounit" {with-test} + "ounit" {with-test & >= "2.0.0"} "ppx_import" {with-test} "ocamlbuild" {build} ] diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam index 4eb399bf943c..43b906a158e2 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam @@ -31,7 +31,7 @@ depends: [ "yojson" {< "1.6.0"} "ppx_deriving" {>= "1.0"} "ocamlfind" {build} - "ounit" {with-test} + "ounit" {with-test & >= "2.0.0"} "ppx_import" {with-test} "ocamlbuild" {build} ] diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam index f2562f25b68f..516f79258cf8 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam @@ -28,7 +28,7 @@ depends: [ "yojson" {< "1.6.0"} "ppx_deriving" {>= "2.0" & < "4.0"} "ocamlfind" {build} - "ounit" {with-test} + "ounit" {with-test & >= "2.0.0"} "ppx_import" {with-test} "ocamlbuild" {build} ] diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam index 001a281f32ee..2c19485c0eb2 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam @@ -31,7 +31,7 @@ depends: [ "ocamlfind" {build} "cppo" {build} "cppo_ocamlbuild" {build} - "ounit" {with-test} + "ounit" {with-test & >= "2.0.0"} "ppx_import" {with-test & >= "1.1"} ] synopsis: "JSON codec generator for OCaml >=4.02" diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam index 9f907d83aee8..62547afd7341 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam @@ -32,7 +32,7 @@ depends: [ "ocamlbuild" {build} "cppo" {build} "cppo_ocamlbuild" {build} - "ounit" {with-test} + "ounit" {with-test & >= "2.0.0"} "ppx_import" {with-test & >= "1.1"} ] conflicts: [ diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam index dc6a9280c82e..07092981b23d 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.3/opam @@ -21,7 +21,7 @@ depends: [ "ppxfind" {build} "dune" {build & >= "1.2"} "cppo" {build} - "ounit" {with-test} + "ounit" {with-test & >= "2.0.0"} ] conflicts: [ "ppx_deriving" {= "4.2"} From 06b128adae50d29c862d382bf98a61b765745f40 Mon Sep 17 00:00:00 2001 From: Nathan Rebours Date: Mon, 4 Feb 2019 13:18:16 +0100 Subject: [PATCH 03/10] Add upper bound on ppx_import dependency --- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam | 2 +- packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam index a98b674872f4..166bfcc9f1b8 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.0/opam @@ -29,7 +29,7 @@ depends: [ "ppx_deriving" {>= "1.0" & < "2.0"} "ocamlfind" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test} + "ppx_import" {with-test & <= "1.5"} "ocamlbuild" {build} ] synopsis: "JSON codec generator for OCaml >=4.02" diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam index 36dbaa89be57..bfef81204f4b 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.1/opam @@ -32,7 +32,7 @@ depends: [ "ppx_deriving" {>= "1.0" & < "2.0"} "ocamlfind" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test} + "ppx_import" {with-test & <= "1.5"} "ocamlbuild" {build} ] synopsis: "JSON codec generator for OCaml >=4.02" diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam index d464aef2a002..5b7c2f1c5474 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam @@ -32,7 +32,7 @@ depends: [ "ppx_deriving" {>= "2.0" & < "3.0"} "ocamlfind" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test} + "ppx_import" {with-test <= "1.5"} "ocamlbuild" {build} ] synopsis: "JSON codec generator for OCaml >=4.02" diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam index 43b906a158e2..64c9ce9cecc6 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam @@ -32,7 +32,7 @@ depends: [ "ppx_deriving" {>= "1.0"} "ocamlfind" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test} + "ppx_import" {with-test <= "1.5"} "ocamlbuild" {build} ] synopsis: "JSON codec generator for OCaml >=4.02" diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam index 516f79258cf8..4feaf4fcb521 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam @@ -29,7 +29,7 @@ depends: [ "ppx_deriving" {>= "2.0" & < "4.0"} "ocamlfind" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test} + "ppx_import" {with-test <= "1.5"} "ocamlbuild" {build} ] synopsis: "JSON codec generator for OCaml >=4.02" diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam index 2c19485c0eb2..30c6acc9d0d5 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.0/opam @@ -32,7 +32,7 @@ depends: [ "cppo" {build} "cppo_ocamlbuild" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test & >= "1.1"} + "ppx_import" {with-test & >= "1.1" & <= "1.5"} ] synopsis: "JSON codec generator for OCaml >=4.02" description: """ diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam index 62547afd7341..67c5cedb74cf 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam @@ -33,7 +33,7 @@ depends: [ "cppo" {build} "cppo_ocamlbuild" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test & >= "1.1"} + "ppx_import" {with-test & >= "1.1" & <= "1.5"} ] conflicts: [ "ppx_deriving" {= "4.2"} From 036ff4377286e36f1fb1b4b7947a28630fdaef24 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 6 Feb 2019 14:15:22 +0000 Subject: [PATCH 04/10] ppx_deriving_yojson.2.2: fix opam format typo --- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam index 5b7c2f1c5474..a938d828cccd 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam @@ -32,7 +32,7 @@ depends: [ "ppx_deriving" {>= "2.0" & < "3.0"} "ocamlfind" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test <= "1.5"} + "ppx_import" {with-test & <= "1.5"} "ocamlbuild" {build} ] synopsis: "JSON codec generator for OCaml >=4.02" From a452a1129f5c6990ec41bbc0ea12ad11f621bb5e Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 6 Feb 2019 14:16:05 +0000 Subject: [PATCH 05/10] ppx_deriving_yojson.2.4: fix opam format typo --- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam index 4feaf4fcb521..0f0182aba07c 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam @@ -29,7 +29,7 @@ depends: [ "ppx_deriving" {>= "2.0" & < "4.0"} "ocamlfind" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test <= "1.5"} + "ppx_import" {with-test & <= "1.5"} "ocamlbuild" {build} ] synopsis: "JSON codec generator for OCaml >=4.02" From 3989f2c11100dcf16ef88a4a302fc84d668ec342 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 6 Feb 2019 14:16:47 +0000 Subject: [PATCH 06/10] ppx_deriving_yojson.2.3: fix opam format typo --- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam index 64c9ce9cecc6..ef5709bd7d52 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam @@ -32,7 +32,7 @@ depends: [ "ppx_deriving" {>= "1.0"} "ocamlfind" {build} "ounit" {with-test & >= "2.0.0"} - "ppx_import" {with-test <= "1.5"} + "ppx_import" {with-test & <= "1.5"} "ocamlbuild" {build} ] synopsis: "JSON codec generator for OCaml >=4.02" From 62d55493cccc3e32481a4715cee49ab7d8043ec1 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 6 Feb 2019 17:48:40 +0000 Subject: [PATCH 07/10] ppx_deriving_yojson.1.0: Add missing test dependency --- packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam index ac775c39a4e0..ab3195baacba 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.0/opam @@ -24,6 +24,7 @@ depends: [ "ppx_deriving" {>= "0.2" & < "1.0"} "ocamlbuild" {build} "ounit" {with-test & >= "2.0.0"} + "ppx_import" {with-test & <= "1.5"} ] synopsis: "JSON codec generator for OCaml >=4.02" url { From c4adddf89ca223e491eb558f4ff6c8207562efe6 Mon Sep 17 00:00:00 2001 From: Nathan Rebours Date: Thu, 7 Feb 2019 09:43:46 +0100 Subject: [PATCH 08/10] ppx_deriving_yojson.1.1: Add missing test dependency --- packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam index 05ec9f2cdab5..fc97da9fd607 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam @@ -24,6 +24,7 @@ depends: [ "ppx_deriving" {>= "0.2" & < "1.0"} "ocamlbuild" {build} "ounit" {with-test & >= "2.0.0"} + "ppx_import" {with-test & <= "1.5"} ] synopsis: "JSON codec generator for OCaml >=4.02" url { From eb3e2296508fda37baef12d6a9a0449ef4ac4707 Mon Sep 17 00:00:00 2001 From: Nathan Rebours Date: Thu, 7 Feb 2019 09:50:52 +0100 Subject: [PATCH 09/10] ppx_deriving_yojson1.1: Disable broken tests --- packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam index fc97da9fd607..22b1825d149f 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.1.1/opam @@ -9,13 +9,6 @@ dev-repo: "git://github.com/whitequark/ppx_deriving_yojson.git" 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: [ From 42082493df4afb14d995cb31a0d9055722595e53 Mon Sep 17 00:00:00 2001 From: Nathan Rebours Date: Thu, 7 Feb 2019 12:12:21 +0100 Subject: [PATCH 10/10] ppx_deriving_yojson2.x: remove broken test builds --- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam | 7 ------- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam | 7 ------- packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam | 7 ------- 3 files changed, 21 deletions(-) diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam index a938d828cccd..39697b083b17 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.2/opam @@ -18,13 +18,6 @@ build: [ "native=%{ocaml:native}%" "native-dynlink=%{ocaml:native-dynlink}%" ] - [ - "ocamlbuild" - "-classic-display" - "-use-ocamlfind" - "src_test/test_ppx_yojson.byte" - "--" - ] {with-test} ] depends: [ "ocaml" diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam index ef5709bd7d52..29279b02f9f9 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.3/opam @@ -18,13 +18,6 @@ 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"} diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam index 0f0182aba07c..604776828cbf 100644 --- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam +++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.2.4/opam @@ -15,13 +15,6 @@ 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"}