From 6f0480f6325b81536d06e3c7d5c22a1dafc271f5 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Thu, 3 May 2018 13:29:03 +0100 Subject: [PATCH 1/4] ppx_sexp_conv v0.11.1 --- .../ppx_sexp_conv/ppx_sexp_conv.v0.11.1/descr | 3 +++ .../ppx_sexp_conv/ppx_sexp_conv.v0.11.1/opam | 19 +++++++++++++++++++ .../ppx_sexp_conv/ppx_sexp_conv.v0.11.1/url | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/descr create mode 100644 packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/opam create mode 100644 packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/url diff --git a/packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/descr b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/descr new file mode 100644 index 000000000000..cd8b43ccbbcc --- /dev/null +++ b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/descr @@ -0,0 +1,3 @@ +Generation of S-expression conversion functions from type definitions + +Part of the Jane Street's PPX rewriters collection. diff --git a/packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/opam b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/opam new file mode 100644 index 000000000000..3b2656279bdf --- /dev/null +++ b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/opam @@ -0,0 +1,19 @@ +opam-version: "1.2" +maintainer: "opensource@janestreet.com" +authors: ["Jane Street Group, LLC "] +homepage: "https://github.com/janestreet/ppx_sexp_conv" +bug-reports: "https://github.com/janestreet/ppx_sexp_conv/issues" +dev-repo: "git+https://github.com/janestreet/ppx_sexp_conv.git" +license: "Apache-2.0" +build: [ + ["jbuilder" "build" "-p" name "-j" jobs] +] +conflicts: [ "jbuilder" { = "1.0+beta19" } ] +depends: [ + "base" {>= "v0.11" & < "v0.12"} + "jbuilder" {build & >= "1.0+beta18.1"} + "ocaml-migrate-parsetree" {>= "1.0"} + "ppxlib" {>= "0.1.0" & <= "0.2.0"} + "sexplib0" {>= "v0.11" & < "v0.12"} +] +available: [ ocaml-version >= "4.04.1" ] diff --git a/packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/url b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/url new file mode 100644 index 000000000000..ee9ac3c8493c --- /dev/null +++ b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.11.1/url @@ -0,0 +1,2 @@ +archive: "https://github.com/janestreet/ppx_sexp_conv/releases/download/v0.11.1/ppx_sexp_conv-v0.11.1.tbz" +checksum: "f834fbbdd9e709e2092923f3b254a534" \ No newline at end of file From f510c050b416e2136d91764731da7d09b53db4f2 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Fri, 4 May 2018 12:11:08 +0100 Subject: [PATCH 2/4] add a few constraints and missing dependencies --- packages/msgpck/msgpck.1.0/opam | 2 +- packages/ocaml-topexpect/ocaml-topexpect.0.1/opam | 2 +- packages/ocaml-topexpect/ocaml-topexpect.0.2/opam | 4 +++- packages/ocaml-topexpect/ocaml-topexpect.0.3/opam | 3 ++- packages/qcow/qcow.0.6.0/opam | 2 +- packages/qcow/qcow.0.7.0/opam | 2 +- packages/qcow/qcow.0.8.1/opam | 2 +- packages/qcow/qcow.0.9.0/opam | 2 +- packages/qcow/qcow.0.9.4/opam | 2 +- packages/qcow/qcow.0.9.5/opam | 2 +- packages/yaml/yaml.0.1.0/opam | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/packages/msgpck/msgpck.1.0/opam b/packages/msgpck/msgpck.1.0/opam index 0311d4b6753e..9732cc2e293c 100644 --- a/packages/msgpck/msgpck.1.0/opam +++ b/packages/msgpck/msgpck.1.0/opam @@ -12,7 +12,7 @@ depends: [ "ocamlbuild" {build} "topkg" {build} "ppx_deriving" {build} - "ppx_sexp_conv" {build} + "ppx_sexp_conv" {build & < "v0.11.0"} "sexplib" "ocplib-endian" ] diff --git a/packages/ocaml-topexpect/ocaml-topexpect.0.1/opam b/packages/ocaml-topexpect/ocaml-topexpect.0.1/opam index b699506d54f4..8aa92f0d38e9 100644 --- a/packages/ocaml-topexpect/ocaml-topexpect.0.1/opam +++ b/packages/ocaml-topexpect/ocaml-topexpect.0.1/opam @@ -8,7 +8,7 @@ dev-repo: "https://github.com/let-def/topexpect.git" build: [make] depends: [ "ocamlfind" {build} - "ppx_sexp_conv" + "ppx_sexp_conv" {< "v0.11.0"} "ppx_deriving" ] available: [ocaml-version >= "4.04.0"] diff --git a/packages/ocaml-topexpect/ocaml-topexpect.0.2/opam b/packages/ocaml-topexpect/ocaml-topexpect.0.2/opam index 3963a917a0a7..9770102a7645 100644 --- a/packages/ocaml-topexpect/ocaml-topexpect.0.2/opam +++ b/packages/ocaml-topexpect/ocaml-topexpect.0.2/opam @@ -6,5 +6,7 @@ bug-reports: "https://github.com/let-def/topexpect" license: "MIT" dev-repo: "https://github.com/let-def/topexpect.git" build: [make] -depends: ["ocamlfind" "ppx_sexp_conv" "ppx_deriving"] +depends: ["ocamlfind" + "ppx_sexp_conv" {< "v0.11.0"} + "ppx_deriving"] available: [ocaml-version >= "4.04.0"] diff --git a/packages/ocaml-topexpect/ocaml-topexpect.0.3/opam b/packages/ocaml-topexpect/ocaml-topexpect.0.3/opam index 04eb2c3d81e5..c6bff1293132 100644 --- a/packages/ocaml-topexpect/ocaml-topexpect.0.3/opam +++ b/packages/ocaml-topexpect/ocaml-topexpect.0.3/opam @@ -11,8 +11,9 @@ dev-repo: "https://github.com/let-def/topexpect.git" build: [make] depends: [ "ocamlfind" {build} - "ppx_sexp_conv" {build} + "ppx_sexp_conv" "ppx_deriving" {build} "jbuilder" {build & >="1.0+beta9"} + "sexplib" ] available: [ocaml-version >= "4.04.0"] diff --git a/packages/qcow/qcow.0.6.0/opam b/packages/qcow/qcow.0.6.0/opam index 42d9760fc82e..2a7ff3285b25 100644 --- a/packages/qcow/qcow.0.6.0/opam +++ b/packages/qcow/qcow.0.6.0/opam @@ -26,7 +26,7 @@ depends: [ "topkg" {build} "ppx_tools" {build} "ppx_deriving" {build} - "ppx_sexp_conv" {build} + "ppx_sexp_conv" {build & < "v0.11.0"} "ppx_type_conv" {build} "ounit" {test} "mirage-block-ramdisk" {test} diff --git a/packages/qcow/qcow.0.7.0/opam b/packages/qcow/qcow.0.7.0/opam index 4e870bbc1138..0fe17736a13c 100644 --- a/packages/qcow/qcow.0.7.0/opam +++ b/packages/qcow/qcow.0.7.0/opam @@ -26,7 +26,7 @@ depends: [ "topkg" {build} "ppx_tools" {build} "ppx_deriving" {build} - "ppx_sexp_conv" {build} + "ppx_sexp_conv" {build & < "v0.11.0"} "ppx_type_conv" {build} "ounit" {test} "mirage-block-ramdisk" {test} diff --git a/packages/qcow/qcow.0.8.1/opam b/packages/qcow/qcow.0.8.1/opam index 4dcff435d332..4b342c5e7c1e 100644 --- a/packages/qcow/qcow.0.8.1/opam +++ b/packages/qcow/qcow.0.8.1/opam @@ -29,7 +29,7 @@ depends: [ "topkg" {build} "ppx_tools" {build} "ppx_deriving" {build} - "ppx_sexp_conv" {build} + "ppx_sexp_conv" {build & < "v0.11.0"} "ppx_type_conv" {build} "ounit" {test} "mirage-block-ramdisk" {test} diff --git a/packages/qcow/qcow.0.9.0/opam b/packages/qcow/qcow.0.9.0/opam index 5d35a9e826e2..2bf5457ff48c 100644 --- a/packages/qcow/qcow.0.9.0/opam +++ b/packages/qcow/qcow.0.9.0/opam @@ -32,7 +32,7 @@ depends: [ "topkg" {build} "ppx_tools" {build} "ppx_deriving" {build} - "ppx_sexp_conv" {build} + "ppx_sexp_conv" {build & < "v0.11.0"} "ppx_type_conv" {build} "ounit" {test} "mirage-block-ramdisk" {test} diff --git a/packages/qcow/qcow.0.9.4/opam b/packages/qcow/qcow.0.9.4/opam index 47d6958539bb..3364e5d6afb6 100644 --- a/packages/qcow/qcow.0.9.4/opam +++ b/packages/qcow/qcow.0.9.4/opam @@ -30,7 +30,7 @@ depends: [ "topkg" {build} "ppx_tools" {build} "ppx_deriving" {build} - "ppx_sexp_conv" {build} + "ppx_sexp_conv" {build & < "v0.11.0"} "ppx_type_conv" {build} "ounit" {test} "mirage-block-ramdisk" {test} diff --git a/packages/qcow/qcow.0.9.5/opam b/packages/qcow/qcow.0.9.5/opam index 63cefe51668e..e6e2a314879c 100644 --- a/packages/qcow/qcow.0.9.5/opam +++ b/packages/qcow/qcow.0.9.5/opam @@ -32,7 +32,7 @@ depends: [ "topkg" {build} "ppx_tools" {build} "ppx_deriving" {build} - "ppx_sexp_conv" {build} + "ppx_sexp_conv" {build & < "v0.11.0"} "ppx_type_conv" {build} "ounit" {test} "mirage-block-ramdisk" {test} diff --git a/packages/yaml/yaml.0.1.0/opam b/packages/yaml/yaml.0.1.0/opam index 7bb24bd302d9..062ee96ed54c 100644 --- a/packages/yaml/yaml.0.1.0/opam +++ b/packages/yaml/yaml.0.1.0/opam @@ -11,7 +11,7 @@ available: [ ocaml-version >= "4.03.0"] depends: [ "jbuilder" {build & >="1.0+beta10"} "ctypes" {>="0.12.0"} - "ppx_sexp_conv" {build & >="v0.9.0"} + "ppx_sexp_conv" {build & >="v0.9.0" & < "v0.11.0"} "rresult" "fmt" "logs" From 8ac2ff7cb895ab9a24d0698565fa9498a47bbe4a Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Tue, 8 May 2018 13:39:53 +0100 Subject: [PATCH 3/4] ocaml-topexpect is not compatible with OCaml >= 4.05 --- packages/ocaml-topexpect/ocaml-topexpect.0.1/opam | 2 +- packages/ocaml-topexpect/ocaml-topexpect.0.2/opam | 2 +- packages/ocaml-topexpect/ocaml-topexpect.0.3/opam | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ocaml-topexpect/ocaml-topexpect.0.1/opam b/packages/ocaml-topexpect/ocaml-topexpect.0.1/opam index 8aa92f0d38e9..da5650cd1817 100644 --- a/packages/ocaml-topexpect/ocaml-topexpect.0.1/opam +++ b/packages/ocaml-topexpect/ocaml-topexpect.0.1/opam @@ -11,4 +11,4 @@ depends: [ "ppx_sexp_conv" {< "v0.11.0"} "ppx_deriving" ] -available: [ocaml-version >= "4.04.0"] +available: [ocaml-version >= "4.04.0" & ocaml-version < "4.05.0"] diff --git a/packages/ocaml-topexpect/ocaml-topexpect.0.2/opam b/packages/ocaml-topexpect/ocaml-topexpect.0.2/opam index 9770102a7645..5ebd5def7f1d 100644 --- a/packages/ocaml-topexpect/ocaml-topexpect.0.2/opam +++ b/packages/ocaml-topexpect/ocaml-topexpect.0.2/opam @@ -9,4 +9,4 @@ build: [make] depends: ["ocamlfind" "ppx_sexp_conv" {< "v0.11.0"} "ppx_deriving"] -available: [ocaml-version >= "4.04.0"] +available: [ocaml-version >= "4.04.0" & ocaml-version < "4.05.0"] diff --git a/packages/ocaml-topexpect/ocaml-topexpect.0.3/opam b/packages/ocaml-topexpect/ocaml-topexpect.0.3/opam index c6bff1293132..5c84b48aa850 100644 --- a/packages/ocaml-topexpect/ocaml-topexpect.0.3/opam +++ b/packages/ocaml-topexpect/ocaml-topexpect.0.3/opam @@ -16,4 +16,4 @@ depends: [ "jbuilder" {build & >="1.0+beta9"} "sexplib" ] -available: [ocaml-version >= "4.04.0"] +available: [ocaml-version >= "4.04.0" & ocaml-version < "4.05.0"] From 7142f8f65fd396e00ac836b81fb2342f1c667d7b Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Tue, 8 May 2018 14:46:36 +0100 Subject: [PATCH 4/4] Add missing qcow->io-page-unix dependency --- packages/qcow/qcow.0.6.0/opam | 1 + packages/qcow/qcow.0.7.0/opam | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/qcow/qcow.0.6.0/opam b/packages/qcow/qcow.0.6.0/opam index 2a7ff3285b25..bb7ae76643ec 100644 --- a/packages/qcow/qcow.0.6.0/opam +++ b/packages/qcow/qcow.0.6.0/opam @@ -22,6 +22,7 @@ depends: [ "logs" "fmt" {>="0.8.2"} "io-page" + "io-page-unix" "ocamlfind" {build} "topkg" {build} "ppx_tools" {build} diff --git a/packages/qcow/qcow.0.7.0/opam b/packages/qcow/qcow.0.7.0/opam index 0fe17736a13c..781eace7ad3c 100644 --- a/packages/qcow/qcow.0.7.0/opam +++ b/packages/qcow/qcow.0.7.0/opam @@ -22,6 +22,7 @@ depends: [ "logs" "fmt" {>="0.8.2"} "io-page" + "io-page-unix" "ocamlfind" {build} "topkg" {build} "ppx_tools" {build}