Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce the LRE flake overlay #1516

Merged
merged 1 commit into from
Dec 3, 2024

Conversation

aaronmondal
Copy link
Member

@aaronmondal aaronmondal commented Dec 3, 2024

This change migrates the last patch to an overlay and removes the patch structure. This resolves all IFDs, cleans up the main flake and makes our custom toolchains portable across flakes.

The customClang and customStdenv packages are now available as lre.clang and lre.stdenv.

While the new packages are differently named, they produce the exact same setup as previously. This can be verified by the fact that generate-toolchains is a noop between the previous commit and this one.

Since a renaming of the customClang executable itself would cause differences in the lre-cc toolchain we defer this to a future commit.

Fixes #1262
Closes #1512


This change is Reviewable

This change migrates the last patch to an overlay and removes the patch
structure. This resolves all IFDs, cleans up the main flake and makes
our custom toolchains portable across flakes.

The `customClang` and `customStdenv` packages are now available as
`lre.clang` and `lre.stdenv`.

While the new packages are differently named, they produce the exact
same setup as previously. This can be verified by the fact that
`generate-toolchains` is a noop between the previous commit and this
one.

Since a renaming of the `customClang` executable itself would cause
differences in the lre-cc toolchain we defer this to a future commit.

Fixes TraceMachina#1262
Closes TraceMachina#1512
Copy link
Member Author

@aaronmondal aaronmondal left a comment

Choose a reason for hiding this comment

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

+@SchahinRohani

Reviewable status: 0 of 1 LGTMs obtained, and 0 of 7 files reviewed, and pending CI: Bazel Dev / macos-13, Bazel Dev / macos-14, Bazel Dev / ubuntu-24.04, Cargo Dev / macos-13, Cargo Dev / ubuntu-22.04, Coverage, Installation / macos-13, Installation / macos-14, Installation / ubuntu-22.04, Local / ubuntu-22.04, NativeLink.com Cloud / Remote Cache / macos-14, NativeLink.com Cloud / Remote Cache / ubuntu-24.04, Publish image, Publish nativelink-worker-init, Publish nativelink-worker-lre-cc, Remote / large-ubuntu-22.04, Web Platform Deployment / macos-14, Web Platform Deployment / ubuntu-24.04, asan / ubuntu-22.04, docker-compose-compiles-nativelink (22.04), integration-tests (22.04), macos-13, ubuntu-20.04 / stable, ubuntu-22.04, ubuntu-22.04 / stable, windows-2022 / stable (waiting on @SchahinRohani)

Copy link
Contributor

@SchahinRohani SchahinRohani left a comment

Choose a reason for hiding this comment

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

Great work!

:lgtm:

Reviewed 7 of 7 files at r1, all commit messages.
Reviewable status: 1 of 1 LGTMs obtained, and all files reviewed, and pending CI: Bazel Dev / macos-13, Cargo Dev / macos-13, Coverage, Installation / macos-13, Remote / large-ubuntu-22.04

@aaronmondal aaronmondal mentioned this pull request Dec 3, 2024
3 tasks
@aaronmondal aaronmondal merged commit ae71bc8 into TraceMachina:main Dec 3, 2024
35 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.

Migrate patches to overlays Broken nix flake on aarch64-darwin
2 participants