public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2020-10-25 09:46:04 +01:00
parent 803ca85c20 4effe769e2
commit 4bd836b381
375 changed files with 5960 additions and 3689 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/coreutils/default.nix
+9 -4
View File
@@ -22,16 +22,21 @@ with lib;
stdenv.mkDerivation (rec {
pname = "coreutils";
version = "8.32";
version = "8.31";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo=";
sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz";
};
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
# included on coreutils master; TODO: apply unconditionally, I guess
++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch;
# included on coreutils master; TODO: apply unconditionally, I guess
++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch
++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch
# Fix compilation in musl-cross environments. To be removed in coreutils-8.32.
++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch
# Fix compilation in android-cross environments. To be removed in coreutils-8.32.
++ [ ./coreutils-8.31-android-cross.patch ];
postPatch = ''
# The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.