diff options
| author | Izorkin <izorkin@elven.pw> | 2019-08-17 21:30:38 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-09-09 15:55:35 +0300 |
| commit | 9f8c046849890ccc445f69b643f53874fa60b606 (patch) | |
| tree | 4b1c2f0df899c3e247ac51f638361b5645a3b076 | |
| parent | 50fbe46ae735e155c4e70dead0ddab7f085fc653 (diff) | |
| download | nixpkgs-9f8c046849890ccc445f69b643f53874fa60b606.tar nixpkgs-9f8c046849890ccc445f69b643f53874fa60b606.tar.gz nixpkgs-9f8c046849890ccc445f69b643f53874fa60b606.tar.bz2 nixpkgs-9f8c046849890ccc445f69b643f53874fa60b606.tar.lz nixpkgs-9f8c046849890ccc445f69b643f53874fa60b606.tar.xz nixpkgs-9f8c046849890ccc445f69b643f53874fa60b606.tar.zst nixpkgs-9f8c046849890ccc445f69b643f53874fa60b606.zip | |
mariadb-connector-c: enable default v3.1
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files 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 { }; |