diff options
author | Shea Levy <shea@shealevy.com> | 2014-02-26 07:54:04 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-02-26 07:54:12 -0500 |
commit | 1ce6fff4e21906a3e6cfd26fdf4372f7501541cd (patch) | |
tree | 79fc51e845dd8297ecaa8a8dc49c981461f1650a /pkgs/servers | |
parent | 2fd60ee9484fbbb412f80672367199409d58147c (diff) | |
download | nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.gz nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.bz2 nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.lz nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.xz nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.zst nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.zip |
Merge mysql55 module into mysql
This also removes the default for services.mysql.package, as this should not generally be updated automatically if we change the mysql attribute
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/mysql/5.1.x.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/mysql/5.5.x.nix | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index e09943d86c8d..db6797a8d687 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.mysqlVersion = "5.5"; + meta = { description = "An enhanced, drop-in replacement for MySQL"; homepage = https://mariadb.org/; diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index c210c9965327..c309158a6705 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { rm -rf $out/mysql-test $out/sql-bench $out/share/info ''; + passthru.mysqlVersion = "5.1"; + meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index bd30b7db75ff..e8da8a48d65f 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { rm -rf $out/mysql-test $out/sql-bench ''; + passthru.mysqlVersion = "5.5"; + meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; |