From 66e2ca2e5fccf615119537fe37d7b6ed9e87a323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Fri, 24 Feb 2023 17:08:00 +0100 Subject: [PATCH] [new release] merlin, merlin-lib and dot-merlin-reader (4.8-414) CHANGES: Fri Feb 24 16:55:42 CEST 2023 + merlin binary - Update internal typer to match OCaml 4.14.1 release (ocaml/merlin#1557) - Improve type-enclosing behaviour when used on records' labels (ocaml/merlin#1565, fixes ocaml/merlin#1564) - Restore compatibility with some OCaml compiler's debug flags that were incorrectly rejected by Merlin (ocaml/merlin#1556) - Traverse aliases when jumping to declaration. This matches jump-to-definition's behavior (ocaml/merlin#1563) - Improve locate's behavior in various ill-typed expressions (ocaml/merlin#1546, fixes ocaml/merlin#1567 and partially ocaml/merlin#1543) - Correctly traverse patterns when looking for docs in the typedtree (ocaml/merlin#1572) - Get documentation when the declaration or definition is selected (ocaml/merlin#1542, fixes ocaml/merlin#1540) - On Windows, change to a harmless directory when launching server to avoid locking down current directory (ocaml/merlin#1569, fixes ocaml/merlin#1474) + test suite - Add multiple tests for locate over ill-typed expressions (ocaml/merlin#1546) - Add non-regression tests for other fixes in this release --- .../dot-merlin-reader.4.8-414/opam | 30 +++++++ packages/merlin-lib/merlin-lib.4.8-414/opam | 34 ++++++++ packages/merlin/merlin.4.8-414/opam | 78 +++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 packages/dot-merlin-reader/dot-merlin-reader.4.8-414/opam create mode 100644 packages/merlin-lib/merlin-lib.4.8-414/opam create mode 100644 packages/merlin/merlin.4.8-414/opam diff --git a/packages/dot-merlin-reader/dot-merlin-reader.4.8-414/opam b/packages/dot-merlin-reader/dot-merlin-reader.4.8-414/opam new file mode 100644 index 00000000000..c031c43355f --- /dev/null +++ b/packages/dot-merlin-reader/dot-merlin-reader.4.8-414/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" {>= "4.08" & < "5.0.0"} + "dune" {>= "2.9.0"} + "merlin-lib" {>= "4.6"} + "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.8-414/merlin-4.8-414.tbz" + checksum: [ + "sha256=1cc5d685c54e5d6d39f32d78deb34171f10e9a3b76b5925771728798a6798baf" + "sha512=49804812b9066a457ad15d4e11a8bdb0323beead43712b5f5f936f60aa2975753c2a62dc95c7a49f3bd07c210056a170fb5c71f269ca1890aa26c96b45541fc6" + ] +} +x-commit-hash: "85ad3a6b09edbf54685eb8e962e82c209f409951" diff --git a/packages/merlin-lib/merlin-lib.4.8-414/opam b/packages/merlin-lib/merlin-lib.4.8-414/opam new file mode 100644 index 00000000000..07698b02d44 --- /dev/null +++ b/packages/merlin-lib/merlin-lib.4.8-414/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" {>= "4.14" & < "4.15"} + "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.8-414/merlin-4.8-414.tbz" + checksum: [ + "sha256=1cc5d685c54e5d6d39f32d78deb34171f10e9a3b76b5925771728798a6798baf" + "sha512=49804812b9066a457ad15d4e11a8bdb0323beead43712b5f5f936f60aa2975753c2a62dc95c7a49f3bd07c210056a170fb5c71f269ca1890aa26c96b45541fc6" + ] +} +x-commit-hash: "85ad3a6b09edbf54685eb8e962e82c209f409951" diff --git a/packages/merlin/merlin.4.8-414/opam b/packages/merlin/merlin.4.8-414/opam new file mode 100644 index 00000000000..b080c70cc5a --- /dev/null +++ b/packages/merlin/merlin.4.8-414/opam @@ -0,0 +1,78 @@ +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" {>= "4.14" & < "4.15"} + "dune" {>= "2.9.0"} + "merlin-lib" {= version} + "dot-merlin-reader" {>= "4.6"} + "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))) + +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.8-414/merlin-4.8-414.tbz" + checksum: [ + "sha256=1cc5d685c54e5d6d39f32d78deb34171f10e9a3b76b5925771728798a6798baf" + "sha512=49804812b9066a457ad15d4e11a8bdb0323beead43712b5f5f936f60aa2975753c2a62dc95c7a49f3bd07c210056a170fb5c71f269ca1890aa26c96b45541fc6" + ] +} +x-commit-hash: "85ad3a6b09edbf54685eb8e962e82c209f409951"