From db75b5d052f67ffdda7232ab032161343e8cca59 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Jan 2015 07:45:39 +0100
Subject: [PATCH] merlin: update from 2.1 to 2.1.1

---
 pkgs/development/tools/ocaml/merlin/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 106581b8fea4..bd568eaf84d1 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl, ocaml, findlib, yojson, menhir
-, withEmacsMode ? false, emacs}:
+{ stdenv, fetchzip, ocaml, findlib, yojson, menhir
+, withEmacsMode ? false, emacs }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
+let version = "2.1.1"; in
+
 stdenv.mkDerivation {
 
-  name = "merlin-2.1";
+  name = "merlin-${version}";
 
-  src = fetchurl {
-    url = https://github.com/the-lambda-church/merlin/archive/v2.1.tar.gz;
-    sha256 = "0rk5ffhr69wbhr50ixgw1vnv0wkhxwh1z3cpbcwkm72cnac74nj6";
+  src = fetchzip {
+    url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz";
+    sha256 = "1j60jsgls6kkkh2cv4gq36q0mf27nw8pc6k94n0yvjafjmwl3kks";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ]