Merge pull request #288662 from LeSuisse/bind-9.18.24
bind: 9.18.21 -> 9.18.24
This commit is contained in:
commit
619cb8eb53
1 changed files with 5 additions and 2 deletions
|
@ -24,11 +24,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bind";
|
pname = "bind";
|
||||||
version = "9.18.21";
|
version = "9.18.24";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
|
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" ];
|
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
|
||||||
|
@ -91,6 +91,9 @@ stdenv.mkDerivation rec {
|
||||||
preCheck = lib.optionalString stdenv.hostPlatform.isMusl ''
|
preCheck = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
# musl doesn't respect TZDIR, skip timezone-related tests
|
# musl doesn't respect TZDIR, skip timezone-related tests
|
||||||
sed -i '/^ISC_TEST_ENTRY(isc_time_formatISO8601L/d' tests/isc/time_test.c
|
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 = {
|
passthru = {
|
||||||
|
|
Loading…
Reference in a new issue