* [bug#49136] [PATCH 0/2] Update ocaml-merlin
@ 2021-06-20 14:49 Xinglu Chen
2021-06-20 14:52 ` [bug#49136] [PATCH 1/2] gnu: ocaml-dot-merlin-reader: Update to 4.2-411 Xinglu Chen
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Xinglu Chen @ 2021-06-20 14:49 UTC (permalink / raw)
To: 49136
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#49136] [PATCH 1/2] gnu: ocaml-dot-merlin-reader: Update to 4.2-411.
2021-06-20 14:49 [bug#49136] [PATCH 0/2] Update ocaml-merlin Xinglu Chen
@ 2021-06-20 14:52 ` Xinglu Chen
2021-06-20 14:52 ` [bug#49136] [PATCH 2/2] gnu: ocaml-merlin: Inherit from ‘ocaml-dot-merlin-reader’ Xinglu Chen
2021-06-20 22:15 ` bug#49136: [PATCH 0/2] Update ocaml-merlin Julien Lepiller
2 siblings, 0 replies; 4+ messages in thread
From: Xinglu Chen @ 2021-06-20 14:52 UTC (permalink / raw)
To: 49136
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#49136] [PATCH 2/2] gnu: ocaml-merlin: Inherit from ‘ocaml-dot-merlin-reader’.
2021-06-20 14:49 [bug#49136] [PATCH 0/2] Update ocaml-merlin Xinglu Chen
2021-06-20 14:52 ` [bug#49136] [PATCH 1/2] gnu: ocaml-dot-merlin-reader: Update to 4.2-411 Xinglu Chen
@ 2021-06-20 14:52 ` Xinglu Chen
2021-06-20 22:15 ` bug#49136: [PATCH 0/2] Update ocaml-merlin Julien Lepiller
2 siblings, 0 replies; 4+ messages in thread
From: Xinglu Chen @ 2021-06-20 14:52 UTC (permalink / raw)
To: 49136
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#49136: [PATCH 0/2] Update ocaml-merlin
2021-06-20 14:49 [bug#49136] [PATCH 0/2] Update ocaml-merlin Xinglu Chen
2021-06-20 14:52 ` [bug#49136] [PATCH 1/2] gnu: ocaml-dot-merlin-reader: Update to 4.2-411 Xinglu Chen
2021-06-20 14:52 ` [bug#49136] [PATCH 2/2] gnu: ocaml-merlin: Inherit from ‘ocaml-dot-merlin-reader’ Xinglu Chen
@ 2021-06-20 22:15 ` Julien Lepiller
2 siblings, 0 replies; 4+ messages in thread
From: Julien Lepiller @ 2021-06-20 22:15 UTC (permalink / raw)
To: Xinglu Chen; +Cc: 49136-done
Le Sun, 20 Jun 2021 16:49:41 +0200,
Xinglu Chen <public@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!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-20 22:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-20 14:49 [bug#49136] [PATCH 0/2] Update ocaml-merlin Xinglu Chen
2021-06-20 14:52 ` [bug#49136] [PATCH 1/2] gnu: ocaml-dot-merlin-reader: Update to 4.2-411 Xinglu Chen
2021-06-20 14:52 ` [bug#49136] [PATCH 2/2] gnu: ocaml-merlin: Inherit from ‘ocaml-dot-merlin-reader’ Xinglu Chen
2021-06-20 22:15 ` bug#49136: [PATCH 0/2] Update ocaml-merlin Julien Lepiller
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).