public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65950 from aanderse/mysql-update

Browse Source 
mysql57: 5.7.25 -> 5.7.27
This commit is contained in:
Andreas Rammhold 2019-08-06 08:15:50 +00:00 committed by GitHub
commit 955480e6bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/mysql.nix
View File

@ -19,7 +19,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' services.mysql.initialScript = pkgs.writeText "mysql-init.sql" ''
CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123';
''; '';
services.mysql.package = pkgs.mysql; services.mysql.package = pkgs.mysql57;
}; };
mariadb = mariadb =

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