public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mysql: v5 is now default

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9917
This commit is contained in:
Yury G. Kudryashov 2007-12-12 00:21:38 +00:00
parent 8a0b8dcff6
commit 6f24ef9bc9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1234,10 +1234,9 @@ rec {
# perhaps this can be done setting php_value in apache don't have time to investigate any further ? # perhaps this can be done setting php_value in apache don't have time to investigate any further ?
# This expression is a quick hack now. But perhaps it helps you adding the configuration flags you need? # This expression is a quick hack now. But perhaps it helps you adding the configuration flags you need?
php = (import ../development/interpreters/php_configurable) { php = (import ../development/interpreters/php_configurable) {
inherit mkDerivationByConfiguration stdenv; inherit mkDerivationByConfiguration stdenv mysql;
lib = lib_unstable; lib = lib_unstable;
inherit fetchurl flex bison apacheHttpd; # gettext; inherit fetchurl flex bison apacheHttpd; # gettext;
mysql = mysql5;
inherit libxml2; inherit libxml2;
}; };
@ -1995,8 +1994,7 @@ rec {
libdbiDrivers = libdbiDriversFun { libdbiDrivers = libdbiDriversFun {
version = "0.8.2-1"; version = "0.8.2-1";
mysql = mysql5; inherit sqlite mysql;
inherit sqlite;
} null; } null;
@ -2857,12 +2855,12 @@ rec {
inherit fetchurl stdenv apacheHttpd python; inherit fetchurl stdenv apacheHttpd python;
}; };
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 */
}; };
mysql5 = import ../servers/sql/mysql5 { mysql = import ../servers/sql/mysql5 {
inherit fetchurl stdenv ncurses zlib perl; inherit fetchurl stdenv ncurses zlib perl;
ps = procps; /* !!! Linux only */ ps = procps; /* !!! Linux only */
}; };