Merge branch 'staging' into fix-ncurses-darwin-extensions

2018-05-02 15:40:38 -05:00
parent b4d9113fbf 3513034208
commit eeb016e8f0
251 changed files with 2068 additions and 1387 deletions
@@ -170,6 +170,7 @@ stdenv.mkDerivation rec {
  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";

  checkTarget = "test";
+  doCheck = false; # fails with "testsuite/tests: No such file or directory.  Stop."

  # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
  # treat that as a unary `{x,y,z,..}` repetition.