diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-02-25 03:16:07 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-02-25 03:16:07 +0000 |
| commit | 6eaa389efab41b444d610a2a7ae6c2d816270cdc (patch) | |
| tree | 169610f6147f453727c6a07be4522892b6ed88d2 | |
| parent | b0f3e2c543c39d2c586d20c1b4f50d8e9b63d575 (diff) | |
| download | nixpkgs-6eaa389efab41b444d610a2a7ae6c2d816270cdc.tar nixpkgs-6eaa389efab41b444d610a2a7ae6c2d816270cdc.tar.gz nixpkgs-6eaa389efab41b444d610a2a7ae6c2d816270cdc.tar.bz2 nixpkgs-6eaa389efab41b444d610a2a7ae6c2d816270cdc.tar.lz nixpkgs-6eaa389efab41b444d610a2a7ae6c2d816270cdc.tar.xz nixpkgs-6eaa389efab41b444d610a2a7ae6c2d816270cdc.tar.zst nixpkgs-6eaa389efab41b444d610a2a7ae6c2d816270cdc.zip | |
MySQL5 should be default already.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10846
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e82ff84e622..32c3c9a8aea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |