dot-merlin-reader: 3.4.2 -> 4.1

4.1 uncoupled the versions between merlin and dot-merlin-reader which
means we can and must update them independently of each other since
merlin 4.1 is only available in specific versions for OCaml 4.11 and
4.12 respectively.

Therefore merlin now fetches its own source instead of inheriting it
from dot-merlin-reader.
This commit is contained in:
sternenseemann 2021-03-18 16:25:48 +01:00 committed by sterni
parent 2ed44fa49c
commit 29d77c57ed
2 changed files with 11 additions and 5 deletions

View file

@ -3,8 +3,14 @@
buildDunePackage rec {
pname = "merlin";
version = "3.4.2";
inherit (dot-merlin-reader) src version useDune2;
src = fetchurl {
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
sha256 = "e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81";
};
useDune2 = true;
minimumOCamlVersion = "4.02.3";

View file

@ -2,15 +2,15 @@
buildDunePackage rec {
pname = "dot-merlin-reader";
version = "3.4.2";
version = "4.1";
useDune2 = true;
minimumOCamlVersion = "4.02.1";
minimumOCamlVersion = "4.06";
src = fetchurl {
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
sha256 = "109ai1ggnkrwbzsl1wdalikvs1zx940m6n65jllxj68in6bvidz1";
url = "https://github.com/ocaml/merlin/releases/download/v${version}/dot-merlin-reader-v${version}.tbz";
sha256 = "14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd";
};
buildInputs = [ yojson csexp result ];