about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-09-23 14:32:25 -0500
committerWill Dietz <w@wdtz.org>2018-09-23 14:32:25 -0500
commit095ef623d917f3bbd3e560e8ff9f2a6e953fa7ca (patch)
tree27e44e0d623bc70594275478befa5e618bb3123b
parent193d248569f2f6aa2667e9f5319328bf5a61e137 (diff)
downloadnixlib-095ef623d917f3bbd3e560e8ff9f2a6e953fa7ca.tar
nixlib-095ef623d917f3bbd3e560e8ff9f2a6e953fa7ca.tar.gz
nixlib-095ef623d917f3bbd3e560e8ff9f2a6e953fa7ca.tar.bz2
nixlib-095ef623d917f3bbd3e560e8ff9f2a6e953fa7ca.tar.lz
nixlib-095ef623d917f3bbd3e560e8ff9f2a6e953fa7ca.tar.xz
nixlib-095ef623d917f3bbd3e560e8ff9f2a6e953fa7ca.tar.zst
nixlib-095ef623d917f3bbd3e560e8ff9f2a6e953fa7ca.zip
Revert "Revert "Merge #42880: coreutils: 8.29 -> 8.30""
This reverts commit e3ee9c098a64deb30e8d9edb180e613b93046f45.
-rw-r--r--pkgs/tools/misc/coreutils/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 3d1c7145698c..582f8d8f05f9 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.29";
+  name = "coreutils-8.30";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/${name}.tar.xz";
-    sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j";
+    sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8";
   };
 
   patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
@@ -32,6 +32,7 @@ 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'
   '';