From 0b06254f5d35834fb1f612632bb58200f4cfa6c3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Feb 2022 22:41:22 +0100 Subject: [PATCH 1/6] Revert "Revert "Merge pull request #158822 from helsinki-systems/upd/mariadb"" This reverts commit 0c5b8cd1cbabd8663a429431d74aeff918686964. --- pkgs/servers/sql/mariadb/default.nix | 26 +++++++++++++++++++------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fb07bc39154d..3254b6f23271 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -10,6 +10,7 @@ , bzip2, lz4, lzo, snappy, xz, zlib, zstd , cracklib, judy, libevent, libxml2 , linux-pam, numactl, pmdk +, fmt_8 , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: @@ -173,7 +174,8 @@ in stdenv.mkDerivation (common // { ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv - ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]; + ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] + ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; patches = common.patches; @@ -235,17 +237,27 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.22"; - sha256 = "000ca1hdnj2jg051cjgdd2ralgwgh2p8nwb1x6b85202xdpc7ga4"; + version = "10.4.23"; + sha256 = "1wlhjd1xvk6p2lb93v8kfjk1scyjz882fx0i0sjyyk047mh2i852"; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.13"; - sha256 = "0n0w1pyypv6wsknaqyykj3lc9zv6smji4q5jcf90w4rid330iw0n"; + version = "10.5.14"; + sha256 = "02y292mfvr6ils4m61lh9vy74z3w2xkz6xinpgg9wl5h7q29gzaf"; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.5"; - sha256 = "13qaqb2h6kysfdi3h1l9zbb2qlpjgxb1n8mxnj5jm96r50209gp0"; + version = "10.6.6"; + sha256 = "1hz1iwkgrlhhrn5ypxszfp5ngfmfakjxl3ihzsm4845xhzn1fr77"; + }; + mariadb_107 = mariadbPackage { + # Supported until 2023-02 + version = "10.7.2"; + sha256 = "1cx5s8vq7s3r4w1drmp549kl2nyijzq6ds2mcjyzc7bk9ylipx6p"; + }; + mariadb_108 = mariadbPackage { + # Supported until 2023-05 + version = "10.8.1"; + sha256 = "0ns0z8w3374jrfdrmq7ncag089xwmf7wkr5aq3p9shk1b5mln9z2"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d37a6e8efb03..60905d22a980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21532,6 +21532,8 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 + mariadb_107 + mariadb_108 ; mariadb = mariadb_106; From 1a1666daafa5b82eeb7da382291c870cc38ade1b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Feb 2022 22:45:37 +0100 Subject: [PATCH 2/6] mariadb_104: 10.4.23 -> 10.4.24 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 3254b6f23271..6f3c44430fae 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -237,8 +237,8 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.23"; - sha256 = "1wlhjd1xvk6p2lb93v8kfjk1scyjz882fx0i0sjyyk047mh2i852"; + version = "10.4.24"; + sha256 = "0ipqilri8isn0mfvwg8imwf36zm3jsw0wf2yx905c2bznd8mb5zy"; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 From b445fd58544eb75ec068b4152eae899405f44bf9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Feb 2022 22:45:47 +0100 Subject: [PATCH 3/6] mariadb_105: 10.5.14 -> 10.5.15 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 6f3c44430fae..85ff653b2ba3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -242,8 +242,8 @@ in { }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.14"; - sha256 = "02y292mfvr6ils4m61lh9vy74z3w2xkz6xinpgg9wl5h7q29gzaf"; + version = "10.5.15"; + sha256 = "0nfvyxb157qsbl0d1i5gfzr2hb1nm0iv58f7qcbk5kkhz0vyv049"; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 From 45ab3705c8b651bf386b1c7ee47c45f92a2600e6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Feb 2022 22:45:59 +0100 Subject: [PATCH 4/6] mariadb_106: 10.6.6 -> 10.6.7 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 85ff653b2ba3..57c6055d6eb1 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -247,8 +247,8 @@ in { }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.6"; - sha256 = "1hz1iwkgrlhhrn5ypxszfp5ngfmfakjxl3ihzsm4845xhzn1fr77"; + version = "10.6.7"; + sha256 = "1idjnkjfkjvyr6r899xbiwq9wwbs84cm85mbc725yxjshqghzvkm"; }; mariadb_107 = mariadbPackage { # Supported until 2023-02 From 068a321777fca49935072ad2098a774ccc281d7a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Feb 2022 22:46:12 +0100 Subject: [PATCH 5/6] mariadb_107: 10.7.2 -> 10.7.3 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 57c6055d6eb1..3c749490ef13 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -252,8 +252,8 @@ in { }; mariadb_107 = mariadbPackage { # Supported until 2023-02 - version = "10.7.2"; - sha256 = "1cx5s8vq7s3r4w1drmp549kl2nyijzq6ds2mcjyzc7bk9ylipx6p"; + version = "10.7.3"; + sha256 = "1m2wa67vvdm61ap8spl18b9vqkmsnq4rfd0248l17jf9zwcnja6s"; }; mariadb_108 = mariadbPackage { # Supported until 2023-05 From 25365685ea0b85fdb4199bb66a5ca923541d44be Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Feb 2022 22:46:26 +0100 Subject: [PATCH 6/6] mariadb_108: 10.8.1 -> 10.8.2 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 3c749490ef13..1b8b1eb1108f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -257,7 +257,7 @@ in { }; mariadb_108 = mariadbPackage { # Supported until 2023-05 - version = "10.8.1"; - sha256 = "0ns0z8w3374jrfdrmq7ncag089xwmf7wkr5aq3p9shk1b5mln9z2"; + version = "10.8.2"; + sha256 = "0v4mms3mihylnqlc0ifvwzykah6lkdd39lmxbv5vnhbsh7wggq0l"; }; }