Loading pkgs/tools/misc/coreutils/default.nix +5 −0 Original line number Diff line number Diff line Loading @@ -39,6 +39,11 @@ stdenv.mkDerivation rec { hash = "sha256-zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o="; }; patches = 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. sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh Loading pkgs/tools/misc/coreutils/fix-test-failure-musl.patch 0 → 100644 +23 −0 Original line number Diff line number Diff line 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) Loading
pkgs/tools/misc/coreutils/default.nix +5 −0 Original line number Diff line number Diff line Loading @@ -39,6 +39,11 @@ stdenv.mkDerivation rec { hash = "sha256-zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o="; }; patches = 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. sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh Loading
pkgs/tools/misc/coreutils/fix-test-failure-musl.patch 0 → 100644 +23 −0 Original line number Diff line number Diff line 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)