From d8e9ce040227cc5d43ae501f34fb608a80b3c13d Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 12:55:43 +0200 Subject: [PATCH] gofumpt: use finalAttrs, versionCheckHook Signed-off-by: Paul Meyer --- pkgs/by-name/go/gofumpt/package.nix | 32 +++++++++++++---------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/go/gofumpt/package.nix b/pkgs/by-name/go/gofumpt/package.nix index 7d9248cf9d73..13f35f5982b8 100644 --- a/pkgs/by-name/go/gofumpt/package.nix +++ b/pkgs/by-name/go/gofumpt/package.nix @@ -3,18 +3,17 @@ buildGoModule, fetchFromGitHub, nix-update-script, - testers, - gofumpt, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gofumpt"; version = "0.8.0"; src = fetchFromGitHub { owner = "mvdan"; - repo = pname; - rev = "v${version}"; + repo = "gofumpt"; + rev = "v${finalAttrs.version}"; hash = "sha256-37wYYB0k8mhQq30y1oo77qW3bIqqN/K/NG1RgxK6dyI="; }; @@ -24,7 +23,7 @@ buildGoModule rec { ldflags = [ "-s" - "-X main.version=v${version}" + "-X main.version=v${finalAttrs.version}" ]; checkFlags = [ @@ -32,23 +31,20 @@ buildGoModule rec { "-skip=^TestScript/diagnose$" ]; - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = gofumpt; - version = "v${version}"; - }; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Stricter gofmt"; homepage = "https://github.com/mvdan/gofumpt"; - changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ + changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rvolosatovs katexochen ]; mainProgram = "gofumpt"; }; -} +})