ocamlPackages.elpi: use recent version of ppxlib
This commit is contained in:
parent
fca6647ac7
commit
551c849344
2 changed files with 10 additions and 4 deletions
|
@ -1,5 +1,7 @@
|
|||
{ stdenv, lib, fetchzip, buildDunePackage, camlp5
|
||||
, ppxlib, ppx_deriving, re, perl, ncurses
|
||||
, re, perl, ncurses
|
||||
, ppxlib, ppx_deriving
|
||||
, ppxlib_0_15, ppx_deriving_0_15
|
||||
, version ? "1.13.7"
|
||||
}:
|
||||
with lib;
|
||||
|
@ -23,7 +25,11 @@ buildDunePackage rec {
|
|||
|
||||
buildInputs = [ perl ncurses ];
|
||||
|
||||
propagatedBuildInputs = [ camlp5 ppxlib ppx_deriving re ];
|
||||
propagatedBuildInputs = [ camlp5 re ]
|
||||
++ (if lib.versionAtLeast version "1.13"
|
||||
then [ ppxlib ppx_deriving ]
|
||||
else [ ppxlib_0_15 ppx_deriving_0_15 ]
|
||||
);
|
||||
|
||||
meta = {
|
||||
description = "Embeddable λProlog Interpreter";
|
||||
|
|
|
@ -344,8 +344,8 @@ let
|
|||
then ppxlib.override { version = "0.15.0"; }
|
||||
else ppxlib; in
|
||||
{
|
||||
ppx_deriving = ppx_deriving.override { ppxlib = ppxlib_0_15; };
|
||||
ppxlib = ppxlib_0_15;
|
||||
ppx_deriving_0_15 = ppx_deriving.override { ppxlib = ppxlib_0_15; };
|
||||
inherit ppxlib_0_15;
|
||||
}
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in a new issue