From 135f8cb73cc6ecb3c49c08f01247ba62af920347 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 21 May 2025 16:34:51 +0200 Subject: [PATCH 1/3] bind: 9.20.8 -> 9.20.9 https://downloads.isc.org/isc/bind9/cur/9.20/doc/arm/html/notes.html#notes-for-bind-9-20-9 Fixes: CVE-2025-40775 --- pkgs/by-name/bi/bind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index c98a55d66668..0d518a160cb1 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bind"; - version = "9.20.8"; + version = "9.20.9"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-MATZnEdr6rSamGwtSfkC4s13ZsmrGLJh6LNTyr86BLU="; + hash = "sha256-PSaQDtnJqFkHP/6puX4pLBJI2tGCebF7BfyyPDCR+G0="; }; outputs = [ From 7f5b661595acb758b20f768471714a7d2c97676e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 21 May 2025 16:50:36 +0200 Subject: [PATCH 2/3] bind: make kubernetes passthru tests conditional on x86_64-linux This unbreaks `nix-build -A knot.tests --eval system aarch64-linux`. --- pkgs/by-name/bi/bind/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index 0d518a160cb1..ede0e139e35d 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -136,13 +136,16 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests = { - withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; }; - inherit (nixosTests) bind; - prometheus-exporter = nixosTests.prometheus-exporters.bind; - kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node; - kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node; - }; + tests = + { + withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; }; + inherit (nixosTests) bind; + prometheus-exporter = nixosTests.prometheus-exporters.bind; + } + // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node; + kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node; + }; updateScript = gitUpdater { # No nicer place to find latest stable release. From a3e38960d1b85fa1e0bff5e9eb0eb8ff6e63add0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 21 May 2025 16:58:51 +0200 Subject: [PATCH 3/3] bind: remove globin from maintainers Added in 2019 but made no change since. --- pkgs/by-name/bi/bind/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index ede0e139e35d..f969a14feaef 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor finalAttrs.version}/doc/arm/html/notes.html#notes-for-bind-${ lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version }"; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; outputsToInstall = [