From 7fe30d5b5e22818712b90664d905483ea3fe54c3 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Tue, 5 Sep 2023 18:16:37 +0200 Subject: Make submakes always use the same Guix we use --- Makefile | 3 +++ subrepos/hydrilla | 2 +- subrepos/hydrilla-website | 2 +- subrepos/koszko-org-website | 2 +- subrepos/sheets-websites | 2 +- 5 files changed, 7 insertions(+), 4 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 index de2ece0..2793350 160000 --- a/subrepos/hydrilla +++ b/subrepos/hydrilla @@ -1 +1 @@ -Subproject commit de2ece0ec785b7187e24fa43d1c00465a290443d +Subproject commit 2793350b2d5a9ed22b92ac44bb30d2e85b16704a diff --git a/subrepos/hydrilla-website b/subrepos/hydrilla-website index 2b2c709..8f4bd4e 160000 --- a/subrepos/hydrilla-website +++ b/subrepos/hydrilla-website @@ -1 +1 @@ -Subproject commit 2b2c70932bf6ffcd77fbe5f6c59a203299f755a5 +Subproject commit 8f4bd4ec60bcc9f50f90360ba75bd5348050dfb3 diff --git a/subrepos/koszko-org-website b/subrepos/koszko-org-website index a928b67..40b1963 160000 --- a/subrepos/koszko-org-website +++ b/subrepos/koszko-org-website @@ -1 +1 @@ -Subproject commit a928b671f4fdeabf99cec3c28d10582d5e2becfc +Subproject commit 40b1963b6b32d37a99c8a1a76cb153a2598af9ef diff --git a/subrepos/sheets-websites b/subrepos/sheets-websites index e4bb845..2ece1ce 160000 --- a/subrepos/sheets-websites +++ b/subrepos/sheets-websites @@ -1 +1 @@ -Subproject commit e4bb845655ccc4c0788336b140845b051bd661a5 +Subproject commit 2ece1ce89e1b5ce6bbe55d98970d380efc15639e -- cgit v1.2.3