diff options
| author | romildo <malaquias@gmail.com> | 2017-05-28 23:06:55 -0300 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2017-05-29 09:46:47 +0200 |
| commit | 1c6abe0230087a9072812023d42ea32e8126bf87 (patch) | |
| tree | 5e3bee7161e2d5038d75d22d8aa508a16cd2fa2c | |
| parent | f6ef5614a0f23d23c9494811bb1ac3b35d2a07c6 (diff) | |
| download | nixlib-1c6abe0230087a9072812023d42ea32e8126bf87.tar nixlib-1c6abe0230087a9072812023d42ea32e8126bf87.tar.gz nixlib-1c6abe0230087a9072812023d42ea32e8126bf87.tar.bz2 nixlib-1c6abe0230087a9072812023d42ea32e8126bf87.tar.lz nixlib-1c6abe0230087a9072812023d42ea32e8126bf87.tar.xz nixlib-1c6abe0230087a9072812023d42ea32e8126bf87.tar.zst nixlib-1c6abe0230087a9072812023d42ea32e8126bf87.zip | |
merlin: 2.5.3 -> 2.5.4
- Update to version 2.5.4. - Remove dependency on menhir, which seems not needed.
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 7af1b5ccd7a3..6f0d71d76b18 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, yojson, menhir, lib +{ stdenv, fetchzip, ocaml, findlib, yojson, lib , withEmacsMode ? false, emacs }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; @@ -8,10 +8,10 @@ let then "2.3.1" else - "2.5.3"; + "2.5.4"; hashes = { "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn"; - "2.5.3" = "0qljklgcrpqdxzvcqj7b4785zcz322pjvw9cddbmzla33hagglha"; + "2.5.4" = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh"; }; in @@ -24,7 +24,7 @@ stdenv.mkDerivation { sha256 = hashes."${version}"; }; - buildInputs = [ ocaml findlib yojson menhir ] + buildInputs = [ ocaml findlib yojson ] ++ stdenv.lib.optional withEmacsMode emacs; preConfigure = "mkdir -p $out/bin"; |