diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-11-23 11:22:30 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-23 11:29:38 +0100 |
commit | b15e543d303ea58fdc0f0541c708389f9d513e3d (patch) | |
tree | 5c4bd48d67d4d3cd4806269dcabf58382f448bed /gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch | |
parent | 4efc08d895274ee39e6e6e5c49121fb05a0281b6 (diff) | |
parent | daf7b5ecef8de0e536ffd8d2957f022d010767a8 (diff) | |
download | guix-patches-b15e543d303ea58fdc0f0541c708389f9d513e3d.tar guix-patches-b15e543d303ea58fdc0f0541c708389f9d513e3d.tar.gz |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch')
-rw-r--r-- | gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch b/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch deleted file mode 100644 index b437bfb061..0000000000 --- a/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 - |