Merge pull request #46089 from vbgl/ocaml-4.07-enableP4
ocamlPackages.{tyxml,lwt}: always enable camlp4 support
This commit is contained in:
commit
f9e7de9294
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder
|
{ stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder
|
||||||
, ocaml, findlib, cppo
|
, ocaml, findlib, cppo
|
||||||
, ocaml-migrate-parsetree, ppx_tools_versioned, result
|
, ocaml-migrate-parsetree, ppx_tools_versioned, result
|
||||||
, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07"
|
, withP4 ? true
|
||||||
, camlp4 ? null
|
, camlp4 ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re
|
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re
|
||||||
, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07"
|
, withP4 ? true
|
||||||
, camlp4 ? null
|
, camlp4 ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue