From 4d47330bef2115d8cb0ac81a48682924c5fe9f27 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Nov 2020 07:36:38 +0100 Subject: [PATCH] ocamlPackages.ipaddr: use Dune 2 --- pkgs/development/ocaml-modules/ipaddr/cstruct.nix | 2 +- pkgs/development/ocaml-modules/ipaddr/default.nix | 2 +- pkgs/development/ocaml-modules/ipaddr/sexp.nix | 2 +- pkgs/development/ocaml-modules/macaddr/default.nix | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index b6240d39ebd..d1386230452 100644 --- 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 ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index a4a6f9fc7a1..3090066c2f4 100644 --- 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 ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 8d6186d6338..1ede3c064ad 100644 --- 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 ]; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 08b486bb683..5552393b408 100644 --- 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 {