Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coreutils: 9.5 -> 9.6 #375757

Merged
merged 1 commit into from
Feb 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.