Skip to content

feat(packages): ship fish and drop zsh, as Dakota does - #1291

Closed
hanthor wants to merge 1 commit into
feat/dakota-timesyncdfrom
feat/dakota-fish-shell
Closed

hanthor wants to merge 1 commit into
feat/dakota-timesyncdfrom
feat/dakota-fish-shell

Conversation

@hanthor

@hanthor hanthor commented Nov 16, 2026

Copy link
Copy Markdown
Member

Stacked on #1286, which is stacked on #1284.

What

  • fish leaves packages/utah.toml [unavailable], along with its deliberate-exclusion block (Standing: fish is deliberately excluded from the Utah image (D3) #419). packages/base.toml already lists it, so it installs. It is published in the pinned factory image: I checked the sha256:523507… repodata.
  • zsh is removed from packages/base.toml. It was not in the Hummingbird base (rpm -q zsh says not installed), so dropping it from the manifest drops it from the image, along with the zsh RPM's /etc/zshrc, /etc/zshenv and /etc/skel/.zshrc.
  • Common's /etc/zsh/{zlogin,zprofile,zshenv,zshrc} stay. Dakota ships the same files byte for byte without zsh installed (same hashes in the Dakota and Utah image scans), so they are inert.
  • scripts/check-repo-availability.py: DELIBERATELY_EXCLUDED is now empty. The gate tests patch in a stand-in, so the "deliberate exclusion stops resolving / leaves the overlay" paths are still exercised.
  • Docs: docs/bluefin-package-gaps.md D3 is marked superseded by parity(dakota): shells — drop zsh, revisit fish #1230 (bash stays the default shell). Site data and doc counts were regenerated (6 genuinely unavailable).

Verification

  • pytest tests/test_repo_availability_gate.py tests/test_package_resolution.py tests/test_check_doc_counts.py tests/test_site.py: 103 passed.
  • just check: not completed locally. Its git submodule update hung for 10+ minutes cloning tilingshell from GitHub on this host, so I killed it. CI runs the full gate.

Closes #1230

Dakota ships fish from GNOME OS and no zsh. fish leaves [unavailable]
(the factory builds it; it was a deliberate exclusion, #419) so
base.toml's entry installs, and zsh leaves the base manifest. Common's
/etc/zsh files stay, unused, exactly as on Dakota. The repo gate keeps
its deliberate-exclusion mechanism with an empty set; its tests use a
stand-in.

Closes #1230

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions github-actions Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 16, 2026
@github-actions

github-actions Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@hivecommons-hive hivecommons-hive Bot added author/clanker A contributor's own hive authored this PR under their login no-dco A commit is missing Signed-off-by — run `git rebase --signoff` role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Nov 16, 2026
@hivecommons-hive

hivecommons-hive Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

Withdrawn: this PR is not back in your court after all. The failing checks (contract) are red on the base branch too; this change did not break them. There is nothing to fix here: the PR is back on the normal path, and the hive checks it again once the base branch is green.

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Nov 16, 2026
@hivecommons-hive hivecommons-hive Bot linked an issue Nov 16, 2026 that may be closed by this pull request
@hivecommons-hive hivecommons-hive Bot added stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 16, 2026

@Danathar Danathar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Stand-in review (the hive's reviewers are out of quota). Approving. fish ships and zsh goes, matching Dakota and the #1230 owner decision. No zsh use remains in system_files, ujust recipes, profile.d, contracts or scripts at head. Common's /etc/zsh/* files stay but only zsh reads them, and Dakota ships the same files. Dakota ships /usr/bin/fish and no zsh. In the testsuite only common_shell.feature mentions zsh, and both scenarios are @requires_brew; the latest Utah e2e run skipped them ("Homebrew not present"). Small follow-ups: docs/bluefin-package-gaps.md (lines 29, 93, 97, 106) still says fish is blocked and zsh wanted. Those two zsh scenarios would fail on Utah if CI ever gets Homebrew, so they're worth scoping to Bluefin-classic. baselines/triage.toml still lists fish as unavailable. Users with a zsh login shell lose it, which is worth one line in the release text. Merge note: this conflicts with the #1287–#1289 chain (README, contract, packages/utah.toml, presets, counts). Both lower "genuinely unavailable" 7→6, so the second to land needs a rebase and a count regeneration (expected 5).

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 16, 2026
@hanthor

hanthor commented Nov 16, 2026

Copy link
Copy Markdown
Member Author

Folded into the part-2 landing PR (fold/dakota-sq) with this change unchanged apart from rebase and conflict resolution. Closing here; review continues there.

@hanthor hanthor closed this Nov 16, 2026
@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Nov 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. author/clanker A contributor's own hive authored this PR under their login no-dco A commit is missing Signed-off-by — run `git rebase --signoff` role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

parity(dakota): shells — drop zsh, revisit fish

2 participants