From 252e0d4a88a93b6bd0cd05ce5374e2d9929dbf70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Tue, 26 Nov 2024 17:07:25 +0100 Subject: [PATCH] [new release] merlin (4 packages) (5.3-502) 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 occurrences bug in which relative paths in index files are resolved against the PWD rather than the SOURCE_ROOT (ocaml/merlin#1855) - Fix exception in polarity search (ocaml/merlin#1858 fixes ocaml/merlin#1113) - Fix jump to `fun` targets not working (ocaml/merlin#1863, fixes ocaml/merlin#1862) - Fix type-enclosing results instability. This reverts some overly aggressive deduplication that should be done on the client side. (ocaml/merlin#1864) - Fix occurrences not working when the definition comes from a hidden source file (ocaml/merlin#1865) --- .../dot-merlin-reader.5.3-502/opam | 30 +++++++ packages/merlin-lib/merlin-lib.5.3-502/opam | 35 ++++++++ packages/merlin/merlin.5.3-502/opam | 82 +++++++++++++++++++ packages/ocaml-index/ocaml-index.5.3-502/opam | 41 ++++++++++ 4 files changed, 188 insertions(+) create mode 100644 packages/dot-merlin-reader/dot-merlin-reader.5.3-502/opam create mode 100644 packages/merlin-lib/merlin-lib.5.3-502/opam create mode 100644 packages/merlin/merlin.5.3-502/opam create mode 100644 packages/ocaml-index/ocaml-index.5.3-502/opam diff --git a/packages/dot-merlin-reader/dot-merlin-reader.5.3-502/opam b/packages/dot-merlin-reader/dot-merlin-reader.5.3-502/opam new file mode 100644 index 00000000000..db750646aaf --- /dev/null +++ b/packages/dot-merlin-reader/dot-merlin-reader.5.3-502/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.2" } + "dune" {>= "3.0.0"} + "merlin-lib" {= version} + "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/v5.3-502/merlin-5.3-502.tbz" + checksum: [ + "sha256=2cea46f12397fa6e31ef0c0d4f5e11c1cfd916ee49420694005c95ebb3aa24bc" + "sha512=e94abb9ae38149245337db033e2c3891c7ec772168e99abf1bda0216a894c0854e7170b56fe88eba83ec98f2ebc0f5c7c723e8db14f59eeb6dd348bec12c6d62" + ] +} +x-commit-hash: "ac951c635e09d6d72462eb9bb70ee4b9ee844d0d" diff --git a/packages/merlin-lib/merlin-lib.5.3-502/opam b/packages/merlin-lib/merlin-lib.5.3-502/opam new file mode 100644 index 00000000000..e3720d6c06f --- /dev/null +++ b/packages/merlin-lib/merlin-lib.5.3-502/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" {>= "5.2" & < "5.3"} + "dune" {>= "3.0.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/v5.3-502/merlin-5.3-502.tbz" + checksum: [ + "sha256=2cea46f12397fa6e31ef0c0d4f5e11c1cfd916ee49420694005c95ebb3aa24bc" + "sha512=e94abb9ae38149245337db033e2c3891c7ec772168e99abf1bda0216a894c0854e7170b56fe88eba83ec98f2ebc0f5c7c723e8db14f59eeb6dd348bec12c6d62" + ] +} +x-commit-hash: "ac951c635e09d6d72462eb9bb70ee4b9ee844d0d" diff --git a/packages/merlin/merlin.5.3-502/opam b/packages/merlin/merlin.5.3-502/opam new file mode 100644 index 00000000000..f6cf3fbd5e4 --- /dev/null +++ b/packages/merlin/merlin.5.3-502/opam @@ -0,0 +1,82 @@ +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.2" & < "5.3"} + "dune" {>= "3.0.0"} + "merlin-lib" {= version} + "dot-merlin-reader" {= version} + "ocaml-index" {>= "1.0" & post} + "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/v5.3-502/merlin-5.3-502.tbz" + checksum: [ + "sha256=2cea46f12397fa6e31ef0c0d4f5e11c1cfd916ee49420694005c95ebb3aa24bc" + "sha512=e94abb9ae38149245337db033e2c3891c7ec772168e99abf1bda0216a894c0854e7170b56fe88eba83ec98f2ebc0f5c7c723e8db14f59eeb6dd348bec12c6d62" + ] +} +x-commit-hash: "ac951c635e09d6d72462eb9bb70ee4b9ee844d0d" diff --git a/packages/ocaml-index/ocaml-index.5.3-502/opam b/packages/ocaml-index/ocaml-index.5.3-502/opam new file mode 100644 index 00000000000..f4c6bc59b97 --- /dev/null +++ b/packages/ocaml-index/ocaml-index.5.3-502/opam @@ -0,0 +1,41 @@ +opam-version: "2.0" +synopsis: "A tool that indexes value usages from cmt files" +description: + "ocaml-index should integrate with the build system to index codebase and allow tools such as Merlin to perform project-wide occurrences queries." +maintainer: ["ulysse@tarides.com"] +authors: ["ulysse@tarides.com"] +license: "MIT" +homepage: "https://github.com/ocaml/merlin/ocaml-index" +bug-reports: "https://github.com/ocaml/merlin/issues" +depends: [ + "dune" {>= "3.0.0"} + "ocaml" {>= "5.2"} + "merlin-lib" {>= "5.1-502"} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "--promote-install-files=false" + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] + ["dune" "install" "-p" name "--create-install-files" name] +] +dev-repo: "git+https://github.com/ocaml/merlin.git" +url { + src: + "https://github.com/ocaml/merlin/releases/download/v5.3-502/merlin-5.3-502.tbz" + checksum: [ + "sha256=2cea46f12397fa6e31ef0c0d4f5e11c1cfd916ee49420694005c95ebb3aa24bc" + "sha512=e94abb9ae38149245337db033e2c3891c7ec772168e99abf1bda0216a894c0854e7170b56fe88eba83ec98f2ebc0f5c7c723e8db14f59eeb6dd348bec12c6d62" + ] +} +x-commit-hash: "ac951c635e09d6d72462eb9bb70ee4b9ee844d0d"