summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2015-10-29 08:24:59 +0100
committerVincent Laporte <Vincent.Laporte@gmail.com>2015-10-29 21:35:41 +0100
commit7cb6dbc3d002be0cfd82631def276e357f4ee1dd (patch)
tree11d1551e0daa25d02bc0eb50afdbfbaa77a243e5
parent2b7ded8d62f17cfd08100b89cd824bc41c51bee6 (diff)
downloadnixlib-7cb6dbc3d002be0cfd82631def276e357f4ee1dd.tar
nixlib-7cb6dbc3d002be0cfd82631def276e357f4ee1dd.tar.gz
nixlib-7cb6dbc3d002be0cfd82631def276e357f4ee1dd.tar.bz2
nixlib-7cb6dbc3d002be0cfd82631def276e357f4ee1dd.tar.lz
nixlib-7cb6dbc3d002be0cfd82631def276e357f4ee1dd.tar.xz
nixlib-7cb6dbc3d002be0cfd82631def276e357f4ee1dd.tar.zst
nixlib-7cb6dbc3d002be0cfd82631def276e357f4ee1dd.zip
merlin: 2.2 -> 2.3
-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 8b93650743dd..6618d079ea83 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -3,7 +3,7 @@
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
-let version = "2.2"; in
+let version = "2.3"; in
 
 stdenv.mkDerivation {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz";
-    sha256 = "19n4gwpqav2kax5rl61bq354g7ycdahl4f3ihjp418hwi1phwbzz";
+    sha256 = "18glpvd572ajz0d66chx2ib5miy4b29q1qhc7sxb60mlsrffr13s";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ]