From 264d2a554d9ded84cb8a767255aa9bb364dd9f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Mon, 10 Jun 2024 18:05:03 +0200 Subject: [PATCH] [new release] merlin (3 packages) (4.16-501) CHANGES: Mon Jun 10 17:35:42 CEST 2024 + merlin binary - Addition of a `merlin-lib.commands` library which disassociates the execution of commands from the `new_protocol`, from the binary, allowing it to be invoked from other projects (ocaml/merlin#1758) - `merlin-lib.commands`: Add a `find_command_opt` alternative to `find_command` that does not raise (ocaml/merlin#1778) --- .../dot-merlin-reader.4.16-501/opam | 30 +++++++ packages/merlin-lib/merlin-lib.4.16-501/opam | 34 ++++++++ packages/merlin/merlin.4.16-501/opam | 81 +++++++++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 packages/dot-merlin-reader/dot-merlin-reader.4.16-501/opam create mode 100644 packages/merlin-lib/merlin-lib.4.16-501/opam create mode 100644 packages/merlin/merlin.4.16-501/opam diff --git a/packages/dot-merlin-reader/dot-merlin-reader.4.16-501/opam b/packages/dot-merlin-reader/dot-merlin-reader.4.16-501/opam new file mode 100644 index 000000000000..303c8579d2ed --- /dev/null +++ b/packages/dot-merlin-reader/dot-merlin-reader.4.16-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.16-501/merlin-4.16-501.tbz" + checksum: [ + "sha256=da5bf309b040645c292ae4572cc6a0a700dbd2bcfc996ac13c8e5c3836c21e26" + "sha512=99eba17b2bdec5411d239093f4e8e11ada79b2b84ae88074a1b46e47eb836bbf8cb7836c472c22e7f9e68cff1b9ea6d9b9989b70055c3277edb4cddc4a86460c" + ] +} +x-commit-hash: "90844631770a38552ab2c8f9f870be9590bf984b" diff --git a/packages/merlin-lib/merlin-lib.4.16-501/opam b/packages/merlin-lib/merlin-lib.4.16-501/opam new file mode 100644 index 000000000000..4a8da4132864 --- /dev/null +++ b/packages/merlin-lib/merlin-lib.4.16-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.16-501/merlin-4.16-501.tbz" + checksum: [ + "sha256=da5bf309b040645c292ae4572cc6a0a700dbd2bcfc996ac13c8e5c3836c21e26" + "sha512=99eba17b2bdec5411d239093f4e8e11ada79b2b84ae88074a1b46e47eb836bbf8cb7836c472c22e7f9e68cff1b9ea6d9b9989b70055c3277edb4cddc4a86460c" + ] +} +x-commit-hash: "90844631770a38552ab2c8f9f870be9590bf984b" diff --git a/packages/merlin/merlin.4.16-501/opam b/packages/merlin/merlin.4.16-501/opam new file mode 100644 index 000000000000..b7532bf4ff71 --- /dev/null +++ b/packages/merlin/merlin.4.16-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.16-501/merlin-4.16-501.tbz" + checksum: [ + "sha256=da5bf309b040645c292ae4572cc6a0a700dbd2bcfc996ac13c8e5c3836c21e26" + "sha512=99eba17b2bdec5411d239093f4e8e11ada79b2b84ae88074a1b46e47eb836bbf8cb7836c472c22e7f9e68cff1b9ea6d9b9989b70055c3277edb4cddc4a86460c" + ] +} +x-commit-hash: "90844631770a38552ab2c8f9f870be9590bf984b"