Skip to content

Comments

util-linux: 2.41 -> 2.41.1 #422015

Merged
numinit merged 1 commit intoNixOS:stagingfrom
numinit:util-linux/2.41.1
Jul 20, 2025
Merged

util-linux: 2.41 -> 2.41.1 #422015
numinit merged 1 commit intoNixOS:stagingfrom
numinit:util-linux/2.41.1

Conversation

@numinit
Copy link
Contributor

@numinit numinit commented Jul 3, 2025

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

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 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 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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@numinit numinit requested review from DerRockWolf, MisileLab and alyssais and removed request for DerRockWolf and MisileLab July 3, 2025 08:48
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hasn't made it in yet

@numinit numinit marked this pull request as draft July 3, 2025 08:53
@numinit
Copy link
Contributor Author

numinit commented Jul 3, 2025

Drafting until #421985 is merged and makes its way to staging first

@XYenon XYenon mentioned this pull request Jul 16, 2025
13 tasks
@MisileLab
Copy link
Contributor

#421985 merged @numinit

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 19, 2025
@numinit
Copy link
Contributor Author

numinit commented Jul 19, 2025

Thanks for the reminder, rebasing :-)

@numinit numinit force-pushed the util-linux/2.41.1 branch from 8bf57f4 to d3aed00 Compare July 19, 2025 18:54
@numinit numinit marked this pull request as ready for review July 19, 2025 18:54
@numinit
Copy link
Contributor Author

numinit commented Jul 19, 2025

We probably ought to merge #422014 before this. That fetchurl turned into infinite recursion in 25.05.

@nix-owners

This comment has been minimized.

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
@numinit numinit force-pushed the util-linux/2.41.1 branch from d3aed00 to e6b8ad3 Compare July 19, 2025 19:00
@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: 11-100 This PR causes between 11 and 100 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. labels Jul 19, 2025
@alyssais
Copy link
Member

We probably ought to merge #422014 before this. That fetchurl turned into infinite recursion in 25.05.

Why does the order we merge matter? There's no blank hash in this PR.

@numinit
Copy link
Contributor Author

numinit commented Jul 20, 2025

Hmm... it seemed potentially broken with any fetch (possibly a quirk of my testing last time) - double-checked again and it seems fine. Probably fine to go.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jul 20, 2025
@numinit numinit merged commit 4df6ada into NixOS:staging Jul 20, 2025
30 of 32 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jul 20, 2025

Backport failed for staging-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-25.05
git worktree add -d .worktree/backport-422015-to-staging-25.05 origin/staging-25.05
cd .worktree/backport-422015-to-staging-25.05
git switch --create backport-422015-to-staging-25.05
git cherry-pick -x e6b8ad33ff67c8dfd87d64876babd0c6db2e05f4

@alyssais
Copy link
Member

Did anybody check it on Darwin? We had to do a hotfix on staging-next last time.

@numinit
Copy link
Contributor Author

numinit commented Jul 21, 2025

Yeah, I verified it at the time but apparently did not tick the box. Just checked again by cherry-picking onto master. They have definitely applied util-linux/util-linux#3013 this time.

/nix/store/srkra3fa9l5wbynng5npxxlx07a7s4s9-util-linux-minimal-2.41.1-bin and /nix/store/ljbpcnhyn641x7kr5p86xqs66i2ms9w4-util-linux-2.41.1-bin on the community builder.

@alyssais
Copy link
Member

Cool! Are you working on the backport?

@numinit
Copy link
Contributor Author

numinit commented Jul 21, 2025

Yeah I'll get it up tonight.

@mdaniels5757 mdaniels5757 added 8.has: port to stable This PR already has a backport to the stable release. and removed backport staging-25.05 labels Jul 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 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: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants