Skip to content

Update the prelude to upstream facebook/buck2 as of 2484d70a6f8a - #10

Merged
simonmar merged 1 commit into
masterfrom
update-prelude
Oct 1, 2026
Merged

simonmar merged 1 commit into
masterfrom
update-prelude

Conversation

@simonmar

@simonmar simonmar commented Oct 1, 2026

Copy link
Copy Markdown
Owner

Brings prelude/ from upstream 1469fe7461 (2026-08-14, the snapshot this was originally taken from) forward to 2484d70a6f8a (2026-09-30, the commit buck2 release 2026-10-01 was built from): 368 upstream commits touching prelude/.

The old snapshot passed eager_materialization_enabled to ctx.actions.run, so it could not be loaded by any buck2 release newer than 2026-09-01. The new one loads with 2026-10-01 and latest, and no longer with 2026-09-01 (it uses root_values).

Done as a three-way merge (base: upstream at 1469fe7461; ours: the old prelude/; theirs: upstream at 2484d70a6f8a). Upstream touched none of our Haskell changes (haskell/, decls/haskell_.bzl, toolchains/haskell.bzl, third-party/pkgconfig.bzl); the only file changed on both sides was toolchains/demo.bzl, which merged without conflicts. Everything else is taken from upstream unchanged.

CI is moved to the 2026-10-01 release to match.

Tested with buck2 2026-10-01: example/ (TemplateHaskell, .hsc, C++ FFI) builds and tests in dev, opt and prof modes.

Brings prelude/ from upstream 1469fe7461 (2026-08-14, the snapshot this
was originally taken from) forward to 2484d70a6f8a (2026-09-30, the
commit buck2 release 2026-10-01 was built from): 368 upstream commits
touching prelude/.

The old snapshot passed `eager_materialization_enabled` to
`ctx.actions.run`, so it could not be loaded by any buck2 release newer
than 2026-09-01. The new one loads with 2026-10-01 and `latest`, and no
longer with 2026-09-01 (it uses `root_values`).

Done as a three-way merge (base: upstream at 1469fe7461; ours: the old
prelude/; theirs: upstream at 2484d70a6f8a). Upstream touched none of our
Haskell changes (haskell/*, decls/haskell_*.bzl, toolchains/haskell.bzl,
third-party/pkgconfig.bzl); the only file changed on both sides was
toolchains/demo.bzl, which merged without conflicts. Everything else is
taken from upstream unchanged.

CI is moved to the 2026-10-01 release to match.

Tested with buck2 2026-10-01: example/ (TemplateHaskell, .hsc, C++ FFI)
builds and tests in dev, opt and prof modes.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@simonmar
simonmar merged commit eaef425 into master Oct 1, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant