From 651467f688ffa4946116fa3e4d68fe266681bf1a Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 7 Nov 2025 15:55:43 +0100
Subject: [PATCH 1/2] catnip: cleanup

---
 pkgs/by-name/ca/catnip/package.nix | 31 ++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix
index 13275ec04617..9caff3b40356 100644
--- a/pkgs/by-name/ca/catnip/package.nix
+++ b/pkgs/by-name/ca/catnip/package.nix
@@ -4,18 +4,18 @@
   fetchFromGitHub,
   pkg-config,
   portaudio,
-  testers,
-  catnip,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "catnip";
   version = "1.8.7";
 
   src = fetchFromGitHub {
     owner = "noriah";
     repo = "catnip";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-M9VGpDsBambe9kXyEgDg53pKOSL2zH1ugfSbRgAiaCo=";
   };
 
@@ -31,22 +31,25 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=main.version=${version}"
+    "-X=main.version=${finalAttrs.version}"
   ];
 
-  passthru.tests = {
-    version = testers.testVersion {
-      package = catnip;
-    };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Terminal audio visualizer for linux/unix/macOS/windows";
     homepage = "https://github.com/noriah/catnip";
-    changelog = "https://github.com/noriah/catnip/releases/tag/${src.rev}";
-    license = licenses.mit;
+    changelog = "https://github.com/noriah/catnip/releases/tag/${finalAttrs.src.rev}";
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "catnip";
   };
-}
+})

From 30cb9857d8cd95384961761a8a887171f08f3fea Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 7 Nov 2025 15:57:04 +0100
Subject: [PATCH 2/2] catnip: add liberodark to maintainers

---
 pkgs/by-name/ca/catnip/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix
index 9caff3b40356..84033d22dfe9 100644
--- a/pkgs/by-name/ca/catnip/package.nix
+++ b/pkgs/by-name/ca/catnip/package.nix
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/noriah/catnip";
     changelog = "https://github.com/noriah/catnip/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     mainProgram = "catnip";
   };
 })