diff --git a/README.md b/README.md index 4fb5052fe..8694e5dda 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Bluefin's `base.toml` and is now edited by hand as Dakota parity work lands. | --- | --- | | Base manifest installed | **61** | | Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 257 | -| Genuinely unavailable | **7** | +| Genuinely unavailable | **6** | ## Known gaps diff --git a/docs/bluefin-package-gaps.md b/docs/bluefin-package-gaps.md index 9fa5a5980..948b2c735 100644 --- a/docs/bluefin-package-gaps.md +++ b/docs/bluefin-package-gaps.md @@ -62,10 +62,10 @@ exclusion stays test-enforced; CUDA stays out (7.68 GB baked in vs toolkit + 2. Q2: Flatpak-first / container-CUDA posture — ~~permanent or temporary?~~ DECIDED: permanent (D2). ### D3 (DECIDED, still Draft): shells and fonts -- fish stays OUT permanently — not a factory watch item, an exclusion. -- zsh is wanted on the image (unblocks when the ruby4.0/texi2html buildroot - conflict resolves), but NOT as default shell — bash stays default; a - default-shell change is too controversial to bundle here. +- Shells: superseded by #1230 (Dakota parity, 2026-11-16). fish ships, as on + GNOME OS and Dakota; zsh does not. bash stays the default shell. Common's + `/etc/zsh/*` files stay in the image unused, exactly as Dakota ships them + without zsh. (Was: fish out permanently, zsh wanted, #419.) - Core emoji (google-noto-emoji-color-fonts) is wanted, but NOT Bluefin's font sprawl — no nerd-fonts bulk, no math-fonts excess. 3. Q3: factory-blocked list — ~~watch or fork?~~ DECIDED per D3; remainder diff --git a/docs/skills/package-contract.md b/docs/skills/package-contract.md index 8f77a4e3a..c9fcd15b1 100644 --- a/docs/skills/package-contract.md +++ b/docs/skills/package-contract.md @@ -357,7 +357,7 @@ describe the same image as its `surface.tsv`; after a refresh, Current counts, per the README "Parity with Dakota" section: 61 base manifest packages installed, 257 Utah additions (GNOME 51, base-image parity, device -firmware, desktop services), 7 genuinely unavailable. `scripts/check-doc-counts.py` (part of +firmware, desktop services), 6 genuinely unavailable. `scripts/check-doc-counts.py` (part of `just check`) recomputes these from the manifests and fails if either document drifts from `site/data/packages.json`. diff --git a/packages/base.toml b/packages/base.toml index 31456ac76..7bf95294c 100644 --- a/packages/base.toml +++ b/packages/base.toml @@ -103,7 +103,6 @@ packages = [ "xdg-terminal-exec", "xorriso", "zenity", - "zsh", ] [fedora_v42] diff --git a/packages/utah.toml b/packages/utah.toml index c84eb134c..8fc81a764 100644 --- a/packages/utah.toml +++ b/packages/utah.toml @@ -687,12 +687,6 @@ packages = [ # [unavailable] into the contract once utah-packages builds both; tracked by # #10. # -# fish -# Deliberately excluded, not blocked: the factory builds it and it resolves, -# but Bluefin classic shipping every shell was a mistake Utah does not repeat. -# Users who want fish get it from Homebrew. Tracked by #419. Dakota ships -# fish from GNOME OS; whether Utah follows is #1230. -# # firefox # Neither enabled repository provides the firefox RPM: the factory does # not build it and Hummingbird's server repository does not carry it. @@ -739,7 +733,6 @@ packages = [ "anaconda-live", "evolution-ews-core", "firefox", - "fish", "nss-mdns", "slitherer", ] diff --git a/scripts/check-repo-availability.py b/scripts/check-repo-availability.py index 2a6d1199d..7a0b0e2ac 100644 --- a/scripts/check-repo-availability.py +++ b/scripts/check-repo-availability.py @@ -31,9 +31,7 @@ # exclusion that stops resolving -- or vanishes from the overlay -- has lost # the property this set asserts. DELIBERATELY_EXCLUDED = frozenset({ - # Bluefin classic shipping every shell was a mistake Utah does not repeat; - # users who want fish get it from Homebrew. - "fish", + # Empty since fish joined the contract (#1230, Dakota ships it). # NOTE: firefox is not here. Its entry reads like a deliberate exclusion # -- Utah ships org.mozilla.firefox as a Flatpak -- but no enabled # repository provides the RPM at all, which makes it blocked debt with a diff --git a/site/data/packages.json b/site/data/packages.json index c3b9b4cb7..6fcc6de28 100644 --- a/site/data/packages.json +++ b/site/data/packages.json @@ -19,6 +19,7 @@ "evtest", "fastfetch", "firewall-config", + "fish", "flatpak-spawn", "fzf", "gcc", @@ -65,8 +66,7 @@ "wl-clipboard", "xdg-terminal-exec", "xorriso", - "zenity", - "zsh" + "zenity" ], "title": "Base manifest", "transient": false @@ -376,7 +376,7 @@ ], "totals": { "installed": 318, - "unavailable": 7 + "unavailable": 6 }, "unavailable": [ { @@ -395,12 +395,6 @@ ], "name": "firefox" }, - { - "issues": [ - 419 - ], - "name": "fish" - }, { "issues": [ 253 diff --git a/tests/test_package_resolution.py b/tests/test_package_resolution.py index 82167a407..169607c5a 100644 --- a/tests/test_package_resolution.py +++ b/tests/test_package_resolution.py @@ -399,10 +399,12 @@ def comment_block(self, name): block.append(line) return "\n".join([lines[starts[0]], *block]) - def test_fish_stays_excluded(self): - self.assertIn("fish", self.names(), - "Bluefin classic shipping every shell was a mistake Utah " - "does not repeat (bare-metal audit #382)") + def test_fish_ships_and_zsh_does_not(self): + # Dakota ships fish from GNOME OS and no zsh (#1230). + self.assertNotIn("fish", self.names()) + base = tomllib.loads((ROOT / "packages/base.toml").read_text()) + self.assertIn("fish", base["fedora"]["packages"]) + self.assertNotIn("zsh", base["fedora"]["packages"]) def test_firefox_rpm_stays_excluded(self): self.assertIn("firefox", self.names(), diff --git a/tests/test_repo_availability_gate.py b/tests/test_repo_availability_gate.py index 9a586a172..fd7941f42 100644 --- a/tests/test_repo_availability_gate.py +++ b/tests/test_repo_availability_gate.py @@ -315,17 +315,23 @@ def test_names_a_blocked_entry_that_now_resolves(self): self.assertIn(stale, calls["stderr"]) self.assertIn("move it out of [unavailable] into the contract", calls["stderr"]) + # No entry is deliberately excluded today (fish joined the contract in + # #1230); exercise the policy with firefox standing in for one. + EXCLUDED = frozenset({"firefox"}) + def test_fails_when_a_deliberate_exclusion_stops_resolving(self): - verdicts = self.healthy() - verdicts["fish"] = 1 - calls = self.run_check(stdout=self.markers(verdicts)) + with patch.object(checker, "DELIBERATELY_EXCLUDED", self.EXCLUDED): + verdicts = self.healthy() + verdicts["firefox"] = 1 + calls = self.run_check(stdout=self.markers(verdicts)) self.assertEqual(calls["exit"], 1) - self.assertIn("fish", calls["stderr"]) + self.assertIn("firefox", calls["stderr"]) self.assertIn("deliberately excluded but no longer resolves", calls["stderr"]) def test_fails_when_a_deliberate_exclusion_leaves_the_overlay(self): - with tempfile.TemporaryDirectory() as tmp: + with tempfile.TemporaryDirectory() as tmp, \ + patch.object(checker, "DELIBERATELY_EXCLUDED", self.EXCLUDED): overlay = Path(tmp) / "utah.toml" overlay.write_text('[unavailable]\npackages=["anaconda-live"]\n') calls = self.run_check( @@ -333,7 +339,7 @@ def test_fails_when_a_deliberate_exclusion_leaves_the_overlay(self): stdout="UTAH_RESOLVE_ONE anaconda-live 1\n") self.assertEqual(calls["exit"], 1) - self.assertIn("fish", calls["stderr"]) + self.assertIn("firefox", calls["stderr"]) self.assertIn("policy was dropped, not repealed", calls["stderr"]) def test_refuses_to_pass_without_a_verdict(self):