Skip to content

Commit

Permalink
coreutils: 9.5 -> 9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
trofi committed Jan 22, 2025
1 parent a993849 commit 0f12663
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 87 deletions.
17 changes: 2 additions & 15 deletions pkgs/tools/misc/coreutils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
49 changes: 0 additions & 49 deletions pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch

This file was deleted.

23 changes: 0 additions & 23 deletions pkgs/tools/misc/coreutils/fix-test-failure-musl.patch

This file was deleted.

0 comments on commit 0f12663

Please sign in to comment.