From 188b5df7cd035edc1e77f5d9c108ce61d679f213 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Wed, 2 Oct 2024 18:13:17 +0200
Subject: [PATCH 01/11] percona-server, percona-xtrabackup: rework naming

When reworking the percona package naming towards the two release
streams "innovation" and "lts", I did not anticipate the case that two
releases are long-term supported in parallel, and that the latest
Innovation release is end-of-life and replaced by a more recent lts.

Hence, the first-level attribute names now reflect the package
major-minor versions again, augmented by attribute names pointing to
respective lts and innovation releases.
---
 pkgs/servers/sql/percona-server/{lts.nix => 8_0.nix}      | 0
 .../sql/percona-server/{innovation.nix => 8_3.nix}        | 0
 pkgs/servers/sql/percona-server/default.nix               | 6 ++++--
 pkgs/tools/backup/percona-xtrabackup/{lts.nix => 8_0.nix} | 0
 .../backup/percona-xtrabackup/{innovation.nix => 8_3.nix} | 0
 pkgs/tools/backup/percona-xtrabackup/default.nix          | 4 ++--
 pkgs/top-level/aliases.nix                                | 2 --
 pkgs/top-level/all-packages.nix                           | 8 ++++++--
 8 files changed, 12 insertions(+), 8 deletions(-)
 rename pkgs/servers/sql/percona-server/{lts.nix => 8_0.nix} (100%)
 rename pkgs/servers/sql/percona-server/{innovation.nix => 8_3.nix} (100%)
 rename pkgs/tools/backup/percona-xtrabackup/{lts.nix => 8_0.nix} (100%)
 rename pkgs/tools/backup/percona-xtrabackup/{innovation.nix => 8_3.nix} (100%)

diff --git a/pkgs/servers/sql/percona-server/lts.nix b/pkgs/servers/sql/percona-server/8_0.nix
similarity index 100%
rename from pkgs/servers/sql/percona-server/lts.nix
rename to pkgs/servers/sql/percona-server/8_0.nix
diff --git a/pkgs/servers/sql/percona-server/innovation.nix b/pkgs/servers/sql/percona-server/8_3.nix
similarity index 100%
rename from pkgs/servers/sql/percona-server/innovation.nix
rename to pkgs/servers/sql/percona-server/8_3.nix
diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix
index 002765a04cd9d..e7d55c4af9620 100644
--- a/pkgs/servers/sql/percona-server/default.nix
+++ b/pkgs/servers/sql/percona-server/default.nix
@@ -1,12 +1,14 @@
 pkgs: {
-  percona-server_lts = pkgs.callPackage ./lts.nix {
+  # old lts
+  percona-server_8_0 = pkgs.callPackage ./8_0.nix {
     inherit (pkgs.darwin) developer_cmds DarwinTools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
     boost = pkgs.boost177; # Configure checks for specific version.
     icu = pkgs.icu69;
+    # newer versions cause linking failures against `libabsl_spinlock_wait`
     protobuf = pkgs.protobuf_21;
   };
-  percona-server_innovation = pkgs.callPackage ./innovation.nix {
+  percona-server_8_3 = pkgs.callPackage ./8_3.nix {
     inherit (pkgs.darwin) developer_cmds DarwinTools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
     # newer versions cause linking failures against `libabsl_spinlock_wait`
diff --git a/pkgs/tools/backup/percona-xtrabackup/lts.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix
similarity index 100%
rename from pkgs/tools/backup/percona-xtrabackup/lts.nix
rename to pkgs/tools/backup/percona-xtrabackup/8_0.nix
diff --git a/pkgs/tools/backup/percona-xtrabackup/innovation.nix b/pkgs/tools/backup/percona-xtrabackup/8_3.nix
similarity index 100%
rename from pkgs/tools/backup/percona-xtrabackup/innovation.nix
rename to pkgs/tools/backup/percona-xtrabackup/8_3.nix
diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix
index f3466dc9f165f..0cf044ff51c7c 100644
--- a/pkgs/tools/backup/percona-xtrabackup/default.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/default.nix
@@ -1,6 +1,6 @@
 pkgs: {
-  percona-xtrabackup_lts = pkgs.callPackage ./lts.nix {
+  percona-xtrabackup_8_0 = pkgs.callPackage ./8_0.nix {
     boost = pkgs.boost177;
   };
-  percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { };
+  percona-xtrabackup_8_3 = pkgs.callPackage ./8_3.nix { };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e5d2e936717d6..313b9fd7b6871 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1213,8 +1213,6 @@ mapAliases {
   pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22
   peach = asouldocs; # Added 2022-08-28
   pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
-  percona-server_8_0 = percona-server_lts; # Added 2024-05-07
-  percona-xtrabackup_8_0 = percona-xtrabackup_lts; # Added 2024-05-07
   perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead";
   perldevelPackages = perldevel;
   petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cba16c1aa9f3..0b6c41d1a3822 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11089,9 +11089,13 @@ with pkgs;
 
   perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
 
-  inherit (import ../servers/sql/percona-server pkgs) percona-server_lts percona-server_innovation;
+  inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_3;
+  percona-server_lts = percona-server_8_0;
+  percona-server_innovation = percona-server_8_3;
   percona-server = percona-server_lts;
-  inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_lts percona-xtrabackup_innovation;
+  inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_3;
+  percona-xtrabackup_lts = percona-xtrabackup_8_0;
+  percona-xtrabackup_innovation = percona-xtrabackup_8_3;
   percona-xtrabackup = percona-xtrabackup_lts;
 
   pick = callPackage ../tools/misc/pick { };

From 712028ec9ae4d54b689f6df2ae43e8fdfd3b216b Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Wed, 2 Oct 2024 17:27:52 +0200
Subject: [PATCH 02/11] percona-server_8_4: init at 8.4.0-1

This is a new LTS release as well.
---
 pkgs/servers/sql/percona-server/8_3.nix     | 123 -----------
 pkgs/servers/sql/percona-server/8_4.nix     | 221 ++++++++++++++++++++
 pkgs/servers/sql/percona-server/default.nix |   2 +-
 pkgs/top-level/all-packages.nix             |   7 +-
 4 files changed, 226 insertions(+), 127 deletions(-)
 delete mode 100644 pkgs/servers/sql/percona-server/8_3.nix
 create mode 100644 pkgs/servers/sql/percona-server/8_4.nix

diff --git a/pkgs/servers/sql/percona-server/8_3.nix b/pkgs/servers/sql/percona-server/8_3.nix
deleted file mode 100644
index 61b2ff7bb4a10..0000000000000
--- a/pkgs/servers/sql/percona-server/8_3.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{ lib, stdenv, fetchurl, bison, cmake, pkg-config
-, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2
-, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
-, coreutils, procps, gnused, gnugrep, hostname, makeWrapper
-, systemd
-# Percona-specific deps
-, cyrus_sasl, gnumake, openldap
-# optional: different malloc implementations
-, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools
-}:
-
-assert !(withJemalloc && withTcmalloc);
-
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "percona-server_innovation";
-  version = "8.3.0-1";
-
-  src = fetchurl {
-    url = "https://downloads.percona.com/downloads/percona-distribution-mysql-ps/percona-distribution-mysql-ps-${builtins.head (lib.strings.split "-" finalAttrs.version)}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg";
-  };
-
-  nativeBuildInputs = [
-    bison cmake pkg-config makeWrapper
-    # required for scripts/CMakeLists.txt
-    coreutils gnugrep procps
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
-
-  patches = [
-    ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
-  ];
-
-  ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
-  postPatch = ''
-    substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
-    substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
-    # The rocksdb setup script is called with `env -i` and cannot find anything in PATH.
-    patchShebangs storage/rocksdb/get_rocksdb_files.sh
-    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp
-    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE"
-    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
-  '';
-
-  buildInputs = [
-    boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
-    zstd libfido2 openldap perl cyrus_sasl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    numactl libtirpc systemd
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools CoreServices developer_cmds DarwinTools
-  ]
-  ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc
-  ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools;
-
-  outputs = [ "out" "static" ];
-
-  cmakeFlags = [
-    # Percona-specific flags.
-    "-DPORTABLE=1"
-    "-DWITH_LDAP=system"
-    "-DROCKSDB_DISABLE_AVX2=1"
-    "-DROCKSDB_DISABLE_MARCH_NATIVE=1"
-
-    # Flags taken from mysql package.
-    "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
-    "-DWITH_ROUTER=OFF" # It may be packaged separately.
-    "-DWITH_SYSTEM_LIBS=ON"
-    "-DWITH_UNIT_TESTS=OFF"
-    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-    "-DMYSQL_DATADIR=/var/lib/mysql"
-    "-DINSTALL_INFODIR=share/mysql/docs"
-    "-DINSTALL_MANDIR=share/man"
-    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
-    "-DINSTALL_INCLUDEDIR=include/mysql"
-    "-DINSTALL_DOCREADMEDIR=share/mysql"
-    "-DINSTALL_SUPPORTFILESDIR=share/mysql"
-    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-    "-DINSTALL_MYSQLTESTDIR="
-    "-DINSTALL_DOCDIR=share/mysql/docs"
-    "-DINSTALL_SHAREDIR=share/mysql"
-
-
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    "-DWITH_SYSTEMD=1"
-    "-DWITH_SYSTEMD_DEBUG=1"
-  ]
-  ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1"
-  ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1";
-
-  postInstall = ''
-    moveToOutput "lib/*.a" $static
-    so=${stdenv.hostPlatform.extensions.sharedLibrary}
-    ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
-
-    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]}
-    wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]}
-    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-    wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-  '';
-
-  passthru = {
-    client = finalAttrs.finalPackage;
-    connector-c = finalAttrs.finalPackage;
-    server = finalAttrs.finalPackage;
-    mysqlVersion = lib.versions.majorMinor finalAttrs.version;
-    tests = nixosTests.mysql.percona-server_innovation;
-  };
-
-
-  meta = with lib; {
-    homepage = "https://www.percona.com/software/mysql-database/percona-server";
-    description = ''
-      A free, fully compatible, enhanced, open source drop-in replacement for
-      MySQL® that provides superior performance, scalability and instrumentation.
-    '';
-    license = licenses.gpl2;
-    maintainers = teams.flyingcircus.members;
-    platforms = platforms.unix;
-  };
-})
diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix
new file mode 100644
index 0000000000000..6ed5e077b40a3
--- /dev/null
+++ b/pkgs/servers/sql/percona-server/8_4.nix
@@ -0,0 +1,221 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bison,
+  cmake,
+  pkg-config,
+  boost,
+  icu,
+  libedit,
+  libevent,
+  lz4,
+  ncurses,
+  openssl,
+  perl,
+  protobuf,
+  re2,
+  readline,
+  zlib,
+  zstd,
+  libfido2,
+  numactl,
+  cctools,
+  CoreServices,
+  developer_cmds,
+  libtirpc,
+  rpcsvc-proto,
+  curl,
+  DarwinTools,
+  nixosTests,
+  coreutils,
+  procps,
+  gnused,
+  gnugrep,
+  hostname,
+  makeWrapper,
+  systemd,
+  # Percona-specific deps
+  cyrus_sasl,
+  gnumake,
+  openldap,
+  # optional: different malloc implementations
+  withJemalloc ? false,
+  withTcmalloc ? false,
+  jemalloc,
+  gperftools,
+}:
+
+assert !(withJemalloc && withTcmalloc);
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "percona-server";
+  version = "8.4.0-1";
+
+  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-76PXXqTNBVsD7RX2vhp7RyESiFpJL0h0zG9ucNfy3uQ=";
+  };
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    pkg-config
+    makeWrapper
+    # required for scripts/CMakeLists.txt
+    coreutils
+    gnugrep
+    procps
+  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
+
+  patches = [
+    ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
+  ];
+
+  ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
+  postPatch = ''
+    substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
+    substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
+    # The rocksdb setup script is called with `env -i` and cannot find anything in PATH.
+    patchShebangs storage/rocksdb/get_rocksdb_files.sh
+    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp
+    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE"
+    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
+  '';
+
+  buildInputs =
+    [
+      boost
+      (curl.override { inherit openssl; })
+      icu
+      libedit
+      libevent
+      lz4
+      ncurses
+      openssl
+      protobuf
+      re2
+      readline
+      zlib
+      zstd
+      libfido2
+      openldap
+      perl
+      cyrus_sasl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      numactl
+      libtirpc
+      systemd
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools
+      CoreServices
+      developer_cmds
+      DarwinTools
+    ]
+    ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc
+    ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools;
+
+  outputs = [
+    "out"
+    "static"
+  ];
+
+  cmakeFlags =
+    [
+      # Percona-specific flags.
+      "-DPORTABLE=1"
+      "-DWITH_LDAP=system"
+      "-DROCKSDB_DISABLE_AVX2=1"
+      "-DROCKSDB_DISABLE_MARCH_NATIVE=1"
+
+      # Flags taken from mysql package.
+      "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
+      "-DWITH_ROUTER=OFF" # It may be packaged separately.
+      "-DWITH_SYSTEM_LIBS=ON"
+      "-DWITH_UNIT_TESTS=OFF"
+      "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+      "-DMYSQL_DATADIR=/var/lib/mysql"
+      "-DINSTALL_INFODIR=share/mysql/docs"
+      "-DINSTALL_MANDIR=share/man"
+      "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+      "-DINSTALL_INCLUDEDIR=include/mysql"
+      "-DINSTALL_DOCREADMEDIR=share/mysql"
+      "-DINSTALL_SUPPORTFILESDIR=share/mysql"
+      "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+      "-DINSTALL_MYSQLTESTDIR="
+      "-DINSTALL_DOCDIR=share/mysql/docs"
+      "-DINSTALL_SHAREDIR=share/mysql"
+
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      "-DWITH_SYSTEMD=1"
+      "-DWITH_SYSTEMD_DEBUG=1"
+    ]
+    ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1"
+    ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1";
+
+  postInstall =
+    ''
+      moveToOutput "lib/*.a" $static
+      so=${stdenv.hostPlatform.extensions.sharedLibrary}
+      ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
+
+      wrapProgram $out/bin/mysqld_safe --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          procps
+          gnugrep
+          gnused
+          hostname
+        ]
+      }
+      wrapProgram $out/bin/mysql_config --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnused
+        ]
+      }
+      wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnugrep
+        ]
+      }
+      wrapProgram $out/bin/ps-admin --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnugrep
+        ]
+      }
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      wrapProgram $out/bin/mysqld_multi --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnugrep
+        ]
+      }
+    '';
+
+  passthru = {
+    client = finalAttrs.finalPackage;
+    connector-c = finalAttrs.finalPackage;
+    server = finalAttrs.finalPackage;
+    mysqlVersion = lib.versions.majorMinor finalAttrs.version;
+    tests = nixosTests.mysql.percona-server_innovation;
+  };
+
+  meta = with lib; {
+    homepage = "https://www.percona.com/software/mysql-database/percona-server";
+    description = ''
+      A free, fully compatible, enhanced, open source drop-in replacement for
+      MySQL® that provides superior performance, scalability and instrumentation.
+      Long-term support release.
+    '';
+    license = licenses.gpl2;
+    maintainers = teams.flyingcircus.members;
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix
index e7d55c4af9620..161d8f179ced5 100644
--- a/pkgs/servers/sql/percona-server/default.nix
+++ b/pkgs/servers/sql/percona-server/default.nix
@@ -8,7 +8,7 @@ pkgs: {
     # newer versions cause linking failures against `libabsl_spinlock_wait`
     protobuf = pkgs.protobuf_21;
   };
-  percona-server_8_3 = pkgs.callPackage ./8_3.nix {
+  percona-server_8_4 = pkgs.callPackage ./8_4.nix {
     inherit (pkgs.darwin) developer_cmds DarwinTools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
     # newer versions cause linking failures against `libabsl_spinlock_wait`
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b6c41d1a3822..f128ecf8e98e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11089,9 +11089,10 @@ with pkgs;
 
   perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
 
-  inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_3;
-  percona-server_lts = percona-server_8_0;
-  percona-server_innovation = percona-server_8_3;
+  inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4;
+  percona-server_lts = percona-server_8_4;
+  # temporarily, latest LTS and Innovation release are equal
+  percona-server_innovation = percona-server_8_4;
   percona-server = percona-server_lts;
   inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_3;
   percona-xtrabackup_lts = percona-xtrabackup_8_0;

From b04c93f6f43e41006fe4578fcdf5a5300812d1b6 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Sun, 13 Oct 2024 17:39:54 +0200
Subject: [PATCH 03/11] percona-server_8_0: 8.0.36-28 -> 8.0.37-29

This is a new LTS release as well.
---
 pkgs/servers/sql/percona-server/8_0.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index 352b0239c429c..af3925fc58133 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -7,12 +7,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "percona-server_lts";
-  version = "8.0.36-28";
+  pname = "percona-server";
+  version = "8.0.37-29";
 
   src = fetchurl {
     url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-iktEvZz3mjjmJ16PX51OjSwwiFS3H9W/XRco//Q6aEQ=";
+    hash = "sha256-zZgq3AxCRYdte3dTUJiuMvVGdl9U01s8jxcAqDxZiNM=";
   };
 
   nativeBuildInputs = [
@@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = ''
       A free, fully compatible, enhanced, open source drop-in replacement for
       MySQL® that provides superior performance, scalability and instrumentation.
+      Long-term support release.
     '';
     license = licenses.gpl2Plus;
     maintainers = teams.flyingcircus.members;

From a309521902bc8f80708a9ea08eb00989c276b6c8 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Wed, 2 Oct 2024 18:06:45 +0200
Subject: [PATCH 04/11] percona-xtrabackup_8_0: 8.0.36-30 -> 8.0.35-31

---
 pkgs/tools/backup/percona-xtrabackup/8_0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix
index fbb4c045d776f..04d026ce87d2c 100644
--- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix
@@ -1,8 +1,8 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "8.0.35-30";
-  hash = "sha256-yagqBKU057Gk5pEyT2R3c5DtxNG/+TSPenFgbxUiHPo=";
+  version = "8.0.35-31";
+  hash = "sha256-KHfgSi9bQlqsi5aDRBlSpdZgMfOrAwHK51k8KhQ9Udg=";
 
   # includes https://github.com/Percona-Lab/libkmip.git
   fetchSubmodules = true;

From 1e514dc39015085ba433e82138d535c07941f8d6 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Wed, 2 Oct 2024 18:07:30 +0200
Subject: [PATCH 05/11] percona-xtrabackup_8_4: init at 8.4.0-1

---
 pkgs/tools/backup/percona-xtrabackup/8_3.nix   | 15 ---------------
 pkgs/tools/backup/percona-xtrabackup/8_4.nix   | 18 ++++++++++++++++++
 .../backup/percona-xtrabackup/default.nix      |  2 +-
 pkgs/top-level/all-packages.nix                |  7 ++++---
 4 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/tools/backup/percona-xtrabackup/8_3.nix
 create mode 100644 pkgs/tools/backup/percona-xtrabackup/8_4.nix

diff --git a/pkgs/tools/backup/percona-xtrabackup/8_3.nix b/pkgs/tools/backup/percona-xtrabackup/8_3.nix
deleted file mode 100644
index 003df8aa6b505..0000000000000
--- a/pkgs/tools/backup/percona-xtrabackup/8_3.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "8.3.0-1";
-  hash = "sha256-qZM2AFhpwrN0BR+DdozYn7s2I+c1tWpD5QvppTEfGEY=";
-
-  # includes https://github.com/Percona-Lab/libkmip.git
-  fetchSubmodules = true;
-
-  extraPatches = [
-  ];
-
-  extraPostInstall = ''
-  '';
-})
diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix
new file mode 100644
index 0000000000000..0bfcbb12e2362
--- /dev/null
+++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix
@@ -0,0 +1,18 @@
+{ callPackage, ... }@args:
+
+callPackage ./generic.nix (
+  args
+  // {
+    version = "8.4.0-1";
+    hash = "sha256-2tWRRYH0P0HZsWTxeuvDeVWvDwqjjdv6J7YiZwoTKtM=";
+
+    # includes https://github.com/Percona-Lab/libkmip.git
+    fetchSubmodules = true;
+
+    extraPatches =
+      [
+      ];
+
+    extraPostInstall = '''';
+  }
+)
diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix
index 0cf044ff51c7c..8ff666574b4c1 100644
--- a/pkgs/tools/backup/percona-xtrabackup/default.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/default.nix
@@ -2,5 +2,5 @@ pkgs: {
   percona-xtrabackup_8_0 = pkgs.callPackage ./8_0.nix {
     boost = pkgs.boost177;
   };
-  percona-xtrabackup_8_3 = pkgs.callPackage ./8_3.nix { };
+  percona-xtrabackup_8_4 = pkgs.callPackage ./8_4.nix { };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f128ecf8e98e9..c8a19e4641f78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11094,9 +11094,10 @@ with pkgs;
   # temporarily, latest LTS and Innovation release are equal
   percona-server_innovation = percona-server_8_4;
   percona-server = percona-server_lts;
-  inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_3;
-  percona-xtrabackup_lts = percona-xtrabackup_8_0;
-  percona-xtrabackup_innovation = percona-xtrabackup_8_3;
+  inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4;
+  percona-xtrabackup_lts = percona-xtrabackup_8_4;
+  # temporarily, latest LTS and Innovation release are equal
+  percona-xtrabackup_innovation = percona-xtrabackup_8_4;
   percona-xtrabackup = percona-xtrabackup_lts;
 
   pick = callPackage ../tools/misc/pick { };

From 8315d06e9967498851141b4391fcd0f0433507bf Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Wed, 2 Oct 2024 18:35:03 +0200
Subject: [PATCH 06/11] percona: release notes for 8.4 LTS release

---
 nixos/doc/manual/release-notes/rl-2411.section.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 6f2dd011eaf0c..20a9cb715e635 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -191,6 +191,10 @@
   Also be aware that if you have set additional options in `services.wstunnel.{clients,servers}.<name>.extraArgs`,
   that those might have been removed or modified upstream.
 
+- `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed.
+
+- `percona-server_lts` now points towards the new LTS release `percona-server_8_4`. The previous LTS continues to be supported and is available as `percona-server_8_0`. The same is true for the supporting `percona-xtrabackup` tooling.
+
 - `clang-tools_<version>` packages have been moved into `llvmPackages_<version>` (i.e. `clang-tools_18` is now `llvmPackages_18.clang-tools`).
   - For convenience, the top-level `clang-tools` attribute remains and is now bound to `llvmPackages.clang-tools`.
   - Top-level `clang_tools_<version>` attributes are now aliases; these will be removed in a future release.

From 8d14fa2886fec877690c6d28cfcdba4503dbbcea Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Wed, 2 Oct 2024 18:46:14 +0200
Subject: [PATCH 07/11] percona: apply nixfmt

---
 pkgs/servers/sql/percona-server/8_0.nix       | 136 +++++++++++++++---
 pkgs/tools/backup/percona-xtrabackup/8_0.nix  |  29 ++--
 .../backup/percona-xtrabackup/generic.nix     |  85 +++++++++--
 3 files changed, 201 insertions(+), 49 deletions(-)

diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index af3925fc58133..a82a4fe8d7a7e 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -1,9 +1,43 @@
-{ lib, stdenv, fetchurl, bison, cmake, pkg-config
-, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2
-, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
-, coreutils, procps, gnused, gnugrep, hostname, makeWrapper
-# Percona-specific deps
-, cyrus_sasl, gnumake, openldap
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bison,
+  cmake,
+  pkg-config,
+  boost,
+  icu,
+  libedit,
+  libevent,
+  lz4,
+  ncurses,
+  openssl,
+  perl,
+  protobuf,
+  re2,
+  readline,
+  zlib,
+  zstd,
+  libfido2,
+  numactl,
+  cctools,
+  CoreServices,
+  developer_cmds,
+  libtirpc,
+  rpcsvc-proto,
+  curl,
+  DarwinTools,
+  nixosTests,
+  coreutils,
+  procps,
+  gnused,
+  gnugrep,
+  hostname,
+  makeWrapper,
+  # Percona-specific deps
+  cyrus_sasl,
+  gnumake,
+  openldap,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,9 +50,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    bison cmake pkg-config makeWrapper
+    bison
+    cmake
+    pkg-config
+    makeWrapper
     # required for scripts/CMakeLists.txt
-    coreutils gnugrep procps
+    coreutils
+    gnugrep
+    procps
   ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
   patches = [
@@ -36,16 +75,41 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
   '';
 
-  buildInputs = [
-    boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
-    zstd libfido2 openldap perl cyrus_sasl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    numactl libtirpc
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools CoreServices developer_cmds DarwinTools
-  ];
+  buildInputs =
+    [
+      boost
+      (curl.override { inherit openssl; })
+      icu
+      libedit
+      libevent
+      lz4
+      ncurses
+      openssl
+      protobuf
+      re2
+      readline
+      zlib
+      zstd
+      libfido2
+      openldap
+      perl
+      cyrus_sasl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      numactl
+      libtirpc
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools
+      CoreServices
+      developer_cmds
+      DarwinTools
+    ];
 
-  outputs = [ "out" "static" ];
+  outputs = [
+    "out"
+    "static"
+  ];
 
   cmakeFlags = [
     # Percona-specific flags.
@@ -78,11 +142,39 @@ stdenv.mkDerivation (finalAttrs: {
     so=${stdenv.hostPlatform.extensions.sharedLibrary}
     ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
 
-    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]}
-    wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]}
-    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-    wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
+    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        procps
+        gnugrep
+        gnused
+        hostname
+      ]
+    }
+    wrapProgram $out/bin/mysql_config --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnused
+      ]
+    }
+    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnugrep
+      ]
+    }
+    wrapProgram $out/bin/ps-admin --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnugrep
+      ]
+    }
+    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnugrep
+      ]
+    }
   '';
 
   passthru = {
diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix
index 04d026ce87d2c..c9822f1ec84c8 100644
--- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix
@@ -1,17 +1,20 @@
-{ callPackage, ... } @ args:
+{ callPackage, ... }@args:
 
-callPackage ./generic.nix (args // {
-  version = "8.0.35-31";
-  hash = "sha256-KHfgSi9bQlqsi5aDRBlSpdZgMfOrAwHK51k8KhQ9Udg=";
+callPackage ./generic.nix (
+  args
+  // {
+    version = "8.0.35-31";
+    hash = "sha256-KHfgSi9bQlqsi5aDRBlSpdZgMfOrAwHK51k8KhQ9Udg=";
 
-  # includes https://github.com/Percona-Lab/libkmip.git
-  fetchSubmodules = true;
+    # includes https://github.com/Percona-Lab/libkmip.git
+    fetchSubmodules = true;
 
-  extraPatches = [
-    ./abi-check.patch
-  ];
+    extraPatches = [
+      ./abi-check.patch
+    ];
 
-  extraPostInstall = ''
-    rm -r "$out"/docs
-  '';
-})
+    extraPostInstall = ''
+      rm -r "$out"/docs
+    '';
+  }
+)
diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix
index d81dee6f97f66..fdb5d9f701f42 100644
--- a/pkgs/tools/backup/percona-xtrabackup/generic.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix
@@ -1,8 +1,36 @@
-{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config
-, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4
-, ncurses, numactl, openssl, procps, protobuf, valgrind, xxd, zlib
-, perlPackages
-, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ...
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  bison,
+  boost,
+  cmake,
+  makeWrapper,
+  pkg-config,
+  curl,
+  cyrus_sasl,
+  libaio,
+  libedit,
+  libev,
+  libevent,
+  libgcrypt,
+  libgpg-error,
+  lz4,
+  ncurses,
+  numactl,
+  openssl,
+  procps,
+  protobuf,
+  valgrind,
+  xxd,
+  zlib,
+  perlPackages,
+  version,
+  hash,
+  fetchSubmodules ? false,
+  extraPatches ? [ ],
+  extraPostInstall ? "",
+  ...
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,12 +44,39 @@ stdenv.mkDerivation (finalAttrs: {
     inherit hash fetchSubmodules;
   };
 
-  nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ];
+  nativeBuildInputs = [
+    bison
+    boost
+    cmake
+    makeWrapper
+    pkg-config
+  ];
 
-  buildInputs = [
-    (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4
-    ncurses numactl openssl procps protobuf valgrind xxd zlib
-  ] ++ (with perlPackages; [ perl DBI DBDmysql ]);
+  buildInputs =
+    [
+      (curl.override { inherit openssl; })
+      cyrus_sasl
+      libaio
+      libedit
+      libevent
+      libev
+      libgcrypt
+      libgpg-error
+      lz4
+      ncurses
+      numactl
+      openssl
+      procps
+      protobuf
+      valgrind
+      xxd
+      zlib
+    ]
+    ++ (with perlPackages; [
+      perl
+      DBI
+      DBDmysql
+    ]);
 
   patches = extraPatches;
 
@@ -42,10 +97,12 @@ stdenv.mkDerivation (finalAttrs: {
     "-DWITH_MAN_PAGES=OFF"
   ];
 
-  postInstall = ''
-    wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB
-    rm -r "$out"/lib/plugin/debug
-  '' + extraPostInstall;
+  postInstall =
+    ''
+      wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB
+      rm -r "$out"/lib/plugin/debug
+    ''
+    + extraPostInstall;
 
   passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version;
 

From 16a8db078642abcacbeaab8ce4c5267857f18ff2 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Thu, 3 Oct 2024 01:16:00 +0200
Subject: [PATCH 08/11] .git-blame-ignore-revs: add percona reformatting

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 8a25858cfd6a7..7d6251cbee9b9 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -174,3 +174,6 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9
 
 # fetchurl: nixfmt-rfc-style
 ce21e97a1f20dee15da85c084f9d1148d84f853b
+
+# percona: apply nixfmt
+8d14fa2886fec877690c6d28cfcdba4503dbbcea

From 4b5141e0189a07f54f0842570ac03492fe5c6d97 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Sun, 13 Oct 2024 20:34:54 +0200
Subject: [PATCH 09/11] percona: deprecate innovation/lts release flavours

Percona upstream has decided not to create releases or each MySQL
innovation upstream release, but just for LTS releases.
https://www.percona.com/blog/no-mysql-9-x-innovation-releases-from-percona/
---
 nixos/doc/manual/release-notes/rl-2411.section.md |  3 ++-
 pkgs/servers/sql/percona-server/default.nix       |  1 +
 pkgs/tools/backup/percona-xtrabackup/default.nix  |  1 +
 pkgs/top-level/aliases.nix                        |  4 ++++
 pkgs/top-level/all-packages.nix                   | 12 ++----------
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 20a9cb715e635..4c32ad992167a 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -193,7 +193,8 @@
 
 - `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed.
 
-- `percona-server_lts` now points towards the new LTS release `percona-server_8_4`. The previous LTS continues to be supported and is available as `percona-server_8_0`. The same is true for the supporting `percona-xtrabackup` tooling.
+- Percona has decided not to follow the LTS/ Innovation release scheme of upstream MySQL and thus [will only create releases for MySQL LTS versions](https://www.percona.com/blog/no-mysql-9-x-innovation-releases-from-percona/). Hence, the package names `percona-server_lts`, `percona-server_innovation`, `percona-xtrabackup_lts` and `percona-xtrabackup_innovation` are deprecated.
+  - `percona-server` and `percona-server_lts` now point towards the new LTS release `percona-server_8_4`. The previous LTS continues to be supported and is available as `percona-server_8_0`. The same is true for the supporting `percona-xtrabackup` tooling.
 
 - `clang-tools_<version>` packages have been moved into `llvmPackages_<version>` (i.e. `clang-tools_18` is now `llvmPackages_18.clang-tools`).
   - For convenience, the top-level `clang-tools` attribute remains and is now bound to `llvmPackages.clang-tools`.
diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix
index 161d8f179ced5..aaac48de68ff0 100644
--- a/pkgs/servers/sql/percona-server/default.nix
+++ b/pkgs/servers/sql/percona-server/default.nix
@@ -14,4 +14,5 @@ pkgs: {
     # newer versions cause linking failures against `libabsl_spinlock_wait`
     protobuf = pkgs.protobuf_21;
   };
+  percona-server = pkgs.percona-server_8_4;
 }
diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix
index 8ff666574b4c1..9fd2e627c17e5 100644
--- a/pkgs/tools/backup/percona-xtrabackup/default.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/default.nix
@@ -3,4 +3,5 @@ pkgs: {
     boost = pkgs.boost177;
   };
   percona-xtrabackup_8_4 = pkgs.callPackage ./8_4.nix { };
+  percona-xtrabackup = pkgs.percona-xtrabackup_8_4;
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 313b9fd7b6871..3cb9749864a0e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1212,6 +1212,10 @@ mapAliases {
   pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20
   pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22
   peach = asouldocs; # Added 2022-08-28
+  percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13
+  percona-server_lts = percona-server; # Added 2024-10-13
+  percona-xtrabackup_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13
+  percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13
   pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
   perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead";
   perldevelPackages = perldevel;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8a19e4641f78..70cd16965e9fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11089,16 +11089,8 @@ with pkgs;
 
   perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
 
-  inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4;
-  percona-server_lts = percona-server_8_4;
-  # temporarily, latest LTS and Innovation release are equal
-  percona-server_innovation = percona-server_8_4;
-  percona-server = percona-server_lts;
-  inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4;
-  percona-xtrabackup_lts = percona-xtrabackup_8_4;
-  # temporarily, latest LTS and Innovation release are equal
-  percona-xtrabackup_innovation = percona-xtrabackup_8_4;
-  percona-xtrabackup = percona-xtrabackup_lts;
+  inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4 percona-server;
+  inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4 percona-xtrabackup;
 
   pick = callPackage ../tools/misc/pick { };
 

From 6d0da9a167b688525dc7c7f778104ad3126c7bd6 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Sun, 13 Oct 2024 20:58:42 +0200
Subject: [PATCH 10/11] tests/mysql: properly specify percona packages

---
 nixos/tests/mysql/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix
index ad54b0e00c1b3..079eff163b1cf 100644
--- a/nixos/tests/mysql/common.nix
+++ b/nixos/tests/mysql/common.nix
@@ -4,7 +4,7 @@
     inherit (pkgs) mysql80;
   };
   perconaPackages = {
-    inherit (pkgs) percona-server_lts percona-server_innovation;
+    inherit (pkgs) percona-server_8_0 percona-server_8_4;
   };
   mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
 }

From f02bd5b0fccb9b9365fe3d219a88df3cff78c914 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Sun, 13 Oct 2024 22:56:01 +0200
Subject: [PATCH 11/11] percona: correct licensing information

Corrects the partially wrong change from #313931, all Oracle MySQL
derivates are actually GPLv2 only.
---
 pkgs/servers/sql/percona-server/8_0.nix          | 2 +-
 pkgs/servers/sql/percona-server/8_4.nix          | 2 +-
 pkgs/tools/backup/percona-xtrabackup/generic.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index a82a4fe8d7a7e..1d1a64e31643c 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
       MySQL® that provides superior performance, scalability and instrumentation.
       Long-term support release.
     '';
-    license = licenses.gpl2Plus;
+    license = licenses.gpl2Only;
     maintainers = teams.flyingcircus.members;
     platforms = platforms.unix;
   };
diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix
index 6ed5e077b40a3..0b68f84d4b129 100644
--- a/pkgs/servers/sql/percona-server/8_4.nix
+++ b/pkgs/servers/sql/percona-server/8_4.nix
@@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: {
       MySQL® that provides superior performance, scalability and instrumentation.
       Long-term support release.
     '';
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
     maintainers = teams.flyingcircus.members;
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix
index fdb5d9f701f42..3f4cdd86cf10a 100644
--- a/pkgs/tools/backup/percona-xtrabackup/generic.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Non-blocking backup tool for MySQL";
     homepage = "http://www.percona.com/software/percona-xtrabackup";
-    license = licenses.lgpl2;
+    license = licenses.gpl2Only;
     platforms = platforms.linux;
     maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ];
   };