From e3ee9c098a64deb30e8d9edb180e613b93046f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 3 Sep 2018 08:31:01 +0200 Subject: [PATCH] Revert "Merge #42880: coreutils: 8.29 -> 8.30" This reverts commit edc13bae5462f7d088897bf6a268cc12c32f1aaf, reversing changes made to 90464f60490b965b482b82cd6b747bb4577c2786. Bootstrap tools generation is broken, and I don't know why yet. --- pkgs/tools/misc/coreutils/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 582f8d8f05f9..3d1c7145698c 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -16,11 +16,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.30"; + name = "coreutils-8.29"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"; + sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j"; }; 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 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 print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl substituteInPlace ./tests/install/install-C.sh \ --replace 'mode3=2755' 'mode3=1755' '';