Conversation
There was a problem hiding this comment.
Hasn't made it in yet
|
Drafting until #421985 is merged and makes its way to staging first |
|
Thanks for the reminder, rebasing :-) |
8bf57f4 to
d3aed00
Compare
|
We probably ought to merge #422014 before this. That fetchurl turned into infinite recursion in 25.05. |
This comment has been minimized.
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
d3aed00 to
e6b8ad3
Compare
Why does the order we merge matter? There's no blank hash in this PR. |
|
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. |
|
Backport failed for 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 |
|
Did anybody check it on Darwin? We had to do a hotfix on staging-next last time. |
|
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.
|
|
Cool! Are you working on the backport? |
|
Yeah I'll get it up tonight. |
Drop most of our patches, since they were fixed:
libmount:
libuuid:
https://lore.kernel.org/util-linux/wnfaquaapqknjnu2bdvddkp2xbleowfcr2g3cqiewpl54oclmi@mrseflcu5nyk/T/#u
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.