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

rustc: apply patch to fix delay_span_bug ICE #214792

Merged
merged 1 commit into from
Feb 8, 2023

Conversation

winterqt
Copy link
Member

@winterqt winterqt commented Feb 5, 2023

Description of changes

https://hydra.nixos.org/build/207931877
rust-lang/rust#107691
rust-lang/rust#107688

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin, nix-build -A vector
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@winterqt
Copy link
Member Author

winterqt commented Feb 7, 2023

@NixOS/rust The upstream patch hasn't been approved. Assuming we have to land this today to get it in for this cycle (along with the scheduled OpenSSL update), we have two options:

  1. Let vector (the only package, at least AFAIK, that's affected by this) regress for hopefully just one cycle, as people can always just pin it.
  2. Revert the bump.

Thoughts?

@figsoda
Copy link
Member

figsoda commented Feb 7, 2023

How urgent is the OpenSSL update? Looking at hydra, the regression doesn't seem to effect much more packages, perhaps we can just add back rust 1.66 for vector if we can't apply the patch in time?

@winterqt
Copy link
Member Author

winterqt commented Feb 7, 2023

How urgent is the OpenSSL update?

High severity per the announcement.

perhaps we can just add back rust 1.66 for vector if we can't apply the patch in time?

I'd be open to that since it won't even have to hit staging.

@winterqt winterqt marked this pull request as ready for review February 8, 2023 02:20
@winterqt winterqt requested a review from figsoda February 8, 2023 03:00
Copy link
Member

@figsoda figsoda left a comment

Choose a reason for hiding this comment

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

changes lgtm, just waiting for upstream to be approved

@winterqt
Copy link
Member Author

winterqt commented Feb 8, 2023

@figsoda Upstream approved them, which is why I undrafted this.

@figsoda
Copy link
Member

figsoda commented Feb 8, 2023

Ah I misunderstood rust-lang/rust#107688 (comment), this is good to go once CI's done

@figsoda
Copy link
Member

figsoda commented Feb 8, 2023

@ofborg build vector

@winterqt
Copy link
Member Author

winterqt commented Feb 8, 2023

Vector built on both Linux architectures, and Darwin is timing out as expected. Let's do it.

@winterqt winterqt merged commit 6056eaa into NixOS:staging-next Feb 8, 2023
@winterqt winterqt deleted the rustc-delay-span-bug-ice branch February 8, 2023 04:36
@figsoda
Copy link
Member

figsoda commented Feb 8, 2023

was just about to do that lol

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.

None yet

2 participants