diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
| commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
| tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/tools/ocaml/merlin | |
| parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
| parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
| download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip | |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/tools/ocaml/merlin')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix b/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix index 4b11dd13983d..54712be2b6ec 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.6"; + version = "3.3.9"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ"; + sha256 = "00ng8299l5rzpak8ljxzr6dgxw6z52ivm91159ahv09xk4d0y5x3"; }; buildInputs = [ yojson ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix new file mode 100644 index 000000000000..7af1b4513a85 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, ocamlPackages }: + +with ocamlPackages; + +buildDunePackage rec { + pname = "dot-merlin-reader"; + version = "3.4.0"; + + minimumOCamlVersion = "4.02.1"; + + src = fetchurl { + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + sha256 = "048rkpbvayksv8mgmkgi17vv0y9xplv7v2ww4d1hs7bkm5zzsvg2"; + }; + + buildInputs = [ yojson csexp result ]; + + meta = with lib; { + description = "Reads config files for merlin"; + homepage = "https://github.com/ocaml/merlin"; + license = licenses.mit; + maintainers = [ maintainers.hongchangwu ]; + }; +} |