From 44931d4293ba3f1d24430624086ee0c7b705fcc3 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 1 Jan 2016 17:38:30 +0100
Subject: [PATCH] js_of_ocaml: 2.5 -> 2.6

---
 .../tools/ocaml/js_of_ocaml/Makefile.conf.diff        | 11 -----------
 pkgs/development/tools/ocaml/js_of_ocaml/default.nix  | 10 +++++-----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
index 0e3f55df6d20..e6fc96038ff8 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
@@ -8,14 +8,3 @@
  
  ####
  
---- old/Makefile	2014-09-30 16:40:37.000000000 +0200
-+++ new/Makefile	2015-10-14 10:28:41.366815864 +0200
-@@ -52,7 +52,7 @@
- install-bin:
- 	install -d -m 755 $(BINDIR)
- 	install $(BIN) $(BINDIR)
--	install $(TOOLS) $(BINDIR)
-+	install $(TOOLS) $(BINDIR) || true
- 
- uninstall: uninstall-lib uninstall-bin
- 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index eaabd50059d3..0c57ae47c2c8 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
- cmdliner, tyxml, reactivedata}:
+ cmdliner, tyxml, reactivedata, cppo, which, base64}:
 
 stdenv.mkDerivation {
-  name = "js_of_ocaml-2.5";
+  name = "js_of_ocaml-2.6";
   src = fetchurl {
-    url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz;
-    sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv";
+    url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz;
+    sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61";
     };
   
   buildInputs = [ocaml findlib menhir ocsigen_deriving
-                 cmdliner tyxml reactivedata];
+                 cmdliner tyxml reactivedata cppo which base64];
   propagatedBuildInputs = [ ocaml_lwt camlp4 ];
 
   patches = [ ./Makefile.conf.diff ];