mysql: deprecate alias

This commit is contained in:
Sandro Jäckel
2021-03-14 17:11:57 +01:00
parent dcb501f993
commit 62733b37b4
11 changed files with 25 additions and 25 deletions

View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, withMySQL ? true, withPSQL ? false, withSQLite ? false
, mysql, postgresql, sqlite, gawk, gnugrep, findutils, gnused
, mariadb, postgresql, sqlite, gawk, gnugrep, findutils, gnused
, lib
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patchShebangs .
substituteInPlace shmig \
--replace "\`which mysql\`" "${lib.optionalString withMySQL "${mysql.client}/bin/mysql"}" \
--replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb.client}/bin/mysql"}" \
--replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \
--replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \
--replace "awk" "${gawk}/bin/awk" \

View File

@@ -1,7 +1,7 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security
, sqliteSupport ? true, sqlite
, postgresqlSupport ? true, postgresql
, mysqlSupport ? true, mysql, zlib, libiconv
, mysqlSupport ? true, mariadb, zlib, libiconv
}:
assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysqlSupport == true)
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
++ optional (stdenv.isDarwin && mysqlSupport) libiconv
++ optional sqliteSupport sqlite
++ optional postgresqlSupport postgresql
++ optionals mysqlSupport [ mysql zlib ];
++ optionals mysqlSupport [ mariadb zlib ];
buildAndTestSubdir = "diesel_cli";