aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2024-09-10 13:44:34 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2025-06-15 01:30:30 +0200
commit3acb5bb6bb5c9f500e59a21d4e87b45a0c079a65 (patch)
tree0784837519c493c98dcbb574f2c6041b90194d15
parent7dbebdc245c18be186e2626fd7c69389a2763a79 (diff)
downloadhaunt-blog-3acb5bb6bb5c9f500e59a21d4e87b45a0c079a65.tar.gz
haunt-blog-3acb5bb6bb5c9f500e59a21d4e87b45a0c079a65.tar.bz2
haunt-blog-3acb5bb6bb5c9f500e59a21d4e87b45a0c079a65.zip
Makefile: GUIX_SHELL: remove duplicated -C argument.
Many calls to GUIX_SHELL like 'HAUNT ?= $(GUIX_SHELL) -C' already use the -C argument. This removes duplicated -C by removing it from GUIX_SHELL instead of removing the -C in all the calls as it makes overriding GUIX_SHELL easier, and always having the -C ensure that the host environment doesn't leak in the build process, improving reproducibility. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 52f1c2b..338f727 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,10 @@ BLOG_URL ?= https://blog.replicant.us/page
# gnu: guile-next: Update to commit 3b76a30.
GUIX_COMMIT ?= b1365a032613e7756aca892a7422fda0b26b0627
-GUIX_SHELL ?= guix time-machine --commit=$(GUIX_COMMIT) -- shell -C
+GUIX_SHELL ?= guix time-machine --commit=$(GUIX_COMMIT) -- shell
GUIX_PYTHON_PACKAGES ?= python python-beautifulsoup4 python-html2text python-sh
-CONVERT ?= $(GUIX_SHELL) $(GUIX_PYTHON_PACKAGES) -- python3 wordpresshtml2commonmark.py
+CONVERT ?= $(GUIX_SHELL) -C $(GUIX_PYTHON_PACKAGES) -- python3 wordpresshtml2commonmark.py
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
@@ -148,7 +148,7 @@ wordpress/pages/replicant_blog_page_%.html: wordpress/pages
$(CURL) $(BLOG_URL)/$(subst replicant_blog_page_,,$*)/ -o $@
generate-wordpress-articles: build
- $(GUIX_SHELL) $(GUIX_PYTHON_PACKAGES) \
+ $(GUIX_SHELL) -C $(GUIX_PYTHON_PACKAGES) \
-- \
python3 haunthtml2wordpress.py \
./site/first-online-replicant-meeting.html