aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/tools/ocaml/merlin
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2015-06-05 11:28:45 +0200
committerVincent Laporte <Vincent.Laporte@gmail.com>2015-06-06 17:42:24 +0200
commit142400b8d5f2d05506df38d9212d91ab0eca8fc5 (patch)
treebf0ca40e66d49f7df9b099217501dbd1d318ab70 /pkgs/development/tools/ocaml/merlin
parent4cf3596fdae5982b5c549c52977662ace7bff26a (diff)
ocaml-merlin: update from 2.1.2 to 2.2
Diffstat (limited to 'pkgs/development/tools/ocaml/merlin')
-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 2d02bf054b7..8b93650743d 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.1.2"; in
+let version = "2.2"; 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 = "0l6s4bvspjl1l26bf33xf4k5imdzryas15s1isn6998aiakxq20n";
+ sha256 = "19n4gwpqav2kax5rl61bq354g7ycdahl4f3ihjp418hwi1phwbzz";
};
buildInputs = [ ocaml findlib yojson menhir ]