diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-03-18 16:25:48 +0100 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2021-03-27 17:26:12 +0100 |
| commit | 29d77c57edefc8412eb9abb23985d9371d409c76 (patch) | |
| tree | 1966c25e8f1628754d58cc69413cfcfe3b777446 /pkgs/development/tools/ocaml | |
| parent | 2ed44fa49c72f27a27d8ae11fb1c0c5a8c5914dc (diff) | |
| download | nixpkgs-29d77c57edefc8412eb9abb23985d9371d409c76.tar nixpkgs-29d77c57edefc8412eb9abb23985d9371d409c76.tar.gz nixpkgs-29d77c57edefc8412eb9abb23985d9371d409c76.tar.bz2 nixpkgs-29d77c57edefc8412eb9abb23985d9371d409c76.tar.lz nixpkgs-29d77c57edefc8412eb9abb23985d9371d409c76.tar.xz nixpkgs-29d77c57edefc8412eb9abb23985d9371d409c76.tar.zst nixpkgs-29d77c57edefc8412eb9abb23985d9371d409c76.zip | |
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.
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index ce168084f2c..1c9b549d612 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -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"; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index b3b73776058..894fe6f75ae 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -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 ]; |