futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: ocaml-merlin: Inherit from ‘ocaml-dot-merlin-reader’.

Browse Source 
* 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.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
This commit is contained in:
Xinglu Chen 2021-06-20 16:52:16 +02:00 committed by Julien Lepiller
parent 5ae0d2c247
commit 980c33bd3f
No known key found for this signature in database
GPG Key ID: 53D457B2D636EE82
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/ocaml.scm
View File

@ -4566,21 +4566,16 @@ format}. @code{craml} is released as a single binary (called @code{craml}).")
(define-public ocaml-merlin (define-public ocaml-merlin
(package (package
(inherit ocaml-dot-merlin-reader)
(name "ocaml-merlin") (name "ocaml-merlin")
(version "3.4.2") (arguments
(source '(#:package "merlin"
(origin #:phases
(method git-fetch) (modify-phases %standard-phases
(uri (git-reference (replace 'check
(url "https://github.com/ocaml/merlin") (lambda* (#:key tests? #:allow-other-keys)
(commit (string-append "v" version)))) (when tests?
(file-name (git-file-name name version)) (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))))))
(sha256
(base32
"0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj"))))
(build-system dune-build-system)
(arguments '(#:package "merlin"
#:test-target "tests"))
(inputs (inputs
`(("ocaml-yojson" ,ocaml-yojson) `(("ocaml-yojson" ,ocaml-yojson)
("ocaml-csexp" ,ocaml-csexp) ("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-dot-merlin-reader" ,ocaml-dot-merlin-reader) ; required for tests
("ocaml-mdx" ,ocaml-mdx) ("ocaml-mdx" ,ocaml-mdx)
("jq" ,jq))) ("jq" ,jq)))
(home-page "https://ocaml.github.io/merlin/")
(synopsis "Context sensitive completion for OCaml in Vim and Emacs") (synopsis "Context sensitive completion for OCaml in Vim and Emacs")
(description "Merlin is an editor service that provides modern IDE (description "Merlin is an editor service that provides modern IDE
features for OCaml. Emacs and Vim support is provided out-of-the-box. features for OCaml. Emacs and Vim support is provided out-of-the-box.