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

cargo,clippy,rustc,rustfmt: 1.77.2 -> 1.78.0 #309580

Merged
merged 4 commits into from
May 30, 2024
Merged

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented May 6, 2024

Description of changes

I guess we want to hold this until breaking changes are allowed again, since we have packages using nightly features that have been renamed.

Built:

  • fd on aarch64-linux
  • fd on x86_64-linux
  • fd on x86_64-darwin
  • firefox on aarch64-linux
  • firefox on x86_64-linux
  • firefox-esr on aarch64-linux
  • firefox-esr on x86_64-linux
  • thunderbird on aarch64-linux
  • thunderbird on x86_64-linux
  • betterbird on aarch64-linux
  • librewolf on aarch64-linux
  • floorp on aarch64-linux
  • nixosTests.kernel-rust on aarch64-linux
  • nixosTests.kernel-rust on x86_64-linux

I haven't fixed thunderbirdPackages.thunderbird-102, but it's been marked insecure since September, and I think we should just remove it: #308820.

Could somebody please check fd on x86_64-darwin?

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.05 Release Notes (or backporting 23.05 and 23.11 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.

Some changes were made when this patch was committed to rust-next.
Most importantly, the minimum rustc version was updated from 1.77.0 to
1.77.1, and if we use the latest version of the patch, we'll be able
to cleanly apply the 1.78.0 patch.

rust-next gets force pushed sometimes[1], so we shouldn't fetch from
it in a FOD, hence we now have rust-1.77-6.8.patch in-tree, but this
will save us from having rust-1.78.patch in-tree, which we can fetch
from lore.

[1]: https://github.com/Rust-for-Linux/linux/activity?ref=rust-next
@alyssais alyssais requested review from blitz and Ma27 May 6, 2024 14:58
@alyssais alyssais changed the title Rust 1.78 @alyssais cargo,clippy,rustc,rustfmt: 1.77.2 -> 1.78.0 May 6, 2024
@alyssais alyssais changed the title @alyssais cargo,clippy,rustc,rustfmt: 1.77.2 -> 1.78.0 cargo,clippy,rustc,rustfmt: 1.77.2 -> 1.78.0 May 6, 2024
@alyssais alyssais marked this pull request as ready for review May 15, 2024 14:46
@zowoq
Copy link
Contributor

zowoq commented May 15, 2024

Could somebody please check fd on x86_64-darwin?

Built.

@centromere
Copy link
Member

Is this ready to go?

@alyssais
Copy link
Member Author

Yes from my PoV, but since we're between staging cycles anyway, I was holding off on merging in case anybody wanted to review.

@vcunat vcunat merged commit 30d447f into NixOS:staging May 30, 2024
33 of 34 checks passed
@vcunat
Copy link
Member

vcunat commented May 30, 2024

I'm not 100% sure how git auto-resolved pkgs/top-level/linux-kernels.nix and perhaps some other changes in there, but given that's a basically leaf-package issue, I didn't wait/try.

@alyssais
Copy link
Member Author

sigh the update seems to have broken cross compilation of Rust programs. Bisecting…

@alyssais alyssais deleted the rust-1.78 branch May 31, 2024 17:43
@rhelmot rhelmot mentioned this pull request May 31, 2024
14 tasks
@vcunat
Copy link
Member

vcunat commented Jun 1, 2024

  • rustc won't build on aarch64-darwin now:
    cargo:warning=error: unknown target CPU 'apple-a13'
    cargo:warning=note: valid target CPU values are: mvp, bleeding-edge, generic
    
    on Hydra and I can reproduce the same locally.
    /cc staging-next 2024-05-31 #316075

@alyssais
Copy link
Member Author

alyssais commented Jun 4, 2024

Fix for cross compilation: #317179

@alyssais
Copy link
Member Author

alyssais commented Jun 4, 2024

Potential fix for aarch64-darwin: #317273

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.

4 participants