From d6e423c400b22959c090e7b2be0d47641a84dd1c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 22 Oct 2017 06:48:10 +0000
Subject: ocamlPackages.merlin: 3.0.2 -> 3.0.3

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

(limited to 'pkgs')

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index a6252a5c729d..3d5a13c7e0ce 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchzip, ocaml, findlib, yojson, lib
+{ stdenv, fetchzip, ocaml, findlib, yojson
 , withEmacsMode ? false, emacs }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
+assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 
 let
-  version = "3.0.2";
+  version = "3.0.3";
 in
 
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz";
-    sha256 = "0lcgafs5ip8vhvrp1d7yv6mzjsirmayd83cj4wwq6zxcrl7yv4x8";
+    sha256 = "19gz9vcdna84xcm2b53m6b5g4c7ppb61j05fnvry3shvjiz2p58p";
   };
 
   buildInputs = [ ocaml findlib yojson ]
-- 
cgit 1.4.1