Skip to content

[staging] coreutils: 9.3 -> 9.4 #252165

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.

Sign up for GitHub

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

Closed
dasJ wants to merge 1 commit into from
Closed

[staging] coreutils: 9.3 -> 9.4 #252165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 2 additions & 13 deletions pkgs/tools/misc/coreutils/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,13 @@ with lib;

stdenv.mkDerivation (rec {
pname = "coreutils${optionalString (!minimal) "-full"}";
version = "9.0";
version = "9.1";

src = fetchurl {
url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz";
sha256 = "sha256-zjCs30pBvFuzDdlV6eqnX6IWtOPesIiJ7TJDPHs7l84=";
sha256 = "sha256:08q4b0w7mwfxbqjs712l6wrwl2ijs7k50kssgbryg9wbsw8g98b1";
Copy link
Member

@vcunat vcunat Sep 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This branch has gotten all weird. 9.0 -> 9.1 instead of 9.3 -> 9.4 – and the hash format.

};

patches = [
./fix-chmod-exit-code.patch
# Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433
./disable-seek-hole.patch
# Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=52330
# This patch can be dropped, once we upgrade to the next coreutils version after 9.0
./fix-arm64-macos.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
Expand Down Expand Up @@ -75,8 +66,6 @@ stdenv.mkDerivation (rec {
echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c
''
])) + (optionalString stdenv.isAarch64 ''
sed '2i print "Skipping tail assert test"; exit 77' -i ./tests/tail-2/assert.sh

# Sometimes fails: https://github.com/NixOS/nixpkgs/pull/143097#issuecomment-954462584
sed '2i echo Skipping cut huge range test && exit 77' -i ./tests/misc/cut-huge-range.sh
'');
Expand Down
43 changes: 0 additions & 43 deletions pkgs/tools/misc/coreutils/disable-seek-hole.patch
View file
Open in desktop

This file was deleted.

124 changes: 0 additions & 124 deletions pkgs/tools/misc/coreutils/fix-arm64-macos.patch
View file
Open in desktop

This file was deleted.

108 changes: 0 additions & 108 deletions pkgs/tools/misc/coreutils/fix-chmod-exit-code.patch
View file
Open in desktop

This file was deleted.