Skip to content

binutils 2.41 -> 2.42#304035

Merged
lovesegfault merged 1 commit intoNixOS:stagingfrom
silvanshade:binutils-2.42
Jun 20, 2024
Merged

binutils 2.41 -> 2.42#304035
lovesegfault merged 1 commit intoNixOS:stagingfrom
silvanshade:binutils-2.42

Conversation

@silvanshade
Copy link
Member

@silvanshade silvanshade commented Apr 14, 2024

Description of changes

This PR updates binutils to version 2.42.

I removed two patches:

  • gold-powerpc-for-llvm.patch: seems to be applied upstream
  • 0001-libtool.m4-update-macos-version-detection-block.patch: doesn't apply; not clear if it's still needed

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.

@Ericson2314 @lovesegfault

@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. labels Apr 14, 2024
@ofborg ofborg bot requested review from Ericson2314 and lovesegfault April 14, 2024 15:49
@ofborg ofborg bot added 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 Apr 14, 2024
@skeuchel
Copy link

skeuchel commented Apr 14, 2024

This should target the staging branch because of the mass rebuild.

@skeuchel
Copy link

skeuchel commented Apr 14, 2024

The previous PR mentions a couple of needed fixes for 2.42 #283732 (comment).

@silvanshade silvanshade changed the base branch from master to staging April 14, 2024 21:41
@skeuchel
Copy link

skeuchel commented Apr 15, 2024

Could you rebase the PR by following the instructions in the CONTRIBUTING.md.

I built a bunch of packages and a couple failed:

@silvanshade silvanshade marked this pull request as draft April 15, 2024 12:38
@silvanshade silvanshade changed the base branch from staging to master April 15, 2024 12:39
@silvanshade silvanshade changed the base branch from master to staging April 15, 2024 12:42
@silvanshade
Copy link
Member Author

silvanshade commented Apr 15, 2024

Could you rebase the PR by following the instructions in the CONTRIBUTING.md.

Okay, I think I changed it to the way it was described. Let me know if there's still something else that needs to be changed with that.

@JohnRTitor
Copy link
Member

JohnRTitor commented May 16, 2024

It's still marked as draft @silvanshade perhaps you want to change that. Draft PRs can not be merged.

@silvanshade silvanshade marked this pull request as ready for review May 16, 2024 02:53
@lovesegfault
Copy link
Member

lovesegfault commented May 16, 2024

cc. @trofi

@trofi
Copy link
Contributor

trofi commented May 16, 2024 •
edited by lovesegfault
Loading

Looking at #283732 (comment) nixpkgs still needs at least two prerequisites:

@trofi
Copy link
Contributor

trofi commented May 16, 2024

Proposed kexec-tools fix as #312313

@lovesegfault
Copy link
Member

lovesegfault commented May 24, 2024

I'm going to wait for both of the prereqs to land in master, then kick off a mass build and see what happens :)

@silvanshade silvanshade reopened this Jun 11, 2024
@JohnRTitor
Copy link
Member

JohnRTitor commented Jun 12, 2024

I'm going to wait for both of the prereqs to land in master, then kick off a mass build and see what happens :)

Those PRs are still in staging-next. But I think we can rebase this PR to the latest staging.

@silvanshade

@lovesegfault
Copy link
Member

lovesegfault commented Jun 19, 2024

Rebased, kicking off the build

@lovesegfault
Copy link
Member

lovesegfault commented Jun 19, 2024

Result of nixpkgs-review pr 304035 run on x86_64-linux 1

16 packages built:
  • clang
  • gcc
  • gcc.info (gcc.info.info ,gcc.info.man)
  • gcc.man (gcc.man.info ,gcc.man.man)
  • linux
  • linux.dev (linux.dev.dev)
  • nix
  • nix.debug (nix.debug.debug ,nix.debug.dev ,nix.debug.doc ,nix.debug.man)
  • nix.dev (nix.dev.debug ,nix.dev.dev ,nix.dev.doc ,nix.dev.man)
  • nix.doc (nix.doc.debug ,nix.doc.dev ,nix.doc.doc ,nix.doc.man)
  • nix.man (nix.man.debug ,nix.man.dev ,nix.man.doc ,nix.man.man)
  • python3
  • python3.debug (python3.debug.debug)
  • rustc
  • rustc.doc (rustc.doc.doc ,rustc.doc.man)
  • rustc.man (rustc.man.doc ,rustc.man.man)

@lovesegfault
Copy link
Member

lovesegfault commented Jun 19, 2024

I'm going to try building up to the installer ISO now.

@lovesegfault
Copy link
Member

lovesegfault commented Jun 19, 2024

Okay, I cherry-picked this branch on top of nixos-unstable and did:

$ nix build --keep-going -f nixos/release-combined.nix nixos.iso_gnome.x86_64-linux

Here is what I got:

/nix/store/h7p838lx3ys6z4ywdklqlgv8fswvrrbl-nixos-gnome-24.11pre56789.gfedcba-x86_64-linux.iso

I have uploaded it to https://binutils.cachix.org and pinned it: https://app.cachix.org/api/v1/cache/binutils/serve/h7p838lx3ys6z4ywdklqlgv8fswvrrbl/iso/nixos-gnome-24.11pre56789.gfedcba-x86_64-linux.iso

If someone wants to try booting that into a VM, I'd appreciate it. I'm going to build the AArch64 image now

@lovesegfault
Copy link
Member

lovesegfault commented Jun 20, 2024

Alright, the aarch64-linux build was successful, I've pushed it to cachix and pinned it: https://app.cachix.org/api/v1/cache/binutils/serve/bhgrm272wfmgdgfjf7i81njb3n6lwwy8/iso/nixos-gnome-24.11pre56789.gfedcba-aarch64-linux.iso

@lovesegfault lovesegfault merged commit 1ae061e into NixOS:staging Jun 20, 2024
@lovesegfault
Copy link
Member

lovesegfault commented Jun 20, 2024

Fingers crossed!

@trofi
Copy link
Contributor

trofi commented Jun 20, 2024

Thanks all!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

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.

5 participants

@silvanshade @skeuchel @JohnRTitor @lovesegfault @trofi