commit ca735645a1dd4d0f3ef47b73cf1d36744deee890 · pyrox.dev/nixpkgs

+6 -19

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

···

       10
       10
        
         logs,

     

       11
       11
        
         lwt,

     

       12
       12
        
         macaddr,

     

       13
       13
       -
         mirage-time,

     

       13
       13
       +
         mirage-sleep,

     

       14
       14
        
         alcotest,

     

       15
       15
       -
         mirage-clock-unix,

     

       16
       16
       -
         mirage-flow,

     

       17
       17
       -
         mirage-random,

     

       18
       18
       -
         mirage-random-test,

     

       19
       19
       -
         mirage-time-unix,

     

       15
       15
       +
         bos,

     

       20
       16
        
         mirage-vnetif,

     

       21
       21
       -
         bisect_ppx,

     

       22
       17
        
       }:

     

       23
       18
        
       

     

       24
       19
        
       buildDunePackage rec {

     

       25
       20
        
         pname = "arp";

     

       26
       26
       -
         version = "3.1.1";

     

       21
       21
       +
         version = "4.0.0";

     

       27
       22
        
       

     

       28
       23
        
         src = fetchurl {

     

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

     

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

     

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

     

       31
       26
        
         };

     

       32
       27
        
       

     

       33
       28
        
         minimalOCamlVersion = "4.08";

     

       34
       29
        
       

     

       35
       35
       -
         nativeBuildInputs = [

     

       36
       36
       -
           bisect_ppx

     

       37
       37
       -
         ];

     

       38
       38
       -
       

     

       39
       30
        
         propagatedBuildInputs = [

     

       40
       31
        
           cstruct

     

       41
       32
        
           duration

     
···

       44
       35
        
           logs

     

       45
       36
        
           lwt

     

       46
       37
        
           macaddr

     

       47
       47
       -
           mirage-time

     

       38
       38
       +
           mirage-sleep

     

       48
       39
        
         ];

     

       49
       40
        
       

     

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

     

       51
       42
        
         doCheck = !stdenv.hostPlatform.isDarwin;

     

       52
       43
        
         checkInputs = [

     

       53
       44
        
           alcotest

     

       54
       54
       -
           mirage-clock-unix

     

       55
       55
       -
           mirage-flow

     

       56
       56
       -
           mirage-random

     

       57
       57
       -
           mirage-random-test

     

       58
       58
       -
           mirage-time-unix

     

       45
       45
       +
           bos

     

       59
       46
        
           mirage-vnetif

     

       60
       47
        
         ];

     

       61
       48

+2

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

···

       13
       13
        
         tcpip,

     

       14
       14
        
         tls,

     

       15
       15
        
         tls-mirage,

     

       16
       16
       +
         mirage-crypto-rng-mirage,

     

       16
       17
        
         dnssec,

     

       17
       18
        
         alcotest,

     

       18
       19
        
       }:

     
···

       37
       38
        
           tcpip

     

       38
       39
        
           tls

     

       39
       40
        
           tls-mirage

     

       41
       41
       +
           mirage-crypto-rng-mirage

     

       40
       42
        
         ];

     

       41
       43
        
       

     

       42
       44
        
         doCheck = true;

+29

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

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchurl,

     

       4
       4
       +
         buildDunePackage,

     

       5
       5
       +
         mtime,

     

       6
       6
       +
         version ? "5.0.0",

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildDunePackage {

     

       10
       10
       +
         pname = "mirage-mtime";

     

       11
       11
       +
       

     

       12
       12
       +
         inherit version;

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchurl {

     

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

     

       16
       16
       +
           hash = "sha256-IwdaAyZyj8gfRPxQP9SOwb28AbtVy9PY7qcr0Pns9GU=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         propagatedBuildInputs = [

     

       20
       20
       +
           mtime

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         meta = {

     

       24
       24
       +
           description = "Monotonic time for MirageOS";

     

       25
       25
       +
           license = lib.licenses.isc;

     

       26
       26
       +
           maintainers = [ lib.maintainers.vbgl ];

     

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

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+31

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

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildDunePackage,

     

       4
       4
       +
         fetchurl,

     

       5
       5
       +
         lwt,

     

       6
       6
       +
         duration,

     

       7
       7
       +
         version ? "4.0.0",

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildDunePackage {

     

       11
       11
       +
         inherit version;

     

       12
       12
       +
         pname = "mirage-sleep";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchurl {

     

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

     

       16
       16
       +
           hash = "sha256-J7cw7sE3EE3BIhSdwD1KV3VeXjEqviVmys3LgGhEE/A=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         propagatedBuildInputs = [

     

       20
       20
       +
           duration

     

       21
       21
       +
           lwt

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         meta = {

     

       25
       25
       +
           description = "Sleep operations for MirageOS";

     

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

     

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

     

       28
       28
       +
           license = lib.licenses.isc;

     

       29
       29
       +
           maintainers = [ lib.maintainers.vbgl ];

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+8 -13

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

···

       6
       6
        
         cstruct,

     

       7
       7
        
         cstruct-lwt,

     

       8
       8
        
         mirage-net,

     

       9
       9
       -
         mirage-clock,

     

       10
       10
       -
         mirage-crypto-rng-mirage,

     

       11
       11
       -
         mirage-time,

     

       9
       9
       +
         mirage-mtime,

     

       10
       10
       +
         mirage-crypto-rng,

     

       11
       11
       +
         mirage-sleep,

     

       12
       12
        
         macaddr,

     

       13
       13
        
         macaddr-cstruct,

     

       14
       14
        
         fmt,

     
···

       22
       22
        
         mirage-flow,

     

       23
       23
        
         mirage-vnetif,

     

       24
       24
        
         pcap-format,

     

       25
       25
       -
         mirage-clock-unix,

     

       26
       25
        
         arp,

     

       27
       26
        
         ipaddr-cstruct,

     

       28
       28
       -
         mirage-crypto-rng,

     

       29
       27
        
         lru,

     

       30
       28
        
         metrics,

     

       31
       29
        
         withFreestanding ? false,

     
···

       34
       32
        
       

     

       35
       33
        
       buildDunePackage rec {

     

       36
       34
        
         pname = "tcpip";

     

       37
       37
       -
         version = "8.2.0";

     

       35
       35
       +
         version = "9.0.0";

     

       38
       36
        
       

     

       39
       37
        
         src = fetchurl {

     

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

     

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

     

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

     

       42
       40
        
         };

     

       43
       41
        
       

     

       44
       42
        
         nativeBuildInputs = [

     
···

       50
       48
        
             cstruct

     

       51
       49
        
             cstruct-lwt

     

       52
       50
        
             mirage-net

     

       53
       53
       -
             mirage-clock

     

       54
       54
       -
             mirage-crypto-rng-mirage

     

       55
       55
       -
             mirage-time

     

       51
       51
       +
             mirage-mtime

     

       52
       52
       +
             mirage-crypto-rng

     

       53
       53
       +
             mirage-sleep

     

       56
       54
        
             ipaddr-cstruct

     

       57
       55
        
             macaddr

     

       58
       56
        
             macaddr-cstruct

     
···

       75
       73
        
         doCheck = true;

     

       76
       74
        
         checkInputs = [

     

       77
       75
        
           alcotest

     

       78
       78
       -
           mirage-crypto-rng

     

       79
       79
       -
           mirage-flow

     

       80
       76
        
           mirage-vnetif

     

       81
       77
        
           pcap-format

     

       82
       82
       -
           mirage-clock-unix

     

       83
       78
        
         ];

     

       84
       79
        
         __darwinAllowLocalNetworking = true;

     

       85
       80

+4

pkgs/top-level/ocaml-packages.nix

···

       1206
       1206
        
       

     

       1207
       1207
        
           mirage-logs = callPackage ../development/ocaml-modules/mirage-logs { };

     

       1208
       1208
        
       

     

       1209
       1209
       +
           mirage-mtime = callPackage ../development/ocaml-modules/mirage-mtime { };

     

       1210
       1210
       +
       

     

       1209
       1211
        
           mirage-nat = callPackage ../development/ocaml-modules/mirage-nat { };

     

       1210
       1212
        
       

     

       1211
       1213
        
           mirage-net = callPackage ../development/ocaml-modules/mirage-net { };

     
···

       1223
       1225
        
           mirage-random-test = callPackage ../development/ocaml-modules/mirage-random-test { };

     

       1224
       1226
        
       

     

       1225
       1227
        
           mirage-runtime = callPackage ../development/ocaml-modules/mirage/runtime.nix { };

     

       1228
       1228
       +
       

     

       1229
       1229
       +
           mirage-sleep = callPackage ../development/ocaml-modules/mirage-sleep { };

     

       1226
       1230
        
       

     

       1227
       1231
        
           mirage-time = callPackage ../development/ocaml-modules/mirage-time { };

     

       1228
       1232