git.iko.soy/typeable/nixpkgs
on master help sign in
Switch to buildDunePackage, and remove redundancies
commit54ed86852e921948cbd35bc7e228ebfca38c4d47 authorJoachim Breitner <mail@joachim-breitner.de> dateSat 1 Dec 2018, 17:45 (8 years ago) parent7621523
2 files changed+10−44
pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix+5−30 pkgs/development/ocaml-modules/bisect_ppx/default.nix+5−14
pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix+5−30
@@ -1,32 +1,7 @@
1−{ stdenv, fetchFromGitHub, ocaml, dune, findlib, ocamlbuild }:
1+{ buildDunePackage, bisect_ppx, ocamlbuild }:
22
3−let version = "1.4.0"; in
4−
5−stdenv.mkDerivation {
6− name = "ocaml${ocaml.version}-bisect_ppx-ocamlbuild-${version}";
7−
8− src = fetchFromGitHub {
9− owner = "aantron";
10− repo = "bisect_ppx";
11− rev = version;
12− sha256 = "1plhm4pvrhpapz5zaks194ji1fgzmp13y942g10pbn9m7kgkqg4h";
13− };
14−
15− buildInputs = [
16− ocaml
17− dune
18− findlib
19− ocamlbuild
20− ];
21−
22− buildPhase = "dune build -p bisect_ppx-ocamlbuild";
23−
24− inherit (dune) installPhase;
25−
26− meta = {
27− homepage = https://github.com/aantron/bisect_ppx;
28− platforms = ocaml.meta.platforms or [];
29− description = "Code coverage for OCaml";
30− license = stdenv.lib.licenses.mpl20;
31− };
3+buildDunePackage rec {
4+ inherit (bisect_ppx) version src meta;
5+ pname = "bisect_ppx-ocamlbuild";
6+ buildInputs = [ ocamlbuild ];
327}
pkgs/development/ocaml-modules/bisect_ppx/default.nix+5−14
@@ -1,9 +1,8 @@
1−{ stdenv, fetchFromGitHub, ocaml, dune, findlib, ocaml-migrate-parsetree, ppx_tools_versioned }:
1+{ stdenv, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree, ppx_tools_versioned }:
22
3−let version = "1.4.0"; in
4−
5−stdenv.mkDerivation {
6− name = "ocaml${ocaml.version}-bisect_ppx-${version}";
3+buildDunePackage rec {
4+ pname = "bisect_ppx";
5+ version = "1.4.0";
76
87 src = fetchFromGitHub {
98 owner = "aantron";
@@ -13,21 +12,13 @@ stdenv.mkDerivation {
1312 };
1413
1514 buildInputs = [
16− ocaml
17− dune
18− findlib
1915 ocaml-migrate-parsetree
2016 ppx_tools_versioned
2117 ];
2218
23− buildPhase = "dune build -p bisect_ppx";
24−
25− inherit (dune) installPhase;
26−
2719 meta = {
28− homepage = https://github.com/aantron/bisect_ppx;
29− platforms = ocaml.meta.platforms or [];
3020 description = "Code coverage for OCaml";
3121 license = stdenv.lib.licenses.mpl20;
22+ homepage = https://github.com/aantron/bisect_ppx;
3223 };
3324}