Commit ce860f6a authored by Jules Aguillon's avatar Jules Aguillon Committed by Vincent Laporte
Browse files

ocamlPackages.merlin: 4.10 → 4.12

parent 91ab8ed2

pkgs/development/tools/ocaml/merlin/4.x.nix

+4 −1
Original line number Diff line number Diff line
@@ -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 =