Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

util-linux: 2.40.4 -> 2.41 #391562

Open
wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Conversation

MisileLab
Copy link
Contributor

https://lore.kernel.org/util-linux/2cifsg7vkdiivfsmmximhbzybrsopn7zfqgwz2f6hyflh35pjr@ecyicq2cbsro

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.

@RossComputerGuy
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 391562 --package util-linux


aarch64-linux

❌ 9 packages failed to build:
  • util-linux
  • util-linux.bin (util-linux.bin.bin, util-linux.bin.debug, util-linux.bin.dev, util-linux.bin.lib, util-linux.bin.login, util-linux.bin.man, util-linux.bin.mount, util-linux.bin.swap)
  • util-linux.debug (util-linux.debug.bin, util-linux.debug.debug, util-linux.debug.dev, util-linux.debug.lib, util-linux.debug.login, util-linux.debug.man, util-linux.debug.mount, util-linux.debug.swap)
  • util-linux.dev (util-linux.dev.bin, util-linux.dev.debug, util-linux.dev.dev, util-linux.dev.lib, util-linux.dev.login, util-linux.dev.man, util-linux.dev.mount, util-linux.dev.swap)
  • util-linux.lib (util-linux.lib.bin, util-linux.lib.debug, util-linux.lib.dev, util-linux.lib.lib, util-linux.lib.login, util-linux.lib.man, util-linux.lib.mount, util-linux.lib.swap)
  • util-linux.login (util-linux.login.bin, util-linux.login.debug, util-linux.login.dev, util-linux.login.lib, util-linux.login.login, util-linux.login.man, util-linux.login.mount, util-linux.login.swap)
  • util-linux.man (util-linux.man.bin, util-linux.man.debug, util-linux.man.dev, util-linux.man.lib, util-linux.man.login, util-linux.man.man, util-linux.man.mount, util-linux.man.swap)
  • util-linux.mount (util-linux.mount.bin, util-linux.mount.debug, util-linux.mount.dev, util-linux.mount.lib, util-linux.mount.login, util-linux.mount.man, util-linux.mount.mount, util-linux.mount.swap)
  • util-linux.swap (util-linux.swap.bin, util-linux.swap.debug, util-linux.swap.dev, util-linux.swap.lib, util-linux.swap.login, util-linux.swap.man, util-linux.swap.mount, util-linux.swap.swap)

@RossComputerGuy
Copy link
Member

Failed due to /nix/store/bpl8lqqw67kpqd7jcqy0km6fn3rs67i9-perl5.40.0-XML-Parser-2.46.drv tests failure.

@MisileLab
Copy link
Contributor Author

MisileLab commented Mar 23, 2025

Failed due to /nix/store/bpl8lqqw67kpqd7jcqy0km6fn3rs67i9-perl5.40.0-XML-Parser-2.46.drv tests failure.

#390052 (comment)

@RossComputerGuy
Copy link
Member

For now, we can at least fix util-linuxMinimal which fails due to this:

util-linux-minimal> Running phase: buildPhase
util-linux-minimal> build flags: -j64 SHELL=/nix/store/qs3260bv46fbmqanb1kjxyxl02dc4cyj-bash-5.2p37/bin/bash usrbin_execdir=/nix/store/xm6lhaqwl32cf52j3jcamy9swc0588gp-util-linux-minimal-2.41-bin/bin usrlib_execdir=/nix/store/ibksdw55m8azir8yj3xf14bw3zpiy6lw-util-linux-minimal-2.41-lib/lib usrsbin_execdir=/nix/store/xm6lhaqwl32cf52j3jcamy9swc0588gp-util-linux-minimal-2.41-bin/sbin
util-linux-minimal> make  all-recursive
util-linux-minimal> make[1]: Entering directory '/build/util-linux-2.41'
util-linux-minimal> Making all in po
util-linux-minimal> make[2]: Entering directory '/build/util-linux-2.41/po'
util-linux-minimal> make[2]: Nothing to be done for 'all'.
util-linux-minimal> make[2]: Leaving directory '/build/util-linux-2.41/po'
util-linux-minimal> make[2]: Entering directory '/build/util-linux-2.41'
util-linux-minimal>   CC       sys-utils/umount-umount.o
util-linux-minimal>   CC       sys-utils/wdctl-wdctl.o
util-linux-minimal>   CC       sys-utils/mountpoint-mountpoint.o
util-linux-minimal>   GEN      errnos.h
util-linux-minimal> /nix/store/qs3260bv46fbmqanb1kjxyxl02dc4cyj-bash-5.2p37/bin/bash: line 1: ./tools/all_errnos: cannot execute: required file not found
util-linux-minimal> make[2]: *** [Makefile:19494: errnos.h] Error 127
util-linux-minimal>   CC       lib/agetty-logindefs.o
util-linux-minimal> make[2]: *** Waiting for unfinished jobs....
util-linux-minimal> make[2]: Leaving directory '/build/util-linux-2.41'
util-linux-minimal> make[1]: *** [Makefile:17521: all-recursive] Error 1
util-linux-minimal> make[1]: Leaving directory '/build/util-linux-2.41'
util-linux-minimal> make: *** [Makefile:7553: all] Error 2

@RossComputerGuy
Copy link
Member

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 8733fc0f1d27..5823947c37dd 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {

   postPatch =
     ''
-      patchShebangs tests/run.sh tools/all_syscalls
+      patchShebangs tests/run.sh tools/all_syscalls tools/all_errnos

       substituteInPlace sys-utils/eject.c \
         --replace "/bin/umount" "$bin/bin/umount"

Just needs this and util-linuxMinimal will build.

Copy link
Member

@RossComputerGuy RossComputerGuy left a comment

Choose a reason for hiding this comment

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

Minimal works, full build doesn't until #392267 unblocks.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants