Merge pull request #157261 from LeSuisse/mysql57-5.7.37
This commit is contained in:
commit
30396b78db
|
@ -3,7 +3,7 @@
|
||||||
inherit (pkgs.darwin) cctools;
|
inherit (pkgs.darwin) cctools;
|
||||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
||||||
});
|
});
|
||||||
mysqlPackage = {
|
mysqlPackages = {
|
||||||
inherit (pkgs) mysql57 mysql80;
|
inherit (pkgs) mysql57 mysql80;
|
||||||
};
|
};
|
||||||
mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
|
mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
|
||||||
|
|
|
@ -142,7 +142,7 @@ let
|
||||||
in
|
in
|
||||||
lib.mapAttrs (_: package: makeMySQLTest {
|
lib.mapAttrs (_: package: makeMySQLTest {
|
||||||
inherit package;
|
inherit package;
|
||||||
hasRocksDB = false; hasMroonga = false;
|
hasRocksDB = false; hasMroonga = false; useSocketAuth = false;
|
||||||
}) mysqlPackages
|
}) mysqlPackages
|
||||||
// (lib.mapAttrs (_: package: makeMySQLTest {
|
// (lib.mapAttrs (_: package: makeMySQLTest {
|
||||||
inherit package;
|
inherit package;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, fetchurl, cmake, bison, pkg-config
|
{ lib, stdenv, fetchurl, cmake, bison, pkg-config
|
||||||
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
|
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
|
||||||
, cctools, CoreServices, developer_cmds
|
, cctools, CoreServices, developer_cmds
|
||||||
, libtirpc, rpcsvc-proto
|
, libtirpc, rpcsvc-proto, nixosTests
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# Note: zlib is not required; MySQL can use an internal zlib.
|
# Note: zlib is not required; MySQL can use an internal zlib.
|
||||||
|
@ -9,11 +9,11 @@
|
||||||
let
|
let
|
||||||
self = stdenv.mkDerivation rec {
|
self = stdenv.mkDerivation rec {
|
||||||
pname = "mysql";
|
pname = "mysql";
|
||||||
version = "5.7.27";
|
version = "5.7.37";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
|
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
|
sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||||
|
@ -75,6 +75,7 @@ self = stdenv.mkDerivation rec {
|
||||||
connector-c = self;
|
connector-c = self;
|
||||||
server = self;
|
server = self;
|
||||||
mysqlVersion = "5.7";
|
mysqlVersion = "5.7";
|
||||||
|
tests = nixosTests.mysql.mysql57;
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in a new issue