ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-14 07:00:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Add ocaml-merlin.

Browse source 
* gnu/packages/ocaml.scm (ocaml-merlin): New variable.
(ocaml4.07-merlin): Inherit from ocaml-merlin.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
This commit is contained in:
pukkamustard 2020-12-28 22:10:16 +01:00 committed by Julien Lepiller
parent 995685738e
commit 8b036927a4
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 41 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
gnu/packages/ocaml.scm
View file

@ -3936,11 +3936,10 @@ (define-public ocaml-dot-merlin-reader
@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)
@ -3950,18 +3949,19 @@ (define-public ocaml4.07-merlin
(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.
@ -3969,6 +3969,34 @@ (define-public ocaml4.07-merlin
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")