summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml
diff options
context:
space:
mode:
authorVincent Laporte <vbgl@users.noreply.github.com>2018-06-25 00:19:58 +0200
committerxeji <36407913+xeji@users.noreply.github.com>2018-06-25 00:19:58 +0200
commitf3a155e656858d6b67f7c18bfc8379bf8badc061 (patch)
tree5207971f72a99c88b5929d9b71e68fc39877f233 /pkgs/development/tools/ocaml
parentcd4c5a3cf6c99bc752997f60b5606ff39cb89069 (diff)
downloadnixlib-f3a155e656858d6b67f7c18bfc8379bf8badc061.tar
nixlib-f3a155e656858d6b67f7c18bfc8379bf8badc061.tar.gz
nixlib-f3a155e656858d6b67f7c18bfc8379bf8badc061.tar.bz2
nixlib-f3a155e656858d6b67f7c18bfc8379bf8badc061.tar.lz
nixlib-f3a155e656858d6b67f7c18bfc8379bf8badc061.tar.xz
nixlib-f3a155e656858d6b67f7c18bfc8379bf8badc061.tar.zst
nixlib-f3a155e656858d6b67f7c18bfc8379bf8badc061.zip
ocamlPackages.merlin: 3.0.5 -> 3.1.0 (#42386)
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r--pkgs/development/tools/ocaml/merlin/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index d09f06623a7e..4ad1bfb3234d 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 
 let
-  version = "3.0.5";
+  version = "3.1.0";
 in
 
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz";
-    sha256 = "06h0klzzvb62rzb6m0pq8aa207fz7z54mjr05vky4wv8195bbjiy";
+    sha256 = "1vf0c2mmflp94r8hshb44lsvnfdy03ld6mld2n79cdxr3zl24ci2";
   };
 
   buildInputs = [ ocaml findlib yojson ]