about summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2019-05-31 05:30:00 -0500
committerVincent Laporte <vbgl@users.noreply.github.com>2019-06-03 17:13:37 +0200
commitddaf94d80483c8989cd7e1569df40215fee7b16c (patch)
tree6188ea96156c05bded596c76970ee833820de355 /pkgs/development/tools/ocaml
parent7531309c6e9bf54f864daba2aee1f7272ac46abc (diff)
downloadnixlib-ddaf94d80483c8989cd7e1569df40215fee7b16c.tar
nixlib-ddaf94d80483c8989cd7e1569df40215fee7b16c.tar.gz
nixlib-ddaf94d80483c8989cd7e1569df40215fee7b16c.tar.bz2
nixlib-ddaf94d80483c8989cd7e1569df40215fee7b16c.tar.lz
nixlib-ddaf94d80483c8989cd7e1569df40215fee7b16c.tar.xz
nixlib-ddaf94d80483c8989cd7e1569df40215fee7b16c.tar.zst
nixlib-ddaf94d80483c8989cd7e1569df40215fee7b16c.zip
ocamlPackages.merlin: 3.2.2 -> 3.3.0
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r--pkgs/development/tools/ocaml/merlin/default.nix14
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index e059a5d6a76c..ca98daa8c28c 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchzip, buildDunePackage, yojson }:
+{ stdenv, fetchFromGitHub, buildDunePackage, yojson }:
 
 buildDunePackage rec {
   pname = "merlin";
-  version = "3.2.2";
+  version = "3.3.0";
 
-  minimumOCamlVersion = "4.02";
+  minimumOCamlVersion = "4.02.1";
 
-  src = fetchzip {
-    url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz";
-    sha256 = "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb";
+  src = fetchFromGitHub {
+    owner = "ocaml";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1s4y7jz581hj4gqv4pkk3980khw4lm0qzcj416b4ckji40q7nf9d";
   };
 
   buildInputs = [ yojson ];