Unverified Commit ca735645 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

ocamlPackages.tcpip: 8.2.0 → 9.0.0; ocamlPackages.arp: 3.1.1 → 4.0.0 (#385499)

parents f040307d 1e9f22f1

pkgs/development/ocaml-modules/arp/default.nix

+6 −19
Original line number Diff line number Diff line
@@ -10,32 +10,23 @@ 
  logs,

  lwt,

  macaddr,

  mirage-time,

  mirage-sleep,

  alcotest,

  mirage-clock-unix,

  mirage-flow,

  mirage-random,

  mirage-random-test,

  mirage-time-unix,

  bos,

  mirage-vnetif,

  bisect_ppx,

}:



buildDunePackage rec {

  pname = "arp";

  version = "3.1.1";

  version = "4.0.0";



  src = fetchurl {

    url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";

    hash = "sha256-6jPFiene6jAPtivCugtVfP3+6k9A5gBoWzpoxoaPBvE=";

    hash = "sha256-C2Bh/2NwZqCJEidCnkhwRMoW3AsbQtvwdFh9IiJkDaU=";

  };



  minimalOCamlVersion = "4.08";



  nativeBuildInputs = [

    bisect_ppx

  ];



  propagatedBuildInputs = [

    cstruct

    duration
@@ -44,18 +35,14 @@ buildDunePackage rec { 
    logs

    lwt

    macaddr

    mirage-time

    mirage-sleep

  ];



  ## NOTE: As of 18 april 2023 and ARP version 3.0.0, tests fail on Darwin.

  doCheck = !stdenv.hostPlatform.isDarwin;

  checkInputs = [

    alcotest

    mirage-clock-unix

    mirage-flow

    mirage-random

    mirage-random-test

    mirage-time-unix

    bos

    mirage-vnetif

  ];

pkgs/development/ocaml-modules/dns/resolver.nix

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
  tcpip,

  tls,

  tls-mirage,

  mirage-crypto-rng-mirage,

  dnssec,

  alcotest,

}:
@@ -37,6 +38,7 @@ buildDunePackage { 
    tcpip

    tls

    tls-mirage

    mirage-crypto-rng-mirage

  ];



  doCheck = true;

pkgs/development/ocaml-modules/mirage-mtime/default.nix

0 → 100644
+29 −0
Original line number Diff line number Diff line 
{

  lib,

  fetchurl,

  buildDunePackage,

  mtime,

  version ? "5.0.0",

}:



buildDunePackage {

  pname = "mirage-mtime";



  inherit version;



  src = fetchurl {

    url = "https://github.com/mirage/mirage-mtime/releases/download/v${version}/mirage-mtime-${version}.tbz";

    hash = "sha256-IwdaAyZyj8gfRPxQP9SOwb28AbtVy9PY7qcr0Pns9GU=";

  };



  propagatedBuildInputs = [

    mtime

  ];



  meta = {

    description = "Monotonic time for MirageOS";

    license = lib.licenses.isc;

    maintainers = [ lib.maintainers.vbgl ];

    homepage = "https://github.com/mirage/mirage-mtime";

  };

}

pkgs/development/ocaml-modules/mirage-sleep/default.nix

0 → 100644
+31 −0
Original line number Diff line number Diff line 
{

  lib,

  buildDunePackage,

  fetchurl,

  lwt,

  duration,

  version ? "4.0.0",

}:



buildDunePackage {

  inherit version;

  pname = "mirage-sleep";



  src = fetchurl {

    url = "https://github.com/mirage/mirage-sleep/releases/download/v${version}/mirage-sleep-${version}.tbz";

    hash = "sha256-J7cw7sE3EE3BIhSdwD1KV3VeXjEqviVmys3LgGhEE/A=";

  };



  propagatedBuildInputs = [

    duration

    lwt

  ];



  meta = {

    description = "Sleep operations for MirageOS";

    homepage = "https://github.com/mirage/mirage-sleep";

    changelog = "https://raw.githubusercontent.com/mirage/mirage-sleep/refs/tags/v${version}/CHANGES.md";

    license = lib.licenses.isc;

    maintainers = [ lib.maintainers.vbgl ];

  };

}

pkgs/development/ocaml-modules/tcpip/default.nix

+8 −13
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 
  cstruct,

  cstruct-lwt,

  mirage-net,

  mirage-clock,

  mirage-crypto-rng-mirage,

  mirage-time,

  mirage-mtime,

  mirage-crypto-rng,

  mirage-sleep,

  macaddr,

  macaddr-cstruct,

  fmt,
@@ -22,10 +22,8 @@ 
  mirage-flow,

  mirage-vnetif,

  pcap-format,

  mirage-clock-unix,

  arp,

  ipaddr-cstruct,

  mirage-crypto-rng,

  lru,

  metrics,

  withFreestanding ? false,
@@ -34,11 +32,11 @@ 


buildDunePackage rec {

  pname = "tcpip";

  version = "8.2.0";

  version = "9.0.0";



  src = fetchurl {

    url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";

    hash = "sha256-kW5oirqJdnbERNuBKfSWOtc5+NG+Yx2eAJxiKLS31u0=";

    hash = "sha256-WTd+01kIDY2pSuyRR0pTO62VXBK+eYJ77IU8y0ltZZo=";

  };



  nativeBuildInputs = [
@@ -50,9 +48,9 @@ buildDunePackage rec { 
      cstruct

      cstruct-lwt

      mirage-net

      mirage-clock

      mirage-crypto-rng-mirage

      mirage-time

      mirage-mtime

      mirage-crypto-rng

      mirage-sleep

      ipaddr-cstruct

      macaddr

      macaddr-cstruct
@@ -75,11 +73,8 @@ buildDunePackage rec { 
  doCheck = true;

  checkInputs = [

    alcotest

    mirage-crypto-rng

    mirage-flow

    mirage-vnetif

    pcap-format

    mirage-clock-unix

  ];

  __darwinAllowLocalNetworking = true;