From f16124d52147402d227af776d9ceb727e35564a2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Sat, 5 Jul 2014 17:29:21 +0200
Subject: [PATCH 1/2] Adds merlin

Merlin is an editor-independant tool to ease the developpement of
programs in OCaml. It aims to provide features available in modern IDEs.

Homepage: http://the-lambda-church.github.io/merlin/
---
 .../tools/ocaml/merlin/default.nix            | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/merlin/default.nix

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
new file mode 100644
index 00000000000..a5a06f37c9c
--- /dev/null
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}:
+let
+  pname = "merlin";
+  version = "1.6";
+  webpage = "http://the-lambda-church.github.io/merlin/";
+in
+stdenv.mkDerivation {
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/the-lambda-church/${pname}/archive/v${version}.tar.gz";
+    sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy";
+  };
+
+  buildInputs = [ ocaml findlib biniou yojson menhir easy-format ];
+
+  prefixKey = "--prefix ";
+
+  meta = {
+    description = "An editor-independant tool to ease the developpement of programs in OCaml";
+    homepage = "${webpage}";
+    license = stdenv.lib.licenses.mit;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6535fea816..c84af828153 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3217,6 +3217,8 @@ let
 
     menhir = callPackage ../development/ocaml-modules/menhir { };
 
+    merlin = callPackage ../development/tools/ocaml/merlin { };
+
     mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
 
     mlgmp =  callPackage ../development/ocaml-modules/mlgmp { };

From 81f258e7bfd5b65424fd25a10d1378600924960c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Fri, 1 Aug 2014 09:42:37 +0200
Subject: [PATCH 2/2] merlin: some cleaning of the derivation

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

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index a5a06f37c9c..c0882439f5c 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,15 +1,10 @@
 {stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}:
-let
-  pname = "merlin";
-  version = "1.6";
-  webpage = "http://the-lambda-church.github.io/merlin/";
-in
 stdenv.mkDerivation {
 
-  name = "${pname}-${version}";
+  name = "merlin-1.6";
 
   src = fetchurl {
-    url = "https://github.com/the-lambda-church/${pname}/archive/v${version}.tar.gz";
+    url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz";
     sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy";
   };
 
@@ -19,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "An editor-independant tool to ease the developpement of programs in OCaml";
-    homepage = "${webpage}";
+    homepage = "http://the-lambda-church.github.io/merlin/";
     license = stdenv.lib.licenses.mit;
   };
 }