all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: pukkamustard <pukkamustard@posteo.net>
To: 60120@debbugs.gnu.org
Cc: pukkamustard <pukkamustard@posteo.net>
Subject: [bug#60120] [PATCH 28/28] gnu: Add ocaml5.0-merlin.
Date: Fri, 16 Dec 2022 13:25:27 +0000	[thread overview]
Message-ID: <20221216132527.2539-28-pukkamustard@posteo.net> (raw)
In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net>

* gnu/packages/ocaml.scm (ocaml5.0-merlin): New variable.
---
 gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index dc824626fd..1e4fb46645 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5435,6 +5435,7 @@ (define-public ocaml-merlin
              (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
@@ -5447,6 +5448,32 @@ (define-public ocaml-merlin
 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")
-- 
2.38.1





  parent reply	other threads:[~2022-12-16 13:27 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-16 13:22 [bug#60120] [PATCH 00/28] gnu: Add ocaml-5.0 pukkamustard
2022-12-16 13:25 ` [bug#60120] [PATCH 01/28] " pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 02/28] gnu: ocaml-findlib: Update to 1.9.5 pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 03/28] gnu: Add ocaml5.0-findlib pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 04/28] guix: ocaml: Add package-with-ocaml5.0 pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 05/28] gnu: opam: Use OCaml 4.14 compiled version when building OCaml 5.0 packages pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 06/28] gnu: Add ocaml-psq pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 07/28] gnu: Add ocaml-monolith pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 08/28] gnu: Add ocaml-optint pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 09/28] gnu: Add ocaml-hmap pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 10/28] gnu: Add ocaml5.0-base pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 11/28] gnu: Update ocaml-ppxlib to 0.25.1 pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 12/28] gnu: Update ocaml-qcheck to 0.20 pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 13/28] gnu: Add ocaml5.0-ppx-expect pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 14/28] gnu: Update ocaml-odoc to 2.2.0 pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 15/28] gnu: Add ocaml5.0-crowbar pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 16/28] gnu: Add ocaml-lwt-dllist pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 17/28] gnu: Add ocaml5.0-ctypes pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 18/28] gnu: Add ocaml-bechamel pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 19/28] gnu: ocaml-mdx: Move inputs to propagated-inputs pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 20/28] gnu: Add ocaml5.0-eio pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 21/28] gnu: Add ocaml5.0-eio-luv pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 22/28] gnu: Add ocaml-uring pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 23/28] gnu: Add ocaml5.0-eio-linux pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 24/28] gnu: Add ocaml5.0-eio-main pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 25/28] gnu: Update ocaml-merlin-lib to 4.7-414 pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 26/28] gnu: Add ocaml5.0-merlin-lib pukkamustard
2022-12-16 13:25   ` [bug#60120] [PATCH 27/28] gnu: Add ocaml5.0-dot-merlin-reader pukkamustard
2022-12-16 13:25   ` pukkamustard [this message]
2022-12-21 21:11   ` bug#60120: [PATCH 01/28] gnu: Add ocaml-5.0 Julien Lepiller
2022-12-22  7:08     ` [bug#60120] " pukkamustard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221216132527.2539-28-pukkamustard@posteo.net \
    --to=pukkamustard@posteo.net \
    --cc=60120@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.