From eafda42dc6680d879fecc5365399457453fe6f42 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Tue, 13 Sep 2016 21:48:15 -0400
Subject: [PATCH] ocaml-textutils: 112.17.00 -> 112.17.00/113.33.03

PPX/P4 split
---
 .../ocaml-modules/core_extended/default.nix    |  4 ++--
 .../ocaml-modules/janestreet/textutils.nix     | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  4 +++-
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/textutils.nix

diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix
index d25cd81bcd8a..fef4fd81158f 100644
--- a/pkgs/development/ocaml-modules/core_extended/default.nix
+++ b/pkgs/development/ocaml-modules/core_extended/default.nix
@@ -1,5 +1,5 @@
 {stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf,
- fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2_p4, sexplib_p4}:
+ fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils_p4, re2_p4, sexplib_p4}:
 
 buildOcaml rec {
   name = "core_extended";
@@ -15,7 +15,7 @@ buildOcaml rec {
   hasSharedObjects = true;
   buildInputs = [ pa_bench pa_test pa_ounit ];
   propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4
-                           pipebang textutils re2_p4 sexplib_p4 ];
+                           pipebang textutils_p4 re2_p4 sexplib_p4 ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/core_extended;
diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/pkgs/development/ocaml-modules/janestreet/textutils.nix
new file mode 100644
index 000000000000..459743f055ab
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/textutils.nix
@@ -0,0 +1,18 @@
+{stdenv, buildOcamlJane,
+ bin_prot, core, fieldslib, sexplib, typerep, variantslib,
+ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
+
+buildOcamlJane rec {
+  name = "textutils";
+  hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb";
+  propagatedBuildInputs =
+    [ bin_prot core fieldslib sexplib typerep variantslib
+      ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/textutils;
+    description = "Text output utilities";
+    maintainers = [ maintainers.maurer ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ed93e0f0aba..a506ab9f61be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5387,7 +5387,7 @@ in
       camlp5 = camlp5_transitional;
     };
 
-    textutils = callPackage ../development/ocaml-modules/textutils { };
+    textutils_p4 = callPackage ../development/ocaml-modules/textutils { };
 
     type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { };
     type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { };
@@ -5575,6 +5575,8 @@ in
     core = callPackage ../development/ocaml-modules/janestreet/core.nix {};
 
     re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {};
+
+    textutils = callPackage ../development/ocaml-modules/janestreet/textutils.nix {};
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;