Merge pull request #3188 from vbgl/merlin

Adds merlin
This commit is contained in:
Pascal Wittmann 2014-08-01 13:39:27 +02:00
commit 0baac649aa
2 changed files with 23 additions and 0 deletions

View File

@ -0,0 +1,21 @@
{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}:
stdenv.mkDerivation {
name = "merlin-1.6";
src = fetchurl {
url = "https://github.com/the-lambda-church/merlin/archive/v1.6.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 = "http://the-lambda-church.github.io/merlin/";
license = stdenv.lib.licenses.mit;
};
}

View File

@ -3218,6 +3218,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 { };