Skip to content

Comments

[Backport staging-25.05] util-linux: 2.41 -> 2.41.1#427288

Merged
numinit merged 2 commits intoNixOS:staging-25.05from
numinit:for-25.05/util-linux/2.41.1
Jul 23, 2025
Merged

[Backport staging-25.05] util-linux: 2.41 -> 2.41.1#427288
numinit merged 2 commits intoNixOS:staging-25.05from
numinit:for-25.05/util-linux/2.41.1

Conversation

@numinit
Copy link
Contributor

@numinit numinit commented Jul 22, 2025

Backport of #422015, this is a patch release of util-linux.

Drops various patches that were fixed in 2.41.1. Note that this also cherry-picks 5d8f5a0 to avoid conflicts.

cc @chetgurevitch

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

chetgurevitch and others added 2 commits July 21, 2025 18:31
Fixes errors in stage-1 as well as from systemd-remount-fs for systems
using X-mount.subdir for root

(cherry picked from commit 5d8f5a0)
Drop most of our patches, since they were fixed:

libmount:
    - (subdir) restrict for real mounts only (by Karel Zak)
    - (subdir) remove unused code (by Karel Zak)
    - fix --no-canonicalize regression (by Karel Zak)

libuuid:
    - fix uuid_time on macOS without attribute((alias)) (by Eugene Gershnik)

https://lore.kernel.org/util-linux/wnfaquaapqknjnu2bdvddkp2xbleowfcr2g3cqiewpl54oclmi@mrseflcu5nyk/T/#u
(cherry picked from commit e6b8ad3)
@numinit
Copy link
Contributor Author

numinit commented Jul 22, 2025

Tested with git cherry-pick 5d8f5a0f8ec1c514787fb613b87e98d793cb6ca8 e6b8ad33ff67c8dfd87d64876babd0c6db2e05f4 against release-25.05 on Linux and the Darwin community builder.

@numinit numinit changed the title [Backport release-25.05] util-linux: 2.41 -> 2.41.1 [Backport staging-25.05] util-linux: 2.41 -> 2.41.1 Jul 22, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person. 4.workflow: backport This targets a stable branch labels Jul 22, 2025
@numinit numinit merged commit ef00634 into NixOS:staging-25.05 Jul 23, 2025
36 of 38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants