aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2023-09-05 18:16:37 +0200
committerWojtek Kosior <koszko@koszko.org>2023-09-05 18:16:37 +0200
commit7fe30d5b5e22818712b90664d905483ea3fe54c3 (patch)
tree976f9e371a6cdb1cba5e8e013affe2c9111326b4
parent3cde49d1e577441654ad49c8a87119951d6e95fe (diff)
downloadkoszko-org-server-7fe30d5b5e22818712b90664d905483ea3fe54c3.tar.gz
koszko-org-server-7fe30d5b5e22818712b90664d905483ea3fe54c3.zip
Make submakes always use the same Guix we use
-rw-r--r--Makefile3
m---------subrepos/hydrilla0
m---------subrepos/hydrilla-website0
m---------subrepos/koszko-org-website0
m---------subrepos/sheets-websites0
5 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f1e8fbe..29705dc 100644
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,16 @@
-include Makefile.local
GUIX ?= guix
+export GUIX
# Almost all commands in this Makefilo are run through `guix time-machine` with
# Guix revision fixed to the one from the commit below. This ensures that the
# same working environment is always used.
GUIX_COMMIT ?= a86979b41a49a8fcdaa887970ba594dbba701226
+export GUIX_COMMIT
GUIX_TM ?= $(GUIX) time-machine --commit=$(GUIX_COMMIT) --
+export GUIX_TM
GUIX_LOAD_PATHS = $$( \
find subrepos/ -mindepth 1 -maxdepth 1 \
diff --git a/subrepos/hydrilla b/subrepos/hydrilla
-Subproject de2ece0ec785b7187e24fa43d1c00465a290443
+Subproject 2793350b2d5a9ed22b92ac44bb30d2e85b16704
diff --git a/subrepos/hydrilla-website b/subrepos/hydrilla-website
-Subproject 2b2c70932bf6ffcd77fbe5f6c59a203299f755a
+Subproject 8f4bd4ec60bcc9f50f90360ba75bd5348050dfb
diff --git a/subrepos/koszko-org-website b/subrepos/koszko-org-website
-Subproject a928b671f4fdeabf99cec3c28d10582d5e2becf
+Subproject 40b1963b6b32d37a99c8a1a76cb153a2598af9e
diff --git a/subrepos/sheets-websites b/subrepos/sheets-websites
-Subproject e4bb845655ccc4c0788336b140845b051bd661a
+Subproject 2ece1ce89e1b5ce6bbe55d98970d380efc15639