diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-03-29 06:30:59 +0200 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-03-29 08:02:14 +0200 |
commit | aeb65012faef8aa9329b4caccfab94fda0684c77 (patch) | |
tree | 4937946e6026ffa30f1b012ec2cbefdf0de65061 /pkgs/development/ocaml-modules | |
parent | e87b6f72d11ff413b7647681c8c84b6474b6be37 (diff) | |
download | nixpkgs-aeb65012faef8aa9329b4caccfab94fda0684c77.tar nixpkgs-aeb65012faef8aa9329b4caccfab94fda0684c77.tar.gz nixpkgs-aeb65012faef8aa9329b4caccfab94fda0684c77.tar.bz2 nixpkgs-aeb65012faef8aa9329b4caccfab94fda0684c77.tar.lz nixpkgs-aeb65012faef8aa9329b4caccfab94fda0684c77.tar.xz nixpkgs-aeb65012faef8aa9329b4caccfab94fda0684c77.tar.zst nixpkgs-aeb65012faef8aa9329b4caccfab94fda0684c77.zip |
ocamlPackages.{macaddr,ipaddr}: minor cleaning
Diffstat (limited to 'pkgs/development/ocaml-modules')
6 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index d1386230452..c2621584f34 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 useDune2 minimumOCamlVersion; + inherit (ipaddr) version src; propagatedBuildInputs = [ ipaddr cstruct ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 3090066c2f4..c4eefb637fb 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 useDune2 minimumOCamlVersion; + inherit (macaddr) version src; 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 1ede3c064ad..373b5a87e49 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 useDune2 minimumOCamlVersion; + inherit (ipaddr) version src; propagatedBuildInputs = [ ipaddr ]; diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix index 14323040892..db543c0574e 100644 --- a/pkgs/development/ocaml-modules/macaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -5,9 +5,7 @@ buildDunePackage { pname = "macaddr-cstruct"; - inherit (macaddr) version src minimumOCamlVersion; - - useDune2 = true; + inherit (macaddr) version src; propagatedBuildInputs = [ macaddr cstruct ]; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 4f5790fdc0c..7eb74ff064d 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -6,9 +6,7 @@ buildDunePackage rec { pname = "macaddr"; version = "5.3.0"; - useDune2 = true; - - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix index 35cc7c6b440..1f03c1326a5 100644 --- a/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -5,9 +5,7 @@ buildDunePackage { pname = "macaddr-sexp"; - inherit (macaddr) version src minimumOCamlVersion; - - useDune2 = true; + inherit (macaddr) version src; propagatedBuildInputs = [ ppx_sexp_conv ]; |