Skip to content

wezterm: make it build with clang 19#366840

Merged
vcunat merged 2 commits intoNixOS:staging-nextfrom
ofalvai:wezterm-clang-19
Dec 23, 2024
Merged

wezterm: make it build with clang 19#366840
vcunat merged 2 commits intoNixOS:staging-nextfrom
ofalvai:wezterm-clang-19

Conversation

@ofalvai
Copy link
Contributor

@ofalvai ofalvai commented Dec 20, 2024

zlib patch: the upstream patch doesn't apply to this old vendored version of zlib.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 20, 2024
@SuperSandro2000
Copy link
Member

@ofborg build wezterm

@SuperSandro2000
Copy link
Member

No idea why darwin is failing

warning: non-local `impl` definition, `impl` blocks should be written at the same level as their item
  --> mux/src/renderable.rs:23:86
   |
23 |     Debug, Clone, Copy, PartialEq, Eq, Default, Deserialize, Serialize, FromDynamic, ToDynamic,
   |                                                                                      ^--------
   |                                                                                      |
   |                                                                                      `ToDynamic` is not local
   |                                                                                      move the `impl` block outside of this constant `_IMPL_PLACEDYNAMIC_FOR_RenderableDimensions`
24 | )]
25 | pub struct RenderableDimensions {
   |            -------------------- `RenderableDimensions` is not local
   |
   = note: the derive macro `ToDynamic` defines the non-local `impl`, and may need to be changed
   = note: the derive macro `ToDynamic` may come from an old version of the `wezterm_dynamic_derive` crate, try updating your dependency with `cargo update -p wezterm_dynamic_derive`
   = note: an `impl` is never scoped, even when it is nested inside an item, as it may impact type checking outside of that item, which can be the case if neither the trait or the self type are at the same nesting level as the `impl`
   = note: items in an anonymous const item (`const _: () = { ... }`) are treated as in the same scope as the anonymous const's declaration for the purpose of this lint
   = note: this warning originates in the derive macro `ToDynamic` (in Nightly builds, run with -Z macro-backtrace for more info)

@ofborg ofborg bot requested review from SuperSandro2000 and mimame December 21, 2024 01:53
@ofborg ofborg bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Dec 21, 2024
@ofalvai
Copy link
Contributor Author

ofalvai commented Dec 21, 2024

@SuperSandro2000 those are warnings only, the real failure is the last line of the ofBorg log:

error: building of '/nix/store/6y2kr2qcrjmknk7hz0sy2gmaplmgvhjk-wezterm-20240203-110809-5046fc22.drv^out' from .drv file timed out after 3600 seconds

Let me run a nixpkgs-review on all platforms as proof

@ofalvai
Copy link
Contributor Author

ofalvai commented Dec 21, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 366840


aarch64-linux

✅ 1 package built:
  • wezterm

x86_64-darwin

✅ 1 package built:
  • wezterm

aarch64-darwin

✅ 1 package built:
  • wezterm

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Dec 21, 2024
@vcunat vcunat merged commit 7929c2e into NixOS:staging-next Dec 23, 2024
7 of 9 checks passed
@vcunat
Copy link
Member

vcunat commented Dec 23, 2024

I confirm aarch64-darwin and x86_64-linux builds.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants