From 4eecf80f20e29e924715d10cc4b493c01c824ce0 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 25 Apr 2025 23:13:53 +0200 Subject: [PATCH 1/3] unbound: add Scrumplex to maintainers Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/un/unbound/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index a91611b20089..2eed024d722e 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -213,7 +213,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; homepage = "https://www.unbound.net"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ Scrumplex ]; platforms = platforms.unix ++ platforms.windows; }; }) From 96fa7dae4d3603d94a5a350913dc00f4f7599ad8 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 25 Apr 2025 23:16:59 +0200 Subject: [PATCH 2/3] unbound: add updateScript Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/un/unbound/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 2eed024d722e..f7ded6e19128 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -48,6 +48,8 @@ withMakeWrapper ? !stdenv.hostPlatform.isMinGW, libnghttp2, + # for passthru.updateScript + nix-update-script, # for passthru.tests gnutls, }: @@ -203,10 +205,17 @@ stdenv.mkDerivation (finalAttrs: { ) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'" ) (builtins.filter (p: p != null) finalAttrs.buildInputs); - passthru.tests = { - inherit gnutls; - nixos-test = nixosTests.unbound; - nixos-test-exporter = nixosTests.prometheus-exporters.unbound; + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex=release-(.+)" + ]; + }; + tests = { + inherit gnutls; + nixos-test = nixosTests.unbound; + nixos-test-exporter = nixosTests.prometheus-exporters.unbound; + }; }; meta = with lib; { From 7abce42d72118f5a5e88a5efea3c34af212e7ea3 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 25 Apr 2025 23:18:04 +0200 Subject: [PATCH 3/3] unbound: remove with lib Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/un/unbound/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index f7ded6e19128..6311472f2e8d 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -218,11 +218,11 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Validating, recursive, and caching DNS resolver"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://www.unbound.net"; maintainers = with lib.maintainers; [ Scrumplex ]; - platforms = platforms.unix ++ platforms.windows; + platforms = with lib.platforms; unix ++ windows; }; })