diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-13 11:43:39 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-13 11:43:39 +0100 |
| commit | dfdf1597a7cc13c40653722a771be12afaa64edb (patch) | |
| tree | 4d7cd3f21ba89453f23ea1addb55e00574a638bf /pkgs/development/tools/ocaml/merlin/default.nix | |
| parent | d5d8b3514d64fcd4022186795f604ec3f360ae17 (diff) | |
| parent | 418ad571c3ec856d49b65fa53ab99f185c2d9def (diff) | |
| download | nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.gz nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.bz2 nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.lz nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.xz nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.zst nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.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 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 67acf874baf..ed3d5efc789 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, yojson }: +{ lib, fetchurl, buildDunePackage, yojson }: buildDunePackage rec { pname = "merlin"; - version = "3.3.2"; + version = "3.3.3"; minimumOCamlVersion = "4.02.1"; - src = fetchFromGitHub { - owner = "ocaml"; - repo = pname; - rev = "v${version}"; - sha256 = "1z9mcxflraj15sbz6q7f84n31n9fsialw7z8bi3r1biz68nypva9"; + src = fetchurl { + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + sha256 = "05dfkbpbb7nvs4g6y0iw7a9f73ygvhs9l45l2g56y7zagvs9x43j"; }; buildInputs = [ yojson ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; homepage = "https://github.com/ocaml/merlin"; license = licenses.mit; |