From 2acf031b81358363efed92d021b862492086c38b Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Tue, 13 Sep 2016 21:51:24 -0400
Subject: core_extended: 112.24.00 -> 112.24.00/113.33.03

PPX/P4 split
---
 .../ocaml-modules/async_shell/default.nix          |  4 ++--
 .../ocaml-modules/janestreet/core-extended.nix     | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/core-extended.nix

(limited to 'pkgs/development/ocaml-modules')

diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix
index b8ca9097a48e..92a3836ba90f 100644
--- a/pkgs/development/ocaml-modules/async_shell/default.nix
+++ b/pkgs/development/ocaml-modules/async_shell/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, async, core_p4, core_extended}:
+{stdenv, buildOcaml, fetchurl, async, core_p4, core_extended_p4}:
 
 buildOcaml rec {
   name = "async_shell";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105";
   };
 
-  propagatedBuildInputs = [ async core_p4 core_extended ];
+  propagatedBuildInputs = [ async core_p4 core_extended_p4 ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async_shell;
diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
new file mode 100644
index 000000000000..df7f6903cd24
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
@@ -0,0 +1,22 @@
+{stdenv, buildOcamlJane, fetchurl,
+ core,
+ bin_prot, fieldslib, sexplib, typerep, variantslib,
+ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
+ re2, textutils,
+ ocaml_oasis, opam, js_build_tools}:
+
+buildOcamlJane rec {
+  name = "core_extended";
+  hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5";
+  propagatedBuildInputs =
+    [ core bin_prot fieldslib sexplib typerep variantslib
+      ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane
+      re2 textutils ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/core_extended;
+    description = "Jane Street Capital's standard library overlay";
+    license = licenses.asl20;
+    maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
+  };
+}
-- 
cgit 1.4.1