diff options
| -rw-r--r-- | nixos/tests/mysql.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/mysql/5.7.x.nix | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index abf9606aa366..05bd968de02d 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -19,7 +19,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; ''; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mysql57; }; mariadb = diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 249a5af5d480..6636c099e832 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bison +{ stdenv, fetchurl, cmake, bison, pkgconfig , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds }: @@ -6,12 +6,12 @@ let self = stdenv.mkDerivation rec { - name = "mysql-${version}"; - version = "5.7.25"; + pname = "mysql"; + version = "5.7.27"; src = fetchurl { - url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "0gvjcdnba7nf2dx3fbqk1qyg49zclfvaihb78l8h6qc08di1qxak"; + url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; + sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' @@ -19,13 +19,11 @@ self = stdenv.mkDerivation rec { export PATH=$PATH:$TMPDIR ''; - nativeBuildInputs = [ cmake bison ]; + nativeBuildInputs = [ cmake bison pkgconfig ]; buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; - enableParallelBuilding = true; - outputs = [ "out" "static" ]; cmakeFlags = [ @@ -76,7 +74,7 @@ self = stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.mysql.com/; + homepage = "https://www.mysql.com/"; description = "The world's most popular open source database"; platforms = platforms.unix; license = with licenses; [ |