aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2023-08-24 21:06:01 +0200
committerWojtek Kosior <koszko@koszko.org>2023-08-25 12:27:23 +0200
commit7a05a24d414a5a95ee2bf377c87464d57bf5e035 (patch)
tree20d91be5ce69b7f5c15538604299b6012a426526
parentf3ca662bf88213874d52929314f28ddcb6db9443 (diff)
downloadkoszko-org-server-7a05a24d414a5a95ee2bf377c87464d57bf5e035.tar.gz
koszko-org-server-7a05a24d414a5a95ee2bf377c87464d57bf5e035.zip
don't pull mitmproxy just for running hydrilla server
-rw-r--r--Makefile2
-rw-r--r--container.scm6
m---------subrepos/hydrilla0
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5f9b51b..1acdba5 100644
--- a/Makefile
+++ b/Makefile
@@ -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