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.

Sign up for GitHub

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

Jump to bottom

[staging] rust: 1.45 -> 1.46.0 #96890

Merged
merged 2 commits into from Sep 23, 2020
Merged

[staging] rust: 1.45 -> 1.46.0 #96890

merged 2 commits into from Sep 23, 2020

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Sep 1, 2020 •
edited

Motivation for this change

This adds the rust toolchain 1.46.0:

https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1460-2020-08-27

Because rustc-1.46.0 enables static PIE by default for x86_64-unknown-linux-musl this release will suffer from: #94228. So this PR doesn't remove the 1.45.2 release.

This commit also specifies the right LLVM packages to use for each rust release.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@basvandijk
Copy link
Member Author

@GrahamcOfBorg build fd firefox thunderbird

@basvandijk basvandijk force-pushed the rust-1.46.0 branch 2 times, most recently from 96d0dcd to 2b9b5f7 Compare September 1, 2020 07:39
@basvandijk basvandijk marked this pull request as ready for review September 1, 2020 08:10
@basvandijk
Copy link
Member Author

Building fd on x86_64-linux succeeds.

@basvandijk basvandijk changed the title Rust: add 1.46.0 Rust: add 1.46.0 (to staging) Sep 1, 2020
kevincox
kevincox approved these changes Sep 1, 2020
View reviewed changes
pkgs/top-level/all-packages.nix
@@ -9518,15 +9518,22 @@ in

rust_1_44 = callPackage ../development/compilers/rust/1_44.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
llvmPackages = llvmPackages_9;
};
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
Copy link
Contributor

Choose a reason for hiding this comment

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

It might be nice to leave a comment explaining why the older versions are left available.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@jonringer
Copy link
Contributor

@GrahamcOfBorg eval

@06kellyjac 06kellyjac mentioned this pull request Sep 14, 2020
Merged
10 tasks
@06kellyjac
Copy link
Member

Build of deno 1.4.0 on x86_64-linux was a success.

@jonringer jonringer changed the title Rust: add 1.46.0 (to staging) [staging] rust: 1.45 -> 1.46.0 Sep 14, 2020
jonringer
jonringer reviewed Sep 14, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM
commit message should be:

rust: 1.45 -> 1.46.0

as you're bumping the default

@06kellyjac
Copy link
Member

06kellyjac commented Sep 22, 2020 •
edited by basvandijk

Are these the only 2 things that need resolving to get this merged?:

  • comment explaining why the older versions are left available
  • Update commit message to rust: 1.45 -> 1.46.0

@oxalica
Copy link
Contributor

oxalica commented Sep 22, 2020 •
edited

I noticed that we still lock firefox and thunderbird on rustPackages_1_44.
Do they actually work on 1.46? I think the musl issue mentioned should not block this.
If they are built successfully with 1.46, at least we can remove rust 1.44 from nixpkgs.

EDIT: firefox and thunderbird are built successfully with rustPackages_1_46

oxalica
oxalica suggested changes Sep 23, 2020
View reviewed changes
Copy link
Contributor

@oxalica oxalica left a comment

Choose a reason for hiding this comment

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

firefox, thunderbird and thunderbird-78 are built successfully with latest rustPackages_1_46_0.
We can remove the override (rust 1.44) in all-packages.nix at line 20463, 23292 and 23300.

@basvandijk
rust: 1.45.2 -> 1.46.0
b837bd4 
This adds the rust toolchain 1.46.0:

https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1460-2020-08-27

Because rustc-1.46.0 enables static PIE by default for
`x86_64-unknown-linux-musl` this release will suffer from:

NixOS#94228

So this commit doesn't remove the 1.45.2 release.

This commit also specifies the right LLVM packages to use for each
rust release.
@basvandijk
rust: remove 1.44.1 since firefox and thunderbird build with 1.46
c011333
@basvandijk
Copy link
Member Author

@oxalica

firefox, thunderbird and thunderbird-78 are built successfully with latest rustPackages_1_46_0.

Thanks for checking!

We can remove the override (rust 1.44) in all-packages.nix at line 20463, 23292 and 23300.

Done

@06kellyjac

  • comment explaining why the older versions are left available

Done

  • Update commit message to rust: 1.45 -> 1.46.0

Done

@basvandijk
Copy link
Member Author

@GrahamcOfBorg eval

@basvandijk basvandijk merged commit b5e4884 into NixOS:staging Sep 23, 2020
@utsl42 utsl42 mentioned this pull request Oct 23, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@lblasc lblasc lblasc approved these changes

@kevincox kevincox kevincox approved these changes

@oxalica oxalica oxalica approved these changes

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@basvandijk @jonringer @06kellyjac @oxalica @lblasc @kevincox @flosse