diff options
| author | Jules Aguillon <jules@j3s.fr> | 2023-09-27 12:00:56 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2023-09-27 14:49:44 +0200 |
| commit | ce860f6a1e0989d041556c45832b0b370a3d59a3 (patch) | |
| tree | c1b8df4a915c1472231dee3a9c88fd13c3248bdb | |
| parent | 91ab8ed21d681fc9f23f2a85df20e0f5c81efad3 (diff) | |
| download | nixpkgs-ce860f6a1e0989d041556c45832b0b370a3d59a3.tar nixpkgs-ce860f6a1e0989d041556c45832b0b370a3d59a3.tar.gz nixpkgs-ce860f6a1e0989d041556c45832b0b370a3d59a3.tar.bz2 nixpkgs-ce860f6a1e0989d041556c45832b0b370a3d59a3.tar.lz nixpkgs-ce860f6a1e0989d041556c45832b0b370a3d59a3.tar.xz nixpkgs-ce860f6a1e0989d041556c45832b0b370a3d59a3.tar.zst nixpkgs-ce860f6a1e0989d041556c45832b0b370a3d59a3.zip | |
ocamlPackages.merlin: 4.10 → 4.12
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/4.x.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 06f358eb828..ef9330054f3 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.10" else "4.7"; + merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.12" else "4.7"; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; @@ -26,6 +26,9 @@ let "4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY="; "4.10-414" = "sha256-/a1OqASISpb06eh2gsam1rE3wovM4CT8ybPV86XwR2c="; "4.10-500" = "sha256-m9+Qz8DT94yNSwpamTVLQKISHtRVBWnZD3t/yyujSZ0="; + "4.12-414" = "sha256-tgMUT4KyFeJubYVY1Sdv9ZvPB1JwcqEGcCuwuMqXHRQ="; + "4.12-500" = "sha256-j49R7KVzNKlXDL7WibTHxPG4VSOVv0uaz5/yMZZjkH8="; + "4.12-501" = "sha256-zMwzI1SXQDWQ9PaKL4o3J6JlRjmEs7lkXrwauy+QiMA="; }; ocamlVersionShorthand = |