aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2023-08-29 16:00:36 +0200
committerWojtek Kosior <koszko@koszko.org>2023-08-29 16:06:49 +0200
commitde2ece0ec785b7187e24fa43d1c00465a290443d (patch)
tree6d0bd58f1e013ad8d9e53bb203db436e7470f9b7 /Makefile
parentd16a726e958aa78d5d9f3515eb18b589e27bdac1 (diff)
downloadhaketilo-hydrilla-de2ece0ec785b7187e24fa43d1c00465a290443d.tar.gz
haketilo-hydrilla-de2ece0ec785b7187e24fa43d1c00465a290443d.zip
Make sure Makefile's 'dist' target can also be run with newer Guix
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5ee80ec..ca95a75 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,12 @@ GUIX_COMMIT := a86979b41a49a8fcdaa887970ba594dbba701226
GUIX_TM = $(GUIX) time-machine --commit=$(GUIX_COMMIT) --
-GUIX_PACKAGE_SELECTION_FLAGS = -f guix.scm
+GUIX_FULL_PACKAGE_FLAGS = -f guix.scm
+GUIX_MINIMAL_PACKAGE_FLAGS = -e '(@ (hydrilla-base) hydrilla-without-haketilo)' -L ./guix-module-dir
+GUIX_PACKAGE_SELECTION_FLAGS = $(GUIX_FULL_PACKAGE_FLAGS)
GUIX_DEVSHELL = $(GUIX_TM) shell -D $(GUIX_PACKAGE_SELECTION_FLAGS) --
+GUIX_MINIMAL_DEVSHELL = $(GUIX_TM) shell -D $(GUIX_MINIMAL_PACKAGE_FLAGS) --
GET_VER = $$(grep '^Version:' src/hydrilla.egg-info/PKG-INFO | cut -d' ' -f2)
RECORD_VER = VER="$(GET_VER)"
@@ -40,7 +43,7 @@ wheel:
# Make a source tarball and repack in a deterministic way so that its
# reproducible.
dist src/hydrilla/_version.py:
- $(GUIX_DEVSHELL) python3 -m build -s
+ $(GUIX_MINIMAL_DEVSHELL) python3 -m build -s
$(RECORD_VER) && \
RELNAME=hydrilla-"$$VER" && \
DISTFILE=dist/"$$RELNAME".tar.gz && \
@@ -110,7 +113,7 @@ shell-with-haketilo: dist
.PHONY:
shell-with-hydrilla-only:
$(MAKE) shell-with-haketilo \
- GUIX_PACKAGE_SELECTION_FLAGS="-e '(@ (hydrilla-base) hydrilla-without-haketilo)' -L ./guix-module-dir"
+ GUIX_PACKAGE_SELECTION_FLAGS="$(GUIX_MINIMAL_PACKAGE_FLAGS)"
catalogs:
$(GUIX_DEVSHELL) python3 setup.py compile_catalog