[new release] merlin and dot-merlin-reader (3.6.1)

CHANGES:

Mon Jul 26 04:43:37 PM CET 2021

  + merlin binary
    - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330)
    - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam)
  + editor modes
    - vim: add support for the `merlin-locate-type` command:
      `MerlinLocateType` (ocaml/merlin#1359)
    - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359)
  + test suite
    - disable tests failing in Opam's CI due to nested dune projects

packages/dot-merlin-reader/dot-merlin-reader.3.6.1/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.02.1" & < "4.12"}
+  "dune" {>= "2.7.0"}
+  "yojson" {>= "1.6.0"}
+  "ocamlfind" {>= "1.6.0"}
+  "csexp" {>= "1.2.3"}
+  "result" {>= "1.5"}
+  "menhirLib" { dev }
+]
+x-commit-hash: "9f6504e9585f8e67101d869494f9efb6dc348c9d"
+url {
+  src:
+    "https://github.com/ocaml/merlin/releases/download/v3.6.1/merlin-v3.6.1.tbz"
+  checksum: [
+    "sha256=b611b2b0bdc424629d2f6aa625fca81bb7734cb10c997eedc184c922d95cb9f6"
+    "sha512=47764d6b9483eee7e51da67d04c83b19a3b0dd406911eeef20a59dab88ab7d11ba45ae43131c61de69e3d88c65a204e76110000020871d64a2abe9cdcd361a61"
+  ]
+}

packages/merlin/merlin.3.6.1/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" "merlin,dot-merlin-reader" "-j" "1"] {with-test & ocaml:version >= "4.03"}
+]
+depends: [
+  "ocaml" {>= "4.02.3" & < "4.12"}
+  "dune" {>= "1.8.0"}
+  "dot-merlin-reader" {>= "3.4.2"}
+  "yojson" {>= "1.6.0"}
+  "mdx" {with-test & >= "1.3.0"}
+  "conf-jq" {with-test}
+  "csexp" {>= "1.2.3"}
+  "result" {>= "1.5"}
+  "menhir" {dev}
+  "menhirLib" {dev}
+  "menhirSdk" {dev}
+]
+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\" \"config\" \"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}
+]
+x-commit-hash: "9f6504e9585f8e67101d869494f9efb6dc348c9d"
+url {
+  src:
+    "https://github.com/ocaml/merlin/releases/download/v3.6.1/merlin-v3.6.1.tbz"
+  checksum: [
+    "sha256=b611b2b0bdc424629d2f6aa625fca81bb7734cb10c997eedc184c922d95cb9f6"
+    "sha512=47764d6b9483eee7e51da67d04c83b19a3b0dd406911eeef20a59dab88ab7d11ba45ae43131c61de69e3d88c65a204e76110000020871d64a2abe9cdcd361a61"
+  ]
+}