Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00
parent f8472457a4 53b389327e
commit 716aac2519
1293 changed files with 75245 additions and 28520 deletions
@@ -17,7 +17,10 @@ stdenv.mkDerivation {
  buildInputs = [ pcre libiconv ];

  # cygwin: FAIL: multibyte-white-space
-  doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin;
+  # freebsd: FAIL mb-non-UTF8-performance
+  # all platforms: timing sensitivity in long-pattern-perf 
+  #doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD;
+  doCheck = false;

  # On Mac OS X, force use of mkdir -p, since Grep's fallback
  # (./install-sh) is broken.