percona: apply required multi-version package structure

To work around the pkgs/by-name CI check, I applied the recommended structure
refactoring as documented in https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name#further-possible-refactorings
This commit is contained in:
Oliver Schmidt 2024-05-08 00:35:00 +02:00
parent 52506a2744
commit 9164c33ab6
3 changed files with 23 additions and 17 deletions

View File

@ -0,0 +1,15 @@
pkgs: {
percona-server_lts = pkgs.callPackage ./lts.nix {
inherit (pkgs.darwin) cctools developer_cmds DarwinTools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
boost = pkgs.boost177; # Configure checks for specific version.
icu = pkgs.icu69;
protobuf = pkgs.protobuf_21;
};
percona-server_innovation = pkgs.callPackage ./innovation.nix {
inherit (pkgs.darwin) cctools developer_cmds DarwinTools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
# newer versions cause linking failures against `libabsl_spinlock_wait`
protobuf = pkgs.protobuf_21;
};
}

View File

@ -0,0 +1,6 @@
pkgs: {
percona-xtrabackup_lts = pkgs.callPackage ./lts.nix {
boost = pkgs.boost177;
};
percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { };
}

View File

@ -11701,25 +11701,10 @@ with pkgs;
perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
inherit (import ../servers/sql/percona-server pkgs) percona-server_lts percona-server_innovation;
percona-server = percona-server_lts;
percona-server_lts = callPackage ../servers/sql/percona-server/lts.nix {
inherit (darwin) cctools developer_cmds DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost177; # Configure checks for specific version.
icu = icu69;
protobuf = protobuf_21;
};
percona-server_innovation = callPackage ../servers/sql/percona-server/innovation.nix {
inherit (darwin) cctools developer_cmds DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
# newer versions cause linking failures against `libabsl_spinlock_wait`
protobuf = protobuf_21;
};
inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_lts percona-xtrabackup_innovation;
percona-xtrabackup = percona-xtrabackup_lts;
percona-xtrabackup_lts = callPackage ../tools/backup/percona-xtrabackup/lts.nix {
boost = boost177;
};
percona-xtrabackup_innovation = callPackage ../tools/backup/percona-xtrabackup/innovation.nix { };
pick = callPackage ../tools/misc/pick { };