@@ -1,40 +1,28 @@
1−{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5
1+{ lib, fetchFromGitHub, buildDunePackage, camlp5
22, ppx_tools_versioned, ppx_deriving, re
33}:
44
5−if !stdenv.lib.versionAtLeast ocaml.version "4.03"
6−then throw "elpi is not available for OCaml ${ocaml.version}"
7−else
5+buildDunePackage rec {
6+ pname = "elpi";
7+ version = "1.4.1";
88
9−stdenv.mkDerivation rec {
10− name = "ocaml${ocaml.version}-elpi-${version}";
11− version = "1.2.0";
129 src = fetchFromGitHub {
1310 owner = "LPCIC";
1411 repo = "elpi";
1512 rev = "v${version}";
16− sha256 = "1n4jpidx0vk4y66bhd704ajn8n6f1fd5wsi1shj6wijfmjl14h7s";
13+ sha256 = "0sj2jbimg3jqwz4bsfcdqbrh45bb1dbgxj5g234pg1xjy9kxzl2w";
1714 };
1815
19− buildInputs = [ ocaml findlib ppx_tools_versioned ];
16+ minimumOCamlVersion = "4.04";
2017
21− propagatedBuildInputs = [ camlp5 ppx_deriving re ];
22−
23− createFindlibDestdir = true;
18+ buildInputs = [ ppx_tools_versioned ];
2419
25− preInstall = "make byte";
26−
27− postInstall = ''
28− mkdir -p $out/bin
29− make install-bin BIN=$out/bin
30− make install-bin BYTE=1 BIN=$out/bin
31− '';
20+ propagatedBuildInputs = [ camlp5 ppx_deriving re ];
3221
3322 meta = {
3423 description = "Embeddable λProlog Interpreter";
35− license = stdenv.lib.licenses.lgpl21Plus;
36− maintainers = [ stdenv.lib.maintainers.vbgl ];
24+ license = lib.licenses.lgpl21Plus;
25+ maintainers = [ lib.maintainers.vbgl ];
3726 inherit (src.meta) homepage;
38− inherit (ocaml.meta) platforms;
3927 };
4028}