Merge branch 'master' into staging

2017-11-06 13:24:06 +01:00
parent c8c6a1edb5 bc90fe1fbb
commit 1d9a8e2289
264 changed files with 4203 additions and 2400 deletions
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

  outputMan = "dev"; # tiny page for a dev tool

-  doCheck = true;
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;

  preCheck = ''
    patchShebangs ./run.sh