diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-22 17:20:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-22 17:20:20 +0200 |
| commit | 8374a2a0eee41361d4af9d32460e4956dcbea61c (patch) | |
| tree | 0a4788ab72ad7968aad65dd0668147d065ea9951 /pkgs/development/tools/ocaml/merlin/default.nix | |
| parent | 23be4a8b4de7790f48998d245a3ff5fe549e0f2b (diff) | |
| parent | 95f82e2a45266cdca661389705da7c672c7a9cbc (diff) | |
| download | nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.gz nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.bz2 nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.lz nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.xz nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.zst nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/ocaml/merlin/default.nix')
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index ed3d5efc789d..fa78e47951f3 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.3"; + version = "3.3.4"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "05dfkbpbb7nvs4g6y0iw7a9f73ygvhs9l45l2g56y7zagvs9x43j"; + sha256 = "12wxric6n3rmsn0w16xm8vjd8p5aw24cj76zw2x87qfwwgmy1kdd"; }; buildInputs = [ yojson ]; |