public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocaml-re2: 112.06.00 -> 112.06.00/113.33.03 

PPX/P4 split
This commit is contained in:
Matthew Maurer 2016-09-13 21:37:22 -04:00
parent 0561329ae5
commit 3062264c3a
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/core_extended/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf, {stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf,
fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib_p4}: fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2_p4, sexplib_p4}:
buildOcaml rec { buildOcaml rec {
name = "core_extended"; name = "core_extended";
@ -15,7 +15,7 @@ buildOcaml rec {
hasSharedObjects = true; hasSharedObjects = true;
buildInputs = [ pa_bench pa_test pa_ounit ]; buildInputs = [ pa_bench pa_test pa_ounit ];
propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4 propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4
pipebang textutils re2 sexplib_p4 ]; pipebang textutils re2_p4 sexplib_p4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/janestreet/core_extended; homepage = https://github.com/janestreet/core_extended;

20
pkgs/development/ocaml-modules/janestreet/re2.nix Normal file
View File

@ -0,0 +1,20 @@
{stdenv, buildOcamlJane,
bin_prot, core_kernel, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
rsync}:
buildOcamlJane rec {
name = "re2";
hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw";
buildInputs = [ rsync ];
propagatedBuildInputs =
[ bin_prot core_kernel 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/re2;
description = "OCaml bindings for RE2";
maintainers = [ maintainers.maurer ];
license = licenses.asl20;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -5369,7 +5369,7 @@ in
piqi = callPackage ../development/ocaml-modules/piqi { }; piqi = callPackage ../development/ocaml-modules/piqi { };
piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
re2 = callPackage ../development/ocaml-modules/re2 { }; re2_p4 = callPackage ../development/ocaml-modules/re2 { };
result = callPackage ../development/ocaml-modules/ocaml-result { }; result = callPackage ../development/ocaml-modules/ocaml-result { };
@ -5573,6 +5573,8 @@ in
core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}; core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {};
core = callPackage ../development/ocaml-modules/janestreet/core.nix {}; core = callPackage ../development/ocaml-modules/janestreet/core.nix {};
re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {};
}; };
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;