From ee10bed8c41119cd2bfb8e038e684135116da143 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 00:05:34 +0100 Subject: [PATCH 1/3] pgbadger: lint with nixfmt-rfc-style --- pkgs/tools/misc/pgbadger/default.nix | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix index 4054e6b20e94..cf68371c20f7 100644 --- a/pkgs/tools/misc/pgbadger/default.nix +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -1,8 +1,20 @@ -{ buildPerlPackage, shortenPerlShebang, stdenv, lib, fetchFromGitHub, which, bzip2, PodMarkdown, JSONXS -, TextCSV_XS }: +{ + buildPerlPackage, + bzip2, + fetchFromGitHub, + JSONXS, + lib, + PodMarkdown, + shortenPerlShebang, + stdenv, + TextCSV_XS, + which, +}: + buildPerlPackage rec { pname = "pgbadger"; version = "12.2"; + src = fetchFromGitHub { owner = "darold"; repo = "pgbadger"; @@ -25,10 +37,18 @@ buildPerlPackage rec { PERL_MM_OPT = "INSTALL_BASE=${placeholder "out"}"; - buildInputs = [ PodMarkdown JSONXS TextCSV_XS ]; + buildInputs = [ + JSONXS + PodMarkdown + TextCSV_XS + ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; - nativeCheckInputs = [ which bzip2 ]; + nativeCheckInputs = [ + bzip2 + which + ]; meta = { homepage = "https://github.com/darold/pgbadger"; From 227b3773a4872ab5f16e36c2ddd617c4b1526458 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 00:17:39 +0100 Subject: [PATCH 2/3] pgbadger: add passthru.{updateScript,tests.version} --- pkgs/tools/misc/pgbadger/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix index cf68371c20f7..21361b8231a2 100644 --- a/pkgs/tools/misc/pgbadger/default.nix +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -4,9 +4,12 @@ fetchFromGitHub, JSONXS, lib, + nix-update-script, + pgbadger, PodMarkdown, shortenPerlShebang, stdenv, + testers, TextCSV_XS, which, }: @@ -45,11 +48,22 @@ buildPerlPackage rec { nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + doCheck = false; + nativeCheckInputs = [ bzip2 which ]; + passthru = { + tests.version = testers.testVersion { + inherit version; + command = "${lib.getExe pgbadger} --version"; + package = pgbadger; + }; + updateScript = nix-update-script { }; + }; + meta = { homepage = "https://github.com/darold/pgbadger"; description = "A fast PostgreSQL Log Analyzer"; From 70e6366ffa6384ecf70765d4c8e82488baf0427e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 00:19:45 +0100 Subject: [PATCH 3/3] pgbadger: 12.2 -> 12.4 https://github.com/darold/pgbadger/compare/v12.2...v12.4 https://github.com/darold/pgbadger/releases/tag/v12.4 --- pkgs/tools/misc/pgbadger/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix index 21361b8231a2..b1024d68a91c 100644 --- a/pkgs/tools/misc/pgbadger/default.nix +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -16,13 +16,13 @@ buildPerlPackage rec { pname = "pgbadger"; - version = "12.2"; + version = "12.4"; src = fetchFromGitHub { owner = "darold"; repo = "pgbadger"; - rev = "v${version}"; - hash = "sha256-IzfpDqzS5VcehkPsFxyn3kJsvXs8nLgJ3WT8ZCmIDxI="; + rev = "refs/tags/v${version}"; + hash = "sha256-an/BOkQsMkTXS0HywV1JWerS16HRbO1MHVleYhVqmBM="; }; postPatch = '' @@ -48,8 +48,6 @@ buildPerlPackage rec { nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; - doCheck = false; - nativeCheckInputs = [ bzip2 which