mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-11-13 12:23:38 +01:00
komorebi-for-kde/*, komorebi-for-mac/* crates become members of the root Cargo workspace: one Cargo.lock (901 packages; the 859 Windows entries are unchanged, checked by name and version), the two nested [workspace] manifests and lock files are deleted, their inherited dependencies are written out per crate (script S/pkg-merge.py), KDE's .cargo/config.toml (COMMIT_HASH default) moves to the root .cargo/config.toml (non-forcing, nix still wins). default-members is the Windows set, so a bare cargo command (and crane, which passes no --workspace) builds only Windows crates; the KDE and macOS crates are selected with -p. Crates only KDE used were re-resolved newer by cargo; pinned back to the KDE lock (zbus, zbus_macros 6.1.0, zbus_utils 6.0.0, zruntime 0.2.1, sysinfo 0.40.0). Two small differences remain: unicode-width 0.2.2 (KDE locked 0.2.3) and libz-sys 1.1.31 (macOS locked 1.1.30). The root flake and the two nested flakes still read the old workspaces and do not evaluate at this revision: they are fixed in the next one, which must land with this one (nix cannot be half-merged). Not behaviour. Gates run: Windows clippy --all-targets -D warnings (default-members) PASS; KDE check + 294 lib + 5 schemas PASS from the root workspace; macOS fake-CC check of the four macOS packages --locked PASS. Not run: nix (broken until the next revision), VM, e2e. tools/fast-check now detects the merged layout.