From 0a361c0c6a65b8a2f5beef71c1cd84d7972fe7e0 Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Sat, 27 Jun 2026 14:37:05 +0200 Subject: [PATCH] bind: enable tests, always disable time_test partially (cherry picked from commit a5f4424afe571e1644b9d299cf46bbd7a1288a21) --- pkgs/by-name/bi/bind/package.nix | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index c47a0cb1433e..84d905730c01 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -110,30 +110,15 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; strictDeps = true; - doCheck = false; - # TODO: investigate failures; see this and linked discussions: - # https://github.com/NixOS/nixpkgs/pull/192962 - /* - doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux) - # https://gitlab.isc.org/isc-projects/bind9/-/issues/4269 - && !is32bit; - */ + doCheck = with stdenv.hostPlatform; !isStatic && isLinux; checkTarget = "unit"; checkInputs = [ cmocka - ] - ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ - tzdata ]; - preCheck = - lib.optionalString stdenv.hostPlatform.isMusl '' - # musl doesn't respect TZDIR, skip timezone-related tests - sed -i '/^ISC_TEST_ENTRY(isc_time_formatISO8601L/d' tests/isc/time_test.c - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Test timeouts on Darwin - sed -i '/^ISC_TEST_ENTRY(tcpdns_recv_one/d' tests/isc/netmgr_test.c - ''; + preCheck = '' + # skip timezone-related tests, they are flaky inside the nix sandbox + sed -i '/^ISC_TEST_ENTRY(isc_time_formatISO8601L/d' tests/isc/time_test.c + ''; postFixup = '' remove-references-to -t "$out" "$dnsutils/bin/delv"