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

2018-05-14 23:33:03 -04:00
parent 330ca731e8 0fc21a364b
commit 5e17335bd7
4956 changed files with 139379 additions and 92174 deletions
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
  # This is fixed here:
  # <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
  doCheck = false;
+  doInstallCheck = doCheck;

  setupHook = ./setup-hook.sh;

@@ -89,6 +89,7 @@
  # make check doesn't work on darwin
  # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
  doCheck = false;
+  doInstallCheck = doCheck;

  setupHook = ./setup-hook-2.0.sh;

@@ -85,6 +85,7 @@
  # make check doesn't work on darwin
  # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
  doCheck = false;
+  doInstallCheck = doCheck;

  setupHook = ./setup-hook-2.2.sh;