Merge pull request #1004 from flyingcircusio/PL-132430-percona-innova…

…tion

[24.05] percona: adapt to new release scheme; update nixpkgs

doc/src/mysql.md

@@ -4,14 +4,28 @@
 
 This component sets up a managed instance of the MySQL database server.
 
+We use the [Percona Distribution for MySQL](https://percona.com/software/mysql-database)
+which provides useful improvements over the standard Oracle MySQL/MariaDB implementations.
+
+## Supported versions
+
 There's a role for each supported major version, currently:
 
 - mysql57: Percona 5.7.x (End-of-life)
-- percona80: Percona 8.0.x
-- percona81: Percona 8.1.x
-
-We use the [Percona Distribution for MySQL](https://percona.com/software/mysql-database)
-which provides useful improvements over the standard Oracle MySQL/MariaDB implementations.
+- percona80: Percona 8.0.x (*LTS* release)
+- percona83: Percona 8.3.x (*Innovation* release)
+
+Percona and MySQL currently follow a [two-fold release model](https://www.percona.com/blog/lts-and-innovation-releases-for-percona-server-for-mysql/)
+and provide support for 2 releases in parallel:
+
+- *LTS (recommended)*: These long-term support releases are supported throughout the full release life-time
+  of this NixOS platform release and only receive minor bug and security fixes.
+- *Innovation*: A new innovation release is made roughly each quarter of a year,
+  containing new features and potentially breaking changes.\
+  Please note that these releases won't receive any further upstream support once the successor
+  is out. Our platform will keep each Innovation release made during the release life-time
+  available, enabling you to update at your own pace. But we won't backport changes from
+  newer Percona Innovation releases.
 
 ## Configuration
 

nixos/roles/mysql.nix

@@ -8,6 +8,8 @@ with builtins;
 
 let
   fclib = config.fclib;
+  supportedPerconaVersions = ["8.0" "8.3"];
+  removeDot = builtins.replaceStrings ["."] [""];
 in
 {
   options = with lib;
@@ -55,31 +57,35 @@ in
       };
 
       mysql57 = mkRole "5.7";
-      percona80 = mkRole "8.0";
-      percona81 = mkRole "8.1";
-    };
+    }
+    // lib.listToAttrs (builtins.map
+      (ver: lib.nameValuePair "percona${removeDot ver}" (mkRole ver)
+    ) supportedPerconaVersions);
 
   };
 
   config =
   let
-    mysqlRoles = with config.flyingcircus.roles; {
-      "5.7" = mysql57.enable;
-      "8.0" = percona80.enable;
-      "8.1" = percona81.enable;
-    };
-
-    mysqlPackages = with pkgs; {
-      "5.7" = percona57;
-      "8.0" = percona80;
-      "8.1" = percona81;
-    };
+    mysqlRoles = {
+      "5.7" = config.flyingcircus.roles.mysql57.enable;
+    }
+    // lib.listToAttrs (builtins.map (
+      ver: lib.nameValuePair ver config.flyingcircus.roles."percona${removeDot ver}".enable
+    ) supportedPerconaVersions);
+
+    mysqlPackages = {
+      "5.7" = pkgs.percona57;
+    }
+    // lib.listToAttrs (builtins.map (
+      ver: lib.nameValuePair ver pkgs."percona${removeDot ver}"
+    ) supportedPerconaVersions);
 
     xtrabackupPackages = with pkgs; {
       "5.7" = percona-xtrabackup_2_4;
-      "8.0" = percona-xtrabackup_8_0;
-      "8.1" = percona-xtrabackup_8_1;
-    };
+    }
+    // lib.listToAttrs (builtins.map (
+      ver: lib.nameValuePair ver pkgs."percona-xtrabackup_${builtins.replaceStrings ["."] ["_"] ver}"
+    ) supportedPerconaVersions);
 
     cfg = config.flyingcircus.roles.mysql;
     fclib = config.fclib;

pkgs/overlay.nix

@@ -341,11 +341,15 @@ builtins.mapAttrs (_: patchPhps phpLogPermissionPatch) {
 
   percona80 = super.percona-server_8_0;
 
+  # assertion notifies us about the need to vendor the old innovation releases
+  percona83 = assert self.percona-server_innovation.mysqlVersion == "8.3"; self.percona-server_innovation;
+
   percona-xtrabackup_2_4 = super.callPackage ./percona-xtrabackup/2_4.nix {
     boost = self.boost159;
     openssl = self.openssl_1_1;
   };
 
+  percona-xtrabackup_8_3 = assert self.percona-xtrabackup_innovation.mysqlVersion == "8.3"; self.percona-xtrabackup_innovation;
   # Has been renamed upstream, backy-extract still wants to use it.
   pkgconfig = super.pkg-config;
 

release/important_packages.json

@@ -127,9 +127,14 @@
   "percona",
   "percona-server",
   "percona-xtrabackup_8_0",
+  "percona-xtrabackup_8_3",
+  "percona-xtrabackup_lts",
+  "percona-xtrabackup_innovation",
   "percona57",
   "percona80",
-  "percona81",
+  "percona83",
+  "percona-server_lts",
+  "percona-server_innovation",
   "php72",
   "php73",
   "php74",