Revert "Merge branch 'staging-next'"

This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
This commit is contained in:
Vladimír Čunát
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
stdenv.mkDerivation rec {
pname = "tntdb";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
};
buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ];
buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ];
enableParallelBuilding = true;