public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merlin: update from 1.7.1 to 2.0

Browse Source 
Also adds an option to compile the emacs mode at install time.
This commit is contained in:
Vincent Laporte 2014-11-03 13:29:13 +00:00
parent f2ae7bd844
commit 68b959d655
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/ocaml/merlin/default.nix
View File

@ -1,19 +1,23 @@
{stdenv, fetchurl, ocaml, findlib, yojson, menhir}: {stdenv, fetchurl, ocaml, findlib, yojson, menhir
, withEmacsMode ? false, emacs}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "merlin-1.7.1"; name = "merlin-2.0";
src = fetchurl { src = fetchurl {
url = https://github.com/the-lambda-church/merlin/archive/v1.7.1.tar.gz; url = https://github.com/the-lambda-church/merlin/archive/v2.0.tar.gz;
sha256 = "c3b60c7b3fddaa2860e0d8ac0d4fed2ed60e319875734c7ac1a93df524c67aff"; sha256 = "1khvmncj6gfk9p5wl07gp6ii9csc5s1bcv892lkfpfbnsspis7cp";
}; };
buildInputs = [ ocaml findlib yojson menhir ]; buildInputs = [ ocaml findlib yojson menhir ]
++ stdenv.lib.optional withEmacsMode emacs;
preConfigure = "mkdir -p $out/bin";
prefixKey = "--prefix "; prefixKey = "--prefix ";
configureFlags = stdenv.lib.optional withEmacsMode "--enable-compiled-emacs-mode";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An editor-independent tool to ease the development of programs in OCaml"; description = "An editor-independent tool to ease the development of programs in OCaml";