ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

merlin: 2.5.3 -> 2.5.4

Browse Source 
- Update to version 2.5.4.
- Remove dependency on menhir, which seems not needed.
This commit is contained in:
romildo 2017-05-28 23:06:55 -03:00 committed by vbgl
parent f6ef5614a0
commit 1c6abe0230
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, yojson, menhir, lib { stdenv, fetchzip, ocaml, findlib, yojson, lib
, withEmacsMode ? false, emacs }: , withEmacsMode ? false, emacs }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
@ -8,10 +8,10 @@ let
then then
"2.3.1" "2.3.1"
else else
"2.5.3"; "2.5.4";
hashes = { hashes = {
"2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn"; "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
"2.5.3" = "0qljklgcrpqdxzvcqj7b4785zcz322pjvw9cddbmzla33hagglha"; "2.5.4" = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh";
}; };
in in
@ -24,7 +24,7 @@ stdenv.mkDerivation {
sha256 = hashes."${version}"; sha256 = hashes."${version}";
}; };
buildInputs = [ ocaml findlib yojson menhir ] buildInputs = [ ocaml findlib yojson ]
++ stdenv.lib.optional withEmacsMode emacs; ++ stdenv.lib.optional withEmacsMode emacs;
preConfigure = "mkdir -p $out/bin"; preConfigure = "mkdir -p $out/bin";