From a42fcbf3a5acfb5629f3ec2755fa94b60cfd224a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 26 Sep 2025 21:12:41 +0200 Subject: [PATCH 1/3] muffet: use `finalAttrs` pattern --- pkgs/by-name/mu/muffet/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index 3d2a2952e70c..49cb2c4d2217 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "muffet"; version = "2.11.0"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-GfRR+9PdfY63Pzv2XZenKs8XXAKRr9qMzcHOVhl+hv4="; }; @@ -20,9 +20,9 @@ buildGoModule rec { meta = { description = "Website link checker which scrapes and inspects all pages in a website recursively"; homepage = "https://github.com/raviqqe/muffet"; - changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}"; + changelog = "https://github.com/raviqqe/muffet/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "muffet"; }; -} +}) From af7a1ffaf194292697f23718b334626237612eaa Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 26 Sep 2025 21:13:34 +0200 Subject: [PATCH 2/3] muffet: replace `src.rev` with `src.tag` --- pkgs/by-name/mu/muffet/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index 49cb2c4d2217..1c67dbe9cbfe 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GfRR+9PdfY63Pzv2XZenKs8XXAKRr9qMzcHOVhl+hv4="; }; From 2c3c96371e0dea2e912d26f1c374f6cdb2325dfc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 26 Sep 2025 21:15:04 +0200 Subject: [PATCH 3/3] muffet: use `versionCheckHook` --- pkgs/by-name/mu/muffet/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index 1c67dbe9cbfe..f490fba48285 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule (finalAttrs: { @@ -17,6 +18,10 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-oidOSV8y0VwTabipe7XwurUAra9F65nkTXslwXJ94Jw="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { description = "Website link checker which scrapes and inspects all pages in a website recursively"; homepage = "https://github.com/raviqqe/muffet";