From ea052b6f6ba58142b7f939ffb9daf8461ae894fc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 30 Jun 2017 16:38:57 +0000
Subject: [PATCH] ocamlPackages.js_of_ocaml: 2.8.3 -> 2.8.4

---
 pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 81cd2caf7ee..ab2ef4d9c5e 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild
-, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar
+, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson
 }:
 
 let version = if stdenv.lib.versionAtLeast ocaml.version "4.02"
-  then "2.8.3" else "2.7";
+  then "2.8.4" else "2.7";
 in
 
 stdenv.mkDerivation {
@@ -12,15 +12,15 @@ stdenv.mkDerivation {
     url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz";
     sha256 = {
       "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
-      "2.8.3" = "0xrw215w5saqdcdd9ipjhvg8f982z63znsds9ih445s3jr49szm7";
+      "2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl";
     }."${version}";
   };
 
   buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild
                  cmdliner reactivedata cppo which base64 ]
-  ++ stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.02") tyxml;
+  ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ];
   propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ]
-  ++ stdenv.lib.optional (version == "2.8.3") uchar;
+  ++ stdenv.lib.optional (version == "2.8.4") uchar;
 
   patches = [ ./Makefile.conf.diff ];