3
0
Fork 0
forked from mirrors/nixpkgs

mysql: deprecate alias

This commit is contained in:
Sandro Jäckel 2021-03-14 17:11:57 +01:00
parent dcb501f993
commit 62733b37b4
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
11 changed files with 25 additions and 25 deletions

View file

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools,
signond, lzma,
}:
@ -26,10 +26,10 @@ mkDerivation {
propagatedBuildInputs = [ boost kitemmodels ];
outputs = [ "out" "dev" ];
CXXFLAGS = [
''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mysql}/bin/mysqld\"''
''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mysql}/bin/mysqladmin\"''
''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"''
''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"''
''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mariadb}/bin/mysqld\"''
''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mariadb}/bin/mysqladmin\"''
''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mariadb}/bin/mysql_install_db\"''
''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mariadb}/bin/mysqlcheck\"''
''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
''-DNIXPKGS_POSTGRES_INITDB=\"\"''

View file

@ -1,5 +1,5 @@
{ gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1
, openldap, mysql, libmysqlclient, postgresql }:
, openldap, mariadb, libmysqlclient, postgresql }:
with lib;
gnustep.stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ gnustep.stdenv.mkDerivation rec {
nativeBuildInputs = [ gnustep.make ];
buildInputs = flatten ([ gnustep.base libxml2 openssl_1_1 ]
++ optional (openldap != null) openldap
++ optionals (mysql != null) [ libmysqlclient mysql ]
++ optionals (mariadb != null) [ libmysqlclient mariadb ]
++ optional (postgresql != null) postgresql);
postPatch = ''
@ -31,7 +31,7 @@ gnustep.stdenv.mkDerivation rec {
configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ]
++ optional (openldap != null) "--enable-openldap"
++ optional (mysql != null) "--enable-mysql"
++ optional (mariadb != null) "--enable-mysql"
++ optional (postgresql != null) "--enable-postgresql";
# Yes, this is ugly.

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }:
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }:
# I haven't done any parameter tweaking.. So the defaults provided here might be bad
@ -79,7 +79,7 @@
};
nativeBuildInputs = [ cmake ];
buildInputs = [ unixODBC mysql ];
buildInputs = [ unixODBC mariadb ];
cmakeFlags = [ "-DWITH_UNIXODBC=1" ];

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";

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config
, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages
, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages
, polkit, util-linuxMinimal, x264, zlib
, coreutils, procps, psmisc, nixosTests }:
@ -122,11 +122,11 @@ in stdenv.mkDerivation rec {
done
substituteInPlace scripts/zmdbbackup.in \
--replace /usr/bin/mysqldump ${mysql.client}/bin/mysqldump
--replace /usr/bin/mysqldump ${mariadb.client}/bin/mysqldump
substituteInPlace scripts/zmupdate.pl.in \
--replace "'mysql'" "'${mysql.client}/bin/mysql'" \
--replace "'mysqldump'" "'${mysql.client}/bin/mysqldump'"
--replace "'mysql'" "'${mariadb.client}/bin/mysql'" \
--replace "'mysqldump'" "'${mariadb.client}/bin/mysqldump'"
for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \
scripts/zmupdate.pl.in \
@ -147,7 +147,7 @@ in stdenv.mkDerivation rec {
'';
buildInputs = [
curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib
curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib
util-linuxMinimal # for libmount
] ++ (with perlPackages; [
# build-time dependencies

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, mysql, mailutils, pbzip2, pigz, bzip2, gzip }:
{ lib, stdenv, fetchurl, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }:
stdenv.mkDerivation rec {
pname = "automysqlbackup";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
cp automysqlbackup $out/bin/
cp automysqlbackup.conf $out/etc/
wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]}
wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mariadb mailutils pbzip2 pigz bzip2 gzip ]}
'';
meta = with lib; {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools
{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools
,supportOpenstack ? true
}:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
done
'' + optionalString supportOpenstack ''
# We need a way to pass $PATH to the scripts
sed -i '2iexport PATH=${git}/bin:${mysql}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
'';

View file

@ -402,6 +402,7 @@ mapAliases ({
man_db = man-db; # added 2016-05
manpages = man-pages; # added 2015-12-06
marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15
mysql = mariadb; # moved from top-level 2021-03-14
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09
mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15

View file

@ -18694,7 +18694,6 @@ in
inherit (darwin) cctools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
};
mysql = mariadb; # TODO: move to aliases.nix
mongodb = hiPrio mongodb-3_4;

View file

@ -8,7 +8,7 @@
{ fetchurl, stdenv, lua, unzip, pkg-config
, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat
, autoreconfHook, gnum4
, mysql, postgresql, cyrus_sasl
, postgresql, cyrus_sasl
, fetchFromGitHub, which, writeText
, pkgs
, lib