From 00fe273cf9895d12be4c4100f031c0cefda4667b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 9 Aug 2019 03:42:57 -0500 Subject: [PATCH] ocamlPackages.camomile: 1.0.1 -> 1.0.2 --- .../ocaml-modules/camomile/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 48bd3767742..ff0cb4aa3fe 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -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 ];