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

Merge staging into closure-size

Browse Source 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
This commit is contained in:
Vladimír Čunát
2015-11-20 14:32:58 +01:00
parent bdbbfa0d42 b809f886c0
commit 333d69a5f0
1278 changed files with 105731 additions and 30012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/misc/coreutils/default.nix
View File

@@ -19,13 +19,22 @@ let
sha256 = "0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2";
};
patches = if stdenv.isCygwin then [ ./coreutils-8.23-4.cygwin.patch ] else null;
patches = if stdenv.isCygwin then ./coreutils-8.23-4.cygwin.patch else
(if stdenv.isArm then (fetchurl {
url = "http://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0";
sha256 = "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz";
name = "coreutils-tail-inotify-race.patch";
}) else null);
# The test tends to fail on btrfs and maybe other unusual filesystems.
postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
'';
'' +
# This is required by coreutils-tail-inotify-race.patch to avoid more deps
stdenv.lib.optionalString stdenv.isArm ''
touch -r src/stat.c src/tail.c
'';
outputs = [ "out" "info" ];