buildDunePackage: new support function; use it to refactor some OCaml derivations

This commit is contained in:
Théo Zimmermann
2018-11-07 10:08:03 +01:00
parent 5fc73fd52e
commit 794158fcd5
64 changed files with 506 additions and 828 deletions
+5 -10
View File
@@ -1,8 +1,9 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }:
{ stdenv, fetchFromGitHub, buildDunePackage, czmq, stdint }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-zmq-${version}";
buildDunePackage rec {
pname = "zmq";
version = "20180726";
src = fetchFromGitHub {
owner = "issuu";
repo = "ocaml-zmq";
@@ -14,19 +15,13 @@ stdenv.mkDerivation rec {
./ocaml-zmq-issue43.patch
];
buildInputs = [ ocaml findlib dune czmq ];
buildInputs = [ czmq ];
propagatedBuildInputs = [ stdint ];
buildPhase = "dune build -p zmq";
inherit (dune) installPhase;
meta = with stdenv.lib; {
description = "ZeroMQ bindings for OCaml";
license = licenses.mit;
maintainers = with maintainers; [ akavel ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}
+4 -8
View File
@@ -1,12 +1,8 @@
{ stdenv, ocaml, findlib, dune, zmq, ocaml_lwt }:
{ stdenv, buildDunePackage, zmq, ocaml_lwt }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-zmq-lwt-${version}";
inherit (zmq) version src installPhase meta;
buildInputs = [ ocaml findlib dune ];
buildDunePackage rec {
pname = "zmq-lwt";
inherit (zmq) version src meta;
propagatedBuildInputs = [ zmq ocaml_lwt ];
buildPhase = "dune build -p zmq-lwt";
}