ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 05:37:40 +03:00
Code Issues Projects Releases Wiki Activity

MySQL5 should be default already.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10846
This commit is contained in:
Michael Raskin 2008-02-25 03:16:07 +00:00
parent b0f3e2c543
commit 6eaa389efa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/top-level/all-packages.nix
View File

@ -2497,8 +2497,7 @@ rec {
}; };
libdbiDrivers = libdbiDriversFun { libdbiDrivers = libdbiDriversFun {
mysql = mysql5; inherit sqlite mysql;
inherit sqlite;
} null; } null;
libdv = import ../development/libraries/libdv { libdv = import ../development/libraries/libdv {
@ -3549,7 +3548,7 @@ rec {
inherit fetchurl stdenv apacheHttpd jdk; inherit fetchurl stdenv apacheHttpd jdk;
}; };
mysql = import ../servers/sql/mysql { mysql4 = import ../servers/sql/mysql {
inherit fetchurl stdenv ncurses zlib perl; inherit fetchurl stdenv ncurses zlib perl;
ps = procps; /* !!! Linux only */ ps = procps; /* !!! Linux only */
}; };
@ -3559,6 +3558,8 @@ rec {
ps = procps; /* !!! Linux only */ ps = procps; /* !!! Linux only */
}; };
mysql = mysql5;
mysql_jdbc = import ../servers/sql/mysql/jdbc { mysql_jdbc = import ../servers/sql/mysql/jdbc {
inherit fetchurl stdenv ant; inherit fetchurl stdenv ant;
}; };