From abe5e3b9f7d883b43a43b9bf34cd3a6b6372ef37 Mon Sep 17 00:00:00 2001
From: swrup <swrup@protonmail.com>
Date: Wed, 11 Mar 2026 19:39:43 +0100
Subject: [PATCH]

---
 .gitignore  |  1 +
 GNUmakefile | 35 +++++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7aeab444..aba8e136 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ _taler_exchange_sql
 assets
 secrets
 !secrets/.keep
+vendors
diff --git a/GNUmakefile b/GNUmakefile
index 74d7fa35..2266d4d9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,28 +1,37 @@
-install_list := solo5 ocaml-solo5 mkernel mnet
-pin_list := "git+https://github.com/mirage/Zarith.git#zarith-1.14"
-vendor_list := mkernel miou zarith
+vendor_list := \
+	mkernel miou zarith bstr mnet mirage-crypto-rng-mkernel gmp digestif \
+	kdf utcp flux h1 httpcats mhttp multipart_form-miou prettym tls \
+	x509 vifu cachet mfat mirage-mtime caqti caqti-miou caqti-mnet caqti-driver-pgx
 
 secmod_fat=secrets/secmod.fat
 tap_device=tap-mte
 
-
 check-kvm:
 	$(if $(wildcard /dev/kvm),,$(error KVM support not enabled))
 
+# todo: just opam install . --deps-only?
 installs:
-	@for v in $(install_list); do \
-	  opam install $v
-	done
+	opam install --yes mcrunch
+	opam install --yes sqlite3 # needed for caqti even if not used
+	opam install --yes caqti-driver-pgx
+	opam install --yes $(vendor_list)
 
 pins:
-	@for v in $(pin_list); do \
-	  opam pin $v
-	done
+	opam pin --no-action --yes "git+https://github.com/mirage/Zarith.git#zarith-1.14"
+	opam pin --no-action --yes "git+https://github.com/swrup/mirage-mtime.git#6a6bb4dd25624a3c43e6417dcdf73f3c689946a7"
+	opam pin --no-action --yes "git+https://github.com/robur-coop/vif.git#8c6ac3fb97cb9a31bf6ad8ec63c942336dcfd03e"
+	opam pin --no-action --yes add caqti "git+https://github.com/swrup/ocaml-caqti.git#7838c29ffa9095d32b95affee26b22ef2ad302fd"
+	opam pin --no-action --yes add caqti-miou "git+https://github.com/swrup/ocaml-caqti.git#7838c29ffa9095d32b95affee26b22ef2ad302fd"
+	opam pin --no-action --yes add caqti-mnet "git+https://github.com/swrup/ocaml-caqti.git#7838c29ffa9095d32b95affee26b22ef2ad302fd"
+	opam pin --no-action --yes add caqti-driver-pgx "git+https://github.com/swrup/ocaml-caqti.git#7838c29ffa9095d32b95affee26b22ef2ad302fd"
+	opam pin --no-action --yes "git+https://github.com/swrup/mfat.git#40afdb419df56d4932928a61906e012a3c534549"
 
+
+.PHONY: vendors
 vendors:
-	mkdir -p vendors
+	@mkdir -p vendors
 	@for v in $(vendor_list); do \
-	  [ ! -d vendors/$v ] && opam source $v --dir vendors/$v
+	  [ -d vendors/$$v ] || opam source $$v --dir vendors/$$v ; \
 	done
 
 .PHONY: clean
@@ -30,7 +39,9 @@ clean:
 	rm -rf _build/
 	rm -rf vendors/
 
+# todo: don't erase already existing
 secmod-storage:
+	@mkdir -p secrets
 	mfat make --sectors=2048 $(secmod_fat)
 
 assets: