diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-14 12:01:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 12:01:32 +0000 |
| commit | e196e68bee289193e4e133dd378addd8572dc4c5 (patch) | |
| tree | e622670eff2b4242c48ed397843a12e593ab6f52 /pkgs/development/tools/ocaml | |
| parent | 6b67186fe9a8c05ba3dca00cd7f3434e97c5c0f3 (diff) | |
| parent | 514826ddf2b14eb20c4fac2a19f5f8e4b5858577 (diff) | |
| download | nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.gz nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.bz2 nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.lz nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.xz nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.zst nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.zip | |
Merge master into staging-next
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 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 |