From 6eaa389efab41b444d610a2a7ae6c2d816270cdc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 25 Feb 2008 03:16:07 +0000
Subject: [PATCH] MySQL5 should be default already.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10846
---
 pkgs/top-level/all-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e82ff84e6226..32c3c9a8aeaf 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;
   };