b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #157261 from LeSuisse/mysql57-5.7.37

Browse source
This commit is contained in:
Sandro 2022-01-30 01:04:23 +01:00 committed by GitHub
parent 959eebd3e1 55561105fa
commit 30396b78db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/mysql/common.nix
View file

@ -3,7 +3,7 @@
inherit (pkgs.darwin) cctools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
});
mysqlPackage = {
mysqlPackages = {
inherit (pkgs) mysql57 mysql80;
};
mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";

2
nixos/tests/mysql/mysql.nix
View file

@ -142,7 +142,7 @@ let
in
lib.mapAttrs (_: package: makeMySQLTest {
inherit package;
hasRocksDB = false; hasMroonga = false;
hasRocksDB = false; hasMroonga = false; useSocketAuth = false;
}) mysqlPackages
// (lib.mapAttrs (_: package: makeMySQLTest {
inherit package;

7
pkgs/servers/sql/mysql/5.7.x.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, cmake, bison, pkg-config
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
, cctools, CoreServices, developer_cmds
, libtirpc, rpcsvc-proto
, libtirpc, rpcsvc-proto, nixosTests
}:
# Note: zlib is not required; MySQL can use an internal zlib.
@ -9,11 +9,11 @@
let
self = stdenv.mkDerivation rec {
pname = "mysql";
version = "5.7.27";
version = "5.7.37";
src = fetchurl {
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0=";
};
preConfigure = lib.optionalString stdenv.isDarwin ''
@ -75,6 +75,7 @@ self = stdenv.mkDerivation rec {
connector-c = self;
server = self;
mysqlVersion = "5.7";
tests = nixosTests.mysql.mysql57;
};
meta = with lib; {