From 9f8c046849890ccc445f69b643f53874fa60b606 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 17 Aug 2019 21:30:38 +0300 Subject: mariadb-connector-c: enable default v3.1 --- pkgs/top-level/all-packages.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c51a19e6e0..06ca60b316e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13893,7 +13893,9 @@ in unixODBC = callPackage ../development/libraries/unixODBC { }; - unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {}); + unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { + libmysqlclient = libmysqlclient_2_3; + }); ustr = callPackage ../development/libraries/ustr { }; @@ -14886,8 +14888,10 @@ in rpcbind = callPackage ../servers/rpcbind { }; - libmysqlclient = mariadb-connector-c; - mariadb-connector-c = mariadb-connector-c_2_3; + libmysqlclient = libmysqlclient_3_1; + libmysqlclient_2_3 = mariadb-connector-c_2_3; + libmysqlclient_3_1 = mariadb-connector-c_3_1; + mariadb-connector-c = mariadb-connector-c_3_1; mariadb-connector-c_2_3 = callPackage ../servers/sql/mariadb/connector-c/2_3.nix { }; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; -- cgit 1.4.1