diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-08-30 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2023-08-30 04:20:00 +0000 |
| commit | 905323a083dbfd5bee84a30a7f332de28ecc752c (patch) | |
| tree | ce56b82be135008803563b8c13d5591e23484407 /pkgs/development/tools/ocaml | |
| parent | b367e03d886f57a811440c074c2fd990b0212a4a (diff) | |
ocaml-ng.ocamlPackages_4_14.merlin,ocaml-ng.ocamlPackages_5_0.merlin: 4.9 -> 4.10
Changelog: - https://github.com/ocaml/merlin/releases/tag/v4.10-414 - https://github.com/ocaml/merlin/releases/tag/v4.10-500
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/4.x.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 0a5d317cbcec5..6cd8154877eb5 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,7 +15,7 @@ }: let - merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.9" else "4.7"; + merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.10" else "4.7"; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; @@ -24,6 +24,8 @@ let "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI="; "4.9-414" = "sha256-4j/EeBNZEmn/nSfIIJiOUgpmLIndCvfqZSshUXSZy/0="; "4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY="; + "4.10-414" = "sha256-/a1OqASISpb06eh2gsam1rE3wovM4CT8ybPV86XwR2c="; + "4.10-500" = "sha256-m9+Qz8DT94yNSwpamTVLQKISHtRVBWnZD3t/yyujSZ0="; }; ocamlVersionShorthand = lib.substring 0 3 |