From 5f4cfa67e6f7e92d8acddeebd8f56d1098ffa81e Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 2 Nov 2022 08:55:30 +0100 Subject: [PATCH] ipcalc: add patch to disable tests failing in Darwin sandbox Signed-off-by: Sirio Balmelli --- pkgs/tools/networking/ipcalc/default.nix | 5 ++ .../networking/ipcalc/sandbox_tests.patch | 59 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 pkgs/tools/networking/ipcalc/sandbox_tests.patch diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index a29c426b2893..fa3070eb31e5 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { hash = "sha256-UQq5TqK83I44ANU0yXD8YUTQWvBFLiAxmLSRtKUJ5WE="; }; + patches = [ + # disable tests which fail in NixOS sandbox (trying to access the network) + ./sandbox_tests.patch + ]; + # technically not needed as we do not support the paid maxmind databases, but # keep it around if someone wants to add support and /usr/share/GeoIP is # broken anyway diff --git a/pkgs/tools/networking/ipcalc/sandbox_tests.patch b/pkgs/tools/networking/ipcalc/sandbox_tests.patch new file mode 100644 index 000000000000..d0a246843589 --- /dev/null +++ b/pkgs/tools/networking/ipcalc/sandbox_tests.patch @@ -0,0 +1,59 @@ +diff --git a/tests/meson.build b/tests/meson.build +index 536c169..0ce23f1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -64,54 +64,6 @@ test('RandomIPv6Explicit', + ipcalc.full_path() + ' -6 -r 24' + '|grep Address' + ] + ) +-test('HostnameIPv6Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -6 -o localhost', +- files('hostname-localhost-ipv6') +- ] +-) +-test('HostnameIPv4Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -4 -o localhost', +- files('hostname-localhost-ipv4') +- ] +-) +-test('HostnameIPv4LocalhostJson', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -j -4 -o localhost', +- files('hostname-localhost-ipv4-json') +- ] +-) +-test('IPIPv6Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -h ::1', +- files('ip-localhost-ipv6') +- ] +-) +-test('IPIPv4Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -h 127.0.0.1', +- files('ip-localhost-ipv4') +- ] +-) +-test('IPIPv4LocalhostJson', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -j -h 127.0.0.1', +- files('ip-localhost-ipv4-json') +- ] +-) + # --class-prefix tests + test('AssignClassPrefix12', + testrunner,