Revert "Merge #42880: coreutils: 8.29 -> 8.30"

This reverts commit edc13bae54, reversing
changes made to 90464f6049.
Bootstrap tools generation is broken, and I don't know why yet.
This commit is contained in:
Vladimír Čunát 2018-09-03 08:31:01 +02:00
parent 68a6c04783
commit e3ee9c098a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -16,11 +16,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "coreutils-8.30"; name = "coreutils-8.29";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/coreutils/${name}.tar.xz"; url = "mirror://gnu/coreutils/${name}.tar.xz";
sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"; sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j";
}; };
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh
sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl
substituteInPlace ./tests/install/install-C.sh \ substituteInPlace ./tests/install/install-C.sh \
--replace 'mode3=2755' 'mode3=1755' --replace 'mode3=2755' 'mode3=1755'
''; '';