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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-12-26 09:30:32 +01:00
parent e5271b72cc 0a1dc96ada
commit e45ca47f14
43 changed files with 264 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
# The tests are known broken on Cygwin
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
# Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
# (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
# Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
# and {Open,Free}BSD.
# With non-standard storeDir: https://github.com/NixOS/nix/issues/512
doCheck = stdenv.hostPlatform == stdenv.buildPlatform