Revert "Merge branch 'staging-next'"

This reverts commit 41af38f372, reversing changes made to f0fec244ca. Let's delay this. We have some serious regressions.
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
+{ stdenv, buildPythonPackage, fetchPypi, mysql }:

 buildPythonPackage rec {
  pname = "mysqlclient";
  version = "1.4.4";

  nativeBuildInputs = [
-    libmysqlclient
+    mysql.connector-c
  ];

  buildInputs = [
-    libmysqlclient
+    mysql.connector-c
  ];

  # Tests need a MySQL database