diff options
author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2014-11-03 20:04:10 +0300 |
---|---|---|
committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2014-11-03 20:04:10 +0300 |
commit | 0c7a0f31f920162768023275071c41fa17b54576 (patch) | |
tree | 4c3b213f257b2a479a6d6e6029bada6f7beae6d7 /pkgs/development/tools/ocaml | |
parent | e167a3cbf132aadeef684fad28684ab1c37a7b99 (diff) | |
parent | 68b959d6553012f00ff8be805502cc6f945b75c0 (diff) | |
download | nixlib-0c7a0f31f920162768023275071c41fa17b54576.tar nixlib-0c7a0f31f920162768023275071c41fa17b54576.tar.gz nixlib-0c7a0f31f920162768023275071c41fa17b54576.tar.bz2 nixlib-0c7a0f31f920162768023275071c41fa17b54576.tar.lz nixlib-0c7a0f31f920162768023275071c41fa17b54576.tar.xz nixlib-0c7a0f31f920162768023275071c41fa17b54576.tar.zst nixlib-0c7a0f31f920162768023275071c41fa17b54576.zip |
Merge pull request #4810 from vbgl/merlin
merlin: update from 1.7.1 to 2.0
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r-- | pkgs/development/tools/ocaml/merlin/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 30fabf193620..b20354e76b2f 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -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"; stdenv.mkDerivation { - name = "merlin-1.7.1"; + name = "merlin-2.0"; src = fetchurl { - url = https://github.com/the-lambda-church/merlin/archive/v1.7.1.tar.gz; - sha256 = "c3b60c7b3fddaa2860e0d8ac0d4fed2ed60e319875734c7ac1a93df524c67aff"; + url = https://github.com/the-lambda-church/merlin/archive/v2.0.tar.gz; + sha256 = "1khvmncj6gfk9p5wl07gp6ii9csc5s1bcv892lkfpfbnsspis7cp"; }; - buildInputs = [ ocaml findlib yojson menhir ]; + buildInputs = [ ocaml findlib yojson menhir ] + ++ stdenv.lib.optional withEmacsMode emacs; + preConfigure = "mkdir -p $out/bin"; prefixKey = "--prefix "; + configureFlags = stdenv.lib.optional withEmacsMode "--enable-compiled-emacs-mode"; meta = with stdenv.lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; |