Merge remote-tracking branch 'upstream/master' into staging

2018-05-03 16:35:36 -04:00
parent cbe21ac614 b45ef79b74
commit cf06e42d1c
330 changed files with 20106 additions and 16120 deletions
@@ -76,6 +76,9 @@ let
      ./skip_test_linux_distro.patch
    ];

+    # TimeoutErrors on slow machines -> aarch64
+    doCheck = !stdenv.isAarch64;
+
    postPatch = ''
      substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
    '';