mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-ml/ppx_sexp_conv: drop 0.14.1-r1, 0.14.2-r2, 0.14.3-r1
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
This commit is contained in:
Alfredo Tupone
@@ -1,6 +1,3 @@
|
||||
DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584ec6be4793df706fd3be96670fe685aba82459f9a1e4c6117c594953a3f23c502cc609f1069d482d24278baf7ed87ed5 SHA512 5018abe07300f67cb2c8b8cd8242403a91ac6b7fda13fe43060b3b09635082a7ad45858c7c6442a5fcae2b6d7d398a03eec16cfcbc5fd59f7f3f5c5fd1ad56f9
|
||||
DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25
|
||||
DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
|
||||
DIST ppx_sexp_conv-0.15.1.tar.gz 67448 BLAKE2B 4994b609edd19bc70755c418ff7ed0972199ad6b3dde834ad32400c613113a3b3622dca160a4e49ed5abd6fcb9ced3f7580ffc1bcb055ca1d71a945ae56ea203 SHA512 f2b669e7c7bbbc8dd4978b47b73662dd0195ae85cdd71596485211cb5ab4daedcae9be4b33796674320e0d324b7ee9f90d3b219212be98ed792e3a89ccf8c41b
|
||||
DIST ppx_sexp_conv-0.16.0.tar.gz 66918 BLAKE2B 7f7f4bd9c3178d80b0b813204e8abbc2791a519951793ed99df62988b91fc90e3616565a2c1b629a80a05814b7cb06f491109e079b70aba9a1606552a2a8e19f SHA512 ceacd17683c8e739d2e5eaabb585c01615a11b18c1bef7df85b48820885d344cbae94c1351a6a2522e016a1bd41fc3997928d6b2b2169aeda72ea6626eb1f7a0
|
||||
DIST ppx_sexp_conv-0.17.0.tar.gz 68281 BLAKE2B e4ce4df4becd93b2f5ccd7e356042e59acbe8ce334e163fafb2f984725688a52162719a82caa2cfd47bf00262ac6067abdaa3d057e0abddb9b624e0a6ae1776d SHA512 1e4ac88a62988933473837362522d29ef0bb258b4ffde256fb322d53411e2455e9a5b7fb2ba92f5036ffd88a084867d45d1628e6cd9bf36468d6e1e6e4694afe
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
commit 13e9b27f5f9550b825128f8cd1f31d20dc8fa91b (HEAD, origin/upgrade-ppxlib-0.18.0)
|
||||
Author: Nathan Rebours <nathan.p.rebours@gmail.com>
|
||||
Date: Mon Oct 5 17:33:56 2020 +0200
|
||||
|
||||
Make ppx_sexp_conv 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_conv
|
||||
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/sexp_grammar_lifter.ml b/expander/sexp_grammar_lifter.ml
|
||||
index 05005bf..17f1e73 100644
|
||||
--- a/expander/sexp_grammar_lifter.ml
|
||||
+++ b/expander/sexp_grammar_lifter.ml
|
||||
@@ -28,7 +28,7 @@ type atom = Atom.t
|
||||
type var_name = Sexp.Private.Raw_grammar.var_name
|
||||
type type_name = Sexp.Private.Raw_grammar.type_name
|
||||
|
||||
-let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, None))
|
||||
+let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, loc, None))
|
||||
let lift_var_name = lift_string
|
||||
let lift_type_name = lift_string
|
||||
|
||||
diff --git a/ppx_sexp_conv.opam b/ppx_sexp_conv.opam
|
||||
index 06fd03e..05c4182 100644
|
||||
--- a/ppx_sexp_conv.opam
|
||||
+++ b/ppx_sexp_conv.opam
|
||||
@@ -15,7 +15,7 @@ depends: [
|
||||
"base" {>= "v0.14" & < "v0.15"}
|
||||
"sexplib0" {>= "v0.14" & < "v0.15"}
|
||||
"dune" {>= "2.0.0"}
|
||||
- "ppxlib" {>= "0.11.0"}
|
||||
+ "ppxlib" {>= "0.18.0"}
|
||||
]
|
||||
synopsis: "[@@deriving] plugin to generate S-expression conversion functions"
|
||||
description: "
|
||||
@@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit dune
|
||||
|
||||
DESCRIPTION="Support Library for type-driven code generators"
|
||||
HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
|
||||
SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
|
||||
IUSE="+ocamlopt"
|
||||
|
||||
DEPEND="
|
||||
=dev-ml/base-0.14*:=[ocamlopt?]
|
||||
dev-ml/findlib:=[ocamlopt?]
|
||||
<dev-ml/ppxlib-0.22:=[ocamlopt?]
|
||||
dev-ml/ocaml-compiler-libs:=[ocamlopt?]
|
||||
>=dev-ml/ocaml-migrate-parsetree-2.0.0:=[ocamlopt?]
|
||||
dev-ml/cinaps:=[ocamlopt?]
|
||||
dev-ml/sexplib0:=[ocamlopt?]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
|
||||
@@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit dune
|
||||
|
||||
DESCRIPTION="Support Library for type-driven code generators"
|
||||
HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
|
||||
SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
|
||||
IUSE="+ocamlopt"
|
||||
|
||||
# Upper bound on ppxlib for bug #769536
|
||||
DEPEND="
|
||||
=dev-ml/base-0.14*:=[ocamlopt?]
|
||||
dev-ml/findlib:=[ocamlopt?]
|
||||
<dev-ml/ppxlib-0.21.0:=[ocamlopt?]
|
||||
dev-ml/ocaml-compiler-libs:=[ocamlopt?]
|
||||
>=dev-ml/ocaml-migrate-parsetree-2.0.0:=[ocamlopt?]
|
||||
dev-ml/cinaps:=[ocamlopt?]
|
||||
dev-ml/sexplib0:=[ocamlopt?]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
@@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit dune
|
||||
|
||||
DESCRIPTION="Support Library for type-driven code generators"
|
||||
HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
|
||||
SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
|
||||
IUSE="+ocamlopt"
|
||||
|
||||
# Upper bound on ppxlib for bug #769536
|
||||
DEPEND="
|
||||
=dev-ml/base-0.14*:=[ocamlopt?]
|
||||
dev-ml/findlib:=[ocamlopt?]
|
||||
>=dev-ml/ppxlib-0.22.0:=[ocamlopt?]
|
||||
<dev-ml/ppxlib-0.26.0:=[ocamlopt?]
|
||||
dev-ml/ocaml-compiler-libs:=[ocamlopt?]
|
||||
>=dev-ml/ocaml-migrate-parsetree-2.0.0:=[ocamlopt?]
|
||||
dev-ml/cinaps:=[ocamlopt?]
|
||||
dev-ml/sexplib0:=[ocamlopt?]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
Reference in New Issue
Block a user