nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-06 20:23:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #166134 from bcc32/update-macaddr-ipaddr

Browse Source 
ocamlPackages.{macaddr,ipaddr}: 5.2.0 -> 5.3.0
This commit is contained in:
Vincent Laporte 2022-03-29 20:48:58 +02:00 committed by GitHub
commit deda77e07b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/ipaddr/cstruct.nix
View File

@ -5,7 +5,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "ipaddr-cstruct"; pname = "ipaddr-cstruct";
inherit (ipaddr) version src useDune2 minimumOCamlVersion; inherit (ipaddr) version src;
propagatedBuildInputs = [ ipaddr cstruct ]; propagatedBuildInputs = [ ipaddr cstruct ];

2
pkgs/development/ocaml-modules/ipaddr/default.nix
View File

@ -6,7 +6,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "ipaddr"; pname = "ipaddr";
inherit (macaddr) version src useDune2 minimumOCamlVersion; inherit (macaddr) version src;
propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];

2
pkgs/development/ocaml-modules/ipaddr/sexp.nix
View File

@ -5,7 +5,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "ipaddr-sexp"; pname = "ipaddr-sexp";
inherit (ipaddr) version src useDune2 minimumOCamlVersion; inherit (ipaddr) version src;
propagatedBuildInputs = [ ipaddr ]; propagatedBuildInputs = [ ipaddr ];

4
pkgs/development/ocaml-modules/macaddr/cstruct.nix
View File

@ -5,9 +5,7 @@
buildDunePackage { buildDunePackage {
pname = "macaddr-cstruct"; pname = "macaddr-cstruct";
inherit (macaddr) version src minimumOCamlVersion; inherit (macaddr) version src;
useDune2 = true;
propagatedBuildInputs = [ macaddr cstruct ]; propagatedBuildInputs = [ macaddr cstruct ];

10
pkgs/development/ocaml-modules/macaddr/default.nix
View File

@ -4,15 +4,13 @@
buildDunePackage rec { buildDunePackage rec {
pname = "macaddr"; pname = "macaddr";
version = "5.2.0"; version = "5.3.0";
useDune2 = true; minimalOCamlVersion = "4.04";
minimumOCamlVersion = "4.04";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-v${version}.tbz"; url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz";
sha256 = "f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec"; sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn";
}; };
checkInputs = [ ppx_sexp_conv ounit ]; checkInputs = [ ppx_sexp_conv ounit ];

4
pkgs/development/ocaml-modules/macaddr/sexp.nix
View File

@ -5,9 +5,7 @@
buildDunePackage { buildDunePackage {
pname = "macaddr-sexp"; pname = "macaddr-sexp";
inherit (macaddr) version src minimumOCamlVersion; inherit (macaddr) version src;
useDune2 = true;
propagatedBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ ppx_sexp_conv ];