Skip to content

elfutils: rebase cxx-header-collision.patch, fix for FreeBSD#415087

Closed
rhelmot wants to merge 2 commits intoNixOS:stagingfrom
rhelmot:hounds-elfutils
Closed

elfutils: rebase cxx-header-collision.patch, fix for FreeBSD#415087
rhelmot wants to merge 2 commits intoNixOS:stagingfrom
rhelmot:hounds-elfutils

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented Jun 8, 2025

Do #370365 again, this time for the 0.193 update.

This was generated by, best I can tell, re-doing the process of creating this patch on top of the 0.193 branch.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-freebsd (cross)
  • 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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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.

@rhelmot rhelmot requested a review from RossComputerGuy June 8, 2025 18:44
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 8, 2025
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: stdenv Standard environment 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: mate The MATE Desktop Environment 6.topic: lib The Nixpkgs function library 6.topic: rocm ROCm is an Advanced Micro Devices software stack for graphics processing unit programming. 6.topic: deepin 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Jun 12, 2025
@github-actions github-actions bot added the 8.has: documentation This PR adds or changes documentation label Jun 12, 2025
@nix-owners
Copy link

nix-owners bot commented Jun 12, 2025

The PR's base branch is set to master, but 516 commits from the python-updates branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the python-updates branch, change the base branch to python-updates
  • If the changes should go to the master branch, rebase your PR onto the merge base with the master branch:
    # git rebase --onto $(git merge-base upstream/master HEAD) $(git merge-base upstream/python-updates HEAD)
    git rebase --onto aa81925f05919004f7bf40eb209e9c4df691fe8f d2c984fd5d00fbafe25a6b113e7882842da0c6f2
    git push --force-with-lease

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 12, 2025
@rhelmot rhelmot changed the base branch from master to staging June 12, 2025 02:16
@nixpkgs-ci nixpkgs-ci bot closed this Jun 12, 2025
@github-actions github-actions bot removed 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: stdenv Standard environment 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: mate The MATE Desktop Environment 6.topic: lib The Nixpkgs function library 6.topic: rocm ROCm is an Advanced Micro Devices software stack for graphics processing unit programming. 6.topic: deepin 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Jun 12, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 12, 2025
@rhelmot rhelmot removed this from Stdenv Jun 12, 2025
@rhelmot rhelmot removed the 8.has: documentation This PR adds or changes documentation label Jun 12, 2025
@rhelmot
Copy link
Contributor Author

rhelmot commented Jun 12, 2025

"haha", she thought, "this patch does not affect linux or darwin, so it can go straight to master!" Unfortunately, she did not realize that the relevant version of elfutils had not yet reached master.

I also had to add an additional commit that actually fixes the freebsd build. It is, unfortunately, an enormous mess.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 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. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 12, 2025
@nix-owners nix-owners bot requested a review from r-burns June 12, 2025 02:27
@zowoq
Copy link
Contributor

zowoq commented Jun 26, 2025

With #419451 it looks like the cxx-header-collision patch isn't needed?

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 30, 2025
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". label Nov 2, 2025
@rhelmot rhelmot closed this Dec 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants