GNU bug report logs - #49136
[PATCH 0/2] Update ocaml-merlin

Previous Next

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

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

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-merlin
Date: Sun, 20 Jun 2021 16:49:41 +0200

[Message part 1 (text/plain, inline)]

This series updates ‘ocaml-dot-merlin-reader’ and ‘ocaml-merlin’, the
latest version is 4.2-412, but our OCaml compiler is at version 4.11.1,
so I updated them to 4.2-411.

I also refactored the ‘ocaml-merlin’ package to inherit from
‘ocaml-dot-merlin-reader’ to avoid having to update the version and hash
twice.

Xinglu Chen (2):
  gnu: ocaml-dot-merlin-reader: Update to 4.2-411.
  gnu: ocaml-merlin: Inherit from ‘ocaml-dot-merlin-reader’.

 gnu/packages/ocaml.scm | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)


base-commit: a211078f992bc5a26eaf787c6b01caa41de67597
-- 
2.32.0

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

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

From: Xinglu Chen <public <at> yoctocell.xyz>
To: 49136 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: ocaml-dot-merlin-reader: Update to 4.2-411.
Date: Sun, 20 Jun 2021 16:52:14 +0200

* gnu/packages/ocaml.scm (ocaml-dot-merlin-reader): Update to 4.2-411.
---
 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 047d504a0a..58b34d4293 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4540,7 +4540,7 @@ format}.  @code{craml} is released as a single binary (called @code{craml}).")
 (define-public ocaml-dot-merlin-reader
   (package
     (name "ocaml-dot-merlin-reader")
-    (version "3.4.2")
+    (version "4.2-411")
     (source
      (origin
        (method git-fetch)
@@ -4550,7 +4550,7 @@ format}.  @code{craml} is released as a single binary (called @code{craml}).")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj"))))
+         "1vl6p8m2pag5j283h5g2gzxxfm599k6qhyrjkdf3kyc476fc9lw8"))))
     (build-system dune-build-system)
     (arguments '(#:package "dot-merlin-reader"
                  #:tests? #f))          ; no tests
-- 
2.32.0

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

From: Xinglu Chen <public <at> yoctocell.xyz>
To: 49136 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: ocaml-merlin: Inherit from ‘ocaml-dot-merlin-reader’.
Date: Sun, 20 Jun 2021 16:52:16 +0200

* gnu/packages/ocaml.scm (ocaml-merlin): Inherit from
‘ocaml-dot-merlin-reader’, thus also updating it to 4.2-411.
[version, source, build-system, home-page]: Remove.
[arguments]<#:phases>: Use custom test phase.
---
 gnu/packages/ocaml.scm | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 58b34d4293..21d16a46a1 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4566,21 +4566,16 @@ format}.  @code{craml} is released as a single binary (called @code{craml}).")
 
 (define-public ocaml-merlin
   (package
+    (inherit ocaml-dot-merlin-reader)
     (name "ocaml-merlin")
-    (version "3.4.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ocaml/merlin")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj"))))
-    (build-system dune-build-system)
-    (arguments '(#:package "merlin"
-                 #:test-target "tests"))
+    (arguments
+     '(#:package "merlin"
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))))))
     (inputs
      `(("ocaml-yojson" ,ocaml-yojson)
        ("ocaml-csexp" ,ocaml-csexp)
@@ -4589,7 +4584,6 @@ format}.  @code{craml} is released as a single binary (called @code{craml}).")
      `(("ocaml-dot-merlin-reader" ,ocaml-dot-merlin-reader) ; required for tests
        ("ocaml-mdx" ,ocaml-mdx)
        ("jq" ,jq)))
-    (home-page "https://ocaml.github.io/merlin/")
     (synopsis "Context sensitive completion for OCaml in Vim and Emacs")
     (description "Merlin is an editor service that provides modern IDE
 features for OCaml.  Emacs and Vim support is provided out-of-the-box.
-- 
2.32.0

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

From: Julien Lepiller <julien <at> lepiller.eu>
To: Xinglu Chen <public <at> yoctocell.xyz>
Cc: 49136-done <at> debbugs.gnu.org
Subject: Re: [bug#49136] [PATCH 0/2] Update ocaml-merlin
Date: Mon, 21 Jun 2021 00:15:10 +0200

Le Sun, 20 Jun 2021 16:49:41 +0200,
Xinglu Chen <public <at> yoctocell.xyz> a écrit :

> This series updates ‘ocaml-dot-merlin-reader’ and ‘ocaml-merlin’, the
> latest version is 4.2-412, but our OCaml compiler is at version
> 4.11.1, so I updated them to 4.2-411.
> 
> I also refactored the ‘ocaml-merlin’ package to inherit from
> ‘ocaml-dot-merlin-reader’ to avoid having to update the version and
> hash twice.
> 
> Xinglu Chen (2):
>   gnu: ocaml-dot-merlin-reader: Update to 4.2-411.
>   gnu: ocaml-merlin: Inherit from ‘ocaml-dot-merlin-reader’.
> 
>  gnu/packages/ocaml.scm | 28 +++++++++++-----------------
>  1 file changed, 11 insertions(+), 17 deletions(-)
> 
> 
> base-commit: a211078f992bc5a26eaf787c6b01caa41de67597

Pushed as 5ae0d2c24737572ba3e0619a0176a07758078e1d, thank you!

Previous Next

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