Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ppx-sexp-conv
Commits: 82634be6 by Stephane Glondu at 2021-12-26T11:22:25+01:00 Update debian/watch - - - - - 379fbac4 by Stephane Glondu at 2021-12-26T11:24:10+01:00 New upstream version 0.14.2 - - - - - 452f0f46 by Stephane Glondu at 2021-12-26T11:24:11+01:00 New upstream version 0.14.3 - - - - - 570ce049 by Stephane Glondu at 2021-12-26T11:33:05+01:00 Merge tag 'upstream/0.14.3' Upstream version 0.14.3 - - - - - daa2d174 by Stephane Glondu at 2021-12-26T11:35:14+01:00 New upstream release - - - - - ed2ed4e0 by Stephane Glondu at 2022-01-21T00:30:18+01:00 Update packaging - - - - - 112e9501 by Stephane Glondu at 2022-01-21T00:32:14+01:00 Update changelog and prepare upload to unstable - - - - - 7 changed files: - CHANGES.md - debian/changelog - debian/control - debian/watch - expander/sexp_grammar_lifter.ml - expander/str_generate_sexp_grammar.ml - ppx_sexp_conv.opam Changes: ===================================== CHANGES.md ===================================== @@ -1,3 +1,7 @@ +## v0.14.2 + +- Upgrade to ppxlib 0.18.0 + ## v0.14.1 - Depend on ppxlib >= v0.15.0. ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +ppx-sexp-conv (1:0.14.3-1) unstable; urgency=medium + + * New upstream release + * Bump Standards-Version to 4.6.0 + * Update debian/watch + + -- Stéphane Glondu <[email protected]> Fri, 21 Jan 2022 00:30:39 +0100 + ppx-sexp-conv (1:0.14.1-1) unstable; urgency=medium * New upstream release ===================================== debian/control ===================================== @@ -5,12 +5,12 @@ Maintainer: Debian OCaml Maintainers <[email protected]> Uploaders: Stéphane Glondu <[email protected]> Build-Depends: debhelper-compat (= 13), - ocaml-nox, + ocaml, ocaml-findlib, ocaml-dune, libbase-ocaml-dev (>= 0.14), libsexplib0-ocaml-dev (>= 0.14), - libppxlib-ocaml-dev (>= 0.15.0), + libppxlib-ocaml-dev (>= 0.22.0), dh-ocaml Standards-Version: 4.6.0 Rules-Requires-Root: no ===================================== debian/watch ===================================== @@ -1,2 +1,2 @@ version=4 -opts=uversionmangle=s/-rc/~rc/ https://github.com/janestreet/ppx_sexp_conv/tags /.*/archive/refs/tags/v([\d\.\-rc]+)\.tar\.gz +opts=uversionmangle=s/-rc/~rc/ https://github.com/janestreet/ppx_sexp_conv/tags .*/v?([\d\.\-rc]+)\.tar\.gz ===================================== 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 ===================================== expander/str_generate_sexp_grammar.ml ===================================== @@ -604,7 +604,7 @@ let singleton ~loc ~path core_type : t = let type_variables, core_type = collect_type_variables_of_polymorphic_grammar core_type in - ( List.map type_variables ~f:(fun var_name -> ptyp_var ~loc var_name, Invariant) + ( List.map type_variables ~f:(fun var_name -> ptyp_var ~loc var_name, (NoVariance, NoInjectivity)) , core_type ) in let td = ===================================== 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.22.0"} ] synopsis: "[@@deriving] plugin to generate S-expression conversion functions" description: " View it on GitLab: https://salsa.debian.org/ocaml-team/ppx-sexp-conv/-/compare/94ad2f9c40176af5ed56312c885fbbba03a60e96...112e9501d84aadc440e5c5bea4fe3ff49d0becac -- View it on GitLab: https://salsa.debian.org/ocaml-team/ppx-sexp-conv/-/compare/94ad2f9c40176af5ed56312c885fbbba03a60e96...112e9501d84aadc440e5c5bea4fe3ff49d0becac You're receiving this email because of your account on salsa.debian.org.
