From 2e89de61c59ed6f302f16f026855f48f86e5a72c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 9 Nov 2018 07:26:18 -0500
Subject: [PATCH] dune: 1.4.0 -> 1.5.0 (#49848)

* dune: 1.4.0 -> 1.5.1

* reason: use dune installPhase
---
 pkgs/development/compilers/reason/default.nix |  7 ++-----
 pkgs/development/tools/ocaml/dune/default.nix | 12 ++++++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 0832d14992d1..1b84b9348520 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -21,12 +21,9 @@ stdenv.mkDerivation rec {
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
-  installPhase = ''
-    for p in reason rtop
-    do
-      ${dune.installPhase} $p.install
-    done
+  inherit (dune) installPhase;
 
+  postInstall = ''
     wrapProgram $out/bin/rtop \
       --prefix PATH : "${utop}/bin" \
       --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
index 6d0754da04d0..62493ee83a6f 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "dune-${version}";
-  version = "1.4.0";
+  version = "1.5.1";
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "1fz1jx1d48yb40qan4hw25h8ia55vs7mp94a3rr7cf5gb5ap2zkj";
+    sha256 = "1dbf7wwhr7b41g3p24qb9v5r1vvgrk6i9w8f7y7k5k527xy9jk5w";
   };
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];
@@ -14,10 +14,14 @@ stdenv.mkDerivation rec {
 
   dontAddPrefix = true;
 
-  installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
+  installPhase = ''
+    runHook preInstall
+    ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
+    runHook postInstall
+  '';
 
   meta = {
-    homepage = "https://github.com/ocaml/dune";
+    homepage = https://github.com/ocaml/dune;
     description = "A composable build system";
     maintainers = [ stdenv.lib.maintainers.vbgl ];
     license = stdenv.lib.licenses.mit;