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

rustc: apply patch to fix thin archive reading #213873

Merged
merged 1 commit into from
Feb 1, 2023
Merged

rustc: apply patch to fix thin archive reading #213873

merged 1 commit into from
Feb 1, 2023

Conversation

figsoda
Copy link
Member

@figsoda figsoda commented Jan 31, 2023 •
edited
Loading

Description of changes

#212811 (comment)

built mesa on x86_64-linux on master

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • 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.

@figsoda figsoda marked this pull request as draft January 31, 2023 23:23
@figsoda figsoda marked this pull request as ready for review January 31, 2023 23:27
@figsoda figsoda mentioned this pull request Jan 31, 2023
Merged
13 tasks
@zowoq
Copy link
Contributor

zowoq commented Feb 1, 2023

What about the other two commits that were reverted in the same PR?

@winterqt
Copy link
Member

winterqt commented Feb 1, 2023

Yeah, I think we should apply all of them, as they've all been heavily tested from the discussion in the PR -- no point to diverge, I'd say, unless there was a specific reason you did?

@figsoda
Copy link
Member Author

figsoda commented Feb 1, 2023

I don't think these two commits are in 1.67.0

zowoq
zowoq previously approved these changes Feb 1, 2023
View reviewed changes
@figsoda figsoda changed the base branch from staging to staging-next February 1, 2023 16:13
@figsoda figsoda dismissed zowoq’s stale review February 1, 2023 16:13

The base branch was changed.

@figsoda
Copy link
Member Author

figsoda commented Feb 1, 2023

switching to staging-next: #214010

@zowoq zowoq merged commit 88a42ba into NixOS:staging-next Feb 1, 2023
@figsoda figsoda deleted the mesa branch February 1, 2023 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zowoq zowoq zowoq left review comments

@Mic92 Mic92 Awaiting requested review from Mic92

@LnL7 LnL7 Awaiting requested review from LnL7

@winterqt winterqt Awaiting requested review from winterqt

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

Successfully merging this pull request may close these issues.
3 participants
@figsoda @zowoq @winterqt