Merge pull request #157261 from LeSuisse/mysql57-5.7.37

authored by Sandro and committed by GitHub 30396b78 959eebd3

+6 -5
+1 -1
nixos/tests/mysql/common.nix
··· 3 inherit (pkgs.darwin) cctools; 4 inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; 5 }); 6 - mysqlPackage = { 7 inherit (pkgs) mysql57 mysql80; 8 }; 9 mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
··· 3 inherit (pkgs.darwin) cctools; 4 inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; 5 }); 6 + mysqlPackages = { 7 inherit (pkgs) mysql57 mysql80; 8 }; 9 mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
+1 -1
nixos/tests/mysql/mysql.nix
··· 142 in 143 lib.mapAttrs (_: package: makeMySQLTest { 144 inherit package; 145 - hasRocksDB = false; hasMroonga = false; 146 }) mysqlPackages 147 // (lib.mapAttrs (_: package: makeMySQLTest { 148 inherit package;
··· 142 in 143 lib.mapAttrs (_: package: makeMySQLTest { 144 inherit package; 145 + hasRocksDB = false; hasMroonga = false; useSocketAuth = false; 146 }) mysqlPackages 147 // (lib.mapAttrs (_: package: makeMySQLTest { 148 inherit package;
+4 -3
pkgs/servers/sql/mysql/5.7.x.nix
··· 1 { lib, stdenv, fetchurl, cmake, bison, pkg-config 2 , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl 3 , cctools, CoreServices, developer_cmds 4 - , libtirpc, rpcsvc-proto 5 }: 6 7 # Note: zlib is not required; MySQL can use an internal zlib. ··· 9 let 10 self = stdenv.mkDerivation rec { 11 pname = "mysql"; 12 - version = "5.7.27"; 13 14 src = fetchurl { 15 url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; 16 - sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; 17 }; 18 19 preConfigure = lib.optionalString stdenv.isDarwin '' ··· 75 connector-c = self; 76 server = self; 77 mysqlVersion = "5.7"; 78 }; 79 80 meta = with lib; {
··· 1 { lib, stdenv, fetchurl, cmake, bison, pkg-config 2 , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl 3 , cctools, CoreServices, developer_cmds 4 + , libtirpc, rpcsvc-proto, nixosTests 5 }: 6 7 # Note: zlib is not required; MySQL can use an internal zlib. ··· 9 let 10 self = stdenv.mkDerivation rec { 11 pname = "mysql"; 12 + version = "5.7.37"; 13 14 src = fetchurl { 15 url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; 16 + sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0="; 17 }; 18 19 preConfigure = lib.optionalString stdenv.isDarwin '' ··· 75 connector-c = self; 76 server = self; 77 mysqlVersion = "5.7"; 78 + tests = nixosTests.mysql.mysql57; 79 }; 80 81 meta = with lib; {