From f85a596e6e3a18c9f19731a33b71546de6be10bc Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 18 May 2025 17:03:17 +0800 Subject: [PATCH 1/2] gojo: add installCheck --- pkgs/by-name/go/gojo/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/go/gojo/package.nix b/pkgs/by-name/go/gojo/package.nix index c970aba7ff3f..7c6707420dbd 100644 --- a/pkgs/by-name/go/gojo/package.nix +++ b/pkgs/by-name/go/gojo/package.nix @@ -23,6 +23,10 @@ buildGoModule rec { versionCheckHook ]; versionCheckProgramArg = "-v"; + postInstallCheck = '' + $out/bin/gojo -V > /dev/null + seq 1 10 | $out/bin/gojo -a | grep '^\[1,2,3,4,5,6,7,8,9,10\]$' > /dev/null + ''; doInstallCheck = true; passthru.updateScript = nix-update-script { }; From 58886090b72d78135090b4b1da1f7591bfc5665e Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 18 May 2025 17:06:23 +0800 Subject: [PATCH 2/2] gojo: use finalAttrs style --- pkgs/by-name/go/gojo/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/gojo/package.nix b/pkgs/by-name/go/gojo/package.nix index 7c6707420dbd..b675dabd5378 100644 --- a/pkgs/by-name/go/gojo/package.nix +++ b/pkgs/by-name/go/gojo/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gojo"; version = "0.3.2"; src = fetchFromGitHub { owner = "itchyny"; repo = "gojo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DMFTB5CgJTWf+P9ntgBgzdmcF2qjS9t3iUQ1Rer+Ab4="; }; @@ -24,7 +24,7 @@ buildGoModule rec { ]; versionCheckProgramArg = "-v"; postInstallCheck = '' - $out/bin/gojo -V > /dev/null + $out/bin/gojo --help > /dev/null seq 1 10 | $out/bin/gojo -a | grep '^\[1,2,3,4,5,6,7,8,9,10\]$' > /dev/null ''; doInstallCheck = true; @@ -34,9 +34,9 @@ buildGoModule rec { meta = { description = "Yet another Go implementation of jo"; homepage = "https://github.com/itchyny/gojo"; - changelog = "https://github.com/itchyny/gojo/releases/tag/v${version}"; + changelog = "https://github.com/itchyny/gojo/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; mainProgram = "gojo"; }; -} +})