[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
28/28: gnu: Add ocaml5.0-merlin.
From: |
guix-commits |
Subject: |
28/28: gnu: Add ocaml5.0-merlin. |
Date: |
Wed, 21 Dec 2022 16:11:44 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit fe5836feaf61a7758c2291d9f665b227de3fa9b7
Author: pukkamustard <pukkamustard@posteo.net>
AuthorDate: Fri Dec 16 13:25:27 2022 +0000
gnu: Add ocaml5.0-merlin.
* gnu/packages/ocaml.scm (ocaml5.0-merlin): New variable.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
---
gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c986a9f354..94b4fd514e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5449,6 +5449,7 @@ interfaces and the standard higher-level merlin
protocol.")
(when tests?
(invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))))))
(propagated-inputs (list ocaml-merlin-lib ocaml-yojson))
+ (properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin))))
(native-inputs
(list ocaml-dot-merlin-reader ; required for tests
ocaml-ppxlib
@@ -5461,6 +5462,32 @@ External contributors added support for Visual Studio
Code, Sublime Text and
Atom.")
(license license:expat)))
+(define-public ocaml5.0-merlin
+ (package-with-ocaml5.0
+ (package
+ (inherit ocaml-merlin-lib-500)
+ (name "ocaml-merlin")
+ (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")))))))
+ (propagated-inputs (list ocaml-merlin-lib ocaml-yojson))
+ (native-inputs
+ (list ocaml-dot-merlin-reader ; required for tests
+ ocaml-ppxlib
+ ocaml-mdx
+ jq))
+ (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.
+External contributors added support for Visual Studio Code, Sublime Text and
+Atom.")
+ (license license:expat))))
+
(define-public ocaml-gsl
(package
(name "ocaml-gsl")
- 24/28: gnu: Add ocaml5.0-eio-main., (continued)
- 24/28: gnu: Add ocaml5.0-eio-main., guix-commits, 2022/12/21
- 06/28: gnu: Add ocaml-psq., guix-commits, 2022/12/21
- 05/28: gnu: opam: Use OCaml 4.14 compiled version when building OCaml 5.0 packages., guix-commits, 2022/12/21
- 09/28: gnu: Add ocaml-hmap., guix-commits, 2022/12/21
- 11/28: gnu: Update ocaml-ppxlib to 0.25.1., guix-commits, 2022/12/21
- 19/28: gnu: ocaml-mdx: Move inputs to propagated-inputs., guix-commits, 2022/12/21
- 26/28: gnu: Add ocaml5.0-merlin-lib., guix-commits, 2022/12/21
- 16/28: gnu: Add ocaml-lwt-dllist., guix-commits, 2022/12/21
- 18/28: gnu: Add ocaml-bechamel., guix-commits, 2022/12/21
- 23/28: gnu: Add ocaml5.0-eio-linux., guix-commits, 2022/12/21
- 28/28: gnu: Add ocaml5.0-merlin.,
guix-commits <=
- 22/28: gnu: Add ocaml-uring., guix-commits, 2022/12/21