From 9255b5b81ccfc23571d160ed11854f2049766d66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 13:25:13 +0200
Subject: [PATCH] mysql: Move all versions into the same directory

---
 pkgs/servers/sql/{mysql51/default.nix => mysql/5.1.x.nix} | 0
 pkgs/servers/sql/{mysql55/default.nix => mysql/5.5.x.nix} | 0
 pkgs/servers/sql/{mysql51 => mysql}/abi_check.patch       | 0
 pkgs/top-level/all-packages.nix                           | 4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/servers/sql/{mysql51/default.nix => mysql/5.1.x.nix} (100%)
 rename pkgs/servers/sql/{mysql55/default.nix => mysql/5.5.x.nix} (100%)
 rename pkgs/servers/sql/{mysql51 => mysql}/abi_check.patch (100%)

diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql/5.1.x.nix
similarity index 100%
rename from pkgs/servers/sql/mysql51/default.nix
rename to pkgs/servers/sql/mysql/5.1.x.nix
diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql/5.5.x.nix
similarity index 100%
rename from pkgs/servers/sql/mysql55/default.nix
rename to pkgs/servers/sql/mysql/5.5.x.nix
diff --git a/pkgs/servers/sql/mysql51/abi_check.patch b/pkgs/servers/sql/mysql/abi_check.patch
similarity index 100%
rename from pkgs/servers/sql/mysql51/abi_check.patch
rename to pkgs/servers/sql/mysql/abi_check.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b425783759..2e559871185 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6202,12 +6202,12 @@ let
 
   riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
 
-  mysql51 = import ../servers/sql/mysql51 {
+  mysql51 = import ../servers/sql/mysql/5.1.x.nix {
     inherit fetchurl ncurses zlib perl openssl stdenv;
     ps = procps; /* !!! Linux only */
   };
 
-  mysql55 = callPackage ../servers/sql/mysql55 { };
+  mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { };
 
   mysql = mysql51;