diff options
author | Mark Wright <gienah@gentoo.org> | 2020-10-13 17:47:58 +1100 |
---|---|---|
committer | Mark Wright <gienah@gentoo.org> | 2020-10-13 23:53:41 +1100 |
commit | 3f1a6aa75a1ad0c501e3476a3095811e29deda93 (patch) | |
tree | 4431c6120526a9d36ea27514cc86237ab29a1724 /dev-ml | |
parent | dev-ml/ppx_sexp_conv: Bump to 0.14.1 (diff) | |
download | gentoo-3f1a6aa75a1ad0c501e3476a3095811e29deda93.tar.gz gentoo-3f1a6aa75a1ad0c501e3476a3095811e29deda93.tar.bz2 gentoo-3f1a6aa75a1ad0c501e3476a3095811e29deda93.zip |
dev-ml/ppx_sexp_message: Bump to 0.14.0
Co-Author: Alexis Ballier <aballier@gentoo.org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Mark Wright <gienah@gentoo.org>
Diffstat (limited to 'dev-ml')
-rw-r--r-- | dev-ml/ppx_sexp_message/Manifest | 1 | ||||
-rw-r--r-- | dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch | 41 | ||||
-rw-r--r-- | dev-ml/ppx_sexp_message/metadata.xml | 5 | ||||
-rw-r--r-- | dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild | 27 |
4 files changed, 73 insertions, 1 deletions
diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest index d04f619ba6bc..5b3b55f00d24 100644 --- a/dev-ml/ppx_sexp_message/Manifest +++ b/dev-ml/ppx_sexp_message/Manifest @@ -1 +1,2 @@ +DIST ppx_sexp_message-0.14.0.tar.gz 7738 BLAKE2B a00577faf55b0816991bfe6f11fdc21d9b56893c29e67036483adce56c095cb8a2ee9014f9f0768ab96bbd28fe2f46b262e8a6122cf66ccb2740af7be890db0d SHA512 627f8e52914ef228277ff31a0d2262de823767fa0b510b1a29cbfc754c7cbc84cabe7c94de3e3a72d888d19e23584ebcc46c16997ffd7cdae41378cb44b2bc23 DIST ppx_sexp_message-0.9.0.tar.gz 8965 BLAKE2B df59ff7f598a7ff19a16829addbc5b49f2e7dfb2b30aab43f5d220f6d45f625750ca1d63eba3187b09d494a2c06af642c2a2e4d581c6a247440ba06d6f46dae0 SHA512 38a376b23372b8699fef76085ad2ead7b5fb34b823b0c7e3e52ac90654133a44429d7a3383197b78c8f01a7b64753ce424d5138b8aef596d236ce9c798ec1887 diff --git a/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..a472c5ab29a1 --- /dev/null +++ b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch @@ -0,0 +1,41 @@ +commit fd604b269398aebdb0c5fa5511d9f3c38b6ecb45 (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours <nathan.p.rebours@gmail.com> +Date: Mon Oct 5 18:04:41 2020 +0200 + + Make ppx_sexp_message compatible with ppxlib.0.18.0 + + ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change + in string constants representation. This PR makes ppx_sexp_message + compatible with the latest ppxlib. + + You might want for the actual release of ppxlib.0.18.0 before merging + this! + + Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com> + +diff --git a/expander/ppx_sexp_message_expander.ml b/expander/ppx_sexp_message_expander.ml +index e0c2477..c801cd7 100644 +--- a/expander/ppx_sexp_message_expander.ml ++++ b/expander/ppx_sexp_message_expander.ml +@@ -97,7 +97,7 @@ let sexp_of_expr ~omit_nil e = + let e = rewrite_here e in + let loc = { e.pexp_loc with loc_ghost = true } in + match e.pexp_desc with +- | Pexp_constant (Pconst_string ("", _)) -> Absent ++ | Pexp_constant (Pconst_string ("", _, _)) -> Absent + | Pexp_constant const -> + present_or_omit_nil ~loc ~omit_nil:false (sexp_of_constant ~loc const) + | Pexp_constraint (expr, ctyp) -> sexp_of_constraint ~omit_nil ~loc expr ctyp +diff --git a/ppx_sexp_message.opam b/ppx_sexp_message.opam +index d8a6d95..3d6ef41 100644 +--- a/ppx_sexp_message.opam ++++ b/ppx_sexp_message.opam +@@ -16,7 +16,7 @@ depends: [ + "ppx_here" {>= "v0.14" & < "v0.15"} + "ppx_sexp_conv" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.11.0"} ++ "ppxlib" {>= "0.18.0"} + ] + synopsis: "A ppx rewriter for easy construction of s-expressions" + description: " diff --git a/dev-ml/ppx_sexp_message/metadata.xml b/dev-ml/ppx_sexp_message/metadata.xml index 715559feb2c9..2f418c1a3acf 100644 --- a/dev-ml/ppx_sexp_message/metadata.xml +++ b/dev-ml/ppx_sexp_message/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>gienah@gentoo.org</email> + <name>Mark Wright</name> + </maintainer> <upstream> <remote-id type="github">janestreet/ppx_sexp_message</remote-id> </upstream> diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild new file mode 100644 index 000000000000..35cfea25682a --- /dev/null +++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A ppx rewriter for easy construction of s-expressions" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_message" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:= + dev-ml/ppx_here:= + dev-ml/ppx_sexp_conv:= + dev-ml/ocaml-migrate-parsetree:= + dev-ml/result:= + >=dev-ml/ppxlib-0.18.0:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch ) |