diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix new file mode 100644 index 000000000000..8cab6ec656a2 --- /dev/null +++ b/pkgs/servers/sql/percona-server/default.nix @@ -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; + }; +} diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix new file mode 100644 index 000000000000..f3466dc9f165 --- /dev/null +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -0,0 +1,6 @@ +pkgs: { + percona-xtrabackup_lts = pkgs.callPackage ./lts.nix { + boost = pkgs.boost177; + }; + percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06870578e7fb..f42508513ec5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };