From 188b5df7cd035edc1e77f5d9c108ce61d679f213 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 2 Oct 2024 18:13:17 +0200 Subject: [PATCH] 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 002765a04cd9..e7d55c4af962 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 f3466dc9f165..0cf044ff51c7 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 e5d2e936717d..313b9fd7b687 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 3cba16c1aa9f..0b6c41d1a382 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 { };