From 5a7ab721b40f24375951ad1d48538abff21236bc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 12 Jul 2018 21:25:59 +0000
Subject: ocamlPackages.lwt_log: init at 1.0.0

---
 pkgs/top-level/ocaml-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pkgs/top-level')

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index fb51cb949442..93693203255a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -394,6 +394,10 @@ let
 
     ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2;
 
+    lwt_log = callPackage ../development/ocaml-modules/lwt_log {
+      lwt = lwt3;
+    };
+
     lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix {
       lwt = lwt3;
     };
-- 
cgit 1.4.1


From ca12adfeafb334d3e966a26e01064ba616e0224f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 12 Jul 2018 21:26:06 +0000
Subject: flow: use lwt_log

---
 pkgs/development/tools/analysis/flow/default.nix | 17 +++++------------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'pkgs/top-level')

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 07f3053b9d43..3b4ad8b89c39 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices,
-  findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }:
+{ stdenv, fetchFromGitHub, lib, ocamlPackages, libelf, cf-private, CoreServices }:
 
 with lib;
 
@@ -14,21 +13,15 @@ stdenv.mkDerivation rec {
     sha256 = "0xrcjjk16w6anpy58qa4la1jyfjs0xg5xkp58slhai996wqif24k";
   };
 
-  # lwt.log is being split out into a separate package, so this can be
-  # removed once nixpkgs is updated.
-  # See https://github.com/ocsigen/lwt/issues/453#issuecomment-352897664
-  postPatch = ''
-    substituteInPlace Makefile --replace lwt_log lwt.log
-  '';
-
   installPhase = ''
     mkdir -p $out/bin
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [
-    ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa
-  ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
+  buildInputs = [ libelf
+  ] ++ (with ocamlPackages; [
+    ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx lwt_log wtf8 dtoa
+  ]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
     description = "A static type checker for JavaScript";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba3d88ed92d1..595ea43e7fe3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8098,8 +8098,6 @@ with pkgs;
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     inherit (darwin) cf-private;
-    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx
-      wtf8 dtoa;
   };
 
   foreman = callPackage ../tools/system/foreman { };
-- 
cgit 1.4.1