From 07bc44e7f407bf539044345ce97ee10ce7ab3806 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Wed, 16 Jul 2025 23:33:21 -0400
Subject: [PATCH 1/5] haunt: add normalcea as maintainer

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

diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix
index 1e11a1330b16..320c23e67866 100644
--- a/pkgs/by-name/ha/haunt/package.nix
+++ b/pkgs/by-name/ha/haunt/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
       to do things that aren't provided out-of-the-box.
     '';
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ normalcea ];
     inherit (guile.meta) platforms;
   };
 })

From 18b0b70f35834370580db1f6b19edd7ac0e0a8c2 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Wed, 16 Jul 2025 23:33:45 -0400
Subject: [PATCH 2/5] haunt: enable tests

---
 pkgs/by-name/ha/haunt/package.nix             |  7 +------
 .../ha/haunt/tests/001-test-version.nix       | 21 -------------------
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/by-name/ha/haunt/tests/001-test-version.nix

diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix
index 320c23e67866..810755dd5ef0 100644
--- a/pkgs/by-name/ha/haunt/package.nix
+++ b/pkgs/by-name/ha/haunt/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchurl,
   autoreconfHook,
-  callPackage,
   guile,
   guile-commonmark,
   guile-reader,
@@ -32,8 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     guile-reader
   ];
 
-  # Test suite is non-deterministic in later versions
-  doCheck = false;
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   postInstall = ''
     wrapProgram $out/bin/haunt \
@@ -42,9 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests = {
-      expectVersion = callPackage ./tests/001-test-version.nix { };
-    };
   };
 
   meta = {
diff --git a/pkgs/by-name/ha/haunt/tests/001-test-version.nix b/pkgs/by-name/ha/haunt/tests/001-test-version.nix
deleted file mode 100644
index 09ef5b32947d..000000000000
--- a/pkgs/by-name/ha/haunt/tests/001-test-version.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  stdenv,
-  haunt,
-}:
-
-stdenv.mkDerivation {
-  pname = "haunt-test-version";
-  inherit (haunt) version;
-
-  nativeBuildInputs = [ haunt ];
-
-  dontInstall = true;
-
-  buildCommand = ''
-    haunt --version
-
-    touch $out
-  '';
-
-  meta.timeout = 10;
-}

From 358adde48f211f4d1d57ddbc3890e4784477fa09 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Wed, 16 Jul 2025 23:42:22 -0400
Subject: [PATCH 3/5] haunt: use `makeBinaryWrapper` instead of `makeWrapper`

---
 pkgs/by-name/ha/haunt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix
index 810755dd5ef0..15ef93f31ec7 100644
--- a/pkgs/by-name/ha/haunt/package.nix
+++ b/pkgs/by-name/ha/haunt/package.nix
@@ -6,7 +6,7 @@
   guile,
   guile-commonmark,
   guile-reader,
-  makeWrapper,
+  makeBinaryWrapper,
   pkg-config,
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     autoreconfHook
-    makeWrapper
+    makeBinaryWrapper
     pkg-config
   ];
 

From 2607788438eb47e20303dce4b85916ad0a1c4655 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Wed, 16 Jul 2025 23:37:51 -0400
Subject: [PATCH 4/5] haunt: fetch git source instead of tarball

Introduces the `texinfo` dependency for building documentation and
replaces `fetchurl` with `fetchgit` for tagged releases.
---
 pkgs/by-name/ha/haunt/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix
index 15ef93f31ec7..921e7ed49fdf 100644
--- a/pkgs/by-name/ha/haunt/package.nix
+++ b/pkgs/by-name/ha/haunt/package.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchgit,
   autoreconfHook,
+  texinfo,
   guile,
   guile-commonmark,
   guile-reader,
@@ -14,15 +15,17 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "haunt";
   version = "0.3.0";
 
-  src = fetchurl {
-    url = "https://files.dthompson.us/haunt/haunt-${finalAttrs.version}.tar.gz";
-    hash = "sha256-mLq+0GvlSgZsPryUQQqR63zEg2fpTVKBMdO6JxSZmSs=";
+  src = fetchgit {
+    url = "https://git.dthompson.us/haunt.git";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-i6MI0eaRiA/JNgkIBJGLAsqMnyJz47aavyD6kOL7sqU=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     makeBinaryWrapper
     pkg-config
+    texinfo
   ];
 
   buildInputs = [

From 0238ce441a5b22007b7f60a6f185f4af2b9591a3 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Wed, 16 Jul 2025 23:39:56 -0400
Subject: [PATCH 5/5] haunt: add `passthru.updateScript` via `gitUpdater`

---
 pkgs/by-name/ha/haunt/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix
index 921e7ed49fdf..01a956b279c1 100644
--- a/pkgs/by-name/ha/haunt/package.nix
+++ b/pkgs/by-name/ha/haunt/package.nix
@@ -9,6 +9,7 @@
   guile-reader,
   makeBinaryWrapper,
   pkg-config,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
   };
 
   meta = {