From 32367919c4e8dad0983034a1bb716e709267fd75 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 14 Sep 2016 16:18:43 -0400
Subject: [PATCH] async_extra: 112.24.00 -> 112.24.00/113.33.03

PPX/P4 split
---
 .../development/ocaml-modules/async/default.nix |  4 ++--
 .../ocaml-modules/janestreet/async-extra.nix    | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                 | 10 +++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/async-extra.nix

diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix
index f9d263c40cec..498315f9cbfd 100644
--- a/pkgs/development/ocaml-modules/async/default.nix
+++ b/pkgs/development/ocaml-modules/async/default.nix
@@ -1,5 +1,5 @@
 {stdenv, buildOcaml, fetchurl, async_kernel_p4,
- async_unix_p4, async_extra, pa_ounit}:
+ async_unix_p4, async_extra_p4, pa_ounit}:
 
 buildOcaml rec {
   name = "async";
@@ -12,7 +12,7 @@ buildOcaml rec {
     sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9";
   };
 
-  propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra pa_ounit ];
+  propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra_p4 pa_ounit ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async;
diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
new file mode 100644
index 000000000000..4a283cc9910b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
@@ -0,0 +1,17 @@
+{stdenv, buildOcamlJane, fetchurl, async_kernel, async_unix,
+ bin_prot, core, ppx_custom_printf, fieldslib, herelib,
+ pipebang, sexplib, async_rpc_kernel}:
+
+buildOcamlJane rec {
+  name = "async_extra";
+  hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh";
+  propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf
+                            fieldslib herelib pipebang sexplib async_rpc_kernel ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/async_extra;
+    description = "Jane Street Capital's asynchronous execution library (extra)";
+    license = licenses.asl20;
+    maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0660da42ba5..c003adbfe4b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5060,7 +5060,7 @@ in
 
     asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
 
-    async_extra = callPackage ../development/ocaml-modules/async_extra { };
+    async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { };
 
     async_find = callPackage ../development/ocaml-modules/async_find { };
 
@@ -5610,18 +5610,22 @@ in
       then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}
       else core_extended_p4;
 
-     async_kernel =
+    async_kernel =
       if lib.versionOlder "4.02" ocaml_version
       then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
       else async_kernel_p4;
 
     async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
 
-     async_unix =
+    async_unix =
       if lib.versionOlder "4.02" ocaml_version
       then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
       else async_unix_p4;
 
+    async_extra =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {}
+      else async_extra_p4;
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;