Skip to content

Ship the complete passwordless-sudo lifecycle in settings-dev - #645

Merged
spencerbull merged 5 commits into
omacom:masterfrom
ekollof:fix/omarchy-dev-ship-passwordless-revoke-hook
Oct 11, 2026
Merged

spencerbull merged 5 commits into
omacom:masterfrom
ekollof:fix/omarchy-dev-ship-passwordless-revoke-hook

Conversation

@ekollof

@ekollof ekollof commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

Edge now ships the passwordless-sudo revoke hook through omarchy-dev, but a settings transaction leaves its package-transition marker set. Subsequent grant enabling is refused until reboot. This change ships the complete grant lifecycle in omarchy-settings-dev, so upgrading or removing settings revokes active grants and a completed reinstall permits enabling them again without a reboot.

Settings owns the grant helper, security library, boot cleanup rule, and revoke hook. Its scriptlet sweeps stale grants and clears the transition marker only after successful installation. omarchy-dev requires the security-library capability in built package metadata, preventing an incompatible runtime/settings pairing without requiring an unpublished dependency during isolated builds. The release packages are unchanged.

CI on the reviewed packaging head reports successful Tests and all four package builds. Spencer's latest review records fresh-worker validation of the ownership transfer, recovery from the stuck marker, settings-only upgrades, and timer expiry. See that review for its aarch64-install, ISO, and stable-package limitations.

Separate developer-tool follow-up: omarchy dev pkg-test installs each archive in its own pacman transaction. Across this ownership move, that sequence can delete transferred helpers. omacom/omarchy#14844 builds both archives first and installs them in one transaction; normal repository upgrades were verified in the packaging review.

@ekollof
ekollof force-pushed the fix/omarchy-dev-ship-passwordless-revoke-hook branch from 592ec4a to 0a3dfc8 Compare September 25, 2026 22:47
@spencerbull

Copy link
Copy Markdown
Contributor

Thanks for tracking this down. The missing hook is exactly why omarchy sudo passwordless can't enable a grant on edge today, and with this line the first enable after updating works.

It doesn't hold past the next update, though. The hook runs __package-removing before every omarchy-settings-dev upgrade. That creates /run/omarchy-sudo-passwordless-package-removing (bin/omarchy-sudo-passwordless:233 at 3faafba), and verify_boot_cleanup refuses to publish a grant while that file exists (:210). Nothing removes it: the helper only creates it, omarchy-dev has no install scriptlet, and omarchy-settings-dev.install on master only applies the etc overrides. docs/passwordless-sudo.md gives that job to the settings package's scriptlets ("A successful installation clears the marker only after boot cleanup exists"). With this change alone, every edge update leaves passwordless sudo refused until reboot, and retrying the transaction doesn't recover it. Upstream's test/shell.d/passwordless-grant-lifecycle-test.sh checks for this. Run against master's scriptlets, it stops at pre_remove: command not found.

This also overlaps #257, which ships the same hook from omarchy-settings-dev along with the scriptlets that clear the marker. Git merges the two cleanly, but both packages would then own /usr/share/libalpm/hooks/05-omarchy-passwordless-revoke.hook, and pacman refuses that. Only one of them can land as written.

The rest checks out. The hook is installed byte-for-byte at 0644 and passes the helper's exact-match and ownership checks. The helper and omarchy-security-functions land side by side. And you're right that release omarchy must not get the hook while its v4.0.4 pin carries the old helper.

Next step: the maintainer decides between landing #257 and extending this PR with a settings-dev post_install/post_upgrade that clears the marker once no grants are left.

Reviewed by Opus 5.5 in Claude Code, with Codex XHigh as a second opinion. Codex reached the same finding on the marker from the same lines, but the prompt pointed it there, so that's agreement rather than an independent find. Checked by reading the source and running upstream's lifecycle test, not by installing built packages.

@spencerbull

Copy link
Copy Markdown
Contributor

I've pushed a rework of this branch (c9707284, with master merged in). With it, grants keep working across updates, not just the first time.

What changed. omarchy-settings-dev now ships the whole grant lifecycle, as docs/passwordless-sudo.md asks: omarchy-sudo-passwordless, omarchy-security-functions and their /usr/share/omarchy/bin links, the boot cleanup rule it already had, and the 05 hook. It also ships the scriptlets from #257, which revoke grants before the package changes and clear /run/omarchy-sudo-passwordless-package-removing once no grant remains. omarchy-dev stops shipping the two helpers and the hook, so the hook never outlives its Exec target and removing the runtime alone keeps expiry working. omarchy-dev now requires omarchy-settings-dev=${pkgver} plus a floor at the first settings release that ships the helpers. Without that floor, a new runtime could pair with the old settings package and leave neither with omarchy-security-functions, and omarchy update exits 126 without it. The stable pair is untouched: its v4.0.4 pin still carries the old helper and no hook, so it can't ship this until its pin moves.

The scriptlet and two of the tests come from @AFOliveira's #257, credited on the commit. This is effectively #257's dev half. Once it lands, #257 reduces to the stable pair for the release that carries the hardened helper.

Tests added:

  • tests/passwordless-package-files.sh runs both dev recipes' package() and checks three things: the grant files land in settings-dev only, no path ships from both packages, and settings-dev registers its scriptlet.
  • tests/passwordless-package-lifecycle.py and tests/passwordless-package-metadata.py are adapted from [codex] Revoke passwordless grants when settings is removed #257. The metadata test also checks the new floor.

I broke the fix on purpose several ways to confirm the tests catch each one: the hook back in omarchy-dev, the runtime shipping the helpers, settings dropping the helpers, hook or links, either dependency removed, master's scriptlet, a scriptlet that never clears the marker, and the install= line removed. The tests failed every time. They also fail against this PR's previous head. The CI self-test job passes in an Arch container as root. Upstream's passwordless-grant-lifecycle-test.sh passes against the new dev scriptlet. It still fails on the stable scriptlet, which this doesn't change.

On Proxmox workers, each flow ran on a fresh Omarchy 4.0.4 worker. Packages were built from 3faafba2 with these recipes, plus master's recipes for today's edge; this PR's previous head served as a negative control. 134 checks, none failing:

Flow Result
4.0.4 with an old-format grant → today's edge → this pair Today's edge refuses the grant. The upgrade to this pair succeeds with no file conflicts, the scriptlet sweeps the old grant, and all six grant paths are owned by omarchy-settings-dev. pacman -Qkk is clean, migration 1788163635 completes, and omarchy-sudo-passwordless 5 enables, then disables when run again.
Settings-only upgrade, then a pair upgrade, each with a grant live The hook revokes the grant, the marker clears, and enable works again without a reboot. A new omarchy-dev alone over the old settings is refused by the floor; a new settings alone over the old runtime is refused on file conflicts.
Negative control: this PR's previous head The first grant works. After a settings-only upgrade the marker stays set and the next grant is refused.
Grant lifecycle The rule carries NOTAFTER and passes visudo, the timer is armed, and renewal leaves one rule. The timer removes the rule at the deadline.
pacman -Rdd omarchy-dev with a grant live The helpers, links, boot rule and hook survive. Expiry still removes the rule, and enable still works.
pacman -Rdd omarchy-settings-dev with a grant live The hook revokes the grant and the marker stays set. Reinstalling settings clears it.
Stable → dev → stable → dev in one boot, grants live No file conflicts. Each switch revokes the grant, and stable takes back its helper. On the return to dev, the completed install clears the marker the dev → stable switch left, so enable works without a reboot.
Reboot with a 60-minute grant live Boot cleanup removes it, status is inactive, and enable works.
Revocation made to fail (chattr +i) during a settings upgrade The hook aborts the transaction, settings stays put, the marker holds and publication is refused. The retry succeeds and recovers.
Real omarchy update on the edge channel Switched with omarchy-channel-set edge onto the published r6663 packages, where omarchy sudo passwordless 5 exits without enabling anything. Then omarchy update -y with this pair in a local repo, and omarchy sudo passwordless 30 enables. With that grant live, a second omarchy update -y carried a settings-only bump: the hook revoked the grant, the marker cleared, and omarchy sudo passwordless 5 enabled again in the same boot.

Not covered: packages built or installed on aarch64 (only its package() output is checked), and an ISO install.

Reviewed by Opus 5.5 in Claude Code, with Codex XHigh as the second opinion on the reworked diff. Codex found no defect in the packaging. It traced the ownership move and hook/scriptlet ordering through libalpm's source, and the dependency floor through the build planner and upstream sync. It also found that nothing checked the recipe still registers its scriptlet; that check is the second commit. This is waiting on a maintainer. The title and description above still describe the original one-line change.

@spencerbull spencerbull added bug Something isn't working build-approved Maintainer approved this PR to build on the self-hosted pool new-omarchy-feature labels Sep 28, 2026
@spencerbull

Copy link
Copy Markdown
Contributor

Update, now at ef07c51c, with master merged again. Tests and all four package builds are green.

What changed since my last comment. The first CI run on the reworked branch failed both omarchy-dev builds with target not found: omarchy-settings-dev>=4.0.0.r6663.g3faafba-3. The PR build and publish build each package in its own container and resolve runtime dependencies against the published edge repository, so omarchy-dev can't depend on a settings release that only this change produces. I was wrong to call that floor necessary, and my worker builds used makepkg -d, which hid the problem. The same applies to #257's =${pkgver} for the dev pair: it would fail this way on every upstream pin bump.

omarchy-dev now keeps master's unversioned dependency and instead conflicts with omarchy-settings-dev<4.0.0.r6663.g3faafba-5. pacman checks conflicts only at install time, so the builds are unaffected. The conflict refuses the one pairing that would leave neither package with omarchy-security-functions: a new runtime over a settings release that is held back or hasn't been published. The pairing test is gone; the ownership test now checks the conflict instead. Settings-dev is at pkgrel 5 because master published -4 in the meantime.

Re-checked on fresh Proxmox workers with packages rebuilt from this head. Today's edge is -1/-4, this pair is -2/-5, and a settings-only bump is -6. pacman ran with --noconfirm and no auto-answers, as omarchy update runs it:

Flow Result
The new runtime without its settings release Refused as a conflict in all three cases: pacman -U of the runtime alone, a repository that holds only the runtime, and -Syu --ignore omarchy-settings-dev. Each time the old runtime and its library stay intact.
Both in the repository, then a settings-only bump, with a grant live -Syu upgrades the pair. The next -Syu upgrades settings alone: the hook revokes the grant, the marker clears, and enable works again without a reboot.
Today's edge → this pair, and the settings-only update Same results as before: ownership, sweep, migration, the user-facing command, and re-enabling without a reboot.
Stable ↔ dev switches, settings removal, aborted revocation Same results as before.

Reviewed by Opus 5.5 in Claude Code, with Codex XHigh as the second opinion on both new commits. On c5600b69, Codex found the held-back and runtime-only cases the conflict now refuses. On ef07c51c, it checked the conflict against libalpm, the build and publish paths, the next pin bump and the ISO builder, and found nothing further. One limitation it noted: pacman -S omarchy-dev on its own over an old settings release is refused rather than pulling the new settings in; -Syu or naming both packages does the transition. This is waiting on a maintainer.

@ekollof

ekollof commented Sep 28, 2026

Copy link
Copy Markdown
Contributor Author

Verified from my side at ef07c51c: all checks green (approve, changes, build-isolation, both omarchy-dev builds, self-tests, result).

The rework direction looks right — shipping the full grant lifecycle in omarchy-settings-dev per docs/passwordless-sudo.md, keeping the settings dependency unversioned so the PR/publish per-package containers resolve, and refusing settings-dev releases that predate the helper move. The __package-removing / verify_boot_cleanup interaction you found explains why my original one-line hook only held for the first enable.

Happy with this as the merge shape — over to you for merge.

@spencerbull
spencerbull force-pushed the fix/omarchy-dev-ship-passwordless-revoke-hook branch from ef07c51 to 417c2f1 Compare September 29, 2026 02:19
@spencerbull

Copy link
Copy Markdown
Contributor

Rebased onto master (660cbe39), which had moved the dev pin to r6688.ge332dc9. The branch is now five linear commits on top of master, with @ekollof's first, and the earlier merge commits are gone.

Upstream didn't change the helper, the library, the hooks or docs/passwordless-sudo.md between the two pins. What changed with the pin: both packages are now pkgrel 2, one above the published -1, and the conflict reads omarchy-settings-dev<4.0.0.r6688.ge332dc9-2. Master's tests/settings-runtime-profile.sh (#701) now builds settings-dev from its own source tree, so the commit that moves the helpers also adds them to that tree.

Re-checked at 417c2f1b:

  • Every commit passes the package tests.
  • CI is green: Tests and all four package builds.
  • On fresh Proxmox workers with packages built from e332dc9, 50 checks passed and none failed. The flows were today's edge → this pair; a settings-only update with a grant live, which revokes it and lets you re-enable without a reboot; and the conflict refusing the runtime alone, a repository with only the runtime, and a held-back settings-dev.

@ekollof
ekollof force-pushed the fix/omarchy-dev-ship-passwordless-revoke-hook branch from 417c2f1 to c35e69a Compare September 29, 2026 14:35
@ekollof

ekollof commented Sep 29, 2026

Copy link
Copy Markdown
Contributor Author

Rebased onto master b7a7ad1 to resolve the conflicts.

The conflict was the upstream pin bump r6688.ge332dc9 → r6689.gb421b1b (c830be2) colliding with this branch's pkgver/pkgrel in both dev PKGBUILDs. Resolution keeps master's new pin with the PR's pkgrel=2:

  • omarchy-dev/PKGBUILD: pkgver=4.0.0.r6689.gb421b1b, pkgrel=2, conflict floor now omarchy-settings-dev<4.0.0.r6689.gb421b1b-2
  • omarchy-settings-dev/PKGBUILD: pkgver=4.0.0.r6689.gb421b1b, pkgrel=2 (_commit/sha256sums already took master's b421b1b)
  • tests/passwordless-package-files.sh: floor check now against 4.0.0.r6689.gb421b1b-1

Verified locally: passwordless-package-files.sh PASS on both arches, passwordless-package-lifecycle.py 11/11 PASS, settings-boot-config.sh and settings-runtime-profile.sh PASS. gh now reports mergeable: MERGEABLE (was CONFLICTING).

@ekollof
ekollof force-pushed the fix/omarchy-dev-ship-passwordless-revoke-hook branch from c35e69a to 942d77b Compare September 29, 2026 23:17
@ekollof

ekollof commented Sep 29, 2026

Copy link
Copy Markdown
Contributor Author

Rebased onto master 5a49a3f to resolve the conflicts.

The conflict was the upstream pin bump r6689.gb421b1b -> r6691.g8b4eae6 colliding with this branch's pkgver/pkgrel in both dev PKGBUILDs. Resolution keeps master's new pin with the PR's pkgrel=2:

  • omarchy-dev / omarchy-settings-dev: pkgver=4.0.0.r6691.g8b4eae6, pkgrel=2
  • omarchy-dev conflict floor -> omarchy-settings-dev<4.0.0.r6691.g8b4eae6-2
  • tests/passwordless-package-files.sh floor check -> 4.0.0.r6691.g8b4eae6-1

Verified locally: passwordless-package-files.sh PASS (both arches), passwordless-package-lifecycle.py 11/11 PASS. CI re-running on the pushed head.

@spencerbull
spencerbull force-pushed the fix/omarchy-dev-ship-passwordless-revoke-hook branch 2 times, most recently from 1481961 to 556ae8e Compare October 3, 2026 02:35
@spencerbull

Copy link
Copy Markdown
Contributor

Rebased onto master (97925fbc, dev pin r6694.g821ae58) and reviewed again. Head is 556ae8e0.

The rebase. Edge publishes omarchy-dev r6694-1 and omarchy-settings-dev r6694-2, so this branch now has -2 and -3. "Master's pin with pkgrel 2" no longer works for settings-dev: git merged its pkgrel=2 without a conflict, and that version is already published. I dropped the r6691 pin commit (@ekollof's) and set the numbers in the commits they belong to.

What the review changed. The conflict floor is gone. It had to name the last settings-dev release without the helpers, and that version moves with every upstream pin bump and every settings-only pkgrel while this PR is open. The floor line never conflicts textually, and the test compared it against a constant that moved in the same edit. So a rebase that missed it stayed green while the published release slipped past the guard; the previous rebase had in fact left it at r6689.

omarchy-settings-dev now provides omarchy-security-functions, and omarchy-dev's package() appends it to depends. makepkg checks only the top-level depends before building (/usr/bin/makepkg:1448), so the per-package builds still resolve against the published edge repository. Dependencies added inside package() still go into .PKGINFO; a probe recipe and the built omarchy-dev both show this. The requirement is the actual one, the library omarchy update sources, so pin bumps and pkgrel bumps in either package leave it alone.

On fresh Proxmox workers with packages built from 821ae58, pacman ran as omarchy update runs it. 80 checks, none failing:

  • The new runtime is refused with unable to satisfy dependency 'omarchy-security-functions' required by omarchy-dev in all three skewed cases: pacman -U of the runtime alone, a repository holding only the runtime, and -Syu --ignore omarchy-settings-dev. Each time the old runtime and its library stay intact.
  • pacman -S omarchy-dev on its own now pulls in the settings release that provides the library. The conflict used to refuse this.
  • Unchanged from before: today's edge → this pair; a settings-only update with a grant live, which revokes it and allows re-enabling without a reboot; stable ↔ dev switches; and an aborted revocation.

tests/passwordless-package-files.sh now checks three things in place of the floor: settings-dev provides the library after its package() runs, omarchy-dev's package requires it, and its top-level depends doesn't. Removing any of these makes the test fail. Every commit passes the package tests, and the CI self-test job passes in an Arch container.

Reviewed by Opus 5.5 in Claude Code, with Codex XHigh as the second opinion. On the rebased head it confirmed the four numbers against the published versions. It found the stale-floor gap independently, with a concrete settings-only-bump case, and proposed the capability. On the capability commit it checked the built archives and ran libalpm checks for each transition, and found no defect. It noted that the test read settings-dev's provides before package() ran; that's now checked afterwards. This is waiting on a maintainer. The title and description above still describe the original one-line change.

@spencerbull
spencerbull force-pushed the fix/omarchy-dev-ship-passwordless-revoke-hook branch from 556ae8e to b73c53a Compare October 4, 2026 05:03

@ryanrhughes ryanrhughes left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds and tests pass on b73c53a for both packages and both architectures. Ships the full grant lifecycle in omarchy-settings-dev as docs/passwordless-sudo.md describes, which fixes passwordless sudo on edge.

@ekollof ekollof changed the title Ship the passwordless-sudo revoke hook in omarchy-dev Ship the complete passwordless-sudo lifecycle in settings-dev Oct 8, 2026
@monomyth

monomyth commented Oct 8, 2026

Copy link
Copy Markdown

Current-head CI follow-up for bb26b435be6269185a7355dae1497a85625b01b3: the failed omarchy-dev/aarch64 job stops while preparing the builder image, at the pacman-key --recv-keys ... --keyserver keys.openpgp.org step in Dockerfile:116:

gpg: keyserver receive failed: No keyserver available
==> ERROR: Remote key not fetched correctly from keyserver.

The failure occurs before that package builds. The other three package/architecture builds passed, and Tests passed build isolation and self-tests. This is a key-fetch/build-environment failure, not a reported sudo lifecycle assertion failure; the current ARM runtime build still needs a successful run.

Could a repository maintainer rerun the failed jobs on this head? I inspected the logs only; no code changes or additional host-side validation are claimed.

@spencerbull

Copy link
Copy Markdown
Contributor

Reviewed again at bf0944e6, which is this branch with master merged in. Master had moved both dev packages to the r6857.ge1b0e5e pin and #922 changed both dev PKGBUILDs, so the branch had stopped merging. The conflict was only the version lines: both packages now carry master's pin with pkgrel=2, one above the -1 that edge publishes. Apart from the pin, the diff against master is the one reviewed before.

This matters more now than it did. #896 landed today and ships the 05 revoke hook from omarchy-dev, with nothing to clear the marker it sets. On a fresh worker on today's edge (r6857-1), a grant was enabled, a settings-dev reinstall revoked it, and the next __enable was refused with "a settings package transaction is incomplete" until reboot. Every edge update that touches settings-dev now does that, and this branch is what fixes it. The first sentence of the description predates #896: the hook is no longer absent, but the marker is still never cleared.

Checked on fresh Proxmox workers, with packages built by bin/build from bf0944e6:

  • The Tests job as CI runs it, in an Arch container: the self-tests (with the 11 lifecycle assertions and the ownership check on both architectures), the node tests and build isolation all pass.
  • From the stuck state above, pacman -Sy omarchy-dev on its own pulled settings-dev -2 in with it. All six grant paths, the 05 hook included, moved to omarchy-settings-dev with no file conflicts, the marker cleared, and __enable published a NOTAFTER rule without a reboot.
  • A settings-only -3 with a grant live: the hook, now owned by settings-dev, revoked it, the marker cleared, and enabling worked again in the same boot. An earlier grant expired on its timer.
  • CI on this head: Tests and all four package builds pass.

One sequence breaks, and the fix is upstream. omarchy dev pkg-test installs each package in its own pacman -U --overwrite='*', settings-dev first (bin/omarchy-dev-pkg-test:136 in Omarchy). Across this ownership move that deletes the grant files: settings-dev overwrites the five paths omarchy-dev still owns, then the omarchy-dev upgrade removes them as its old files. On the worker, that left both helpers, their links and the hook missing, and omarchy-update exiting 126. No grant is exposed, because settings-dev's pre-upgrade sweep runs first, and sudo pacman -S omarchy-settings-dev restores everything. Only a developer running pkg-test across this move hits it, once, and packaging cannot prevent it. pkg-test installing what it built in a single pacman -U would.

Not covered: installing on aarch64 (only its package() output and CI's native builds), an ISO install, and the stable pair, which this does not change. When stable's pin moves past v4.0.4, omarchy and omarchy-settings will need the same hook and marker recovery. That is already true on master.

Reviewed by Opus 5.5 in Claude Code, with Codex XHigh as the second opinion, run twice on bf0944e6. The first run was pointed at the ownership move, the scriptlet and the pin, and found no defect; it agreed with conclusions already in its prompt, so its independence is not guaranteed there. The second was given only the pull request, found the pkg-test sequence on its own, and the worker reproduced it. This is waiting on a maintainer.

@ekollof

ekollof commented Oct 10, 2026 •

Copy link
Copy Markdown
Contributor Author

@spencerbull Thanks for reproducing the pkg-test ownership-transfer failure. I have prepared a local source-side fix that builds the entire requested package set first and installs its archives in one pacman -U transaction.

The command-level regression rejects the original sequential install, checks that a failed second build installs nothing, and retains explicit single-package alias behavior. The focused checks, complete CLI suite, bin style check, and git diff --check pass. No real package transaction was run on the development machine.

Published as befcecb3 (fix) and f7eaf229 (regression coverage), with a draft source PR at omacom/omarchy#14844. It does not change the approved packaging implementation.

Also acknowledging the description correction: after #896 the revoke hook is shipped, but the incomplete-transaction marker still needs the recovery implemented here. The opening description's absent-hook premise is now stale.

spencerbull and others added 5 commits October 11, 2026 15:32
The hardened omarchy-sudo-passwordless publishes a grant only when its revocation hook is installed and no package transaction has left /run/omarchy-sudo-passwordless-package-removing behind. The hook sets that marker before every settings upgrade, and the settings scriptlets are what clear it, so shipping the hook alone let the first grant work and then refused every grant after the next update until a reboot.

omarchy-settings-dev now ships the command, omarchy-security-functions, the boot cleanup rule and the hook together, with the scriptlets from omacom#257 that revoke before the package changes and clear the marker once no grant remains. omarchy-dev stops shipping the two helpers and requires the settings release that does: without it omarchy-update has no library to source.

Co-authored-by: Afonso Oliveira <afonso.oliveira707@gmail.com>
…ercises

The lifecycle test reads the .install file directly, so it kept passing with the recipe's install= line gone, which is the one change that would strand the hook's marker again.

Co-Authored-By: Codex XHigh <noreply@openai.com>
The dev pair builds each package on its own against the published edge repository, in the PR build and in publish alike, so omarchy-dev cannot require a settings-dev release that only this change produces: the floor failed both omarchy-dev builds on this PR, and an exact pkgver match would fail the same way on every upstream pin bump. Nothing needs it. The upstream watch moves both pins together, publish stops the run before anything is published when one package fails, and a new settings-dev over an old runtime is refused on the files they would both own.
With the dependency unversioned, a new omarchy-dev could still install over a settings-dev that is held back or not yet published, removing omarchy-security-functions from both, and omarchy-update cannot start without it. A versioned conflict refuses that pairing at install time without constraining the per-package builds, which resolve only depends.

Co-Authored-By: Codex XHigh <noreply@openai.com>
The conflict named the last settings-dev release without the helpers, a version that moves with every upstream pin bump and settings-only pkgrel while this change waits to merge, and a rebase that kept a stale floor still passed the tests while the published release slipped past it. omarchy-settings-dev now provides omarchy-security-functions and omarchy-dev's package() requires it. makepkg checks only the top-level depends before building, so the per-package builds still resolve against the published repository, while pacman refuses a runtime without a settings release that ships the library, and pulls that release in when only the runtime is asked for.

Co-Authored-By: Codex XHigh <noreply@openai.com>
@ekollof
ekollof force-pushed the fix/omarchy-dev-ship-passwordless-revoke-hook branch from a41190e to 99cf1d8 Compare October 11, 2026 13:32
@spencerbull
spencerbull merged commit 40ea155 into omacom:master Oct 11, 2026
10 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

Publish succeeded → live

Packages: omarchy-dev (x86_64, PR artifact); omarchy-dev (aarch64, PR artifact); omarchy-settings-dev (x86_64, PR artifact); omarchy-settings-dev (aarch64, PR artifact)

  • edge/x86_64: omarchy-dev-4.0.0.r6897.g4df5459-2-x86_64, omarchy-settings-dev-4.0.0.r6897.g4df5459-2-x86_64
  • edge/aarch64: omarchy-dev-4.0.0.r6897.g4df5459-2-aarch64, omarchy-settings-dev-4.0.0.r6897.g4df5459-2-aarch64

Some planned slots did not run because an earlier slot failed.

Commit 40ea155 · run

gentlemanSoup pushed a commit to gentlemanSoup/omarchy-pkgs that referenced this pull request Oct 20, 2026
omarchy-settings-dev took over the temporary sudo grant command, its
library, and the revocation hook in omacom#645. 4.5.0 is cut from quattro, which
ships them, so the stable pair needs the same split before its RC pin:
settings ships the helpers and hook, provides omarchy-security-functions,
depends on sudo and runs the grant transition from its scriptlet, while
omarchy stops shipping the helpers and requires the library.

The PKGBUILD side is conditional on the source carrying the revocation
hook, so an older pinned source still builds with the grant command in
omarchy. The tests now cover both pairs and that older layout.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working build-approved Maintainer approved this PR to build on the self-hosted pool new-omarchy-feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants