From bc85b5b9926ca35c39a8e53760d56acf5981696e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 8 Feb 2021 09:04:07 +0100 Subject: [PATCH] ocamlPackages.zmq: use Dune 2 --- pkgs/development/ocaml-modules/zmq/default.nix | 7 +++++-- pkgs/development/ocaml-modules/zmq/lwt.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index d454d244959..9779004085c 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,9 +1,12 @@ -{ lib, fetchFromGitHub, buildDunePackage, czmq, stdint }: +{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, czmq, stdint }: buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "zmq"; version = "20180726"; + + useDune2 = true; + src = fetchFromGitHub { owner = "issuu"; repo = "ocaml-zmq"; @@ -11,7 +14,7 @@ buildDunePackage rec { sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; }; - buildInputs = [ czmq ]; + buildInputs = [ czmq dune-configurator ]; propagatedBuildInputs = [ stdint ]; diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix index f8fc06791b1..6717e787f19 100644 --- a/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "zmq-lwt"; - inherit (zmq) version src meta; + inherit (zmq) version src useDune2 meta; propagatedBuildInputs = [ zmq ocaml_lwt ]; }