From da6ec95b5c7788f329474f7542cbcd84f9710150 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Wed, 5 Oct 2022 11:14:45 -0400
Subject: guix: Switch to manifest.scm and use special guile-syntax-hightlight.

---
 guix.scm     | 41 -----------------------------------------
 manifest.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 41 deletions(-)
 delete mode 100644 guix.scm
 create mode 100644 manifest.scm

diff --git a/guix.scm b/guix.scm
deleted file mode 100644
index 18a8452..0000000
--- a/guix.scm
+++ /dev/null
@@ -1,41 +0,0 @@
-(use-modules (gnu packages autotools)
-             (gnu packages base)
-             (gnu packages guile)
-             (gnu packages guile-xyz)
-             (gnu packages rsync)
-             (guix git-download)
-             (guix packages)
-             (guix profiles)
-             (guix utils))
-
-(define haunt*
-  (let ((commit "63afd408c890aec7d62c754ae1399c901ff2a794"))
-    (package
-     (inherit haunt)
-     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://git.dthompson.us/haunt.git")
-                    (commit commit)))
-              (sha256
-               (base32
-                "0mf8b9w7ky8grsy4cq9573ggg4gm465fgvk8dnk7kxma810fvxmx"))))
-     (native-inputs
-      `(("autoconf" ,autoconf)
-        ("automake" ,automake)
-        ,@(package-native-inputs haunt)))
-     (inputs
-      (cons `("rsync" ,rsync)
-            (package-inputs haunt)))
-     (arguments
-      (substitute-keyword-arguments (package-arguments haunt)
-        ((#:phases phases)
-         `(modify-phases ,phases
-            (add-after 'unpack 'bootstrap
-              (lambda _
-                (invoke "sh" "bootstrap"))))))))))
-
-(packages->manifest
- (list guile-3.0
-       guile-syntax-highlight
-       haunt*))
diff --git a/manifest.scm b/manifest.scm
new file mode 100644
index 0000000..ab5bc9a
--- /dev/null
+++ b/manifest.scm
@@ -0,0 +1,60 @@
+(use-modules (gnu packages autotools)
+             (gnu packages base)
+             (gnu packages guile)
+             (gnu packages guile-xyz)
+             (gnu packages pkg-config)
+             (gnu packages rsync)
+             (gnu packages texinfo)
+             (guix git-download)
+             (guix packages)
+             (guix profiles)
+             (guix utils))
+
+(define guile-syntax-highlight*
+  (let ((commit "d68ccf7c2ae9516ca2ddacc5f65e2277038b23f6"))
+    (package
+      (inherit guile-syntax-highlight)
+      (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.dthompson.us/guile-syntax-highlight.git")
+                    (commit commit)))
+              (sha256
+               (base32
+                "0sbxy7mn6kzx83ml4x530r4g7b22jk1kpp766mcgm35zw7mn1qi9"))))
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'bootstrap
+             (lambda _ (invoke "sh" "bootstrap"))))))
+      (inputs (list guile-3.0-latest))
+      (native-inputs (list autoconf automake pkg-config)))))
+
+(define haunt*
+  (let ((commit "63afd408c890aec7d62c754ae1399c901ff2a794"))
+    (package
+     (inherit haunt)
+     (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.dthompson.us/haunt.git")
+                    (commit commit)))
+              (sha256
+               (base32
+                "0mf8b9w7ky8grsy4cq9573ggg4gm465fgvk8dnk7kxma810fvxmx"))))
+     (native-inputs
+      (list automake autoconf pkg-config texinfo))
+     (inputs
+      (list rsync guile-3.0-latest))
+     (arguments
+      (substitute-keyword-arguments (package-arguments haunt)
+        ((#:phases phases)
+         `(modify-phases ,phases
+            (add-after 'unpack 'bootstrap
+              (lambda _
+                (invoke "sh" "bootstrap"))))))))))
+
+(packages->manifest
+ (list guile-3.0-latest
+       guile-syntax-highlight*
+       haunt*))
-- 
cgit v1.2.3