From 06c5fb70769d85f4daf072e6c1815440e84d1b29 Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Sat, 27 Jan 2024 17:20:21 +0000 Subject: [PATCH] esphome: replace iputils dependency with inetutils. The iputils package is only available on Linux. Adding it as a dependency of esphome made the latter unavailable on other platforms. The inetutils package also provides the ping command needed by esphome, and is available on more platforms. Also enable local networking on darwin in order for the tests to work in the sandbox. --- pkgs/tools/misc/esphome/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 89bf35430496..39a950eab512 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -6,7 +6,7 @@ , platformio , esptool , git -, iputils +, inetutils }: let @@ -78,12 +78,15 @@ python.pkgs.buildPythonApplication rec { # platformio is used in esphome/platformio_api.py # esptool is used in esphome/__main__.py # git is used in esphome/writer.py - # iputils is used in esphome/dashboard/status/ping.py - "--prefix PATH : ${lib.makeBinPath [ platformio esptool git iputils ]}" + # inetutils is used in esphome/dashboard/status/ping.py + "--prefix PATH : ${lib.makeBinPath [ platformio esptool git inetutils ]}" "--prefix PYTHONPATH : $PYTHONPATH" # will show better error messages "--set ESPHOME_USE_SUBPROCESS ''" ]; + # Needed for tests + __darwinAllowLocalNetworking = true; + nativeCheckInputs = with python3Packages; [ hypothesis mock