diff --git a/pkgs/development/ocaml-modules/mirage-nat/default.nix b/pkgs/development/ocaml-modules/mirage-nat/default.nix index fea1e712abd2..f0a89f37f418 100644 --- a/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -6,15 +6,13 @@ buildDunePackage rec { pname = "mirage-nat"; - version = "3.0.1"; + version = "3.0.2"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-wReySOMulGkrPD60XxpgMrUoHzY9hQ7TZzYQyJ3eiik="; + hash = "sha256-Z1g3qb26x/S6asYv6roTW77r41SHy7OGN7MoZJ/E8Is="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-stack/default.nix b/pkgs/development/ocaml-modules/mirage-stack/default.nix deleted file mode 100644 index 94a65548531f..000000000000 --- a/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildDunePackage, fetchurl, tcpip }: - -buildDunePackage rec { - pname = "mirage-stack"; - version = "4.0.0"; - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; - hash = "sha256-q70zGQvT5KTqvL37bZjSD8Su0P72KCUesyfWJcI8zPw="; - }; - - propagatedBuildInputs = [ tcpip ]; - - meta = { - description = "MirageOS signatures for network stacks"; - homepage = "https://github.com/mirage/mirage-stack"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - }; -} - diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index 3fddb162d465..e95d3b182a52 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -1,7 +1,6 @@ { buildDunePackage , lib , fetchurl -, mirage-stack , mirage-time , h2 , tls-mirage @@ -32,10 +31,8 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ - mirage-stack mirage-time h2 tls-mirage diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index 30710bfae265..1f86d7ef5bfb 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -1,8 +1,8 @@ { lib, buildDunePackage, fetchurl -, ppx_cstruct, pkg-config +, pkg-config , cstruct, cstruct-lwt, mirage-net, mirage-clock , mirage-random, mirage-time -, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt +, macaddr, macaddr-cstruct, fmt , lwt, lwt-dllist, logs, duration, randomconv, ethernet , alcotest, mirage-flow, mirage-vnetif, pcap-format , mirage-clock-unix, arp, ipaddr-cstruct, mirage-random-test @@ -13,13 +13,11 @@ buildDunePackage rec { pname = "tcpip"; - version = "7.1.2"; - - duneVersion = "3"; + version = "8.0.0"; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-lraur6NfFD9yddG+y21jlHKt82gLgYBBbedltlgcRm0="; + hash = "sha256-NrTBVr4WcCukxteBotqLoUYrIjcNFVcOERYFbL8CUjM="; }; nativeBuildInputs = [ @@ -27,17 +25,15 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ - ppx_cstruct cstruct cstruct-lwt mirage-net mirage-clock mirage-random mirage-time - ipaddr + ipaddr-cstruct macaddr macaddr-cstruct - mirage-profile fmt lwt lwt-dllist @@ -61,7 +57,6 @@ buildDunePackage rec { mirage-vnetif pcap-format mirage-clock-unix - ipaddr-cstruct ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b50358e4f2ec..ad03d1c14d5a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1056,8 +1056,6 @@ let mirage-runtime = callPackage ../development/ocaml-modules/mirage/runtime.nix { }; - mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { }; - mirage-time = callPackage ../development/ocaml-modules/mirage-time { }; mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { };