diff options
| author | Matthew Maurer <matthew.r.maurer@gmail.com> | 2016-09-13 21:51:24 -0400 |
|---|---|---|
| committer | Matthew Maurer <matthew.r.maurer@gmail.com> | 2016-09-14 02:36:07 -0400 |
| commit | 2acf031b81358363efed92d021b862492086c38b (patch) | |
| tree | ddc2560ea38f868c69ea3d366e4b8db9cf09b351 /pkgs/development/ocaml-modules | |
| parent | eafda42dc6680d879fecc5365399457453fe6f42 (diff) | |
core_extended: 112.24.00 -> 112.24.00/113.33.03
PPX/P4 split
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/async_shell/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/core-extended.nix | 22 |
2 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix index b8ca9097a48e0..92a3836ba90f0 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 0000000000000..df7f6903cd24a --- /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 ]; + }; +} |