summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml
diff options
context:
space:
mode:
authorJules Aguillon <jules@j3s.fr>2023-06-13 14:59:14 +0200
committerVincent Laporte <vbgl@users.noreply.github.com>2023-06-14 06:59:33 +0200
commitba1a6ec548000d4a50719d14e6f73f63016674d5 (patch)
tree7915e074a2f31c543961d2007399ad947aedad81 /pkgs/development/tools/ocaml
parentfc81e16aa6a2a071a0ab93bd10de261db87938e9 (diff)
downloadnixpkgs-ba1a6ec548000d4a50719d14e6f73f63016674d5.tar
nixpkgs-ba1a6ec548000d4a50719d14e6f73f63016674d5.tar.gz
nixpkgs-ba1a6ec548000d4a50719d14e6f73f63016674d5.tar.bz2
nixpkgs-ba1a6ec548000d4a50719d14e6f73f63016674d5.tar.lz
nixpkgs-ba1a6ec548000d4a50719d14e6f73f63016674d5.tar.xz
nixpkgs-ba1a6ec548000d4a50719d14e6f73f63016674d5.tar.zst
nixpkgs-ba1a6ec548000d4a50719d14e6f73f63016674d5.zip
ocamlPackages.merlin: Add versions 4.9-414, 4.9-500
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r--pkgs/development/tools/ocaml/merlin/4.x.nix4
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 ae57eb31529..0a5d317cbce 100644
--- a/pkgs/development/tools/ocaml/merlin/4.x.nix
+++ b/pkgs/development/tools/ocaml/merlin/4.x.nix
@@ -15,13 +15,15 @@
 }:
 
 let
-  merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.8" else "4.7";
+  merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.9" else "4.7";
 
   hashes = {
     "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y=";
     "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU=";
     "4.8-414" = "sha256-HMXWhcVOXW058y143rNBcfEOmjt2tZJXcXKHmKZ5i68=";
     "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI=";
+    "4.9-414" = "sha256-4j/EeBNZEmn/nSfIIJiOUgpmLIndCvfqZSshUXSZy/0=";
+    "4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY=";
   };
 
   ocamlVersionShorthand = lib.substring 0 3