diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/coreutils/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/coreutils/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 90fd78ed04c1..beee4241c541 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -32,22 +32,18 @@ let in stdenv.mkDerivation rec { pname = "coreutils" + (optionalString (!minimal) "-full"); - version = "9.1"; + version = "9.3"; src = fetchurl { url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz"; - sha256 = "sha256-YaH0ENeLp+fzelpPUObRMgrKMzdUhKMlXt3xejhYBCM="; + hash = "sha256-rbz8/omSNbceh2jc8HzVMlILf1T5qAZIQ/jRmakEu6o="; }; - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433 - ./disable-seek-hole.patch - ]; - postPatch = '' # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems. sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh 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 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 @@ -148,10 +144,10 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; FORCE_UNSAFE_CONFIGURE = optionalString stdenv.hostPlatform.isSunOS "1"; - NIX_CFLAGS_COMPILE = [] + env.NIX_CFLAGS_COMPILE = toString ([] # Work around a bogus warning in conjunction with musl. ++ optional stdenv.hostPlatform.isMusl "-Wno-error" - ++ optional stdenv.hostPlatform.isAndroid "-D__USE_FORTIFY_LEVEL=0"; + ++ optional stdenv.hostPlatform.isAndroid "-D__USE_FORTIFY_LEVEL=0"); # Works around a bug with 8.26: # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. |