ocamlPackages.ipaddr: use Dune 2

4 years ago · 4d47330bef
parent 5cc1a81692
commit 4d47330bef
4 changed files with 5 additions and 3 deletions
--- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
@ -5,7 +5,7 @@
 buildDunePackage rec {
  pname = "ipaddr-cstruct";

-  inherit (ipaddr) version src minimumOCamlVersion;
+  inherit (ipaddr) version src useDune2 minimumOCamlVersion;

  propagatedBuildInputs = [ ipaddr cstruct ];

--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@ -6,7 +6,7 @@
 buildDunePackage rec {
  pname = "ipaddr";

-  inherit (macaddr) version src minimumOCamlVersion;
+  inherit (macaddr) version src useDune2 minimumOCamlVersion;

  propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];

--- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix
@ -5,7 +5,7 @@
 buildDunePackage rec {
  pname = "ipaddr-sexp";

-  inherit (ipaddr) version src minimumOCamlVersion;
+  inherit (ipaddr) version src useDune2 minimumOCamlVersion;

  propagatedBuildInputs = [ ipaddr ];

--- a/pkgs/development/ocaml-modules/macaddr/default.nix
+++ b/pkgs/development/ocaml-modules/macaddr/default.nix
@ -6,6 +6,8 @@ buildDunePackage rec {
  pname = "macaddr";
  version = "5.0.1";

+  useDune2 = true;
+
  minimumOCamlVersion = "4.04";

  src = fetchurl {