From 66e02d31305f26fdb7f1172a35734c861e052cc6 Mon Sep 17 00:00:00 2001 From: Michael Glass Date: Wed, 17 Jul 2024 11:56:39 +0200 Subject: [PATCH 1/3] maintainers: add michaelglass --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c58880d779b3..2eba3933d754 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13130,6 +13130,13 @@ github = "michaeldonovan"; githubId = 14077230; }; + michaelglass = { + email = "nixpkgs@mike.is"; + name = "Michael Glass"; + github = "michaelglass"; + githubId = 60136; + keys = [ { fingerprint = "46AF 8625 D92A 219B 8E6D B7F8 9CDD 3769 1649 1385"; } ]; + }; michaelgrahamevans = { email = "michaelgrahamevans@gmail.com"; name = "Michael Evans"; From 245230e640d080aa6616a6876ec7bd7c18776e79 Mon Sep 17 00:00:00 2001 From: Michael Glass Date: Wed, 17 Jul 2024 11:58:45 +0200 Subject: [PATCH 2/3] perlModules.PerconaToolkit: add meta.changelog --- .../perl-modules/Percona-Toolkit/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 6a115732e710..8a86295dc45c 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -1,5 +1,12 @@ -{ lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang -, DBDmysql, DBI, IOSocketSSL, TermReadKey +{ + lib, + fetchFromGitHub, + buildPerlPackage, + shortenPerlShebang, + DBDmysql, + DBI, + IOSocketSSL, + TermReadKey, }: buildPerlPackage rec { @@ -17,7 +24,12 @@ buildPerlPackage rec { nativeBuildInputs = [ shortenPerlShebang ]; - buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; + buildInputs = [ + DBDmysql + DBI + IOSocketSSL + TermReadKey + ]; postInstall = '' shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*) @@ -26,6 +38,7 @@ buildPerlPackage rec { meta = { description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks"; homepage = "https://www.percona.com/software/database-tools/percona-toolkit"; + changelog = "https://docs.percona.com/percona-toolkit/release_notes.html"; license = with lib.licenses; [ gpl2Only ]; maintainers = with lib.maintainers; [ izorkin ]; }; From 6ab1c5291d8c691c57e4bacb6b0b24beba692fdb Mon Sep 17 00:00:00 2001 From: Michael Glass Date: Wed, 17 Jul 2024 11:59:33 +0200 Subject: [PATCH 3/3] percona-toolkit: init at 3.2.0 --- pkgs/by-name/pe/percona-toolkit/package.nix | 51 +++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/pe/percona-toolkit/package.nix diff --git a/pkgs/by-name/pe/percona-toolkit/package.nix b/pkgs/by-name/pe/percona-toolkit/package.nix new file mode 100644 index 000000000000..e544bfef1710 --- /dev/null +++ b/pkgs/by-name/pe/percona-toolkit/package.nix @@ -0,0 +1,51 @@ +{ + stdenv, + lib, + perlPackages, + makeWrapper, +}: + +let + perconaToolkit = perlPackages.PerconaToolkit; +in + +stdenv.mkDerivation { + pname = perconaToolkit.name; + version = perconaToolkit.version; + + nativeBuildInputs = [ makeWrapper ]; + + src = perconaToolkit; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + # make sure dest already exists before symlink + # this prevents installing a broken link into the path + ln -s ${perconaToolkit}/lib $out/lib + ln -s ${perconaToolkit}/share $out/share + + for cmd in ${perconaToolkit}/bin/*; do + ln -s $cmd $out/bin + done + ''; + + dontStrip = true; + postFixup = '' + for cmd in $out/bin/*; do + wrapProgram $cmd --prefix PERL5LIB + done + ''; + + meta = { + inherit (perconaToolkit.meta) + description + homepage + license + platforms + changelog + ; + + maintainers = with lib.maintainers; [ michaelglass ]; + }; +}