From dd8bb15ced9dfd95ccb98a3e3ea32f7a9d7e4597 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyu@yiyuzhou.io>
Date: Fri, 6 Feb 2026 17:02:02 -0600
Subject: [PATCH] haunt: cleanup

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

diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix
index af2d7225869a..54c9ca3921d5 100644
--- a/pkgs/by-name/ha/haunt/package.nix
+++ b/pkgs/by-name/ha/haunt/package.nix
@@ -1,15 +1,16 @@
 {
-  lib,
-  stdenv,
-  fetchgit,
   autoreconfHook,
-  texinfo,
+  fetchgit,
+  gitUpdater,
   guile,
   guile-commonmark,
   guile-reader,
+  lib,
   makeBinaryWrapper,
   pkg-config,
-  gitUpdater,
+  stdenv,
+  texinfo,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,8 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-i6MI0eaRiA/JNgkIBJGLAsqMnyJz47aavyD6kOL7sqU=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     autoreconfHook
+    guile
     makeBinaryWrapper
     pkg-config
     texinfo
@@ -38,34 +42,37 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   postInstall = ''
-    wrapProgram $out/bin/haunt \
+    wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \
       --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \
       --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH"
   '';
 
-  passthru = {
-    updateScript = gitUpdater { rev-prefix = "v"; };
-  };
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   meta = {
     homepage = "https://dthompson.us/projects/haunt.html";
     description = "Guile-based static site generator";
     mainProgram = "haunt";
     longDescription = ''
-      Haunt is a simple, functional, hackable static site generator that gives
-      authors the ability to treat websites as Scheme programs.
+      Haunt is a simple, functional, hackable static site generator
+      that gives authors the ability to treat websites as Scheme
+      programs.
 
-      By giving authors the full expressive power of Scheme, they are able to
-      control every aspect of the site generation process. Haunt provides a
-      simple, functional build system that can be easily extended for this
-      purpose.
+      By giving authors the full expressive power of Scheme, they are
+      able to control every aspect of the site generation process.
+      Haunt provides a simple, functional build system that can be
+      easily extended for this purpose.
 
-      Haunt has no opinion about what markup language authors should use to
-      write posts, though it comes with support for the popular Markdown
-      format. Likewise, Haunt has no opinion about how authors structure their
-      sites. Though it comes with support for building simple blogs or Atom
-      feeds, authors should feel empowered to tweak, replace, or create builders
-      to do things that aren't provided out-of-the-box.
+      Haunt has no opinion about what markup language authors should
+      use to write posts, though it comes with support for the popular
+      Markdown format.  Likewise, Haunt has no opinion about how
+      authors structure their sites.  Though it comes with support for
+      building simple blogs or Atom feeds, authors should feel
+      empowered to tweak, replace, or create builders to do things
+      that aren't provided out-of-the-box.
     '';
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ yiyu ];