From 8534959021f9ecb05b22fd0d7a2754a918d9d5ac Mon Sep 17 00:00:00 2001 From: enricobuehler Date: Mon, 15 Jun 2026 01:47:09 +0200 Subject: [PATCH] fix(ci/flatpak): cargo-sources generator needs python3-tomlkit, not toml flatpak-cargo-generator.py (master) imports `tomlkit` + `aiohttp`; the workflow installed `python3-toml`, so the "Generate offline cargo sources" step would fail with ModuleNotFoundError. Install python3-tomlkit instead, and correct the same note in build-flatpak.sh. Co-Authored-By: Claude Opus 4.8 (1M context) --- .gitea/workflows/flatpak.yml | 3 ++- packaging/flatpak/build-flatpak.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/flatpak.yml b/.gitea/workflows/flatpak.yml index 211a113..6163634 100644 --- a/.gitea/workflows/flatpak.yml +++ b/.gitea/workflows/flatpak.yml @@ -47,7 +47,8 @@ jobs: - name: Tooling run: | - dnf -y install flatpak flatpak-builder git python3 python3-aiohttp python3-toml curl jq + # flatpak-cargo-generator.py (master) needs aiohttp + tomlkit (NOT the old `toml`). + dnf -y install flatpak flatpak-builder git python3 python3-aiohttp python3-tomlkit curl jq # Flathub provides the GNOME runtime/SDK + the rust-stable + ffmpeg-full extensions. flatpak remote-add --user --if-not-exists flathub \ https://dl.flathub.org/repo/flathub.flatpakrepo diff --git a/packaging/flatpak/build-flatpak.sh b/packaging/flatpak/build-flatpak.sh index 72459ce..5fd7515 100755 --- a/packaging/flatpak/build-flatpak.sh +++ b/packaging/flatpak/build-flatpak.sh @@ -63,7 +63,7 @@ else curl -fsSL -o "$GEN" \ https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/cargo/flatpak-cargo-generator.py fi - # Needs python3 + aiohttp + toml. On a host that lacks them (e.g. the Deck), generate on the + # Needs python3 + aiohttp + tomlkit. On a host that lacks them (e.g. the Deck), generate on the # Mac / a dev box instead and rsync the result next to the manifest (reused by the branch above). python3 "$GEN" Cargo.lock -o packaging/flatpak/cargo-sources.json fi