me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ocaml-ppx-variants-conv: Patch for building with ocaml-ppxlib.

Browse source 
The patch will make it build when building it with ocaml-ppxlib@0.23.0.

* gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): Apply the patch.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Xinglu Chen 2021-09-06 16:06:52 +02:00 • committed by Ludovic Courtès
parent b60a7f049c
commit 550f4aa682
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1522,6 +1522,7 @@ dist_patch_DATA = \
%D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
%D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
%D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
%D%/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch \
%D%/packages/patches/omake-fix-non-determinism.patch \
%D%/packages/patches/oneko-remove-nonfree-characters.patch \
%D%/packages/patches/onnx-optimizer-system-library.patch \

4
gnu/packages/ocaml.scm
View file

@ -5340,6 +5340,10 @@ definitions.")
(uri (git-reference
(url "https://github.com/janestreet/ppx_variants_conv")
(commit (string-append "v" version))))
(patches
(search-patches
;; Fix build when building with ocaml-ppxlib@0.23.0.
"ocaml-ppx-variants-ppxlib-api-change.patch"))
(file-name (git-file-name name version))
(sha256
(base32

42
gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch Normal file
View file

@ -0,0 +1,42 @@
From 6103f6fc56f978c847ba7c1f2d9f38ee93a5e337 Mon Sep 17 00:00:00 2001
From: Sonja Heinze <sonjaleaheinze@gmail.com>
Date: Tue, 9 Mar 2021 12:57:47 +0100
Subject: [PATCH] Adapt to Ppxlib's API change
Ppxlib is removing Lexer.keyword_table from the API in exchange for
the more lightweight Keyword.is_keyword.
Signed-off-by: Sonja Heinze <sonjaleaheinze@gmail.com>
---
Patch from <https://github.com/janestreet/ppx_variants_conv/pull/9>.
ppx_variants_conv.opam | 2 +-
src/ppx_variants_conv.ml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ppx_variants_conv.opam b/ppx_variants_conv.opam
index 7e7148d..b56040f 100644
--- a/ppx_variants_conv.opam
+++ b/ppx_variants_conv.opam
@@ -15,7 +15,7 @@ depends: [
"base" {>= "v0.14" & < "v0.15"}
"variantslib" {>= "v0.14" & < "v0.15"}
"dune" {>= "2.0.0"}
- "ppxlib" {>= "0.14.0"}
+ "ppxlib" {>= "0.23.0"}
]
synopsis: "Generation of accessor and iteration functions for ocaml variant types"
description: "
diff --git a/src/ppx_variants_conv.ml b/src/ppx_variants_conv.ml
index 8d60086..112fc78 100644
--- a/src/ppx_variants_conv.ml
+++ b/src/ppx_variants_conv.ml
@@ -66,7 +66,7 @@ end
let variant_name_to_string v =
let s = String.lowercase v in
- if Caml.Hashtbl.mem Lexer.keyword_table s
+ if Keyword.is_keyword s
then s ^ "_"
else s