From 908be257de3179438c30b4bbb650e60c7003ddb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Fri, 1 Dec 2023 14:50:34 +0100 Subject: [PATCH] [new release] merlin (3 packages) (4.13.1-501) CHANGES: Fri Dec 1 15:00:42 CET 2023 + merlin binary - Fix a follow-up issue to the preference of non-ghost nodes introduced in ocaml/merlin#1660 (ocaml/merlin#1690, fixes ocaml/merlin#1689) - Add `-cache-lifespan` flag, that sets cache invalidation period. (ocaml/merlin#1698, ocaml/merlin#1705) - Ignore the new 5.1 `cmi-file` flag instead of rejecting it (ocaml/merlin#1710, fixes ocaml/merlin#1703) - Fix Merlin locate not fallbacking on the correct file in case of ambiguity (@goldfirere, ocaml/merlin#1699) - Fix Merlin reporting errors provoked by the recovery itself (ocaml/merlin#1709, fixes ocaml/merlin#1704) - Add support for OCaml 5.1.1 (ocaml/merlin#1714) + editor modes - vim: load merlin when Vim is compiled with +python3/dyn (e.g. MacVim) - emacs: highlight only first error line by default (ocaml/merlin#1693, fixes ocaml/merlin#1663) --- .../dot-merlin-reader.4.13.1-501/opam | 30 +++++++ .../merlin-lib/merlin-lib.4.13.1-501/opam | 34 ++++++++ packages/merlin/merlin.4.13.1-501/opam | 81 +++++++++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 packages/dot-merlin-reader/dot-merlin-reader.4.13.1-501/opam create mode 100644 packages/merlin-lib/merlin-lib.4.13.1-501/opam create mode 100644 packages/merlin/merlin.4.13.1-501/opam diff --git a/packages/dot-merlin-reader/dot-merlin-reader.4.13.1-501/opam b/packages/dot-merlin-reader/dot-merlin-reader.4.13.1-501/opam new file mode 100644 index 000000000000..d9af5cb7743d --- /dev/null +++ b/packages/dot-merlin-reader/dot-merlin-reader.4.13.1-501/opam @@ -0,0 +1,30 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +synopsis: "Reads config files for merlin" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +license: "MIT" +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "5.1" & < "5.2" } + "dune" {>= "2.9.0"} + "merlin-lib" {>= "4.9"} + "ocamlfind" {>= "1.6.0"} +] +description: + "Helper process: reads .merlin files and outputs the normalized content to + stdout." +url { + src: + "https://github.com/ocaml/merlin/releases/download/v4.13.1-501/merlin-4.13.1-501.tbz" + checksum: [ + "sha256=3557e05f70c5b108210291205a294282be4ed964a4c0ab5e9d9645489d70c1ad" + "sha512=e274ed87affabf2c91db81dafadbc519ddb1da2a2ebbe55d2985d82ea32b93a5651a4e6ac718e5c55d179025efaeb5babdb4cb53080eb2c5a65b147c22bd2719" + ] +} +x-commit-hash: "3dd2198ac1961d0f0c9080b4328461a57af03e89" diff --git a/packages/merlin-lib/merlin-lib.4.13.1-501/opam b/packages/merlin-lib/merlin-lib.4.13.1-501/opam new file mode 100644 index 000000000000..a297f0387b6c --- /dev/null +++ b/packages/merlin-lib/merlin-lib.4.13.1-501/opam @@ -0,0 +1,34 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +license: "MIT" +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "5.1.1" & < "5.2"} + "dune" {>= "2.9.0"} + "csexp" {>= "1.5.1"} + "menhir" {dev & >= "20201216"} + "menhirLib" {dev & >= "20201216"} + "menhirSdk" {dev & >= "20201216"} +] +synopsis: + "Merlin's libraries" +description: + "These libraries provides access to low-level compiler interfaces and the + standard higher-level merlin protocol. The library is provided as-is, is not + thoroughly documented, and its public API might break with any new release." +url { + src: + "https://github.com/ocaml/merlin/releases/download/v4.13.1-501/merlin-4.13.1-501.tbz" + checksum: [ + "sha256=3557e05f70c5b108210291205a294282be4ed964a4c0ab5e9d9645489d70c1ad" + "sha512=e274ed87affabf2c91db81dafadbc519ddb1da2a2ebbe55d2985d82ea32b93a5651a4e6ac718e5c55d179025efaeb5babdb4cb53080eb2c5a65b147c22bd2719" + ] +} +x-commit-hash: "3dd2198ac1961d0f0c9080b4328461a57af03e89" diff --git a/packages/merlin/merlin.4.13.1-501/opam b/packages/merlin/merlin.4.13.1-501/opam new file mode 100644 index 000000000000..be2db8a9c724 --- /dev/null +++ b/packages/merlin/merlin.4.13.1-501/opam @@ -0,0 +1,81 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +license: "MIT" +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +depends: [ + "ocaml" {>= "5.1" & < "5.2"} + "dune" {>= "2.9.0"} + "merlin-lib" {= version} + "dot-merlin-reader" {>= "4.9"} + "yojson" {>= "2.0.0"} + "conf-jq" {with-test} + "ppxlib" {with-test} +] +conflicts: [ + "seq" {!= "base"} + "base-effects" +] +synopsis: + "Editor helper, provides completion, typing and source browsing in Vim and Emacs" +description: + "Merlin is an assistant for editing OCaml code. It aims to provide the features available in modern IDEs: error reporting, auto completion, source browsing and much more." +post-messages: [ + "merlin installed. + +Quick setup for VIM +------------------- +Append this to your .vimrc to add merlin to vim's runtime-path: + let g:opamshare = substitute(system('opam var share'),'\\n$','','''') + execute \"set rtp+=\" . g:opamshare . \"/merlin/vim\" + +Also run the following line in vim to index the documentation: + :execute \"helptags \" . g:opamshare . \"/merlin/vim/doc\" + +Quick setup for EMACS +------------------- +Add opam emacs directory to your load-path by appending this to your .emacs: + (let ((opam-share (ignore-errors (car (process-lines \"opam\" \"var\" \"share\"))))) + (when (and opam-share (file-directory-p opam-share)) + ;; Register Merlin + (add-to-list 'load-path (expand-file-name \"emacs/site-lisp\" opam-share)) + (autoload 'merlin-mode \"merlin\" nil t nil) + ;; Automatically start it in OCaml buffers + (add-hook 'tuareg-mode-hook 'merlin-mode t) + (add-hook 'caml-mode-hook 'merlin-mode t) + ;; Use opam switch to lookup ocamlmerlin binary + (setq merlin-command 'opam) + ;; To easily change opam switches within a given Emacs session, you can + ;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode + ;; and use one of its \"OPSW\" menus. + )) +Take a look at https://github.com/ocaml/merlin for more information + +Quick setup with opam-user-setup +-------------------------------- + +Opam-user-setup support Merlin. + + $ opam user-setup install + +should take care of basic setup. +See https://github.com/OCamlPro/opam-user-setup +" + {success & !user-setup:installed} +] +url { + src: + "https://github.com/ocaml/merlin/releases/download/v4.13.1-501/merlin-4.13.1-501.tbz" + checksum: [ + "sha256=3557e05f70c5b108210291205a294282be4ed964a4c0ab5e9d9645489d70c1ad" + "sha512=e274ed87affabf2c91db81dafadbc519ddb1da2a2ebbe55d2985d82ea32b93a5651a4e6ac718e5c55d179025efaeb5babdb4cb53080eb2c5a65b147c22bd2719" + ] +} +x-commit-hash: "3dd2198ac1961d0f0c9080b4328461a57af03e89"