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

Jump to bottom

rust: 1.48.0 -> 1.49.0 #108635

Merged
merged 1 commit into from Jan 8, 2021
Merged

rust: 1.48.0 -> 1.49.0 #108635

merged 1 commit into from Jan 8, 2021

Conversation

ghost
Copy link

@ghost ghost commented Jan 7, 2021 •
edited by ghost

Motivation for this change
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.

@ghost ghost requested review from LnL7, Mic92 and zowoq as code owners January 7, 2021 03:12
@ofborg ofborg bot added the 6.topic: rust label Jan 7, 2021
@zowoq
Copy link
Contributor

zowoq commented Jan 7, 2021

Built fd on darwin.

@Mic92
Copy link
Member

Mic92 commented Jan 7, 2021 •
edited

Built firefox and thunderbird on Linux-x86_64.

prusnak
prusnak requested changes Jan 7, 2021
View reviewed changes
Copy link
Member

@prusnak prusnak left a comment

Choose a reason for hiding this comment

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

Minor nitpick in documentation

pkgs/development/compilers/rust/1_49.nix
@@ -33,20 +33,20 @@ import ./default.nix {

# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.47.0";
bootstrapVersion = "1.48.0";

# fetch hashes by running `print-hashes.sh 1.45.2`
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# fetch hashes by running `print-hashes.sh 1.45.2`
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`

@prusnak
Copy link
Member

prusnak commented Jan 7, 2021

Rust 1.49.0 contains bootstrap also for aarch64-apple-darwin, but we bootstrap from one version prior (1.48.0), which does not have bootstrap for aarch64-apple-darwin.

Do we want to bootstrap aarch64-apple-darwin from 1.49.0?

@Mic92
Copy link
Member

Mic92 commented Jan 7, 2021

I was able to build fd on aarch64-linux.

@Mic92
Copy link
Member

Mic92 commented Jan 7, 2021

Rust 1.49.0 contains bootstrap also for aarch64-apple-darwin, but we bootstrap from one version prior (1.48.0), which does not have bootstrap for aarch64-apple-darwin.

Do we want to bootstrap aarch64-apple-darwin from 1.49.0?

makes sense.

@prusnak
Copy link
Member

prusnak commented Jan 7, 2021 •
edited

makes sense.

Bootstrapping just one arch from different version than the others will introduce lots of complexity.

What's the reason to bootstrap from one version prior? It's not documented in the comment, it's just said it must be done:

nixpkgs/pkgs/development/compilers/rust/1_49.nix

Lines 34 to 36 in dde8ad8

# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.48.0";

@symphorien
Copy link
Member

Upstream does not test bootstrapping from the same version, and it sometimes breaks: rust-lang/rust#63911 rust-lang/rust#54322

@zowoq zowoq mentioned this pull request Jan 8, 2021
Closed
10 tasks
@jonringer
Copy link
Contributor

@ofborg build ripgrep

@Mic92 Mic92 merged commit 4a580eb into NixOS:staging Jan 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 Awaiting requested review from LnL7

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

@zowoq zowoq Awaiting requested review from zowoq zowoq 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: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@zowoq @Mic92 @prusnak @symphorien @jonringer @SuperSandro2000