tjh.dev
Merge pull request #65954 from aanderse/mysql-backport
mysql57: 5.7.25 -> 5.7.27 [backport]
authored by Samuel Dionne-Riel and committed by GitHub 2f1fc1b6 314e2acf
+18
-4
nixos/tests/mysql.nix
+18
-4
nixos/tests/mysql.nix
···
5
5
};
6
6
7
7
nodes = {
8
-
master =
8
+
mysql =
9
9
{ pkgs, ... }:
10
10
11
11
{
12
12
services.mysql.enable = true;
13
13
services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
14
-
services.mysql.package = pkgs.mysql;
14
+
services.mysql.package = pkgs.mysql57;
15
15
};
16
+
17
+
mariadb =
18
+
{ pkgs, ... }:
19
+
20
+
{
21
+
services.mysql.enable = true;
22
+
services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
23
+
services.mysql.package = pkgs.mariadb;
24
+
};
25
+
16
26
};
17
27
18
28
testScript = ''
19
29
startAll;
20
30
21
-
$master->waitForUnit("mysql");
22
-
$master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
31
+
$mysql->waitForUnit("mysql");
32
+
$mysql->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
33
+
$mysql->shutdown;
34
+
$mariadb->waitForUnit("mysql");
35
+
$mariadb->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
36
+
$mariadb->shutdown;
23
37
'';
24
38
})
+7
-9
pkgs/servers/sql/mysql/5.7.x.nix
+7
-9
pkgs/servers/sql/mysql/5.7.x.nix
···
1
-
{ stdenv, fetchurl, cmake, bison
1
+
{ stdenv, fetchurl, cmake, bison, pkgconfig
2
2
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
3
3
, cctools, CoreServices, developer_cmds }:
4
4
···
6
6
7
7
let
8
8
self = stdenv.mkDerivation rec {
9
-
name = "mysql-${version}";
10
-
version = "5.7.25";
9
+
pname = "mysql";
10
+
version = "5.7.27";
11
11
12
12
src = fetchurl {
13
-
url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
14
-
sha256 = "0gvjcdnba7nf2dx3fbqk1qyg49zclfvaihb78l8h6qc08di1qxak";
13
+
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
14
+
sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
15
15
};
16
16
17
17
preConfigure = stdenv.lib.optional stdenv.isDarwin ''
···
19
19
export PATH=$PATH:$TMPDIR
20
20
'';
21
21
22
-
nativeBuildInputs = [ cmake bison ];
22
+
nativeBuildInputs = [ cmake bison pkgconfig ];
23
23
24
24
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
25
25
++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
26
-
27
-
enableParallelBuilding = true;
28
26
29
27
outputs = [ "out" "static" ];
30
28
···
76
74
};
77
75
78
76
meta = with stdenv.lib; {
79
-
homepage = https://www.mysql.com/;
77
+
homepage = "https://www.mysql.com/";
80
78
description = "The world's most popular open source database";
81
79
platforms = platforms.unix;
82
80
license = with licenses; [