From 928163d8c55b4b05fc3bc92ac1064e50b16aabd0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 00:05:16 +0100 Subject: [PATCH 1/3] dnsx: format with nixfmt --- pkgs/by-name/dn/dnsx/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix index 1f25de07c174..a60d8bbf11ff 100644 --- a/pkgs/by-name/dn/dnsx/package.nix +++ b/pkgs/by-name/dn/dnsx/package.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { From 11d2c2f009a6320b25629158b72cf3735672437e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 00:06:40 +0100 Subject: [PATCH 2/3] dnsx: refactor - add ldflags - add mainProgram --- pkgs/by-name/dn/dnsx/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix index a60d8bbf11ff..8d54f2fa6c3f 100644 --- a/pkgs/by-name/dn/dnsx/package.nix +++ b/pkgs/by-name/dn/dnsx/package.nix @@ -17,6 +17,13 @@ buildGoModule rec { vendorHash = "sha256-WbFkBTPy4N+mAVSkq1q9XcNs1jk6YuBcYxiEmQV/TsM="; + subPackages = [ "cmd/dnsx" ]; + + ldflags = [ + "-s" + "-w" + ]; + # Tests require network access doCheck = false; @@ -32,5 +39,6 @@ buildGoModule rec { changelog = "https://github.com/projectdiscovery/dnsx/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "dnsx"; }; } From 6013083e7588defa20a55e207863a20e39cd2426 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 00:08:25 +0100 Subject: [PATCH 3/3] dnsx: add versionCheckHook --- pkgs/by-name/dn/dnsx/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix index 8d54f2fa6c3f..20c81aa260ab 100644 --- a/pkgs/by-name/dn/dnsx/package.nix +++ b/pkgs/by-name/dn/dnsx/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule rec { @@ -19,6 +20,8 @@ buildGoModule rec { subPackages = [ "cmd/dnsx" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + ldflags = [ "-s" "-w" @@ -27,6 +30,10 @@ buildGoModule rec { # Tests require network access doCheck = false; + doInstallCheck = true; + + versionCheckProgramArg = [ "-version" ]; + meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; longDescription = ''