From 71f7414f9c853c2a5f0935871d2483f08c76abc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Tue, 26 Nov 2024 17:29:09 +0100 Subject: [PATCH] [new release] merlin (3 packages) (4.18-414) CHANGES: Tue Nov 26 17:30:42 CET 2024 + merlin binary - Respect the `EXCLUDE_QUERY_DIR` configuration directive when looking for cmt files (ocaml/merlin#1854) - Fix exception in polarity search (ocaml/merlin#1858 fixes ocaml/merlin#1113) - Fix type-enclosing results instability. This reverts some overly aggressive deduplication that should be done on the client side. (ocaml/merlin#1864) --- packages/merlin-lib/merlin-lib.4.18-414/opam | 35 +++++++++ packages/merlin/merlin.4.18-414/opam | 81 ++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 packages/merlin-lib/merlin-lib.4.18-414/opam create mode 100644 packages/merlin/merlin.4.18-414/opam diff --git a/packages/merlin-lib/merlin-lib.4.18-414/opam b/packages/merlin-lib/merlin-lib.4.18-414/opam new file mode 100644 index 00000000000..d7192b211bf --- /dev/null +++ b/packages/merlin-lib/merlin-lib.4.18-414/opam @@ -0,0 +1,35 @@ +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"} + "alcotest" {with-test & >= "1.3.0" } + "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.18-414/merlin-4.18-414.tbz" + checksum: [ + "sha256=f6d6f7a266141e358c1a869612c8135c859185d547ea3ba5c9ad7bb67fe30cc1" + "sha512=4f272bdb028fd984fef406f7e1eadd0a3ab99d94016316f1b842782b1d1bba2bd50dcf3b4021c2096c6d9b5e5f9f6bae61bedcfd9f933f15c190e01777ef83a9" + ] +} +x-commit-hash: "2b9cd21c24a687ca4dc6d0a191942b13903eae82" diff --git a/packages/merlin/merlin.4.18-414/opam b/packages/merlin/merlin.4.18-414/opam new file mode 100644 index 00000000000..8d684703943 --- /dev/null +++ b/packages/merlin/merlin.4.18-414/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" {>= "4.14" & < "4.15"} + "dune" {>= "2.9.0"} + "merlin-lib" {= version} + "dot-merlin-reader" {>= "4.17.1" < "5.0"} + "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.18-414/merlin-4.18-414.tbz" + checksum: [ + "sha256=f6d6f7a266141e358c1a869612c8135c859185d547ea3ba5c9ad7bb67fe30cc1" + "sha512=4f272bdb028fd984fef406f7e1eadd0a3ab99d94016316f1b842782b1d1bba2bd50dcf3b4021c2096c6d9b5e5f9f6bae61bedcfd9f933f15c190e01777ef83a9" + ] +} +x-commit-hash: "2b9cd21c24a687ca4dc6d0a191942b13903eae82"