Skip to content

[staging] coreutils: 9.4 -> 9.5 #299945

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

Merged
LeSuisse merged 1 commit into from
Apr 7, 2024
Merged

[staging] coreutils: 9.4 -> 9.5 #299945

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
10 changes: 8 additions & 2 deletions pkgs/tools/misc/coreutils/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ let
in
stdenv.mkDerivation rec {
pname = "coreutils" + (optionalString (!minimal) "-full");
version = "9.4";
version = "9.5";

src = fetchurl {
url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz";
hash = "sha256-6mE6TPRGEjJukXIBu7zfvTAd4h/8O1m25cB+BAsnXlI=";
hash = "sha256-zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o=";
};

postPatch = ''
Expand All @@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
sed '2i echo Skipping du threshold test && exit 77' -i ./tests/du/threshold.sh
sed '2i echo Skipping cp reflink-auto test && exit 77' -i ./tests/cp/reflink-auto.sh
sed '2i echo Skipping cp sparse test && exit 77' -i ./tests/cp/sparse.sh
sed '2i echo Skipping env test && exit 77' -i ./tests/env/env.sh
sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh
sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh

Expand All @@ -69,6 +70,11 @@ stdenv.mkDerivation rec {
echo "int main() { return 77; }" > "$f"
done

# We don't have localtime in the sandbox
for f in gnulib-tests/{test-localtime_r.c,test-localtime_r-mt.c}; do
echo "int main() { return 77; }" > "$f"
done

# intermittent failures on builders, unknown reason
sed '2i echo Skipping du basic test && exit 77' -i ./tests/du/basic.sh
'' + (optionalString (stdenv.hostPlatform.libc == "musl") (concatStringsSep "\n" [
Expand Down