forked from mirrors/nixpkgs
MySQL5 should be default already.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10846
This commit is contained in:
parent
b0f3e2c543
commit
6eaa389efa
|
@ -2497,8 +2497,7 @@ rec {
|
|||
};
|
||||
|
||||
libdbiDrivers = libdbiDriversFun {
|
||||
mysql = mysql5;
|
||||
inherit sqlite;
|
||||
inherit sqlite mysql;
|
||||
} null;
|
||||
|
||||
libdv = import ../development/libraries/libdv {
|
||||
|
@ -3549,7 +3548,7 @@ rec {
|
|||
inherit fetchurl stdenv apacheHttpd jdk;
|
||||
};
|
||||
|
||||
mysql = import ../servers/sql/mysql {
|
||||
mysql4 = import ../servers/sql/mysql {
|
||||
inherit fetchurl stdenv ncurses zlib perl;
|
||||
ps = procps; /* !!! Linux only */
|
||||
};
|
||||
|
@ -3559,6 +3558,8 @@ rec {
|
|||
ps = procps; /* !!! Linux only */
|
||||
};
|
||||
|
||||
mysql = mysql5;
|
||||
|
||||
mysql_jdbc = import ../servers/sql/mysql/jdbc {
|
||||
inherit fetchurl stdenv ant;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue