summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-09-25 12:10:27 +0200
committerGitHub <noreply@github.com>2018-09-25 12:10:27 +0200
commit6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf (patch)
tree367d2e89055bd2ee49010b46ac778e6f14b0d690 /pkgs/tools/misc
parent867d387a1c92dee533f380e5aeca874b3507de4f (diff)
parent4d9f9f171b776ede7765aabb4cd4ae588f9fbf68 (diff)
downloadnixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.gz
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.bz2
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.lz
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.xz
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.tar.zst
nixlib-6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf.zip
Merge pull request #47245 from dtzWill/fix/coreutils-8.30-bootstrap
coreutils: try 8.30 again, fix bootstrap tools expression motivating revert before
Diffstat (limited to 'pkgs/tools/misc')
-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'
   '';