Repository navigation
Conversation
Dakota installs gnome-build-meta's core/papers, core/baobab and core/sushi on the host. Install the factory's papers (with papers-previewer), baobab and sushi packages, drop the NautilusPreviewer preinstall, and remove the Papers, NautilusPreviewer and baobab Flatpaks from common's system Brewfile. Mission Center stays a Flatpak. Closes #1270 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danathar, hanthor The full list of commands accepted by this bot can be found here. Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@hanthor this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (4 waiting): fixes are handed out before new work as soon as you have capacity. |
Danathar
left a comment
There was a problem hiding this comment.
Stand-in review (the hive's reviewers are out of quota). Approving. Papers, baobab and Sushi ship natively, as the owner decided on #1270, and papers and papers-previewer are already in the factory. Don't merge yet: baobab and sushi come from utah-packages#1147, which is unmerged. Two notes:
- Dakota doesn't drop these Flatpaks; its
deps.bstsays the Papers Flatpak entry takes precedence. So "as on Dakota" holds for the native packages, and the Flatpak removal is Utah's own choice; worth saying in the commit text. - Existing users keep the Flatpaks, since nothing prunes them. The
.desktopIDs are the same, so the launcher should show one entry (inferred, not booted).
The testsuite's Papers and NautilusPreviewer "installed system-wide" scenarios are @pending today and would need a Utah skip if un-pended. The red contract here comes from the stack's older copy of #1248 (factory pin 523507b8), so rebase onto the current #1248 (0b0664cb) before reading it.
There was a problem hiding this comment.
Summary: This change makes the Utah desktop install three GNOME apps directly in the system image: the PDF viewer (Papers), the disk-usage tool (baobab) and the spacebar file previewer (Sushi). Before, they came as separately downloaded Flatpak apps. This matches the sister image, Dakota, as the owner decided in #1270. The change does what that decision asked. One code comment now says the opposite of what the build script does, and it should be fixed so the next reader isn't misled.
What I need from you: Apply the one-comment fix below.
docs-currency
- The new package comment says the build script points the Documentation menu entry at Papers, but nothing does that (
packages/utah.toml:511-514, low). The comment says the Documentation entry opens the native Papers and that "configure-services.sh retargets it". Nothing inscripts/configure-services.shretargets it. The new comment atscripts/configure-services.sh:284-287says there is "nothing to retarget here", andscripts/configure-services.sh:188-190deletesdocumentation.desktopoutright. The PR body says the same as the script. The README-level docs are fine; only this comment is stale.
--- a/packages/utah.toml
+++ b/packages/utah.toml
@@
# Papers, Disk Usage Analyzer and Files' spacebar previewer (Sushi) as
# Dakota ships them (gnome-build-meta core/papers.bst, core/baobab.bst,
- # core/sushi.bst), not as Flatpaks (#1270). The native Papers is also what
- # the logo menu's Documentation entry opens: the Flatpak cannot read the
- # host's /usr/share/doc (configure-services.sh retargets it, as Dakota's
- # elements/bluefin/common.bst does). The thumbnailer and Files property
- # page come with it.
+ # core/sushi.bst), not as Flatpaks (#1270). The thumbnailer and Files
+ # property page come with it. (Dakota also points its logo-menu
+ # Documentation entry at /usr/bin/papers; Utah's logo menu links
+ # docs.projectbluefin.io instead, see configure-services.sh.)
"papers",correctness (out of scope, follow-up)
- Existing installs keep the old Flatpaks (
scripts/configure-services.sh:288-290). Removing the apps from the system Flatpak list and deletingnautilus-previewer.preinstallstops new installs from getting them. I found nothing inscripts/orsystem_files/that runsflatpak uninstall. A machine that already hasorg.gnome.Papers/org.gnome.baobabwill show two "Document Viewer" / "Disk Usage Analyzer" launchers after it upgrades. #1270 only asked to drop them from the preinstall set, so this doesn't block the PR, but it probably needs a one-time cleanup later.
Limits of this review: I could not check the factory side. Per the PR body, baobab and sushi depend on projectbluefin/utah-packages#1147 being published and the factory pin bumped. Until then, an image build from this branch will fail to resolve those two packages. The author has already flagged this as blocked.
No findings from: security, intent-alignment, style.
Confidence: 3/5 (needs attention) — 1 perspective requested changes
— hive: agent=reviewer-2 backend=claude model=claude-opus-5-5 effort=medium claude=2.1.325
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. Hive filed review findings that do not block this PR as backlog items:
Cap: 3 backlog item(s) per PR. |
|
We should use the flatpaks |
Dakota installs gnome-build-meta's
core/papers.bst,core/baobab.bstandcore/sushi.bstnatively (owner decision on #1270). This PR:papers(withpapers-previewer;-libs,-thumbnailer,-nautiluswere already in),baobabandsushifrom the factory (packages/utah.toml[parity]+[factory].parity);nautilus-previewer.preinstall;org.gnome.Papers,org.gnome.NautilusPreviewerandorg.gnome.baobabfrom common'ssystem-flatpaks.Brewfileinconfigure-services.sh, and from the contract's ordered[flatpak].appslist (the ISO's baked Flatpak set follows the Brewfile);triage.tomlwaivers toplanned(parity(dakota): Flatpak-first vs Dakota's native apps #1270) until the next Utah snapshot drops them; regeneratesGAP.md, site data and doc counts.Mission Center stays a Flatpak. Dakota also retargets common's logo-menu Documentation entry to
/usr/bin/papers; Utah's own04-bluefin-custom-command-menualready replaces that entry with the docs.projectbluefin.io link, so there is nothing to retarget (noted inconfigure-services.sh).Status: blocked on factory publish.
papersis in the published catalog;baobabandsushicome from projectbluefin/utah-packages#1147 (consolidated Rawhide imports, replaces #1024's per-package PRs) and need that merged, published and the Renovate factory pin bumped.Closes #1270
Verification:
umask 022; just checkpasses (1330 tests).