diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-02 02:07:27 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-02 02:07:27 +0400 |
| commit | 4e3ee2706048e871187c565ed49a013e3e8fe68e (patch) | |
| tree | 467b18d3629c09e60a5c540a0ba2e13fb9b404e6 /pkgs/development/tools | |
| parent | fa55a997015820ec54f9847f7d297c561e98629f (diff) | |
| parent | e2db82874cf497c0dd156680d4c4a8f3b028125c (diff) | |
| download | nixlib-4e3ee2706048e871187c565ed49a013e3e8fe68e.tar nixlib-4e3ee2706048e871187c565ed49a013e3e8fe68e.tar.gz nixlib-4e3ee2706048e871187c565ed49a013e3e8fe68e.tar.bz2 nixlib-4e3ee2706048e871187c565ed49a013e3e8fe68e.tar.lz nixlib-4e3ee2706048e871187c565ed49a013e3e8fe68e.tar.xz nixlib-4e3ee2706048e871187c565ed49a013e3e8fe68e.tar.zst nixlib-4e3ee2706048e871187c565ed49a013e3e8fe68e.zip | |
Merge pull request #3681 from vbgl/merlin-1.7
Merlin: update to 1.7
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index c0882439f5c5..970c07f35464 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}: +{stdenv, fetchurl, ocaml, findlib, yojson, menhir}: stdenv.mkDerivation { - name = "merlin-1.6"; + name = "merlin-1.7.1"; src = fetchurl { - url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz"; - sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy"; + url = https://github.com/the-lambda-church/merlin/archive/v1.7.1.tar.gz; + sha256 = "c3b60c7b3fddaa2860e0d8ac0d4fed2ed60e319875734c7ac1a93df524c67aff"; }; - buildInputs = [ ocaml findlib biniou yojson menhir easy-format ]; + buildInputs = [ ocaml findlib yojson menhir ]; prefixKey = "--prefix "; |