[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45498] [PATCH v3 14/14] gnu: Add ocaml-merlin.
From: |
pukkamustard |
Subject: |
[bug#45498] [PATCH v3 14/14] gnu: Add ocaml-merlin. |
Date: |
Mon, 28 Dec 2020 22:10:16 +0100 |
* gnu/packages/ocaml.scm (ocaml-merlin): New variable.
(ocaml4.07-merlin): Inherit from ocaml-merlin.
---
gnu/packages/ocaml.scm | 54 ++++++++++++++++++++++++++++++++----------
1 file changed, 41 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 8efc7caba4..f3f275046f 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3935,11 +3935,10 @@ format}. @code{craml} is released as a single binary
(called @code{craml}).")
@code{ocaml-merlin} configurations.")
(license license:expat)))
-(define-public ocaml4.07-merlin
+(define-public ocaml-merlin
(package
- (name "ocaml4.07-merlin")
- (version "3.2.2")
- (home-page "https://ocaml.github.io/merlin/")
+ (name "ocaml-merlin")
+ (version "3.4.2")
(source
(origin
(method git-fetch)
@@ -3949,18 +3948,19 @@ format}. @code{craml} is released as a single binary
(called @code{craml}).")
(file-name (git-file-name name version))
(sha256
(base32
- "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb"))))
+ "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj"))))
(build-system dune-build-system)
+ (arguments '(#:package "merlin"
+ #:test-target "tests"))
(inputs
- `(("ocaml-yojson" ,(package-with-ocaml4.07 ocaml-yojson))))
+ `(("ocaml-yojson" ,ocaml-yojson)
+ ("ocaml-csexp" ,ocaml-csexp)
+ ("ocaml-result" ,ocaml-result)))
(native-inputs
- `(("ocaml-findlib" ,ocaml-findlib)))
- (arguments
- `(#:package "merlin"
- #:tests? #f ;; Errors in tests in version 3.2.2
- #:ocaml ,ocaml-4.07
- #:findlib ,ocaml4.07-findlib
- #:dune ,ocaml4.07-dune))
+ `(("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.
@@ -3968,6 +3968,34 @@ External contributors added support for Visual Studio
Code, Sublime Text and
Atom.")
(license license:expat)))
+;; ocaml-merlin 3.4.2 can not be built with old version of dune used in
+;; package-with-ocaml4.07
+(define-public ocaml4.07-merlin
+ (package-with-ocaml4.07
+ (package
+ (inherit ocaml-merlin)
+ (name "ocaml-merlin")
+ (version "3.2.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
+ "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb"))))
+ (build-system dune-build-system)
+ (inputs
+ `(("ocaml-yojson" ,ocaml-yojson)))
+ (native-inputs
+ `(("ocaml-findlib" ,ocaml-findlib)))
+ (arguments
+ `(#:package "merlin"
+ ;; Errors in tests in version 3.2.2
+ #:tests? #f)))))
+
(define-public ocaml4.07-gsl
(package
(name "ocaml4.07-gsl")
--
2.29.2
- [bug#45498] [PATCH v2 10/13] gnu: Add ocaml-version., (continued)
- [bug#45498] [PATCH v2 10/13] gnu: Add ocaml-version., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v2 13/13] gnu: ocaml-yojson: Make dependencies propagated-inputs., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v2 09/13] gnu: Add ocaml-odoc., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v2 12/13] gnu: Add ocaml-merlin., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 00/12] Add ocaml-merlin., Julien Lepiller, 2020/12/28
- [bug#45498] [PATCH 00/12] Add ocaml-merlin., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 01/14] gnu: Remove ocaml-js-build-tools., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 04/14] gnu: Add ocaml-parsexp., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 07/14] gnu: ocaml-tyxml: Update to 4.4.0., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 10/14] gnu: Add ocaml-version., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 14/14] gnu: Add ocaml-merlin.,
pukkamustard <=
- [bug#45498] [PATCH v3 02/14] gnu: Add ocaml-sexplib0., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 03/14] gnu: Add ocaml-base., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 05/14] gnu: Add ocaml-sexplib., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 12/14] gnu: ocaml-yojson: Make dependencies propagated-inputs., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 13/14] gnu: Add ocaml-dot-merlin-reader., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 06/14] gnu: Add ocaml-ounit2., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 08/14] gnu: ocaml-markup: Update to 1.0.0., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 09/14] gnu: Add ocaml-odoc., pukkamustard, 2020/12/28
- [bug#45498] [PATCH v3 11/14] gnu: Add ocaml-mdx., pukkamustard, 2020/12/28
bug#45498: [PATCH 00/12] Add ocaml-merlin., Julien Lepiller, 2020/12/30