ocamlPackages.re2: remove at 112.06.00
This is a legacy version for OCaml ≤ 4.02
This commit is contained in:
parent
a2ad2bad48
commit
54f5bff2b5
@ -1,20 +0,0 @@
|
||||
{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 {
|
||||
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;
|
||||
};
|
||||
}
|
@ -1,17 +0,0 @@
|
||||
--- ./lib/Makefile 2014-11-18 08:16:19.000000000 -0800
|
||||
+++ ./lib/Makefile 2015-05-23 14:48:31.000000000 -0700
|
||||
@@ -6,12 +6,12 @@
|
||||
all: libre2_stubs.a dllre2_stubs.so
|
||||
|
||||
dllre2_stubs.so libre2_stubs.a: stubs.o $(LIBRE2)
|
||||
- ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lstdc++
|
||||
+ ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lc++
|
||||
rm libre2_stubs.a # ocamlmklib just includes $(LIBRE2) inside the stubs archive
|
||||
cp $(LIBRE2) libre2_stubs.a && ar r libre2_stubs.a stubs.o
|
||||
|
||||
stubs.o: stubs.cpp stubs.h util.h enum_x_macro.h
|
||||
- g++ -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \
|
||||
+ $(CXX) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \
|
||||
-I$(RE2_HOME) -I$(ocaml-version-selected-include-path) -c stubs.cpp
|
||||
|
||||
#stubs.o: %.o: %.cpp %.h
|
@ -1,29 +0,0 @@
|
||||
{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test,
|
||||
bin_prot_p4, comparelib, sexplib_p4, rsync}:
|
||||
|
||||
buildOcaml rec {
|
||||
name = "re2";
|
||||
version = "112.06.00";
|
||||
|
||||
minimumSupportedOcamlVersion = "4.00";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/janestreet/re2/archive/${version}.tar.gz";
|
||||
sha256 = "a538765872363fcb67f12b95c07455a0afd68f5ae9008b59bb85a996d97cc752";
|
||||
};
|
||||
patches = if stdenv.isDarwin
|
||||
then [./Makefile.patch ./myocamlbuild.patch]
|
||||
else null;
|
||||
|
||||
buildInputs = [ pa_ounit pa_test rsync ];
|
||||
propagatedBuildInputs = [ core_p4 bin_prot_p4 comparelib sexplib_p4 ];
|
||||
|
||||
hasSharedObjects = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/janestreet/re2";
|
||||
description = "OCaml bindings for RE2";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
@ -1,24 +0,0 @@
|
||||
--- ./myocamlbuild.ml 2015-05-23 14:35:18.000000000 -0700
|
||||
+++ ./myocamlbuild.ml 2015-05-23 15:05:24.000000000 -0700
|
||||
@@ -626,16 +626,18 @@
|
||||
rule "Generate lib/options.ml"
|
||||
~prod:"lib/options.ml"
|
||||
~deps:["lib/options.mlp"; "lib/enum_x_macro.h"]
|
||||
- (fun _ _ -> Cmd (S[A"gcc"; A"-E"; A"-P"; A"-x"; A"c";
|
||||
+ (fun _ _ -> Cmd (S[A"cc"; A"-E"; A"-P"; A"-x"; A"c";
|
||||
P"lib/options.mlp"; A"-o"; P"lib/options.ml"]));
|
||||
|
||||
flag ["ocaml"; "link"; "library"; "native"] (S[A"-cclib"; A"-Llib";
|
||||
A"-cclib"; A"-lre2_stubs";
|
||||
- A"-cclib"; A"-lstdc++"]);
|
||||
+ A"-ccopt"; A"--stdlib=libc++";
|
||||
+ A"-cclib"; A"-lc++"]);
|
||||
flag ["ocaml"; "link"; "library"; "byte"] (S[A"-dllib"; A"dllre2_stubs.so";
|
||||
A"-cclib"; A"-Llib";
|
||||
A"-cclib"; A"-lre2_stubs";
|
||||
- A"-cclib"; A"-lstdc++"]);
|
||||
+ A"-ccopt"; A"--stdlib=libc++";
|
||||
+ A"-cclib"; A"-lc++"]);
|
||||
| _ ->
|
||||
()
|
||||
|
@ -732,8 +732,6 @@ let
|
||||
|
||||
ptime = callPackage ../development/ocaml-modules/ptime { };
|
||||
|
||||
re2_p4 = callPackage ../development/ocaml-modules/re2 { };
|
||||
|
||||
resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { };
|
||||
|
||||
result = callPackage ../development/ocaml-modules/ocaml-result { };
|
||||
@ -1168,13 +1166,6 @@ let
|
||||
then callPackage ../development/ocaml-modules/janestreet/core.nix {}
|
||||
else core_p4;
|
||||
|
||||
re2 =
|
||||
if lib.versionOlder "4.03" ocaml.version
|
||||
then janeStreet.re2
|
||||
else if lib.versionOlder "4.02" ocaml.version
|
||||
then callPackage ../development/ocaml-modules/janestreet/re2.nix {}
|
||||
else re2_p4;
|
||||
|
||||
textutils =
|
||||
if lib.versionOlder "4.03" ocaml.version
|
||||
then janeStreet.textutils
|
||||
|
Loading…
Reference in New Issue
Block a user