diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index e58e51c63ae..230320671a7 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -2,14 +2,14 @@ let params = { "8.11" = rec { - version = "1.5.0"; + version = "1.6.0_8.11"; rev = "v${version}"; - sha256 = "0dlw869j6ib58i8fhbr7x3hq2cy088arihhfanv8i08djqml6g8x"; + sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; }; "8.12" = rec { - version = "1.5.1"; + version = "1.6.0"; rev = "v${version}"; - sha256 = "1znjc8c8rivsawmz5bgm9ddl69p62p2pwxphvpap1gfmi5cp8lwi"; + sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; }; }; param = params.${coq.coq-version}; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 93e29d3d34a..865c5448c5b 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,19 +1,19 @@ { lib, fetchzip, buildDunePackage, camlp5 -, ppx_tools_versioned, ppx_deriving, re +, ppxlib, ppx_deriving, re, perl, ncurses }: buildDunePackage rec { pname = "elpi"; - version = "1.11.2"; + version = "1.11.4"; src = fetchzip { url = "https://github.com/LPCIC/elpi/releases/download/v${version}/elpi-v${version}.tbz"; - sha256 = "15hamy9ifr05kczadwh3yj2gmr12a9z1jwppmp5yrns0vykjbj76"; + sha256 = "1hmjp2z52j17vwhhdkj45n9jx11jxkdg2dwa0n04yyw0qqy4m7c1"; }; minimumOCamlVersion = "4.04"; - buildInputs = [ ppx_tools_versioned ]; + buildInputs = [ perl ncurses ppxlib ]; propagatedBuildInputs = [ camlp5 ppx_deriving re ]; @@ -24,5 +24,9 @@ buildDunePackage rec { homepage = "https://github.com/LPCIC/elpi"; }; + postPatch = '' + substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols" + ''; + useDune2 = true; }