diff options
author | superherointj <5861043+superherointj@users.noreply.github.com> | 2023-03-14 07:00:52 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-14 07:00:52 -0300 |
commit | 3c66f2de15281ed7925ac08c6ca6f64729b39bf9 (patch) | |
tree | c8ceeed97edcaf6750bd4252f48a9f71803e9863 /pkgs/development/tools/ocaml | |
parent | 2d2bef3dc39ca16f89ec22d9e4cc9132e2d1f437 (diff) | |
parent | 1480cd40981da3986ead8ea0554eb13c47515127 (diff) |
Merge pull request #220209 from vbgl/ocaml-merlin-4.8.0
ocamlPackages.merlin: 4.7 → 4.8
Diffstat (limited to 'pkgs/development/tools/ocaml')
-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 296675664547e..ae57eb31529f0 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 |