diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix index e4d5c22c187f..602956ee760d 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix @@ -1,32 +1,7 @@ -{ stdenv, fetchFromGitHub, ocaml, dune, findlib, ocamlbuild }: +{ buildDunePackage, bisect_ppx, ocamlbuild }: -let version = "1.4.0"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-bisect_ppx-ocamlbuild-${version}"; - - src = fetchFromGitHub { - owner = "aantron"; - repo = "bisect_ppx"; - rev = version; - sha256 = "1plhm4pvrhpapz5zaks194ji1fgzmp13y942g10pbn9m7kgkqg4h"; - }; - - buildInputs = [ - ocaml - dune - findlib - ocamlbuild - ]; - - buildPhase = "dune build -p bisect_ppx-ocamlbuild"; - - inherit (dune) installPhase; - - meta = { - homepage = https://github.com/aantron/bisect_ppx; - platforms = ocaml.meta.platforms or []; - description = "Code coverage for OCaml"; - license = stdenv.lib.licenses.mpl20; - }; +buildDunePackage rec { + inherit (bisect_ppx) version src meta; + pname = "bisect_ppx-ocamlbuild"; + buildInputs = [ ocamlbuild ]; } diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 7b39cd1968f0..9999cd06fcae 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, ocaml, dune, findlib, ocaml-migrate-parsetree, ppx_tools_versioned }: +{ stdenv, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree, ppx_tools_versioned }: -let version = "1.4.0"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-bisect_ppx-${version}"; +buildDunePackage rec { + pname = "bisect_ppx"; + version = "1.4.0"; src = fetchFromGitHub { owner = "aantron"; @@ -13,21 +12,13 @@ stdenv.mkDerivation { }; buildInputs = [ - ocaml - dune - findlib ocaml-migrate-parsetree ppx_tools_versioned ]; - buildPhase = "dune build -p bisect_ppx"; - - inherit (dune) installPhase; - meta = { - homepage = https://github.com/aantron/bisect_ppx; - platforms = ocaml.meta.platforms or []; description = "Code coverage for OCaml"; license = stdenv.lib.licenses.mpl20; + homepage = https://github.com/aantron/bisect_ppx; }; }