From e8664ee4af127c15fae17cfe2c4d72aa4c449b90 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 18 May 2025 01:14:31 +0800 Subject: [PATCH] gojq: use finalAttrs style --- pkgs/by-name/go/gojq/package.nix | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix index 365b7bc336c0..895730ce9e0a 100644 --- a/pkgs/by-name/go/gojq/package.nix +++ b/pkgs/by-name/go/gojq/package.nix @@ -2,19 +2,18 @@ lib, buildGoModule, fetchFromGitHub, - testers, - gojq, installShellFiles, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gojq"; version = "0.12.17"; src = fetchFromGitHub { owner = "itchyny"; - repo = pname; - rev = "v${version}"; + repo = "gojq"; + rev = "v${finalAttrs.version}"; hash = "sha256-zJkeghN3btF/fZZeuClHV1ndB/2tTTMljEukMYe7UWU="; }; @@ -31,16 +30,25 @@ buildGoModule rec { installShellCompletion --cmd gojq --zsh _gojq ''; - passthru.tests.version = testers.testVersion { - package = gojq; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + postInstallCheck = '' + $out/bin/gojq --help > /dev/null + $out/bin/gojq --raw-output '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null + ''; + doInstallCheck = true; meta = { description = "Pure Go implementation of jq"; homepage = "https://github.com/itchyny/gojq"; - changelog = "https://github.com/itchyny/gojq/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/itchyny/gojq/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + aaronjheng + ]; mainProgram = "gojq"; }; -} +})