JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to buildDunePackage, and remove redundancies

Browse Source
This commit is contained in:
Joachim Breitner 2018-12-01 17:45:37 +01:00
parent 7621523fc1
commit 54ed86852e
2 changed files with 10 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
View File

@ -1,32 +1,7 @@
{ stdenv, fetchFromGitHub, ocaml, dune, findlib, ocamlbuild }: { buildDunePackage, bisect_ppx, ocamlbuild }:
let version = "1.4.0"; in buildDunePackage rec {
inherit (bisect_ppx) version src meta;
stdenv.mkDerivation { pname = "bisect_ppx-ocamlbuild";
name = "ocaml${ocaml.version}-bisect_ppx-ocamlbuild-${version}"; buildInputs = [ ocamlbuild ];
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;
};
} }

19
pkgs/development/ocaml-modules/bisect_ppx/default.nix
View File

@ -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 buildDunePackage rec {
pname = "bisect_ppx";
stdenv.mkDerivation { version = "1.4.0";
name = "ocaml${ocaml.version}-bisect_ppx-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aantron"; owner = "aantron";
@ -13,21 +12,13 @@ stdenv.mkDerivation {
}; };
buildInputs = [ buildInputs = [
ocaml
dune
findlib
ocaml-migrate-parsetree ocaml-migrate-parsetree
ppx_tools_versioned ppx_tools_versioned
]; ];
buildPhase = "dune build -p bisect_ppx";
inherit (dune) installPhase;
meta = { meta = {
homepage = https://github.com/aantron/bisect_ppx;
platforms = ocaml.meta.platforms or [];
description = "Code coverage for OCaml"; description = "Code coverage for OCaml";
license = stdenv.lib.licenses.mpl20; license = stdenv.lib.licenses.mpl20;
homepage = https://github.com/aantron/bisect_ppx;
}; };
} }