diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-03-08 21:10:22 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-03-08 21:10:22 +0100 |
| commit | 1480cd40981da3986ead8ea0554eb13c47515127 (patch) | |
| tree | 9d63b16a191b41ea5bfefe1c64c662ffd703c0d0 /pkgs/development/tools/ocaml/merlin/4.x.nix | |
| parent | 3b12bfe6c4e11e91865f4d244d13fdc9860bd322 (diff) | |
| download | nixpkgs-1480cd40981da3986ead8ea0554eb13c47515127.tar nixpkgs-1480cd40981da3986ead8ea0554eb13c47515127.tar.gz nixpkgs-1480cd40981da3986ead8ea0554eb13c47515127.tar.bz2 nixpkgs-1480cd40981da3986ead8ea0554eb13c47515127.tar.lz nixpkgs-1480cd40981da3986ead8ea0554eb13c47515127.tar.xz nixpkgs-1480cd40981da3986ead8ea0554eb13c47515127.tar.zst nixpkgs-1480cd40981da3986ead8ea0554eb13c47515127.zip | |
ocamlPackages.merlin: 4.7 → 4.8
Diffstat (limited to 'pkgs/development/tools/ocaml/merlin/4.x.nix')
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/4.x.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 29667566454..ae57eb31529 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,13 +15,13 @@ }: let - merlinVersion = "4.7"; + merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.8" else "4.7"; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; - "4.7-414" = "sha256-bIZ4kwmnit/ujM2//jZA59rweo7Y0QfDb+BpoTxswHs="; - "4.7-500" = "sha256-elYb/0vVvohi9yYFe/54brb6Qh6fyiN1kYPRq5fP1zE="; + "4.8-414" = "sha256-HMXWhcVOXW058y143rNBcfEOmjt2tZJXcXKHmKZ5i68="; + "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI="; }; ocamlVersionShorthand = lib.substring 0 3 |