mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Code Issues Wiki Activity

ocamlPackages.elpi: use recent version of ppxlib

Browse source
This commit is contained in:
Vincent Laporte 2021-11-05 21:54:48 +01:00 committed by Vincent Laporte
parent fca6647ac7
commit 551c849344
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/ocaml-modules/elpi/default.nix
View file

@ -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";

4
pkgs/top-level/ocaml-packages.nix
View file

@ -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;
}
);