diff --git a/pkgs/by-name/ut/util-linux/fix-darwin-build.patch b/pkgs/by-name/ut/util-linux/fix-darwin-build.patch deleted file mode 100644 index c65266e886905..0000000000000 --- a/pkgs/by-name/ut/util-linux/fix-darwin-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e47c6f751a7ef87640c61316ada774e8e9cc6b07 Mon Sep 17 00:00:00 2001 -From: Eugene Gershnik -Date: Mon, 6 May 2024 09:29:39 -0700 -Subject: [PATCH] libuuid: fix uuid_time on macOS without attribute((alias)) - -Weak aliases are not supported by clang on Darwin. -Instead this fix uses inline asm to make `_uuid_time` an alias to -`___uuid_time` - -It appears that on macOS the time API is purely 32 or 64 bit depending -on the build type. There is no ABI issue on that platform and `uuid_time` -can be unconditionally aliased to `_uuid_time`. This is all conjectural, -however, since I have no ability to make 32-bit builds for macOS - the -Apple toolchain doesn't support this since 2019. - -Fixes util-linux/util-linux#2873 ---- - libuuid/src/uuid_time.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libuuid/src/uuid_time.c b/libuuid/src/uuid_time.c -index 9b415b3ee73..df0478e1909 100644 ---- a/libuuid/src/uuid_time.c -+++ b/libuuid/src/uuid_time.c -@@ -85,6 +85,10 @@ time_t __uuid_time(const uuid_t uu, struct timeval *ret_tv) - } - #if defined(__USE_TIME_BITS64) && defined(__GLIBC__) - extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); -+#elif defined(__clang__) && defined(__APPLE__) -+__asm__(".globl _uuid_time"); -+__asm__(".set _uuid_time, ___uuid_time"); -+extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv); - #else - extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); - #endif diff --git a/pkgs/by-name/ut/util-linux/fix-mount-regression.patch b/pkgs/by-name/ut/util-linux/fix-mount-regression.patch deleted file mode 100644 index 973ba7493e7d9..0000000000000 --- a/pkgs/by-name/ut/util-linux/fix-mount-regression.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7dbfe31a83f45d5aef2b508697e9511c569ffbc8 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 24 Mar 2025 14:31:05 +0100 -Subject: [PATCH] libmount: fix --no-canonicalize regression - -Fixes: https://github.com/util-linux/util-linux/issues/3474 -Signed-off-by: Karel Zak ---- - libmount/src/context.c | 3 --- - sys-utils/mount.8.adoc | 2 +- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/libmount/src/context.c b/libmount/src/context.c -index 0323cb23d34..15a8ad3bbd0 100644 ---- a/libmount/src/context.c -+++ b/libmount/src/context.c -@@ -530,9 +530,6 @@ int mnt_context_is_xnocanonicalize( - assert(cxt); - assert(type); - -- if (mnt_context_is_nocanonicalize(cxt)) -- return 1; -- - ol = mnt_context_get_optlist(cxt); - if (!ol) - return 0; -diff --git a/sys-utils/mount.8.adoc b/sys-utils/mount.8.adoc -index 4f23f8d1f0e..5103b91c578 100644 ---- a/sys-utils/mount.8.adoc -+++ b/sys-utils/mount.8.adoc -@@ -756,7 +756,7 @@ Allow to make a target directory (mountpoint) if it does not exist yet. The opti - *X-mount.nocanonicalize*[**=**_type_]:: - Allows disabling of canonicalization for mount source and target paths. By default, the `mount` command resolves all paths to their absolute paths without symlinks. However, this behavior may not be desired in certain situations, such as when binding a mount over a symlink, or a symlink over a directory or another symlink. The optional argument _type_ can be either "source" or "target" (mountpoint). If no _type_ is specified, then canonicalization is disabled for both types. This mount option does not affect the conversion of source tags (e.g. LABEL= or UUID=) and fstab processing. - + --The command line option *--no-canonicalize* overrides this mount option and affects all path and tag conversions in all situations, but it does not modify flags for open_tree syscalls. -+The command-line option *--no-canonicalize* overrides this mount option and affects all path and tag conversions in all situations, but for backward compatibility, it does not modify open_tree syscall flags and does not allow the bind-mount over a symlink use case. - + - Note that *mount*(8) still sanitizes and canonicalizes the source and target paths specified on the command line by non-root users, regardless of the X-mount.nocanonicalize setting. - diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 92b7785d53f08..b11fcc6b81dfb 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -36,20 +36,16 @@ let in stdenv.mkDerivation (finalPackage: rec { pname = "util-linux" + lib.optionalString isMinimal "-minimal"; - version = "2.41"; + version = "2.41.1"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = "sha256-ge6Ts8/f6318QJDO3rode7zpFB/QtQG2hrP+R13cpMY="; + hash = "sha256-vprZonb0MFq33S9SJci+H/VDUvVl/03t6WKMGqp97Fc="; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - # https://github.com/util-linux/util-linux/pull/3013 - ./fix-darwin-build.patch - # https://github.com/util-linux/util-linux/pull/3479 (fixes https://github.com/util-linux/util-linux/issues/3474) - ./fix-mount-regression.patch ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ (fetchurl {