Merge pull request #309953 from flyingcircusio/PL-132430-percona-innovation

percona: restructure releases according to upstream release policy

Changed files
+167 -18
nixos
doc
manual
release-notes
tests
pkgs
servers
sql
tools
backup
top-level
+4
nixos/doc/manual/release-notes/rl-2405.section.md
···
- `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information.
+
- `percona-server` now follows [the same two-fold release cycle](https://www.percona.com/blog/lts-and-innovation-releases-for-percona-server-for-mysql/) as Oracle MySQL and provides a *Long-Term-Support (LTS)* in parallel with a continuous-delivery *Innovation* release. `percona-server` defaults to `percona-server_lts`, will be backed by the same release branch throughout the lifetime of this stable NixOS release, and is still available under the versioned attribute `percona-server_8_0`.
+
The `percona-server_innovation` releases however have support periods shorter than the lifetime of this NixOS release and will continuously be updated to newer Percona releases. Note that Oracle considers the *Innovation* releases to be production-grade, but each release might include backwards-incompatible changes, even in its on-disk format.
+
The same release scheme is applied to the supporting `percona-xtrabackup` tool as well.
+
- `git-town` was updated from version 11 to 13. See the [changelog](https://github.com/git-town/git-town/blob/main/CHANGELOG.md#1300-2024-03-22) for breaking changes.
- `k9s` was updated to v0.31. There have been various breaking changes in the config file format,
+1 -1
nixos/tests/mysql/common.nix
···
inherit (pkgs) mysql80;
};
perconaPackages = {
-
inherit (pkgs) percona-server_8_0;
+
inherit (pkgs) percona-server_lts percona-server_innovation;
};
mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
}
+1 -1
nixos/tests/mysql/mysql.nix
···
}) mariadbPackages)
// (lib.mapAttrs (_: package: makeMySQLTest {
inherit package;
-
name = "percona_8_0";
+
name = builtins.replaceStrings ["-"] ["_"] package.pname;
hasMroonga = false; useSocketAuth = false;
}) perconaPackages)
+2 -2
pkgs/servers/sql/percona-server/8.0.x.nix pkgs/servers/sql/percona-server/lts.nix
···
}:
stdenv.mkDerivation (finalAttrs: {
-
pname = "percona-server";
+
pname = "percona-server_lts";
version = "8.0.36-28";
src = fetchurl {
···
connector-c = finalAttrs.finalPackage;
server = finalAttrs.finalPackage;
mysqlVersion = lib.versions.majorMinor finalAttrs.version;
-
tests = nixosTests.mysql.percona-server_8_0;
+
tests = nixosTests.mysql.percona-server_lts;
};
meta = with lib; {
+15
pkgs/servers/sql/percona-server/default.nix
···
+
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;
+
};
+
}
+112
pkgs/servers/sql/percona-server/innovation.nix
···
+
{ lib, stdenv, fetchurl, bison, cmake, pkg-config
+
, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2
+
, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
+
, systemd
+
# Percona-specific deps
+
, coreutils, cyrus_sasl, gnumake, openldap
+
# optional: different malloc implementations
+
, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools
+
}:
+
+
assert !(withJemalloc && withTcmalloc);
+
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "percona-server_innovation";
+
version = "8.3.0-1";
+
+
src = fetchurl {
+
url = "https://downloads.percona.com/downloads/percona-distribution-mysql-ps/percona-distribution-mysql-ps-${builtins.head (lib.strings.split "-" finalAttrs.version)}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
+
hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg";
+
};
+
+
nativeBuildInputs = [ bison cmake pkg-config ]
+
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
+
+
patches = [
+
./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
+
];
+
+
## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
+
postPatch = ''
+
substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
+
substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
+
# The rocksdb setup script is called with `env -i` and cannot find anything in PATH.
+
patchShebangs storage/rocksdb/get_rocksdb_files.sh
+
substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp
+
substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE"
+
substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
+
'';
+
+
buildInputs = [
+
boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
+
zstd libfido2 openldap perl cyrus_sasl
+
] ++ lib.optionals stdenv.isLinux [
+
numactl libtirpc systemd
+
] ++ lib.optionals stdenv.isDarwin [
+
cctools CoreServices developer_cmds DarwinTools
+
]
+
++ lib.optional (stdenv.isLinux && withJemalloc) jemalloc
+
++ lib.optional (stdenv.isLinux && withTcmalloc) gperftools;
+
+
outputs = [ "out" "static" ];
+
+
cmakeFlags = [
+
# Percona-specific flags.
+
"-DPORTABLE=1"
+
"-DWITH_LDAP=system"
+
"-DROCKSDB_DISABLE_AVX2=1"
+
"-DROCKSDB_DISABLE_MARCH_NATIVE=1"
+
+
# Flags taken from mysql package.
+
"-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
+
"-DWITH_ROUTER=OFF" # It may be packaged separately.
+
"-DWITH_SYSTEM_LIBS=ON"
+
"-DWITH_UNIT_TESTS=OFF"
+
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+
"-DMYSQL_DATADIR=/var/lib/mysql"
+
"-DINSTALL_INFODIR=share/mysql/docs"
+
"-DINSTALL_MANDIR=share/man"
+
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+
"-DINSTALL_INCLUDEDIR=include/mysql"
+
"-DINSTALL_DOCREADMEDIR=share/mysql"
+
"-DINSTALL_SUPPORTFILESDIR=share/mysql"
+
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
+
"-DINSTALL_MYSQLTESTDIR="
+
"-DINSTALL_DOCDIR=share/mysql/docs"
+
"-DINSTALL_SHAREDIR=share/mysql"
+
+
+
] ++ lib.optionals stdenv.isLinux [
+
"-DWITH_SYSTEMD=1"
+
"-DWITH_SYSTEMD_DEBUG=1"
+
]
+
++ lib.optional (stdenv.isLinux && withJemalloc) "-DWITH_JEMALLOC=1"
+
++ lib.optional (stdenv.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1";
+
+
postInstall = ''
+
moveToOutput "lib/*.a" $static
+
so=${stdenv.hostPlatform.extensions.sharedLibrary}
+
ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
+
'';
+
+
passthru = {
+
client = finalAttrs.finalPackage;
+
connector-c = finalAttrs.finalPackage;
+
server = finalAttrs.finalPackage;
+
mysqlVersion = lib.versions.majorMinor finalAttrs.version;
+
tests = nixosTests.mysql.percona-server_innovation;
+
};
+
+
+
meta = with lib; {
+
homepage = "https://www.percona.com/software/mysql-database/percona-server";
+
description = ''
+
A free, fully compatible, enhanced, open source drop-in replacement for
+
MySQL® that provides superior performance, scalability and instrumentation.
+
'';
+
license = licenses.gpl2;
+
maintainers = teams.flyingcircus.members;
+
platforms = platforms.unix;
+
};
+
})
pkgs/tools/backup/percona-xtrabackup/8_0.nix pkgs/tools/backup/percona-xtrabackup/lts.nix
+6
pkgs/tools/backup/percona-xtrabackup/default.nix
···
+
pkgs: {
+
percona-xtrabackup_lts = pkgs.callPackage ./lts.nix {
+
boost = pkgs.boost177;
+
};
+
percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { };
+
}
+5 -3
pkgs/tools/backup/percona-xtrabackup/generic.nix
···
, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ...
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "percona-xtrabackup";
inherit version;
src = fetchFromGitHub {
owner = "percona";
repo = "percona-xtrabackup";
-
rev = "${pname}-${version}";
+
rev = "${finalAttrs.pname}-${finalAttrs.version}";
inherit hash fetchSubmodules;
};
···
rm -r "$out"/lib/plugin/debug
'' + extraPostInstall;
+
passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version;
+
meta = with lib; {
description = "Non-blocking backup tool for MySQL";
homepage = "http://www.percona.com/software/percona-xtrabackup";
···
platforms = platforms.linux;
maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ];
};
-
}
+
})
+15
pkgs/tools/backup/percona-xtrabackup/innovation.nix
···
+
{ callPackage, ... } @ args:
+
+
callPackage ./generic.nix (args // {
+
version = "8.3.0-1";
+
hash = "sha256-qZM2AFhpwrN0BR+DdozYn7s2I+c1tWpD5QvppTEfGEY=";
+
+
# includes https://github.com/Percona-Lab/libkmip.git
+
fetchSubmodules = true;
+
+
extraPatches = [
+
];
+
+
extraPostInstall = ''
+
'';
+
})
+2
pkgs/top-level/aliases.nix
···
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;
pgadmin = pgadmin4;
+4 -11
pkgs/top-level/all-packages.nix
···
perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
-
percona-server_8_0 = callPackage ../servers/sql/percona-server/8.0.x.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-xtrabackup = percona-xtrabackup_8_0;
-
percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix {
-
boost = boost177;
-
};
+
inherit (import ../servers/sql/percona-server pkgs) percona-server_lts percona-server_innovation;
+
percona-server = percona-server_lts;
+
inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_lts percona-xtrabackup_innovation;
+
percona-xtrabackup = percona-xtrabackup_lts;
pick = callPackage ../tools/misc/pick { };