Skip to content

Commit

Permalink
percona-server, percona-xtrabackup: rework naming
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
osnyx committed Oct 13, 2024
1 parent edc63e0 commit 188b5df
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 8 deletions.
File renamed without changes.
File renamed without changes.
6 changes: 4 additions & 2 deletions pkgs/servers/sql/percona-server/default.nix
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/backup/percona-xtrabackup/default.nix
Original file line number Diff line number Diff line change
@@ -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 { };
}
2 changes: 0 additions & 2 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down

0 comments on commit 188b5df

Please sign in to comment.