diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index e53c4689448..d25cd81bcd8 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -1,5 +1,5 @@ {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 { name = "core_extended"; @@ -15,7 +15,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; 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; { homepage = https://github.com/janestreet/core_extended; diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix new file mode 100644 index 00000000000..6604a8d012c --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/re2.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93ccbe12238..9ed93e0f0ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5369,7 +5369,7 @@ in piqi = callPackage ../development/ocaml-modules/piqi { }; 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 { }; @@ -5573,6 +5573,8 @@ in core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}; core = callPackage ../development/ocaml-modules/janestreet/core.nix {}; + + re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;