diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/ocaml-modules/arp/default.nix | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/arp/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/arp/default.nix | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix index e1daca1bc38d..7184ef49bc1e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix @@ -1,8 +1,23 @@ -{ lib, buildDunePackage, fetchurl -, cstruct, ipaddr, macaddr, logs, lwt, duration -, mirage-time, mirage-protocols, mirage-profile -, alcotest, ethernet, fmt, mirage-vnetif, mirage-random -, mirage-random-test, mirage-clock-unix, mirage-time-unix +{ lib +, stdenv +, buildDunePackage +, fetchurl +, cstruct +, 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 }: @@ -15,8 +30,8 @@ buildDunePackage rec { sha256 = "1x3l8v96ywc3wrcwbf0j04b8agap4fif0fz6ki2ndzx57yqcjszn"; }; - minimumOCamlVersion = "4.06"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; nativeBuildInputs = [ bisect_ppx @@ -25,21 +40,21 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct duration + ethernet ipaddr logs lwt macaddr mirage-profile - mirage-protocols mirage-time ]; - doCheck = true; + ## NOTE: As of 18 april 2023 and ARP version 3.0.0, tests fail on Darwin. + doCheck = ! stdenv.isDarwin; checkInputs = [ alcotest - ethernet mirage-clock-unix - mirage-profile + mirage-flow mirage-random mirage-random-test mirage-time-unix |