commit 6ad1fe08582fcdfedb2cb7c31b4a016a227bd38a · pyrox.dev/nixpkgs

pkgs/tools/misc/coreutils/default.nix

···

       39
       39
        
           hash = "sha256-zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o=";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
       +
         patches = lib.optionals stdenv.hostPlatform.isMusl [

     

       43
       43
       +
           # https://lists.gnu.org/archive/html/bug-coreutils/2024-03/msg00089.html

     

       44
       44
       +
           ./fix-test-failure-musl.patch

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       42
       47
        
         postPatch = ''

     

       43
       48
        
           # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems.

     

       44
       49
        
           sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh

+23

pkgs/tools/misc/coreutils/fix-test-failure-musl.patch

···

       1
       1
       +
       From 1defda6356c29c7f731bddb9e9231f594e01d9c9

     

       2
       2
       +
       (adjusted so it can be applied on coreutils to coreutils tarball)

     

       3
       3
       +
       

     

       4
       4
       +
       Reported by Adept's Lab via Pádraig Brady at

     

       5
       5
       +
       <https://lists.gnu.org/archive/html/bug-coreutils/2024-03/msg00086.html>.

     

       6
       6
       +
       

     

       7
       7
       +
       diff --git a/gnulib-tests/test-canonicalize.c b/gnulib-tests/test-canonicalize.c

     

       8
       8
       +
       index 6763a525c9..5d19285c00 100644

     

       9
       9
       +
       --- a/gnulib-tests/test-canonicalize.c

     

       10
       10
       +
       +++ b/gnulib-tests/test-canonicalize.c

     

       11
       11
       +
       @@ -394,9 +394,9 @@ main (void)

     

       12
       12
       +
            ASSERT (stat ("/", &st1) == 0);

     

       13
       13
       +
            ASSERT (stat ("//", &st2) == 0);

     

       14
       14
       +
            bool same = psame_inode (&st1, &st2);

     

       15
       15
       +
       -#if defined __MVS__ || defined MUSL_LIBC

     

       16
       16
       +
       -    /* On IBM z/OS and musl libc, "/" and "//" both canonicalize to

     

       17
       17
       +
       -       themselves, yet they both have st_dev == st_ino == 1.  */

     

       18
       18
       +
       +#if defined __MVS__

     

       19
       19
       +
       +    /* On IBM z/OS, "/" and "//" both canonicalize to themselves, yet they both

     

       20
       20
       +
       +       have st_dev == st_ino == 1.  */

     

       21
       21
       +
            same = false;

     

       22
       22
       +
        #endif

     

       23
       23
       +
            if (same)