Repository navigation
Select only hyprland from the aarch64 edge repository (fixes #741) - #787
Conversation
The edge repository publishes hyprland for aarch64 and does not carry hyprtoolkit or hyprland-guiutils, so naming them as omarchy/ targets made every update and install fail with "target not found" (omacom#741). Only omarchy/hyprland is selected from edge now; the other two come from the regular repositories. The pacman fixture models the real edge repository (hyprland only), the target and ignore-list expectations in the other tests follow, and the Install VM check now expects hyprland from edge and hyprtoolkit, hyprland-guiutils and aquamarine from extra.
[Medium impact] This PR appears safe to merge. SummaryThis PR selects only
Reviews (1) · Last reviewed commit: "Select only hyprland from the aarch64 ed..." · Reviewed by Greptile |
|
[Joshua's agent] CI on this head ( |
|
Review (Claude Opus, for Joshua's agent team; not the author's model): the change looks right to me.
One risk worth a maintainer's eye: version skew. Edge hyprland 0.57.0-4 now pairs with whatever hyprtoolkit and hyprland-guiutils ALARM ships. If edge hyprland was built against a newer hyprtoolkit soname, a future edge bump could break at runtime even though pacman resolves. A pacman -Qi check for the hyprtoolkit version Hyprland links against, in the VM job, would catch that. |
maralcbr
left a comment
There was a problem hiding this comment.
Thanks @joshuaswarren, this looks right to me. Reviewed at b622741. No blockers, and CI is green.
Checked and fine
- The selection matches what edge builds.
omarchy-pkgshas a recipe forhyprlandand none for either companion. The Install VM log resolves edge hyprland 0.57.0-4 with extra aquamarine 0.16.0-1, hyprgraphics 0.6.0-1, hyprtoolkit 0.6.0-3 and hyprland-guiutils 0.2.2-6, and notarget not found. - The
hyprtoolkitskew raised above doesn't apply today. Edge hyprland has nohyprtoolkitsoname dependency, only an unversionedhyprland-guiutils. Apacman -Qicheck in the VM job wouldn't catch linkage anyway, since it shows declared dependencies rather than what the binary links.
The real risk is the one in your PR body. Hyprland depends on libaquamarine=15, libhyprgraphics=5, libhyprutils=13 and libhyprwire=3 from extra. When one of those bumps, omarchy update stops until edge rebuilds hyprland. I accept that as a known cost of this selection.
This is a sourcing change as well as a fix. It puts the companions on ALARM's builds, reversing the earlier design of not mixing the two, as noted on #741. Edge no longer ships them, so I'd accept that. x86 isn't affected.
Worth confirming after merge: the VM covers fresh and repeat installs, and test/vm/run-selective-edge:254 says itself that it isn't an old-stack upgrade. The Macs stuck on #741 are that case, and a normal upgrade won't replace a local build that's the same version or newer, so older companions may stay. Fixes #741 closes the issue on merge, so please run omarchy update on one stuck Mac and report back there.
Nits, fine as follow-ups:
test/shell.d/arm-channel-transaction-test.sh:47,53still models three packages, as you noted, and CI skips it because it needs a contained root.test/shell.d/arm-package-recovery-test.sh:32,75are prefix matches, so they'd also pass with the old three-target list.arm-package-sources-test.sh:37does pin the exact list.PINNED_PACKAGESatscripts/collect_e2e.py:131only records versions, but the name is stale now.
After this lands: mac/migrate-standalone still lists all three targets, so #784 fails until that branch merges quattro, and #785 and #786 need a rebase or rerun. #742, #754, #760 and #764 can close with credit to their authors.
Fixes #741.
Cause.
omarchy_arm_package_targetsnamesomarchy/hyprland,omarchy/hyprtoolkitandomarchy/hyprland-guiutils. The edge repository (https://pkgs.omarchy.org/edge/aarch64) publisheshyprlandandaquamarinefor aarch64 but not the other two (omarchy-pkgshas no pkgbuild for either), so pacman stops witherror: target not found: hyprtoolkit/hyprland-guiutils. That is the failure in everyomarchy updateon #741 and in the Install VM job on every recent PR.Reproduced against the real databases (read-only, no install): the edge
omarchy.db(hyprland 0.57.0-4, aquamarine 0.16.0-1.1) and the Arch Linux ARMcore/extra/alarmdatabases, resolved withpacman -Spin a sandbox config (Architecture = aarch64, empty local db):rc=1,error: target not found: hyprtoolkit,error: target not found: hyprland-guiutils.omarchy/hyprlandonly:rc=0; edge hyprland 0.57.0-4, and extra hyprtoolkit 0.6.0-3, hyprland-guiutils 0.2.2-6, aquamarine 0.16.0-1, hyprgraphics 0.6.0-1.Change. Select only
omarchy/hyprlandfrom edge.hyprtoolkitandhyprland-guiutilscome from the regular repositories (hyprland pulls them in; the default package loop installs guiutils the ordinary way). The--ignorelist the upgrade builds from the same list is nowhyprlandonly.Check that fails first.
test/shell.d/arm-package-transaction-test.shnow models the real edge repository (hyprland, asdcontrol, tobi-try) and runs real libalpm. Before the helper change it fails with the sametarget not found: hyprtoolkitandhyprland-guiutils; after, it passes for the three version cases, and asserts that extra cannot replace the edge hyprland and that the two companions come from extra. The other tests that spelled out the three-target list (arm-package-sources,arm-package-recovery,update-file-conflict,update-package-conflict) follow.test/vm/run-selective-edgenow expects hyprland from edge and hyprtoolkit, hyprland-guiutils and aquamarine from extra; I ran its awk check on the real resolved selection above and it passes.Related open PRs, same root cause, none reviewed or merged: #742 (filter targets by what edge lists), #754 and #764 (
extra/targets for the two), #760 (omarchy/hyprlandonly, the same selection as this PR). Their CI had not run (checks blocked on first-time contributors), so none had shown a passing Install VM. This PR takes #760's selection, adds the fixture and VM-check changes, and runs CI. Credit to those authors; close whichever this supersedes.Not verified. I did not run the Install VM or the full
test/shellsuite locally (CI does);test/shell.d/arm-channel-transaction-test.shneeds a contained root and still models three packages in its graphics lane, which does not conflict with this change but I did not run it. No Apple Silicon machine was used. The sandbox used the databases as of 2026-11-03 02:40 UTC; edge and extra move, and the unpinned companions track extra from now on, so a future soname bump in extra (as with aquamarine 0.16) will again need hyprland rebuilt in edge.[Joshua's agent]