From f16b566f1230cd9f269dcaf87a2927f20de2c0f9 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Sun, 1 Feb 2026 16:45:35 -0600 Subject: [PATCH] mockgen: modernize - Switch to `finalAttrs` - Replace `rev` and `sha256` in fetcher with `tag` and `hash`, respectively - Set `main.commit` LD flag to source revision instead of "unknown" --- pkgs/by-name/mo/mockgen/package.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/mo/mockgen/package.nix b/pkgs/by-name/mo/mockgen/package.nix index 91359b62d370..83ecf88bd1f2 100644 --- a/pkgs/by-name/mo/mockgen/package.nix +++ b/pkgs/by-name/mo/mockgen/package.nix @@ -2,8 +2,7 @@ buildGoModule, fetchFromGitHub, lib, - testers, - mockgen, + versionCheckHook, }: buildGoModule (finalAttrs: { @@ -13,8 +12,8 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "uber-go"; repo = "mock"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-gYUL+ucnKQncudQDcRt8aDqM7xE5XSKHh4X0qFrvfGs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-gYUL+ucnKQncudQDcRt8aDqM7xE5XSKHh4X0qFrvfGs="; }; vendorHash = "sha256-Cf7lKfMuPFT/I1apgChUNNCG2C7SrW7ncF8OusbUs+A="; @@ -26,18 +25,12 @@ buildGoModule (finalAttrs: { ldflags = [ "-X=main.version=${finalAttrs.version}" "-X=main.date=1970-01-01T00:00:00Z" - "-X=main.commit=unknown" + "-X=main.commit=${finalAttrs.src.rev}" ]; - passthru.tests.version = testers.testVersion { - package = mockgen; - command = "mockgen -version"; - version = '' - v${finalAttrs.version} - Commit: unknown - Date: 1970-01-01T00:00:00Z - ''; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-version"; + doInstallCheck = true; meta = { description = "Mocking framework for the Go programming language";