aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2024-05-23 17:46:38 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2025-06-15 01:30:30 +0200
commit3b14fd98f1b155357aacd49691eef61c42095035 (patch)
treea41c455b8001a0a1b3d73de272b85ab6f4f21c50 /Makefile
parent40b6f9c73d4e67fb54e2b5954aafcc0abe637ba8 (diff)
downloadhaunt-blog-3b14fd98f1b155357aacd49691eef61c42095035.tar.gz
haunt-blog-3b14fd98f1b155357aacd49691eef61c42095035.tar.bz2
haunt-blog-3b14fd98f1b155357aacd49691eef61c42095035.zip
Makefile: use guile-next to drop backported patch.
The patch we used was merged in the Guile commit bc2c612b89d3c4e7ef017a417af25b50f92fccee ("SRFI-19: Add support for ISO 8601 zones with a colon."). And Guix, since the commit b1365a032613e7756aca892a7422fda0b26b0627 ("gnu: guile-next: Update to commit 3b76a30."), updated guile-next to use a revision that has the patch we need. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8cbbb5f..d058a5e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,14 +16,14 @@
CURL ?= curl
BLOG_URL ?= https://blog.replicant.us/page
-GUILE_PATCH = 0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-colon.patch
-GUIX_COMMIT ?= b25b94335a3ee8d68d2145da8e5ea0325ecea451
+# gnu: guile-next: Update to commit 3b76a30.
+GUIX_COMMIT ?= b1365a032613e7756aca892a7422fda0b26b0627
GUIX_SHELL ?= guix time-machine --commit=$(GUIX_COMMIT) -- shell -C
GUIX_PYTHON_PACKAGES ?= python python-beautifulsoup4 python-html2text python-sh
CONVERT ?= $(GUIX_SHELL) $(GUIX_PYTHON_PACKAGES) -- python3 wordpresshtml2commonmark.py
-HAUNT ?= $(GUIX_SHELL) --with-patch=guile=patches/$(GUILE_PATCH) haunt -- haunt
-HAUNT_SERVE ?= $(GUIX_SHELL) -N --with-patch=guile=patches/$(GUILE_PATCH) haunt -- haunt serve
+HAUNT ?= $(GUIX_SHELL) -C --with-input=guile=guile-next haunt -- haunt
+HAUNT_SERVE ?= $(GUIX_SHELL) -N -C --with-input=guile=guile-next haunt -- haunt serve
HAUNT_PORT ?= 1968
VENDOR_REPLICANT_ARTWORK_REV ?= fc213d2ca94cef9047d1e4a71c21c4c4c87f349d