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

envoy: 1.31.2 -> 1.32.0 #349028

Merged
merged 2 commits into from
Oct 20, 2024
Merged

envoy: 1.31.2 -> 1.32.0 #349028

merged 2 commits into from
Oct 20, 2024

Conversation

katexochen
Copy link
Contributor

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@katexochen
Copy link
Contributor Author

I rebased the patches.

gn1924 doesn't build anymore, maybe we can use gn and drop the package?

Currently build of deps fails with

The current `lockfile` is out of date for 'dynamic_modules_rust_sdk_crate_index'. Please re-run bazel using `CARGO_BAZEL_REPIN=true` if this is expected and the lockfile should be updated.

@lukegb feel free to push on this PR if you like. :)

@stv0g
Copy link
Contributor

stv0g commented Oct 19, 2024

I can confirm that the gn1924 does not build anymore due to the LFS64 patch not applying cleanly.

Signed-off-by: Paul Meyer <[email protected]>
@lukegb
Copy link
Contributor

lukegb commented Oct 19, 2024

@ofborg build envoy envoy.tests
@ofborg eval

@lukegb
Copy link
Contributor

lukegb commented Oct 19, 2024

@ofborg build envoy envoy.tests
@ofborg eval

Envoy 1.32 has added some more dependencies on rules_rust bits, so we
need to support that now.

In particular, for some reason, we always fail with a message about
needing repinning, so we repin during the IFD phase, but we need to
point rules_rust at the nixpkgs Rust toolchain, make it build the
cargo-bazel tool (because the one in nixpkgs is the wrong version), and
then clean up afterwards.
@lukegb
Copy link
Contributor

lukegb commented Oct 19, 2024

@ofborg build envoy envoy.tests
@ofborg eval

third time's a charm?

@lukegb lukegb marked this pull request as ready for review October 19, 2024 22:48
@lukegb lukegb merged commit fe52658 into NixOS:master Oct 20, 2024
32 of 34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants