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

rustup: 1.26.0 -> 1.27.1 #332809

Merged
merged 2 commits into from
Aug 12, 2024
Merged

rustup: 1.26.0 -> 1.27.1 #332809

merged 2 commits into from
Aug 12, 2024

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented Aug 6, 2024

Description of changes

Required to build with Rust 1.80.

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

This used to have git dependencies, but no longer does.

Fixes: 26f5d6f ("rustup: 1.25.2 -> 1.26.0")
@alyssais
Copy link
Member Author

Bisected the build failure on x86_64-linux to rust-lang/rustup#3340.

@emilazy
Copy link
Member

emilazy commented Aug 10, 2024

Maybe we should just manually bump time for now so rustup doesn’t break on unstable and figure out how to get 1.27.1 working at a later date? Although it’s slightly concerning just how old our current version is.

@emilazy
Copy link
Member

emilazy commented Aug 10, 2024

Okay, actually this should be pretty easy to get working. Pushed a WIP that should be enough to pass tests on x86_64-darwin; going to see if those failures are common to the other platforms too.

@emilazy
Copy link
Member

emilazy commented Aug 10, 2024

Tests that only fail on x86_64-darwin (sandbox = true):

    suite::cli_misc::multi_host_smoke_test
    suite::cli_misc::nightly_backtrack_skips_missing
    suite::cli_misc::rename_rls_before
    suite::cli_misc::run_rls_when_not_installed_for_nightly
    suite::cli_misc::rustc_with_bad_rustup_toolchain_env_var

Tests that only fail on aarch64-darwin (sandbox = relaxed) (after disabling the tests that failed previously but without disabling the x86_64-darwin‐specific failures):

    suite::cli_misc::rustup_failed_path_search
    suite::cli_self_upd::updater_is_deleted_after_running_rustup
    suite::cli_v2::change_override
    suite::cli_v2::install_override_toolchain_from_archive

All tests pass on aarch64-linux.

I have no clue why the Darwin failure sets are disjoint. Tightening the sandbox on aarch64-darwin to see if that makes it make any more sense.

@emilazy
Copy link
Member

emilazy commented Aug 10, 2024

Failures on aarch64-darwin (sandbox = true):

    suite::cli_misc::custom_toolchain_cargo_fallback_run
    suite::cli_misc::rename_rls_remove
    suite::cli_rustup::rustup_stable_quiet
    suite::cli_self_upd::update_bad_schema
    suite::cli_self_upd::updater_is_deleted_after_running_rustup
    suite::cli_v1::remove_toolchain_then_add_again

None of this makes much sense. Nondeterminism? Perhaps we really do need to skip tests on Darwin, after all.

@emilazy
Copy link
Member

emilazy commented Aug 10, 2024

Yeah, running again on x86_64-darwin:

rustup> failures:
rustup>     suite::cli_exact::default_none
rustup>     suite::cli_misc::toolchains_symlink
rustup>     suite::cli_misc::version_mentions_rustc_version_confusion
rustup>     suite::cli_v2::remove_override_with_multiple_overrides
rustup>     suite::cli_v2::remove_toolchain

I’ll just disable tests again on Darwin.

Required to build with Rust 1.80.

Link: rust-lang/rust#127343
@emilazy
Copy link
Member

emilazy commented Aug 12, 2024

Let’s land this; it should hopefully be a simple version bump and can’t be more broken than rustup will be in a few days if we don’t do anything.

@emilazy emilazy merged commit 730aa60 into NixOS:master Aug 12, 2024
27 checks passed
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/why-is-rustup-1-26-the-newest-available-version-of-rustup/50605/2

@alyssais alyssais deleted the rustup-1.27.1 branch August 14, 2024 17:45
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.

3 participants