summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2022-01-29 11:04:47 +0100
committerThomas Gerbet <thomas@gerbet.me>2022-01-29 11:04:47 +0100
commit55561105fa2cf72a8d741114c9e3aa887cdd6502 (patch)
treeacdbbfa078ff3bde99bc56a22c51c757c479f3f2
parent1d389b20d380bd08d406a1c77bb45fab660b6fc2 (diff)
downloadnixpkgs-55561105fa2cf72a8d741114c9e3aa887cdd6502.tar
nixpkgs-55561105fa2cf72a8d741114c9e3aa887cdd6502.tar.gz
nixpkgs-55561105fa2cf72a8d741114c9e3aa887cdd6502.tar.bz2
nixpkgs-55561105fa2cf72a8d741114c9e3aa887cdd6502.tar.lz
nixpkgs-55561105fa2cf72a8d741114c9e3aa887cdd6502.tar.xz
nixpkgs-55561105fa2cf72a8d741114c9e3aa887cdd6502.tar.zst
nixpkgs-55561105fa2cf72a8d741114c9e3aa887cdd6502.zip
mysql57: 5.7.27 -> 5.7.37
Changes:
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-37.html
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-36.html
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-35.html
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-34.html
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-33.html
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-32.html
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-31.html
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-30.html
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-29.html
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-28.html
-rw-r--r--nixos/tests/mysql/common.nix2
-rw-r--r--nixos/tests/mysql/mysql.nix2
-rw-r--r--pkgs/servers/sql/mysql/5.7.x.nix7
3 files changed, 6 insertions, 5 deletions
diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix
index 968253d109c..040d360b6d9 100644
--- a/nixos/tests/mysql/common.nix
+++ b/nixos/tests/mysql/common.nix
@@ -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)}";
diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix
index a5e42f85a7f..197e6da80e2 100644
--- a/nixos/tests/mysql/mysql.nix
+++ b/nixos/tests/mysql/mysql.nix
@@ -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;
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index c1ce4d9e1e1..1c8b21f399e 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -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; {