Merge pull request #66368 from marsam/update-camomile

ocamlPackages.camomile: 1.0.1 -> 1.0.2
This commit is contained in:
Vincent Laporte 2019-08-09 14:14:51 +00:00 committed by GitHub
commit e31eca3a4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,28 +1,20 @@
{ stdenv, fetchFromGitHub, ocaml, dune, cppo, findlib }:
{ stdenv, fetchFromGitHub, buildDunePackage, cppo }:
stdenv.mkDerivation rec {
buildDunePackage rec {
pname = "camomile";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "yoriyuki";
repo = pname;
rev = version;
sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
};
buildInputs = [ ocaml dune findlib cppo ];
buildInputs = [ cppo ];
configurePhase = "ocaml configure.ml --share $out/share/camomile";
# Use jbuilder executable because it breaks on dune>=1.10
# https://github.com/yoriyuki/Camomile/commit/505202b58e22628f80bbe15ee76b9470a5bd2f57#r33816944
buildPhase = ''
jbuilder build -p ${pname}
'';
inherit (dune) installPhase;
meta = {
inherit (src.meta) homepage;
maintainers = [ stdenv.lib.maintainers.vbgl ];