nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65954 from aanderse/mysql-backport

Browse Source 
mysql57: 5.7.25 -> 5.7.27 [backport]
This commit is contained in:
Samuel Dionne-Riel
2019-08-06 21:06:24 -04:00
committed by GitHub
parent 314e2acfe8 af17a97d38
commit 2f1fc1b698
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/tests/mysql.nix
View File

@@ -5,20 +5,34 @@ import ./make-test.nix ({ pkgs, ...} : {
};
nodes = {
master =
mysql =
{ pkgs, ... }:
{
services.mysql.enable = true;
services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
services.mysql.package = pkgs.mysql;
services.mysql.package = pkgs.mysql57;
};
mariadb =
{ pkgs, ... }:
{
services.mysql.enable = true;
services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
services.mysql.package = pkgs.mariadb;
};
};
testScript = ''
startAll;
$master->waitForUnit("mysql");
$master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
$mysql->waitForUnit("mysql");
$mysql->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
$mysql->shutdown;
$mariadb->waitForUnit("mysql");
$mariadb->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
$mariadb->shutdown;
'';
})

16
pkgs/servers/sql/mysql/5.7.x.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, bison
{ stdenv, fetchurl, cmake, bison, pkgconfig
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
, cctools, CoreServices, developer_cmds }:
@@ -6,12 +6,12 @@
let
self = stdenv.mkDerivation rec {
name = "mysql-${version}";
version = "5.7.25";
pname = "mysql";
version = "5.7.27";
src = fetchurl {
url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
sha256 = "0gvjcdnba7nf2dx3fbqk1qyg49zclfvaihb78l8h6qc08di1qxak";
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
};
preConfigure = stdenv.lib.optional stdenv.isDarwin ''
@@ -19,13 +19,11 @@ self = stdenv.mkDerivation rec {
export PATH=$PATH:$TMPDIR
'';
nativeBuildInputs = [ cmake bison ];
nativeBuildInputs = [ cmake bison pkgconfig ];
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
enableParallelBuilding = true;
outputs = [ "out" "static" ];
cmakeFlags = [
@@ -76,7 +74,7 @@ self = stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
homepage = https://www.mysql.com/;
homepage = "https://www.mysql.com/";
description = "The world's most popular open source database";
platforms = platforms.unix;
license = with licenses; [