gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coreutils: 9.5 -> 9.6

Browse Source 
Changes: https://savannah.gnu.org/news/?id=10715
This commit is contained in:
Sergei Trofimovich
2025-01-22 06:39:09 +00:00
parent a993849e62
commit 0f126632da
3 changed files with 2 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/coreutils/default.nix
+2 -15
View File
@@ -48,26 +48,13 @@ let
in
stdenv.mkDerivation rec {
pname = "coreutils" + (optionalString (!minimal) "-full");
version = "9.5";
version = "9.6";
src = fetchurl {
url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz";
hash = "sha256-zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o=";
hash = "sha256-egEkMns5j9nrGmq95YM4mCFCLHRP+hBzSyT1V2ENMoM=";
};
patches =
[
# https://lists.gnu.org/archive/html/bug-coreutils/2024-05/msg00037.html
# This is not precisely the patch provided - this is a diff of the Makefile.in
# after the patch was applied and autoreconf was run, since adding autoreconf
# here causes infinite recursion.
./fix-mix-flags-deps-libintl.patch
]
++ lib.optionals stdenv.hostPlatform.isMusl [
# https://lists.gnu.org/archive/html/bug-coreutils/2024-03/msg00089.html
./fix-test-failure-musl.patch
];
postPatch =
''
# The test tends to fail on btrfs, f2fs and maybe other unusual filesystems.
pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch
-49
View File
@@ -1,49 +0,0 @@
--- a/Makefile.in 2024-05-21 17:03:50.488979000 -0700
+++ b/Makefile.in 2024-05-21 17:18:56.243091000 -0700
@@ -692,8 +692,6 @@
@USE_PCLMUL_CRC32_TRUE@am__append_211 = $(cksum_pclmul_ldadd)
@USE_AVX2_WC_LINECOUNT_TRUE@am__append_212 = src/libwc_avx2.a
@USE_AVX2_WC_LINECOUNT_TRUE@am__append_213 = $(wc_avx2_ldadd)
-@SINGLE_BINARY_FALSE@src_coreutils_DEPENDENCIES = \
-@SINGLE_BINARY_FALSE@ $(am__DEPENDENCIES_2)
# Command arch
# Command hostname
# Command chroot
@@ -2825,6 +2823,12 @@
nodist_src_coreutils_OBJECTS =
src_coreutils_OBJECTS = $(am_src_coreutils_OBJECTS) \
$(nodist_src_coreutils_OBJECTS)
+@SINGLE_BINARY_FALSE@src_coreutils_DEPENDENCIES = \
+@SINGLE_BINARY_FALSE@ $(am__DEPENDENCIES_2)
+@SINGLE_BINARY_TRUE@src_coreutils_DEPENDENCIES = \
+@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_1) \
+@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_2) \
+@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_1)
src_coreutils_LINK = $(CCLD) $(src_coreutils_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
am__objects_221 = src/copy.$(OBJEXT) src/cp-hash.$(OBJEXT) \
@@ -7492,7 +7496,12 @@
src_libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS)
# Single binary dependencies
@SINGLE_BINARY_TRUE@src_coreutils_CFLAGS = -DSINGLE_BINARY $(AM_CFLAGS)
-@SINGLE_BINARY_TRUE@src_coreutils_DEPENDENCIES = $(LDADD) $(single_binary_deps)
+
+# Creates symlinks or shebangs to the installed programs when building
+# coreutils single binary.
+@SINGLE_BINARY_TRUE@EXTRA_src_coreutils_DEPENDENCIES = \
+@SINGLE_BINARY_TRUE@ $(single_binary_deps) \
+@SINGLE_BINARY_TRUE@ src/coreutils_$(single_binary_install_type)
@SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_DEPENDENCIES = src/libsinglebin_ls.a
@SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_DEPENDENCIES = src/libsinglebin_ls.a
@SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a
@@ -7880,10 +7889,6 @@
@SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_DEPENDENCIES = $(src_yes_DEPENDENCIES)
@SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_CFLAGS = "-Dmain=single_binary_main_yes (int, char **); int single_binary_main_yes" -Dusage=_usage_yes $(src_coreutils_CFLAGS)
-# Creates symlinks or shebangs to the installed programs when building
-# coreutils single binary.
-@SINGLE_BINARY_TRUE@EXTRA_src_coreutils_DEPENDENCIES = src/coreutils_$(single_binary_install_type)
-
# false exits nonzero even with --help or --version.
# test doesn't support --help or --version.
# Tell automake to exempt then from that installcheck test.
pkgs/tools/misc/coreutils/fix-test-failure-musl.patch
-23
View File
@@ -1,23 +0,0 @@
From 1defda6356c29c7f731bddb9e9231f594e01d9c9
(adjusted so it can be applied on coreutils to coreutils tarball)
Reported by Adept's Lab via Pádraig Brady at
<https://lists.gnu.org/archive/html/bug-coreutils/2024-03/msg00086.html>.
diff --git a/gnulib-tests/test-canonicalize.c b/gnulib-tests/test-canonicalize.c
index 6763a525c9..5d19285c00 100644
--- a/gnulib-tests/test-canonicalize.c
+++ b/gnulib-tests/test-canonicalize.c
@@ -394,9 +394,9 @@ main (void)
ASSERT (stat ("/", &st1) == 0);
ASSERT (stat ("//", &st2) == 0);
bool same = psame_inode (&st1, &st2);
-#if defined __MVS__ || defined MUSL_LIBC
- /* On IBM z/OS and musl libc, "/" and "//" both canonicalize to
- themselves, yet they both have st_dev == st_ino == 1. */
+#if defined __MVS__
+ /* On IBM z/OS, "/" and "//" both canonicalize to themselves, yet they both
+ have st_dev == st_ino == 1. */
same = false;
#endif
if (same)