gnu: ocaml-yojson: Update to 1.7.0.

* gnu/packages/ocaml.scm (ocaml-yojson): Update to 1.7.0.
(ocaml-merlin): Use jbuild to prevent a build failure due to a
deprecation warning.
This commit is contained in:
Julien Lepiller 2019-04-29 15:41:00 +02:00
parent fdd9ab3721
commit 373a2a0797
No known key found for this signature in database
GPG key ID: 43111F4520086A0C

View file

@ -3470,18 +3470,18 @@ (define-public ocaml-biniou
(define-public ocaml-yojson
(package
(name "ocaml-yojson")
(version "1.4.1")
(version "1.7.0")
(home-page "https://github.com/ocaml-community/yojson")
(source
(origin
(method git-fetch)
(uri (git-reference
(url (string-append home-page ".git"))
(commit (string-append "v" version))))
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0nwsfkmqpyfab4rxq76q8ff7giyanghw08094jyrp275v99zdjr9"))))
"0zncsw8bgbkh1pfvfc7nh628hfj84lgx6jwhp9ashj3z1z0w3xjn"))))
(build-system dune-build-system)
(arguments
`(#:test-target "."))
@ -3489,7 +3489,8 @@ (define-public ocaml-yojson
`(("ocaml-biniou" ,ocaml-biniou)
("ocaml-easy-format" ,ocaml-easy-format)))
(native-inputs
`(("ocaml-cppo" ,ocaml-cppo)))
`(("ocaml-alcotest" ,ocaml-alcotest)
("ocaml-cppo" ,ocaml-cppo)))
(synopsis "Low-level JSON library for OCaml")
(description "Yojson is an optimized parsing and printing library for the
JSON format. It addresses a few shortcomings of json-wheel including 2x
@ -3551,7 +3552,8 @@ (define-public ocaml-merlin
(native-inputs
`(("ocaml-findlib" ,ocaml-findlib)))
(arguments
'(#:tests? #f)) ;; Errors in tests in version 3.2.2
'(#:jbuild? #t
#:tests? #f)) ;; Errors in tests in version 3.2.2
(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.