summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorVincent Laporte <vincent.laporte@gmail.com>2014-08-19 18:42:13 +0200
committerVincent Laporte <vincent.laporte@gmail.com>2014-08-19 18:43:41 +0200
commite8d2f8f1092e71c951b95f5a6e1b2227e4d185a9 (patch)
treebaeab82af63b18988757811ecae4524ac0f22074 /pkgs/development/tools
parent559c7cc2dad4a971f0519c9f4861259fca55c3d1 (diff)
downloadnixlib-e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9.tar
nixlib-e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9.tar.gz
nixlib-e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9.tar.bz2
nixlib-e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9.tar.lz
nixlib-e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9.tar.xz
nixlib-e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9.tar.zst
nixlib-e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9.zip
merlin: update to 1.7
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/ocaml/merlin/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index c0882439f5c5..8efb90a9ceff 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}:
+{stdenv, fetchurl, ocaml, findlib, yojson, menhir}:
 stdenv.mkDerivation {
 
-  name = "merlin-1.6";
+  name = "merlin-1.7";
 
   src = fetchurl {
-    url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz";
-    sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy";
+    url = "https://github.com/the-lambda-church/merlin/archive/v1.7.tar.gz";
+    sha256 = "0grprrykah02g8va63lidbcb6n8sd18l2k9spb5rwlcs3xhfw42b";
   };
 
-  buildInputs = [ ocaml findlib biniou yojson menhir easy-format ];
+  buildInputs = [ ocaml findlib yojson menhir ];
 
   prefixKey = "--prefix ";