Repository navigation
Update stacked: 7 packages - #984
Merged
Merged
Conversation
Contributor
|
Important Review skippedBot user detected. To trigger a single review, invoke the ⚙️ Run configuration
You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
norrietaylor
requested changes
Oct 22, 2026
norrietaylor
left a comment
Member
There was a problem hiding this comment.
This can't land as-is:
- zig 0.17.0 needs LLVM 22; the official 0.17.0 build links LLVM 22.1.8. pkgs has
llvm21.1.8 (packages/llvm/build.ncl:13), and zig's CMake needs the matching major, so this will fail to build. It takeszlswith it, whoseminimum_zig_versionis 0.17.0. fx, herdr and dev-language-servers are also at risk, since zig breaks std between minors. Its post-build checks all show Skip. - No
minimal buildran on this head, so none of the 9 has been shown to build. - The bundling reason doesn't hold. None of the 9
build.nclfiles declaresreplace_on_cycle, so a zig failure blocks unrelated fixes: vim 9.2.1225's crash and overflow fixes, z3 5.3.1's soundness fix, and xh.
Suggestion: pull zig and zls out until llvm 22 is packaged, and land the other 7 once minimal build is green.
Per package:
- I verified hashes by reproducing them from the upstream tags for zls, vim, xh, yq, z3 and zizmor. xorgproto matches staging only, and zig couldn't be verified.
- xh: dropping the webpki lock patch is correct (0.26.3's lock already has 0.103.16), but I'd keep the fail-closed grep guards in
build.shas regression checks. - zizmor: the kept lock patch is still needed (1.31.1 has 0.103.13). Only a build will prove that
--lockedpasses.
Generated by Claude Code
…11943 lock guard zig 0.17.0 links LLVM 22 and pkgs has llvm 21.1.8, so zig (and zls, whose minimum_zig_version is 0.17.0) go back to main's versions until llvm 22 is packaged. xh 0.26.3's upstream lock already carries rustls-webpki 0.103.16 and webpki-root-certs 1.0.10, so the lock patch stays dropped, but the fail-closed grep guard is restored as a regression check (presence + no pre-fix versions, not an exact pin, so later bumps don't trip it). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Member
|
Thanks @norrietaylor. All three points held up; addressed in fa6792e, on top of a merge of main (340771d):
Per package:
🤖 Generated with Claude Code |
norrietaylor
approved these changes
Oct 23, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to no response for status checks
Oct 23, 2026
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update stacked (7 packages)
vim 9.2.1225, z3 5.3.1, xh 0.26.3, yq 4.54.1, zizmor 1.31.1, wrangler 4.151.3, xorgproto 2026.1.
Important
Revised after review. zig 0.17.0 and zls 0.17.0 are out of this PR: zig 0.17.0 links
LLVM 22 and pkgs ships llvm 21.1.8, so it cannot build (zls needs zig 0.17.0). Follow-up:
#996 (llvm 22, then zig + zls). The original head's build-bot run failed on zig on both
arches within seconds and aborted the run, so none of the other members built.
These 7 are an independent
--stackedset from the Slack picker, not areplace_on_cyclebase-soup bundle: none of them declares
replace_on_cycle. The bot's generic bundlingnote claimed otherwise; that's a pkgmgr wording bug, being fixed there.
xh: the CVE-2026-111943 lock patch stays dropped (0.26.3's upstream Cargo.lock already
has rustls-webpki 0.103.16 and webpki-root-certs 1.0.10), but the fail-closed grep guard in
build.shis back as a regression check. It requires rustls-webpki to be present andrejects any pre-fix 0.103.x / 1.0.x, without an exact pin, so later bumps don't trip it.
zizmor: keeps its lock patch (1.31.1's lock has 0.103.13).
Verified in a fresh remote session at this head:
--rebuildof xh and zizmor (both compilerustls-webpki 0.103.16; zizmor's
cargo build --lockedpasses with the patch), andmin check --packages xh zizmorpasses everything with no Skip, standalone tests included.Warning
1 requested member did NOT ship — each needs separate follow-up.
A member is dropped when it fails to update, has its gs:// mirror
withheld by the scan gate, or is peeled to keep the shipped set a
closed dependency closure. Reasons are abbreviated — the full
diagnostics ride the Slack thread and the run's logs.
verus-latest0.2026.10.04.426d8b00.2026.10.18.7d82994Pkgscan: 2 below-threshold signals across bundle members (all Info severity, risk score 0.2). Demoted in benign contexts (test fixtures, CI workflow setup); expand for details.
xorgproto (upstream release)metadata/recent-bumprecency NOT evaluated — no release date from the version sourceNote
Build risk — 45 dependents across the tree. Package(s) that
build- or runtime-depend on a member of this bundle may need a rebuild,
or could FTBFS on an API/ABI change. Informational (not blocking) — a
heads-up for the reviewer on what this bump can ripple into.
xorgprotoicedtea-7,icedtea-8,libglvnd,libice,libsm,libx11,libxau,libxcb(+33 more)zigdev-language-servers,fx,herdrzlsdev-language-serversSummary
2025.12026.1override:xorgproto:operator-pinned9.2.12029.2.1225github:vim/vim:tag:operator-pinned4.135.04.151.3github:cloudflare/workers-sdk:operator-pinned0.26.20.26.3github:ducaale/xh:operator-pinned4.53.64.54.1github:mikefarah/yq:operator-pinned5.1.05.3.1github:Z3Prover/z3:operator-pinned1.30.11.31.1github:zizmorcore/zizmor:operator-pinnedPer-package details
xorgproto 2025.1 → 2026.156898c716c0578df...→f9bfe4a9ed8c8ab9...gs://minimal-staging-archives/xorgproto-2025.1.tar.xz→gs://minimal-staging-archives/xorgproto-2026.1.tar.xz(BSD-2-Clause AND HPND AND HPND-sell-variant AND ICU AND MIT AND MIT-open-group AND SGI-B-2.0 AND SMLNJ AND X11 AND X11-swapped)(source: tarball)vim 9.2.1202 → 9.2.12259e97414b85bdcb2d...→797cf32f4a54a0a9...gs://minimal-staging-archives/vim-9.2.1202.tar.gz→gs://minimal-staging-archives/vim-9.2.1225.tar.gzVim(source: GitHub + tarball)wrangler 4.135.0 → 4.151.3→npm:wrangler@4.135.0→npm:wrangler@4.151.3xh 0.26.2 → 0.26.361a88a5b3beac225...→8c54c7e8e878600d...gs://minimal-staging-archives/ducaale/xh/v0.26.2.tar.gz→gs://minimal-staging-archives/ducaale/xh/v0.26.3.tar.gzMIT(source: GitHub + tarball)Carried patches vs 0.26.3
Each
| Localpatch was dry-run against the extracted 0.26.3 tree: forward as build.sh applies it (patch -N), and reverse with exact context (patch -R -F0). Only a patch that reverse-applies WHOLE is treated as upstream; a partial match is a conflict.cve-2026-111943-webpki-lock.patch— reverse-applies to 0.26.3; already upstream. Dropped its build.ncl entry, its build.sh apply line, its build.sh lockfile guard, the comments above each, and the file. Security floors: met by 0.26.3's own lock.No carried patch remains, so
patchwas dropped frombuild_deps(and its import, when unused). Regression tests that guard a removed fix stay.yq 4.53.6 → 4.54.1132a28a669526f99...→0cec36e7035dd56c...https://github.com/mikefarah/yq/archive/refs/tags/v4.53.6.tar.gz→https://github.com/mikefarah/yq/archive/refs/tags/v4.54.1.tar.gzMIT(source: GitHub + tarball)z3 5.1.0 → 5.3.1c433e1add0431c5e...→c007089dd8d92298...https://github.com/Z3Prover/z3/archive/refs/tags/z3-5.1.0.tar.gz→https://github.com/Z3Prover/z3/archive/refs/tags/z3-5.3.1.tar.gzMIT(source: tarball)zizmor 1.30.1 → 1.31.13224fd5b49b77b2e...→9e976cc981bb9b0b...https://github.com/zizmorcore/zizmor/archive/refs/tags/v1.30.1.tar.gz→https://github.com/zizmorcore/zizmor/archive/refs/tags/v1.31.1.tar.gzMIT(source: GitHub + tarball)Carried patches vs 1.31.1
Each
| Localpatch was dry-run against the extracted 1.31.1 tree: forward as build.sh applies it (patch -N), and reverse with exact context (patch -R -F0). Only a patch that reverse-applies WHOLE is treated as upstream; a partial match is a conflict.cve-2026-111943-webpki-lock.patch— still applies forward to 1.31.1. Security floors 1.31.1's own lock misses: rustls-webpki 0.103.13 < 0.103.16 (CVE-2026-111943 / RUSTSEC-2026-0382); webpki-root-certs 1.0.5 < 1.0.10 (CVE-2026-111943 / RUSTSEC-2026-0383).Created by pkgmgr