diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-10-22 06:48:10 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-10-22 13:25:46 +0000 |
| commit | d6e423c400b22959c090e7b2be0d47641a84dd1c (patch) | |
| tree | 268fdad36a56249e00a0cc53d29e5b9a2e28e9b3 /pkgs | |
| parent | a89b28f8b7e3281074ca29beca332a5aea598bc6 (diff) | |
| download | nixlib-d6e423c400b22959c090e7b2be0d47641a84dd1c.tar nixlib-d6e423c400b22959c090e7b2be0d47641a84dd1c.tar.gz nixlib-d6e423c400b22959c090e7b2be0d47641a84dd1c.tar.bz2 nixlib-d6e423c400b22959c090e7b2be0d47641a84dd1c.tar.lz nixlib-d6e423c400b22959c090e7b2be0d47641a84dd1c.tar.xz nixlib-d6e423c400b22959c090e7b2be0d47641a84dd1c.tar.zst nixlib-d6e423c400b22959c090e7b2be0d47641a84dd1c.zip | |
ocamlPackages.merlin: 3.0.2 -> 3.0.3
Diffstat (limited to 'pkgs')
| -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 a6252a5c729d..3d5a13c7e0ce 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip, ocaml, findlib, yojson, lib +{ stdenv, fetchzip, ocaml, findlib, yojson , withEmacsMode ? false, emacs }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.0.2"; + version = "3.0.3"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "0lcgafs5ip8vhvrp1d7yv6mzjsirmayd83cj4wwq6zxcrl7yv4x8"; + sha256 = "19gz9vcdna84xcm2b53m6b5g4c7ppb61j05fnvry3shvjiz2p58p"; }; buildInputs = [ ocaml findlib yojson ] |