lol

ocaml-re2: 112.06.00 -> 112.06.00/113.33.03

PPX/P4 split

+25 -3
+2 -2
pkgs/development/ocaml-modules/core_extended/default.nix
··· 1 1 {stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf, 2 - fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib_p4}: 2 + fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2_p4, sexplib_p4}: 3 3 4 4 buildOcaml rec { 5 5 name = "core_extended"; ··· 15 15 hasSharedObjects = true; 16 16 buildInputs = [ pa_bench pa_test pa_ounit ]; 17 17 propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4 18 - pipebang textutils re2 sexplib_p4 ]; 18 + pipebang textutils re2_p4 sexplib_p4 ]; 19 19 20 20 meta = with stdenv.lib; { 21 21 homepage = https://github.com/janestreet/core_extended;
+20
pkgs/development/ocaml-modules/janestreet/re2.nix
··· 1 + {stdenv, buildOcamlJane, 2 + bin_prot, core_kernel, fieldslib, sexplib, typerep, variantslib, 3 + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, 4 + rsync}: 5 + 6 + buildOcamlJane rec { 7 + name = "re2"; 8 + hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw"; 9 + buildInputs = [ rsync ]; 10 + propagatedBuildInputs = 11 + [ bin_prot core_kernel fieldslib sexplib typerep variantslib 12 + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; 13 + 14 + meta = with stdenv.lib; { 15 + homepage = https://github.com/janestreet/re2; 16 + description = "OCaml bindings for RE2"; 17 + maintainers = [ maintainers.maurer ]; 18 + license = licenses.asl20; 19 + }; 20 + }
+3 -1
pkgs/top-level/all-packages.nix
··· 5369 5369 piqi = callPackage ../development/ocaml-modules/piqi { }; 5370 5370 piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; 5371 5371 5372 - re2 = callPackage ../development/ocaml-modules/re2 { }; 5372 + re2_p4 = callPackage ../development/ocaml-modules/re2 { }; 5373 5373 5374 5374 result = callPackage ../development/ocaml-modules/ocaml-result { }; 5375 5375 ··· 5573 5573 core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}; 5574 5574 5575 5575 core = callPackage ../development/ocaml-modules/janestreet/core.nix {}; 5576 + 5577 + re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {}; 5576 5578 }; 5577 5579 5578 5580 ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;