ocamlPackages.{arp,ethernet,tcpip}: some cleaning
This commit is contained in:
parent
ff951cd1c2
commit
9550348c1a
|
@ -1,8 +1,22 @@
|
||||||
{ lib, buildDunePackage, fetchurl
|
{ lib
|
||||||
, cstruct, ipaddr, macaddr, logs, lwt, duration
|
, buildDunePackage
|
||||||
, mirage-time, mirage-protocols, mirage-profile
|
, fetchurl
|
||||||
, alcotest, ethernet, fmt, mirage-vnetif, mirage-random
|
, cstruct
|
||||||
, mirage-random-test, mirage-clock-unix, mirage-time-unix
|
, duration
|
||||||
|
, ethernet
|
||||||
|
, ipaddr
|
||||||
|
, logs
|
||||||
|
, lwt
|
||||||
|
, macaddr
|
||||||
|
, mirage-profile
|
||||||
|
, mirage-time
|
||||||
|
, alcotest
|
||||||
|
, mirage-clock-unix
|
||||||
|
, mirage-flow
|
||||||
|
, mirage-random
|
||||||
|
, mirage-random-test
|
||||||
|
, mirage-time-unix
|
||||||
|
, mirage-vnetif
|
||||||
, bisect_ppx
|
, bisect_ppx
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -31,7 +45,6 @@ buildDunePackage rec {
|
||||||
lwt
|
lwt
|
||||||
macaddr
|
macaddr
|
||||||
mirage-profile
|
mirage-profile
|
||||||
mirage-protocols
|
|
||||||
mirage-time
|
mirage-time
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -39,7 +52,7 @@ buildDunePackage rec {
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
alcotest
|
alcotest
|
||||||
mirage-clock-unix
|
mirage-clock-unix
|
||||||
mirage-profile
|
mirage-flow
|
||||||
mirage-random
|
mirage-random
|
||||||
mirage-random-test
|
mirage-random-test
|
||||||
mirage-time-unix
|
mirage-time-unix
|
||||||
|
|
|
@ -1,20 +1,26 @@
|
||||||
{ lib, buildDunePackage, fetchurl
|
{ lib
|
||||||
, rresult, cstruct, ppx_cstruct, mirage-net, mirage-protocols
|
, buildDunePackage
|
||||||
, mirage-profile, macaddr, fmt, lwt, logs
|
, fetchurl
|
||||||
|
, cstruct
|
||||||
|
, logs
|
||||||
|
, lwt
|
||||||
|
, macaddr
|
||||||
|
, mirage-net
|
||||||
|
, mirage-profile
|
||||||
|
, ppx_cstruct
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "ethernet";
|
pname = "ethernet";
|
||||||
version = "3.0.0";
|
version = "3.0.0";
|
||||||
|
|
||||||
minimumOCamlVersion = "4.08";
|
minimalOCamlVersion = "4.08";
|
||||||
|
|
||||||
# necessary due to cstruct
|
duneVersion = "3";
|
||||||
useDune2 = true;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||||
sha256 = "0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9";
|
hash = "sha256:0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -22,13 +28,10 @@ buildDunePackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
rresult
|
|
||||||
cstruct
|
cstruct
|
||||||
mirage-net
|
mirage-net
|
||||||
mirage-protocols
|
|
||||||
macaddr
|
macaddr
|
||||||
mirage-profile
|
mirage-profile
|
||||||
fmt
|
|
||||||
lwt
|
lwt
|
||||||
logs
|
logs
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, buildDunePackage, fetchurl
|
{ lib, buildDunePackage, fetchurl
|
||||||
, bisect_ppx, ppx_cstruct, pkg-config
|
, ppx_cstruct, pkg-config
|
||||||
, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
|
, cstruct, cstruct-lwt, mirage-net, mirage-clock
|
||||||
, mirage-random, mirage-stack, mirage-protocols, mirage-time
|
, mirage-random, mirage-time
|
||||||
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
|
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
|
||||||
, lwt, lwt-dllist, logs, duration, randomconv, ethernet
|
, lwt, lwt-dllist, logs, duration, randomconv, ethernet
|
||||||
, alcotest, mirage-flow, mirage-vnetif, pcap-format
|
, alcotest, mirage-flow, mirage-vnetif, pcap-format
|
||||||
|
@ -19,7 +19,7 @@ buildDunePackage rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||||
sha256 = "sha256-lraur6NfFD9yddG+y21jlHKt82gLgYBBbedltlgcRm0=";
|
hash = "sha256-lraur6NfFD9yddG+y21jlHKt82gLgYBBbedltlgcRm0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -27,17 +27,12 @@ buildDunePackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
bisect_ppx
|
|
||||||
ppx_cstruct
|
ppx_cstruct
|
||||||
rresult
|
|
||||||
cstruct
|
cstruct
|
||||||
cstruct-lwt
|
cstruct-lwt
|
||||||
mirage-net
|
mirage-net
|
||||||
mirage-clock
|
mirage-clock
|
||||||
mirage-random
|
mirage-random
|
||||||
mirage-random-test
|
|
||||||
mirage-stack
|
|
||||||
mirage-protocols
|
|
||||||
mirage-time
|
mirage-time
|
||||||
ipaddr
|
ipaddr
|
||||||
macaddr
|
macaddr
|
||||||
|
@ -53,13 +48,15 @@ buildDunePackage rec {
|
||||||
lru
|
lru
|
||||||
metrics
|
metrics
|
||||||
arp
|
arp
|
||||||
|
mirage-flow
|
||||||
] ++ lib.optionals withFreestanding [
|
] ++ lib.optionals withFreestanding [
|
||||||
ocaml-freestanding
|
ocaml-freestanding
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = true;
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
alcotest
|
alcotest
|
||||||
|
mirage-random-test
|
||||||
mirage-flow
|
mirage-flow
|
||||||
mirage-vnetif
|
mirage-vnetif
|
||||||
pcap-format
|
pcap-format
|
||||||
|
|
Loading…
Reference in a new issue