Skip to content

binutils: 2.40 -> 2.41#283732

Merged
marsam merged 5 commits intoNixOS:stagingfrom
trofi:binutils-update
Feb 23, 2024
Merged

binutils: 2.40 -> 2.41#283732
marsam merged 5 commits intoNixOS:stagingfrom
trofi:binutils-update

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jan 25, 2024 •
edited
Loading

Dropped 3 upstreamed / backported patches:

Changes: https://lists.gnu.org/archive/html/info-gnu/2023-07/msg00009.html

Description of changes

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.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@trofi trofi marked this pull request as draft January 25, 2024 10:34
@trofi
Copy link
Contributor Author

trofi commented Jan 25, 2024 •
edited
Loading

Converting to draft as ideally we would need a hydra jobset for this run: the expected fallout is

  • ffmpeg version before version 6: applied backports
  • packages that bundle ffmpeg
    • avidemux: applied ffmpeg backport
    • mythtv: applied ffmpeg backport
    • kodi: applied ffmpeg backport
  • low-level tools like boot loaders and CPU burners: OVMF builds fine
  • one llvm gold test if crashing bintutils: backported binutils upstream patch

I would expect the breakage list around ~20 packages. We'll need to find those before the merge.

@trofi trofi mentioned this pull request Jan 25, 2024
Closed
12 tasks
@Atemu
Copy link
Member

Atemu commented Jan 25, 2024

For the record: I'm not aware of forks or vendorings of ffmpeg other than jellyfin-ffmpeg and jami's ffmpeg inside Nixpkgs.

@trofi
Copy link
Contributor Author

trofi commented Feb 1, 2024

Meanwhile binutils-2.42 is out. We'll need a few extra fixes on top:

@Atemu
Copy link
Member

Atemu commented Feb 1, 2024

I think it'd be good to have 2.41 land first while we wait on the fixes for 2.42.

@trofi
Copy link
Contributor Author

trofi commented Feb 7, 2024

Pushed a few changes that should get the branch into testable state:

Backported a binutils patch to fix a single llvm testsuite failure on gold-powerpc test.

Found and fixed at least 3 copies of bundled ffmpeg with build failure:

  • kodi: backport binutils-2.41 fix for bundled ffmpeg
  • mythtv: backport binutils-2.41 fix for bundled ffmpeg
  • avidemux: backport binutils-2.41 fix for bundled ffmpeg

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 8, 2024
@trofi trofi marked this pull request as ready for review February 8, 2024 22:54
@trofi
Copy link
Contributor Author

trofi commented Feb 8, 2024

Built my system from this branch successfully, booted into it and checked that firefox runs sucessfully. Ready for review.

philiptaron
philiptaron approved these changes Feb 9, 2024
View reviewed changes
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

I did a few test builds (systemd, qemu) on x86_64 and everything's 🚀 .

@marsam marsam merged commit 85e26d0 into NixOS:staging Feb 23, 2024
@trofi trofi deleted the binutils-update branch February 23, 2024 07:27
@mweinelt mweinelt mentioned this pull request Mar 9, 2024
Merged
13 tasks
@skeuchel skeuchel mentioned this pull request Apr 14, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@philiptaron philiptaron philiptaron approved these changes

+1 more reviewer

@marsam marsam marsam approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@trofi @Atemu @philiptaron @marsam