Skip to content

cargo,rustc: 1.75.0 -> 1.76.0#289940

Merged
alyssais merged 2 commits intoNixOS:stagingfrom
alyssais:rust-1.76.0
Feb 26, 2024
Merged

cargo,rustc: 1.75.0 -> 1.76.0#289940
alyssais merged 2 commits intoNixOS:stagingfrom
alyssais:rust-1.76.0

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Feb 19, 2024

Description of changes

Built:

  • fd aarch64-linux
  • fd x86_64-linux
  • fd x86_64-darwin (help wanted!)
  • thunderbird x86_64-linux
  • firefox x86_64-linux
  • rust-out-of-tree-module (both 6.7 and 6.8-rc4; cross aarch64-linux → x86_64-linux)

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.

@github-actions github-actions bot added 6.topic: kernel The Linux kernel 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. labels Feb 19, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 19, 2024
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

LGTM.

Even managed to get the VM tests for kernel with Rust building by cherry-picking ruff 0.2.2 and disabling all tests in python3.pkgs.eventlet.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 21, 2024
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

PR LGTM, but the CI is broken, are we supposed to merge it as-is?

@alyssais
Copy link
Member Author

PR LGTM, but the CI is broken, are we supposed to merge it as-is?

There's nothing we can do about OfBorg timing out a build halfway through (which is what's gone wrong with 3/4 of the OfBorg builds). For the x86_64-linux failure, I've tested it locally.

Usually we test fd on x86_64-darwin before merging a Rust update, but nobody has done that yet. (And we can't do it on OfBorg because OfBorg is not capable of building LLVM for Darwin before timing out, at all, so OfBorg isn't generally usable for Darwin on staging.)

@Ma27
Copy link
Member

Ma27 commented Feb 22, 2024

Usually we test fd on x86_64-darwin before merging a Rust update

I'm wondering, is there any trivial way to do that from an aarch64-linux mac? I have a mac from my new workplace, but I'm not very much into the ecosystem, so if that's reasonable somehow, pointers would be appreciated.

@zowoq
Copy link
Contributor

zowoq commented Feb 24, 2024

Build fd on x86_64-darwin.

@alyssais alyssais merged commit d7deb8a into NixOS:staging Feb 26, 2024
@alyssais alyssais deleted the rust-1.76.0 branch February 26, 2024 10:32
@vcunat
Copy link
Member

vcunat commented Mar 7, 2024

FYI, I see relatively lots of packages failing to build with

the parameter type T may not live long enough

For example, hmm: https://hydra.nixos.org/build/251973802

/cc the staging-next PR #292500

@vcunat
Copy link
Member

vcunat commented Mar 7, 2024

Uh, why the hell are things like "unused import" a hard error in nixpkgs? That might be for some strict upstream CI but not here/default.

@winterqt
Copy link
Member

winterqt commented Mar 7, 2024

It's not.

This happened because Result::inspect_err became stable in this release, which dim defines their own version of, despite being warned against it.

The new version of rustc is saying "oh, you're using the new standard Result::inspect_err, so your custom version of it is unused," thus it warns against that. But because the project is set to fail to compile on warnings, it blows up when using any rustc version past 1.76.0.

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

Labels

6.topic: kernel The Linux kernel 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants