Unverified Commit 619cb8eb authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #288662 from LeSuisse/bind-9.18.24

bind: 9.18.21 -> 9.18.24
parents f896ce73 324f730e
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@

stdenv.mkDerivation rec {
  pname = "bind";
  version = "9.18.21";
  version = "9.18.24";

  src = fetchurl {
    url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
    hash = "sha256-pVa+IlBdnqT5xnF67pxUlznGhJiv88ppA1eH7MZI/sU=";
    hash = "sha256-cJ1zAjyRFd2tO6tltsjHmlkBltDRFPXQyiUz29Ut32Y=";
  };

  outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
@@ -91,6 +91,9 @@ stdenv.mkDerivation rec {
  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
  '';

  passthru = {