GNU bug report logs - #50317
[PATCH 0/2] Update ‘ocaml-ppxlib’

Previous Next

Package: guix-patches;

Reported by: Xinglu Chen <public <at> yoctocell.xyz>

Date: Wed, 1 Sep 2021 12:59:02 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 50317 in the body.
You can then email your comments to 50317 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Wed, 01 Sep 2021 12:59:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Xinglu Chen <public <at> yoctocell.xyz>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 01 Sep 2021 12:59:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Update ‘ocaml-ppxlib’
Date: Wed, 01 Sep 2021 14:58:45 +0200
[Message part 1 (text/plain, inline)]
‘ocaml-ppx-optcomp’ fails to build with the new ‘ocaml-ppxlib’, updating
it makes it build again.

Xinglu Chen (2):
  gnu: ocaml-ppxlib: Update to 0.23.0.
  gnu: ocaml-ppx-optcomp: Update to 0.14.3.

 gnu/packages/ocaml.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


base-commit: 96e487b310d6f70fb6fb4c88cdd936225450706f
-- 
2.33.0



[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Wed, 01 Sep 2021 13:14:02 GMT) Full text and rfc822 format available.

Message #8 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: 50317 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: ocaml-ppxlib: Update to 0.23.0.
Date: Wed, 01 Sep 2021 15:13:32 +0200
* gnu/packages/ocaml.scm (ocaml-ppxlib): Update to 0.23.0.
---
 gnu/packages/ocaml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ecaf024b40..cf96b1f0cf 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5049,7 +5049,7 @@ as part of the same ocaml-migrate-parsetree driver.")
 (define-public ocaml-ppxlib
   (package
     (name "ocaml-ppxlib")
-    (version "0.22.1")
+    (version "0.23.0")
     (home-page "https://github.com/ocaml-ppx/ppxlib")
     (source
      (origin
@@ -5060,7 +5060,7 @@ as part of the same ocaml-migrate-parsetree driver.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0cpfg634if1py1b2rljk3cagq9gj68dl2gk1kdg76f9rapvl2i4g"))))
+         "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1"))))
     (build-system dune-build-system)
     (propagated-inputs
      `(("ocaml-base" ,ocaml-base)
-- 
2.33.0







Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Wed, 01 Sep 2021 13:14:02 GMT) Full text and rfc822 format available.

Message #11 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: 50317 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: ocaml-ppx-optcomp: Update to 0.14.3.
Date: Wed, 01 Sep 2021 15:13:39 +0200
* gnu/packages/ocaml.scm (ocaml-ppx-optcomp): Update to 0.14.3.
---
 gnu/packages/ocaml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index cf96b1f0cf..9241afdd62 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5786,7 +5786,7 @@ else expression.")
 (define-public ocaml-ppx-optcomp
   (package
     (name "ocaml-ppx-optcomp")
-    (version "0.14.1")
+    (version "0.14.3")
     (home-page "https://github.com/janestreet/ppx_optcomp")
     (source
      (origin
@@ -5797,7 +5797,7 @@ else expression.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4"))))
+         "1iflgfzs23asw3k6098v84al5zqx59rx2qjw0mhvk56avlx71pkw"))))
     (build-system dune-build-system)
     (propagated-inputs
      `(("ocaml-base" ,ocaml-base)
-- 
2.33.0







Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Fri, 03 Sep 2021 20:38:01 GMT) Full text and rfc822 format available.

Message #14 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Xinglu Chen <public <at> yoctocell.xyz>
Cc: 50317 <at> debbugs.gnu.org
Subject: Re: bug#50317: [PATCH 0/2] Update ‘ocaml-ppxlib’
Date: Fri, 03 Sep 2021 22:37:35 +0200
Hi,

Xinglu Chen <public <at> yoctocell.xyz> skribis:

> ‘ocaml-ppx-optcomp’ fails to build with the new ‘ocaml-ppxlib’, updating
> it makes it build again.

In that case, I’d suggest updating both in the same commit, so that each
commit contains a working package set.

>   gnu: ocaml-ppxlib: Update to 0.23.0.
>   gnu: ocaml-ppx-optcomp: Update to 0.14.3.

Unfortunately, at least one dependent fails to build:

--8<---------------cut here---------------start------------->8---
starting phase `build'
File "src/ppx_variants_conv.ml", line 69, characters 22-41:
69 |   if Caml.Hashtbl.mem Lexer.keyword_table s
                           ^^^^^^^^^^^^^^^^^^^
Error: Unbound value Lexer.keyword_table
command "dune" "build" "@install" "--profile" "release" failed with status 1
builder for `/gnu/store/g73id3dchmqc0dirv9ahzmgbwsyba78b-ocaml-ppx-variants-conv-0.14.1.drv' failed with exit code 1
--8<---------------cut here---------------end--------------->8---

Could you check this one and other packages returned by ‘guix refresh -l
ocaml-ppxlib’?

Thanks in advance,
Ludo’.




Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Sat, 04 Sep 2021 10:57:02 GMT) Full text and rfc822 format available.

Message #17 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 50317 <at> debbugs.gnu.org
Subject: Re: bug#50317: [PATCH 0/2] Update ‘ocaml-ppxlib’
Date: Sat, 04 Sep 2021 12:56:07 +0200
[Message part 1 (text/plain, inline)]
On Fri, Sep 03 2021, Ludovic Courtès wrote:

> Hi,
>
> Xinglu Chen <public <at> yoctocell.xyz> skribis:
>
>> ‘ocaml-ppx-optcomp’ fails to build with the new ‘ocaml-ppxlib’, updating
>> it makes it build again.
>
> In that case, I’d suggest updating both in the same commit, so that each
> commit contains a working package set.

Or maybe I could reorder the commits so that the ‘ocaml-ppxlib’ update
comes last?

>>   gnu: ocaml-ppxlib: Update to 0.23.0.
>>   gnu: ocaml-ppx-optcomp: Update to 0.14.3.
>
> Unfortunately, at least one dependent fails to build:
>
> --8<---------------cut here---------------start------------->8---
> starting phase `build'
> File "src/ppx_variants_conv.ml", line 69, characters 22-41:
> 69 |   if Caml.Hashtbl.mem Lexer.keyword_table s
>                            ^^^^^^^^^^^^^^^^^^^
> Error: Unbound value Lexer.keyword_table
> command "dune" "build" "@install" "--profile" "release" failed with status 1
> builder for `/gnu/store/g73id3dchmqc0dirv9ahzmgbwsyba78b-ocaml-ppx-variants-conv-0.14.1.drv' failed with exit code 1
> --8<---------------cut here---------------end--------------->8---
>
> Could you check this one and other packages returned by ‘guix refresh -l
> ocaml-ppxlib’?
>

Good catch!  There is a patch that should fix this issue[1]; should I
apply the patch to fix the build?

I didn’t build the ‘ocaml-llwm’ packages since I would have to first
build ‘llvm’ from source...[*].  The ‘ocaml-markup0.8.0’ fails too, but
it was already failing before applying this patch, so I will send a
separate series to try to fix it.  I also had to update ‘ocamlformat’ to
make it build.

Thanks for the taking a look!

[*]: I have noticed that substitute availability has been pretty poor
lately.  :-(

[1]: <https://github.com/janestreet/ppx_variants_conv/pull/9>
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Mon, 06 Sep 2021 08:08:02 GMT) Full text and rfc822 format available.

Message #20 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Xinglu Chen <public <at> yoctocell.xyz>
Cc: 50317 <at> debbugs.gnu.org
Subject: Re: bug#50317: [PATCH 0/2] Update ‘ocaml-ppxlib’
Date: Mon, 06 Sep 2021 10:07:07 +0200
Hi,

Xinglu Chen <public <at> yoctocell.xyz> skribis:

> On Fri, Sep 03 2021, Ludovic Courtès wrote:
>
>> Hi,
>>
>> Xinglu Chen <public <at> yoctocell.xyz> skribis:
>>
>>> ‘ocaml-ppx-optcomp’ fails to build with the new ‘ocaml-ppxlib’, updating
>>> it makes it build again.
>>
>> In that case, I’d suggest updating both in the same commit, so that each
>> commit contains a working package set.
>
> Or maybe I could reorder the commits so that the ‘ocaml-ppxlib’ update
> comes last?

Yes, we can do that.

>> Unfortunately, at least one dependent fails to build:
>>
>> --8<---------------cut here---------------start------------->8---
>> starting phase `build'
>> File "src/ppx_variants_conv.ml", line 69, characters 22-41:
>> 69 |   if Caml.Hashtbl.mem Lexer.keyword_table s
>>                            ^^^^^^^^^^^^^^^^^^^
>> Error: Unbound value Lexer.keyword_table
>> command "dune" "build" "@install" "--profile" "release" failed with status 1
>> builder for `/gnu/store/g73id3dchmqc0dirv9ahzmgbwsyba78b-ocaml-ppx-variants-conv-0.14.1.drv' failed with exit code 1
>> --8<---------------cut here---------------end--------------->8---
>>
>> Could you check this one and other packages returned by ‘guix refresh -l
>> ocaml-ppxlib’?
>>
>
> Good catch!  There is a patch that should fix this issue[1]; should I
> apply the patch to fix the build?

Yes please!  Let me know when there’s something I should apply.  :-)

Thanks,
Ludo’.




Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Mon, 06 Sep 2021 13:50:01 GMT) Full text and rfc822 format available.

Message #23 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 50317 <at> debbugs.gnu.org
Subject: Re: [bug#50317] [PATCH 0/2] Update ‘ocaml-ppxlib’
Date: Mon, 06 Sep 2021 15:49:46 +0200
[Message part 1 (text/plain, inline)]
On Mon, Sep 06 2021, Ludovic Courtès wrote:

> Hi,
>
> Xinglu Chen <public <at> yoctocell.xyz> skribis:
>
>> On Fri, Sep 03 2021, Ludovic Courtès wrote:
>>
>>> Hi,
>>>
>>> Xinglu Chen <public <at> yoctocell.xyz> skribis:
>>>
>>>> ‘ocaml-ppx-optcomp’ fails to build with the new ‘ocaml-ppxlib’, updating
>>>> it makes it build again.
>>>
>>> In that case, I’d suggest updating both in the same commit, so that each
>>> commit contains a working package set.
>>
>> Or maybe I could reorder the commits so that the ‘ocaml-ppxlib’ update
>> comes last?
>
> Yes, we can do that.
>
>>> Unfortunately, at least one dependent fails to build:
>>>
>>> --8<---------------cut here---------------start------------->8---
>>> starting phase `build'
>>> File "src/ppx_variants_conv.ml", line 69, characters 22-41:
>>> 69 |   if Caml.Hashtbl.mem Lexer.keyword_table s
>>>                            ^^^^^^^^^^^^^^^^^^^
>>> Error: Unbound value Lexer.keyword_table
>>> command "dune" "build" "@install" "--profile" "release" failed with status 1
>>> builder for `/gnu/store/g73id3dchmqc0dirv9ahzmgbwsyba78b-ocaml-ppx-variants-conv-0.14.1.drv' failed with exit code 1
>>> --8<---------------cut here---------------end--------------->8---
>>>
>>> Could you check this one and other packages returned by ‘guix refresh -l
>>> ocaml-ppxlib’?
>>>
>>
>> Good catch!  There is a patch that should fix this issue[1]; should I
>> apply the patch to fix the build?
>
> Yes please!  Let me know when there’s something I should apply.  :-)

Cool, I will send a revised series soon!
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Mon, 06 Sep 2021 14:07:02 GMT) Full text and rfc822 format available.

Message #26 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: 50317 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH v2 0/4] Update ‘ocaml-ppxlib’
Date: Mon, 06 Sep 2021 16:06:36 +0200
[Message part 1 (text/plain, inline)]
Changes since v1:

* Update ‘ocamlformat’ to fix the build with ‘ocaml-ppxlib’.

* Patch ‘ocaml-ppx-variants-conv’ to make it build with
  ocaml-ppxlib <at> 0.23.0.

* Reorder the patches so that the ‘ocaml-ppxlib’ update comes last.

Xinglu Chen (4):
  gnu: ocaml-ppx-optcomp: Update to 0.14.3.
  gnu: ocamlformat: Update to 0.19.0.
  gnu: ocaml-ppx-variants-conv: Patch for building with ocaml-ppxlib.
  gnu: ocaml-ppxlib: Update to 0.23.0.

 gnu/local.mk                                  |  1 +
 gnu/packages/ocaml.scm                        | 17 +++++---
 ...ocaml-ppx-variants-ppxlib-api-change.patch | 42 +++++++++++++++++++
 3 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch


base-commit: 9540323458de87b0b8aa421e449a4fe27af7c393
-- 
2.33.0



[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Mon, 06 Sep 2021 14:07:02 GMT) Full text and rfc822 format available.

Message #29 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: 50317 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH v2 1/4] gnu: ocaml-ppx-optcomp: Update to 0.14.3.
Date: Mon, 06 Sep 2021 16:06:45 +0200
* gnu/packages/ocaml.scm (ocaml-ppx-optcomp): Update to 0.14.3.
---
 gnu/packages/ocaml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ecaf024b40..891b1e0d6c 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5786,7 +5786,7 @@ else expression.")
 (define-public ocaml-ppx-optcomp
   (package
     (name "ocaml-ppx-optcomp")
-    (version "0.14.1")
+    (version "0.14.3")
     (home-page "https://github.com/janestreet/ppx_optcomp")
     (source
      (origin
@@ -5797,7 +5797,7 @@ else expression.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4"))))
+         "1iflgfzs23asw3k6098v84al5zqx59rx2qjw0mhvk56avlx71pkw"))))
     (build-system dune-build-system)
     (propagated-inputs
      `(("ocaml-base" ,ocaml-base)
-- 
2.33.0







Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Mon, 06 Sep 2021 14:07:02 GMT) Full text and rfc822 format available.

Message #32 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: 50317 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH v2 2/4] gnu: ocamlformat: Update to 0.19.0.
Date: Mon, 06 Sep 2021 16:06:48 +0200
* gnu/packages/ocaml.scm (ocamlformat): Update to 0.19.0.
[propagated-inputs]: Add ocaml-odoc-parser.
---
 gnu/packages/ocaml.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 891b1e0d6c..53305ce60f 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -7142,7 +7142,7 @@ get an precise reference of when the executable was built.")))
 (define-public ocamlformat
   (package
     (name "ocamlformat")
-    (version "0.18.0")
+    (version "0.19.0")
     (source
       (origin
         (method git-fetch)
@@ -7152,7 +7152,7 @@ get an precise reference of when the executable was built.")))
         (file-name (git-file-name name version))
         (sha256
           (base32
-            "0n6363km8xr81pvyk453n6h2mb0256c5yxw3p1li4dn83f3lwxr1"))))
+            "0dp4pkznz9yvqx9gxwbid1z2b8ajkr8i27zay9ghx69624hz3i4z"))))
     (build-system dune-build-system)
     (arguments
      '(#:package "ocamlformat"
@@ -7170,6 +7170,7 @@ get an precise reference of when the executable was built.")))
         ("ocaml-odoc" ,ocaml-odoc)
         ("ocaml-ppxlib" ,ocaml-ppxlib)
         ("ocaml-re" ,ocaml-re)
+        ("ocaml-odoc-parser" ,ocaml-odoc-parser)
         ("ocaml-stdio" ,ocaml-stdio)
         ("ocaml-uuseg" ,ocaml-uuseg)
         ("ocaml-uutf" ,ocaml-uutf)))
-- 
2.33.0







Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Mon, 06 Sep 2021 14:07:03 GMT) Full text and rfc822 format available.

Message #35 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: 50317 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH v2 3/4] gnu: ocaml-ppx-variants-conv: Patch for building
 with ocaml-ppxlib.
Date: Mon, 06 Sep 2021 16:06:52 +0200
The patch will make it build when building it with ocaml-ppxlib <at> 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.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/ocaml.scm                        |  4 ++
 ...ocaml-ppx-variants-ppxlib-api-change.patch | 42 +++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index dc2e41d384..9fb068917a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1523,6 +1523,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	\
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 53305ce60f..e319fb891d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -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 <at> 0.23.0.
+         "ocaml-ppx-variants-ppxlib-api-change.patch"))
        (file-name (git-file-name name version))
        (sha256
         (base32
diff --git a/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch b/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch
new file mode 100644
index 0000000000..b437bfb061
--- /dev/null
+++ b/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch
@@ -0,0 +1,42 @@
+From 6103f6fc56f978c847ba7c1f2d9f38ee93a5e337 Mon Sep 17 00:00:00 2001
+From: Sonja Heinze <sonjaleaheinze <at> 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 <at> 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
+ 
-- 
2.33.0







Information forwarded to guix-patches <at> gnu.org:
bug#50317; Package guix-patches. (Mon, 06 Sep 2021 14:07:03 GMT) Full text and rfc822 format available.

Message #38 received at 50317 <at> debbugs.gnu.org (full text, mbox):

From: Xinglu Chen <public <at> yoctocell.xyz>
To: 50317 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH v2 4/4] gnu: ocaml-ppxlib: Update to 0.23.0.
Date: Mon, 06 Sep 2021 16:06:54 +0200
* gnu/packages/ocaml.scm (ocaml-ppxlib): Update to 0.23.0.
---
 gnu/packages/ocaml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e319fb891d..1c48a0d353 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5049,7 +5049,7 @@ as part of the same ocaml-migrate-parsetree driver.")
 (define-public ocaml-ppxlib
   (package
     (name "ocaml-ppxlib")
-    (version "0.22.1")
+    (version "0.23.0")
     (home-page "https://github.com/ocaml-ppx/ppxlib")
     (source
      (origin
@@ -5060,7 +5060,7 @@ as part of the same ocaml-migrate-parsetree driver.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0cpfg634if1py1b2rljk3cagq9gj68dl2gk1kdg76f9rapvl2i4g"))))
+         "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1"))))
     (build-system dune-build-system)
     (propagated-inputs
      `(("ocaml-base" ,ocaml-base)
-- 
2.33.0







Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Mon, 06 Sep 2021 21:37:01 GMT) Full text and rfc822 format available.

Notification sent to Xinglu Chen <public <at> yoctocell.xyz>:
bug acknowledged by developer. (Mon, 06 Sep 2021 21:37:02 GMT) Full text and rfc822 format available.

Message #43 received at 50317-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Xinglu Chen <public <at> yoctocell.xyz>
Cc: 50317-done <at> debbugs.gnu.org
Subject: Re: bug#50317: [PATCH 0/2] Update ‘ocaml-ppxlib’
Date: Mon, 06 Sep 2021 23:36:28 +0200
Hi,

Xinglu Chen <public <at> yoctocell.xyz> skribis:

> Changes since v1:
>
> * Update ‘ocamlformat’ to fix the build with ‘ocaml-ppxlib’.
>
> * Patch ‘ocaml-ppx-variants-conv’ to make it build with
>   ocaml-ppxlib <at> 0.23.0.
>
> * Reorder the patches so that the ‘ocaml-ppxlib’ update comes last.

Applied, thanks!

Ludo’.




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 05 Oct 2021 11:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 3 years and 336 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.