Skip to content

util-linux: 2.39.4 -> 2.40.4#376007

Merged
alyssais merged 1 commit intoNixOS:stagingfrom
jmbaur:util-linux-bump
Feb 9, 2025
Merged

util-linux: 2.39.4 -> 2.40.4#376007
alyssais merged 1 commit intoNixOS:stagingfrom
jmbaur:util-linux-bump

Conversation

@jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Jan 23, 2025

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

@github-actions github-actions bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 23, 2025
@xaverdh
Copy link
Contributor

xaverdh commented Jan 23, 2025

related / older attempt: #333467

Copy link
Member

Choose a reason for hiding this comment

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

This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Please vendor the patch, as it could disappear at any time following a rebase and GitHub garbage collection.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

makes sense, patch is now vendored

url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=77454e58d58f904cfdc02d3ca5bb65f1bd8739fc";
hash = "sha256-ELWC4bYN3rvn9XIN0XgCo55pXNfS2VpbZWuwzRLfO/0=";
})
./fix-darwin-build.patch
Copy link
Member

Choose a reason for hiding this comment

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

Ideally there'd be a link to the PR so we know this has been submitted, but this has waited long enough so I'm just going to merge it.

Copy link
Member

Choose a reason for hiding this comment

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

Added in 455db8c

@alyssais alyssais merged commit fb70653 into NixOS:staging Feb 9, 2025
27 checks passed
@jmbaur jmbaur deleted the util-linux-bump branch February 9, 2025 13:22
@YellowOnion
Copy link
Contributor

Hey sweet thanks for merging this, if anyone needs help fixing pkgs breaks or something @ me here or woobilicious on matrix. I have some experience debugging root on bcachefs issues lol.

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

Labels

10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must 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.

5 participants