Merge remote-tracking branch 'origin/staging'

2016-03-27 13:19:04 +01:00
parent d88ae1045d dae3a7b721
commit b07e7bfc7b
106 changed files with 1065 additions and 3988 deletions
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
  ];

  # fails to find lex_token.h sometimes
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;

  outputs = [ "out" "lib" ];