Re-Revert "Merge branch 'staging-next'"

This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 deletions
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, mysql }:
+{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:

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

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

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

  # Tests need a MySQL database