diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | container.scm | 6 | ||||
m--------- | subrepos/hydrilla | 0 |
3 files changed, 5 insertions, 3 deletions
@@ -65,7 +65,7 @@ sample-malcontent: mkdir $@ printf 'hydrilla-builder -s tests/source-package-example/ -d %s' \ "$$(realpath $@)" | \ - make -C subrepos/hydrilla shell-with-haketilo + make -C subrepos/hydrilla shell-with-hydrilla-only LETSENCRYPT_ETC_DIR = $(TEST_ROOT_DIR)/etc/letsencrypt HYDRILLA_WEBSITE_ETC_DIR = $(TEST_ROOT_DIR)/etc/guix-container/hydrilla-website diff --git a/container.scm b/container.scm index 4efae03..7caf4fe 100644 --- a/container.scm +++ b/container.scm @@ -9,7 +9,7 @@ (sheets-websites) (hydrilla-website) (hydrilla-json-schemas) - (hydrilla) + (hydrilla-base) (ice-9 match) ;; srfi-1 provides `append-map`. (srfi srfi-1) @@ -261,7 +261,9 @@ (guix-pythonpath-search-path (package-version (default-python))))) (define %hydrilla-pythonpath-inputs - (cons hydrilla (map cadr (package-transitive-target-inputs hydrilla)))) + (cons hydrilla-without-haketilo + (map cadr (package-transitive-target-inputs + hydrilla-without-haketilo)))) (define %hydrilla-pythonpath-gexp (with-imported-modules (source-module-closure '((guix search-paths))) diff --git a/subrepos/hydrilla b/subrepos/hydrilla -Subproject 0792f29ea1fcc4386246cfc26bf4b2fbe3a5f9d +Subproject d16a726e958aa78d5d9f3515eb18b589e27bdac |