core_kernel: 112.24.00 -> 112.24.00/113.33.03

PPX/P4 split
This commit is contained in:
Matthew Maurer 2016-09-13 20:47:31 -04:00
parent 5ce22cb05e
commit a6f8b1f9ff
4 changed files with 26 additions and 5 deletions

View File

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, core_kernel,
{stdenv, buildOcaml, fetchurl, core_kernel_p4,
bin_prot_p4, fieldslib_p4, pa_ounit, pa_test,
sexplib_p4, herelib}:
@ -14,7 +14,7 @@ buildOcaml rec {
};
buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ core_kernel bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ];
propagatedBuildInputs = [ core_kernel_p4 bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_kernel;

View File

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, type_conv,
core_kernel, bin_prot_p4, comparelib, custom_printf, enumerate,
core_kernel_p4, bin_prot_p4, comparelib, custom_printf, enumerate,
fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit,
pipebang, sexplib_p4, typerep_p4, variantslib_p4}:
@ -17,7 +17,7 @@ buildOcaml rec {
hasSharedObjects = true;
buildInputs = [ pa_bench pa_test pa_ounit ];
propagatedBuildInputs = [ type_conv core_kernel bin_prot_p4 comparelib
propagatedBuildInputs = [ type_conv core_kernel_p4 bin_prot_p4 comparelib
custom_printf enumerate fieldslib_p4 herelib
pipebang sexplib_p4 typerep_p4 variantslib_p4 ];

View File

@ -0,0 +1,19 @@
{stdenv, buildOcamlJane, fetchurl,
bin_prot, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
ocaml_oasis, opam, js_build_tools}:
buildOcamlJane rec {
name = "core_kernel";
hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6";
propagatedBuildInputs =
[ bin_prot 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/core_kernel;
description = "Jane Street Capital's standard library overlay (kernel)";
license = licenses.asl20;
maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
};
}

View File

@ -5303,7 +5303,7 @@ in
core_extended = callPackage ../development/ocaml-modules/core_extended { };
core_kernel = callPackage ../development/ocaml-modules/core_kernel { };
core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { };
core = callPackage ../development/ocaml-modules/core { };
@ -5569,6 +5569,8 @@ in
variantslib = callPackage ../development/ocaml-modules/janestreet/variantslib.nix {};
bin_prot = callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {};
core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {};
};
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;