Skip to content

Commit

Permalink
[new release] merlin (4 packages) (5.4-503)
Browse files Browse the repository at this point in the history
CHANGES:

Fri Jan 10 17:55:42 CET 2025

  + merlin binary
    - Support for OCaml 5.3
    - Use new 5.3 features to improve locate behavior in some cases. Merlin no
      longer confuses uids from interfaces and implementations. (ocaml/merlin#1857)
    - Perform less merges in the indexer (ocaml/merlin#1881)
    - Add initial support for project-wide renaming: occurrences can now return
      all usages of all related definitions. (ocaml/merlin#1877)
  + vim plugin
    - Added support for search-by-type (ocaml/merlin#1846)
      This is exposed through the existing `:MerlinSearch` command, that
      switches between search-by-type and polarity search depending on the
      first character of the query.
  • Loading branch information
voodoos committed Jan 10, 2025
1 parent 67e9405 commit cfbca3f
Show file tree
Hide file tree
Showing 4 changed files with 186 additions and 0 deletions.
30 changes: 30 additions & 0 deletions packages/dot-merlin-reader/dot-merlin-reader.5.4-503/opam
Original file line number Diff line number Diff line change
@@ -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.4-503/merlin-5.4-503.tbz"
checksum: [
"sha256=f2e4780c9a9ca54c403292e7ff7e0fa33d3afeae0c4e735e14f3f9cb74af2cbc"
"sha512=d81598359e33776d0388838f62175f704d96fc6e497d22a72508ea1f53bb7f0815561ae4fbfa6fd9c1a8ada94b8d0d4c7c03c35c4d8c0fbb323e94260ddd4885"
]
}
x-commit-hash: "3b3d3d1682f9334396a8ad6e245d95ae3be353ef"
35 changes: 35 additions & 0 deletions packages/merlin-lib/merlin-lib.5.4-503/opam
Original file line number Diff line number Diff line change
@@ -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.3" & <"5.4"}
"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.4-503/merlin-5.4-503.tbz"
checksum: [
"sha256=f2e4780c9a9ca54c403292e7ff7e0fa33d3afeae0c4e735e14f3f9cb74af2cbc"
"sha512=d81598359e33776d0388838f62175f704d96fc6e497d22a72508ea1f53bb7f0815561ae4fbfa6fd9c1a8ada94b8d0d4c7c03c35c4d8c0fbb323e94260ddd4885"
]
}
x-commit-hash: "3b3d3d1682f9334396a8ad6e245d95ae3be353ef"
80 changes: 80 additions & 0 deletions packages/merlin/merlin.5.4-503/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
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: [
"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"}
]
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.4-503/merlin-5.4-503.tbz"
checksum: [
"sha256=f2e4780c9a9ca54c403292e7ff7e0fa33d3afeae0c4e735e14f3f9cb74af2cbc"
"sha512=d81598359e33776d0388838f62175f704d96fc6e497d22a72508ea1f53bb7f0815561ae4fbfa6fd9c1a8ada94b8d0d4c7c03c35c4d8c0fbb323e94260ddd4885"
]
}
x-commit-hash: "3b3d3d1682f9334396a8ad6e245d95ae3be353ef"
41 changes: 41 additions & 0 deletions packages/ocaml-index/ocaml-index.5.4-503/opam
Original file line number Diff line number Diff line change
@@ -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.4-503/merlin-5.4-503.tbz"
checksum: [
"sha256=f2e4780c9a9ca54c403292e7ff7e0fa33d3afeae0c4e735e14f3f9cb74af2cbc"
"sha512=d81598359e33776d0388838f62175f704d96fc6e497d22a72508ea1f53bb7f0815561ae4fbfa6fd9c1a8ada94b8d0d4c7c03c35c4d8c0fbb323e94260ddd4885"
]
}
x-commit-hash: "3b3d3d1682f9334396a8ad6e245d95ae3be353ef"

0 comments on commit cfbca3f

Please sign in to comment.