diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-01-29 07:45:39 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-01-29 08:43:15 +0100 |
| commit | db75b5d052f67ffdda7232ab032161343e8cca59 (patch) | |
| tree | c768df101a63eeb284bb65989c9d6a906e3ca7a6 /pkgs/development/tools/ocaml/merlin | |
| parent | 54c8a82818b56efb670eb6d9cd6d770ffcc657df (diff) | |
| download | nixlib-db75b5d052f67ffdda7232ab032161343e8cca59.tar nixlib-db75b5d052f67ffdda7232ab032161343e8cca59.tar.gz nixlib-db75b5d052f67ffdda7232ab032161343e8cca59.tar.bz2 nixlib-db75b5d052f67ffdda7232ab032161343e8cca59.tar.lz nixlib-db75b5d052f67ffdda7232ab032161343e8cca59.tar.xz nixlib-db75b5d052f67ffdda7232ab032161343e8cca59.tar.zst nixlib-db75b5d052f67ffdda7232ab032161343e8cca59.zip | |
merlin: update from 2.1 to 2.1.1
Diffstat (limited to 'pkgs/development/tools/ocaml/merlin')
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 106581b8fea4..bd568eaf84d1 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, ocaml, findlib, yojson, menhir -, withEmacsMode ? false, emacs}: +{ stdenv, fetchzip, ocaml, findlib, yojson, menhir +, withEmacsMode ? false, emacs }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; +let version = "2.1.1"; in + stdenv.mkDerivation { - name = "merlin-2.1"; + name = "merlin-${version}"; - src = fetchurl { - url = https://github.com/the-lambda-church/merlin/archive/v2.1.tar.gz; - sha256 = "0rk5ffhr69wbhr50ixgw1vnv0wkhxwh1z3cpbcwkm72cnac74nj6"; + src = fetchzip { + url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz"; + sha256 = "1j60jsgls6kkkh2cv4gq36q0mf27nw8pc6k94n0yvjafjmwl3kks"; }; buildInputs = [ ocaml findlib yojson menhir ] |