about summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2015-01-18 12:32:44 +0100
committerVincent Laporte <Vincent.Laporte@gmail.com>2015-01-19 12:07:00 +0100
commit763b2a77186fe6a3e9f841a0ffb8a30c5cac76a6 (patch)
treec19b6869e7ad89a0c1d10adc11b523cfb4be6033 /pkgs/development/tools/ocaml
parent547f11f0155ec5d1725fa6c23661dbf6cdc45ede (diff)
downloadnixlib-763b2a77186fe6a3e9f841a0ffb8a30c5cac76a6.tar
nixlib-763b2a77186fe6a3e9f841a0ffb8a30c5cac76a6.tar.gz
nixlib-763b2a77186fe6a3e9f841a0ffb8a30c5cac76a6.tar.bz2
nixlib-763b2a77186fe6a3e9f841a0ffb8a30c5cac76a6.tar.lz
nixlib-763b2a77186fe6a3e9f841a0ffb8a30c5cac76a6.tar.xz
nixlib-763b2a77186fe6a3e9f841a0ffb8a30c5cac76a6.tar.zst
nixlib-763b2a77186fe6a3e9f841a0ffb8a30c5cac76a6.zip
merlin: update from 2.0 to 2.1
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r--pkgs/development/tools/ocaml/merlin/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index b20354e76b2f..106581b8fea4 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -5,11 +5,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
 stdenv.mkDerivation {
 
-  name = "merlin-2.0";
+  name = "merlin-2.1";
 
   src = fetchurl {
-    url = https://github.com/the-lambda-church/merlin/archive/v2.0.tar.gz;
-    sha256 = "1khvmncj6gfk9p5wl07gp6ii9csc5s1bcv892lkfpfbnsspis7cp";
+    url = https://github.com/the-lambda-church/merlin/archive/v2.1.tar.gz;
+    sha256 = "0rk5ffhr69wbhr50ixgw1vnv0wkhxwh1z3cpbcwkm72cnac74nj6";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ]