summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2016-11-21 19:17:16 +0100
committerVincent Laporte <Vincent.Laporte@gmail.com>2016-11-21 19:17:16 +0100
commit20486458e681298eb8a59f0ad91559f4cbdc659b (patch)
tree9ee3dc88ffe47bf985002e419e854aacb0f9210c /pkgs/development
parentc531cc2303ba6190e311a330cedea6465cfab4d7 (diff)
downloadnixpkgs-20486458e681298eb8a59f0ad91559f4cbdc659b.tar
nixpkgs-20486458e681298eb8a59f0ad91559f4cbdc659b.tar.gz
nixpkgs-20486458e681298eb8a59f0ad91559f4cbdc659b.tar.bz2
nixpkgs-20486458e681298eb8a59f0ad91559f4cbdc659b.tar.lz
nixpkgs-20486458e681298eb8a59f0ad91559f4cbdc659b.tar.xz
nixpkgs-20486458e681298eb8a59f0ad91559f4cbdc659b.tar.zst
nixpkgs-20486458e681298eb8a59f0ad91559f4cbdc659b.zip
ocamlPackages.merlin: 2.5.1 -> 2.5.2
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/tools/ocaml/merlin/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 3c99c3b9580..2aa2321ef6a 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -8,10 +8,10 @@ let
   then
     "2.3.1"
   else
-    "2.5.1";
+    "2.5.2";
   hashes = {
     "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
-    "2.5.1" = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
+    "2.5.2" = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc";
   };
 in