bin_prot: 112.24.00 -> 112.24.00/113.33.03

PPX/P4 split
This commit is contained in:
Matthew Maurer 2016-09-13 20:42:40 -04:00
parent 7ea027862c
commit 5ce22cb05e
9 changed files with 34 additions and 15 deletions

View File

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, async_kernel, async_unix,
bin_prot, core, custom_printf, fieldslib_p4, herelib, pa_ounit,
bin_prot_p4, core, custom_printf, fieldslib_p4, herelib, pa_ounit,
pipebang, pa_test, sexplib_p4}:
buildOcaml rec {
@ -14,7 +14,7 @@ buildOcaml rec {
};
buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf
propagatedBuildInputs = [ async_kernel async_unix core bin_prot_p4 custom_printf
fieldslib_p4 herelib pipebang sexplib_p4 ];
meta = with stdenv.lib; {

View File

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, core_kernel,
bin_prot, fieldslib_p4, pa_ounit, pa_test,
bin_prot_p4, fieldslib_p4, pa_ounit, pa_test,
sexplib_p4, herelib}:
buildOcaml rec {
@ -14,7 +14,7 @@ buildOcaml rec {
};
buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ core_kernel bin_prot fieldslib_p4 herelib sexplib_p4 ];
propagatedBuildInputs = [ core_kernel 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, async_kernel,
bin_prot, comparelib, core, fieldslib_p4, herelib, pa_ounit,
bin_prot_p4, comparelib, core, fieldslib_p4, herelib, pa_ounit,
pipebang, pa_test, sexplib_p4}:
buildOcaml rec {
@ -15,7 +15,7 @@ buildOcaml rec {
hasSharedObjects = true;
buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ async_kernel core bin_prot comparelib
propagatedBuildInputs = [ async_kernel core bin_prot_p4 comparelib
fieldslib_p4 herelib pipebang pa_test sexplib_p4 ];
meta = with stdenv.lib; {

View File

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, type_conv,
core_kernel, bin_prot, comparelib, custom_printf, enumerate,
core_kernel, 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 comparelib
propagatedBuildInputs = [ type_conv core_kernel bin_prot_p4 comparelib
custom_printf enumerate fieldslib_p4 herelib
pipebang sexplib_p4 typerep_p4 variantslib_p4 ];

View File

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf,
{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core, custom_printf,
fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib_p4}:
buildOcaml rec {
@ -14,7 +14,7 @@ buildOcaml rec {
hasSharedObjects = true;
buildInputs = [ pa_bench pa_test pa_ounit ];
propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib_p4
propagatedBuildInputs = [bin_prot_p4 comparelib core custom_printf fieldslib_p4
pipebang textutils re2 sexplib_p4 ];
meta = with stdenv.lib; {

View File

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, type_conv,
bin_prot, comparelib, custom_printf, enumerate,
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_test pa_ounit ];
propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf
propagatedBuildInputs = [ type_conv pa_bench bin_prot_p4 comparelib custom_printf
enumerate fieldslib_p4 herelib pipebang sexplib_p4
typerep_p4 variantslib_p4 ];

View File

@ -0,0 +1,17 @@
{stdenv, buildOcamlJane, type_conv}:
buildOcamlJane rec {
name = "bin_prot";
version = "113.33.03";
minimumSupportedOcamlVersion = "4.02";
hash = "0jlarpfby755j0kikz6vnl1l6q0ga09b9zrlw6i84r22zchnqdsh";
propagatedBuildInputs = [ type_conv ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/bin_prot;
description = "Binary protocol generator ";
license = licenses.asl20;
maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
};
}

View File

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test,
bin_prot, comparelib, sexplib_p4, rsync}:
bin_prot_p4, comparelib, sexplib_p4, rsync}:
buildOcaml rec {
name = "re2";
@ -16,7 +16,7 @@ buildOcaml rec {
else null;
buildInputs = [ pa_ounit pa_test rsync ];
propagatedBuildInputs = [ core bin_prot comparelib sexplib_p4 ];
propagatedBuildInputs = [ core bin_prot_p4 comparelib sexplib_p4 ];
hasSharedObjects = true;

View File

@ -5146,7 +5146,7 @@ in
biniou = callPackage ../development/ocaml-modules/biniou { };
bin_prot = callPackage ../development/ocaml-modules/bin_prot { };
bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { };
ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
@ -5567,6 +5567,8 @@ in
sexplib = callPackage ../development/ocaml-modules/janestreet/sexplib.nix {};
variantslib = callPackage ../development/ocaml-modules/janestreet/variantslib.nix {};
bin_prot = callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {};
};
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;