From acc3bd5e6f3e441323b3769c8e98501181a5c8d7 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Thu, 19 Dec 2024 16:03:17 +0100 Subject: [PATCH 1/3] percona-server: add updateScript (cherry picked from commit 65d0417b29f9266f10881431f0a5cf2fbbb66af5) --- pkgs/servers/sql/percona-server/8_0.nix | 9 ++++++++- pkgs/servers/sql/percona-server/8_4.nix | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index 3c9e97d5eea04..e7b948f4e8dbb 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + gitUpdater, bison, cmake, pkg-config, @@ -182,7 +183,13 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests.percona-server = nixosTests.mysql.percona-server_8_0; + tests.percona-server = + nixosTests.mysql."percona-server_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}"; + updateScript = gitUpdater { + url = "https://github.com/percona/percona-server"; + rev-prefix = "Percona-Server-"; + allowedVersions = "${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\..+"; + }; }; meta = with lib; { diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index 9b8621e409004..67376c6f1140e 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + gitUpdater, bison, cmake, pkg-config, @@ -204,7 +205,13 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests.percona-server = nixosTests.mysql.percona-server_8_4; + tests.percona-server = + nixosTests.mysql."percona-server_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}"; + updateScript = gitUpdater { + url = "https://github.com/percona/percona-server"; + rev-prefix = "Percona-Server-"; + allowedVersions = "${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\..+"; + }; }; meta = with lib; { From 39735e66463f17731a7f0a0918fdfaba2dbca708 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Thu, 19 Dec 2024 16:05:16 +0100 Subject: [PATCH 2/3] percona-server_8_4: 8.4.2-2 -> 8.4.3-3 release notes: https://docs.percona.com/percona-server/8.4/release-notes/8.4.3-3.html Fixed CVEs, taken from 2d69ebbc4ec95f0b5b2cd4fca76cb20ff7e15996: Fixes: * https://github.com/advisories/GHSA-m6rg-98pc-7rxm * https://github.com/advisories/GHSA-97c4-2w4v-c7r8 * https://github.com/advisories/GHSA-m7rw-p49v-xvr4 * https://github.com/advisories/GHSA-cgw6-mmr2-9474 * https://github.com/advisories/GHSA-m2x9-pvwq-m49p * https://github.com/advisories/GHSA-w76f-wfx3-5qjq * https://github.com/advisories/GHSA-vqmm-339w-hc7c * https://github.com/advisories/GHSA-2rhg-4865-8qfj * https://github.com/advisories/GHSA-vggh-55p7-p625 * https://github.com/advisories/GHSA-j5r3-hxmp-cxpr * https://github.com/advisories/GHSA-c72q-9j4p-2mp4 * https://github.com/advisories/GHSA-cj7p-fg4w-qrvh * https://github.com/advisories/GHSA-fv75-hjwp-hmcm * https://github.com/advisories/GHSA-xhf9-m56c-xh6w * https://github.com/advisories/GHSA-c494-hg27-rg85 * https://github.com/advisories/GHSA-r97q-xhcv-9xx9 * https://github.com/advisories/GHSA-h3ph-4h6g-xqfq * https://github.com/advisories/GHSA-mffh-p59m-fv66 * https://github.com/advisories/GHSA-vchj-ggm5-9rcm * https://github.com/advisories/GHSA-jv2x-g26c-46cq * https://github.com/advisories/GHSA-xcwx-vhj6-p7m7 * https://github.com/advisories/GHSA-6vrv-p2wx-g2fg * https://github.com/advisories/GHSA-6pjm-6xcx-c94q * https://github.com/advisories/GHSA-36gq-2499-pq9x * https://github.com/advisories/GHSA-6477-mq9q-6867 (cherry picked from commit 78075270c40294bfbb64977efd2d034ab7270b23) --- pkgs/servers/sql/percona-server/8_4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index 67376c6f1140e..9fef5c2ca522e 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -51,11 +51,11 @@ assert !(withJemalloc && withTcmalloc); stdenv.mkDerivation (finalAttrs: { pname = "percona-server"; - version = "8.4.2-2"; + version = "8.4.3-3"; src = fetchurl { url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - hash = "sha256-KdaF2+vZfWf6fW8HWi+c97SHW+WqmlcpdPzUUgX94EY="; + hash = "sha256-37W0b8zYKErToJBU+aYtCmQjorcDtvuG0YbOwJzuZgo="; }; nativeBuildInputs = [ From 7faad36f60844f561fb6c003594b03136a9c4c08 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Thu, 19 Dec 2024 16:13:07 +0100 Subject: [PATCH 3/3] percona-xtrabackup_8_4: 8.4.0-1 -> 8.4.0-2 release notes: https://docs.percona.com/percona-xtrabackup/8.4/release-notes/8.4.0-2.html (cherry picked from commit f1d219d74d0b8616a4a807bab7d937a9ac390cc0) --- pkgs/tools/backup/percona-xtrabackup/8_4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix index 47efd663a1d4e..82f2ab5ea95d8 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_4.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix @@ -3,8 +3,8 @@ callPackage ./generic.nix ( args // { - version = "8.4.0-1"; - hash = "sha256-2tWRRYH0P0HZsWTxeuvDeVWvDwqjjdv6J7YiZwoTKtM="; + version = "8.4.0-2"; + hash = "sha256-ClW/B175z/sxF/MT9iHW1Wtr0ere63tIgUpcMp1IfTs="; # includes https://github.com/Percona-Lab/libkmip.git fetchSubmodules = true;