From 4b835e1ec3c1b2f5f665dbfd1262a247141e57cb Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:14:25 +0200 Subject: [PATCH 1/3] pgformatter: 5.9 -> 5.10 Changelog: https://github.com/darold/pgFormatter/releases/tag/v5.10 Diff: https://github.com/darold/pgFormatter/compare/v5.9...v5.10 --- pkgs/by-name/pg/pgformatter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index e8f2e449bcfe..ffce37761ff8 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -8,13 +8,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.9"; + version = "5.10"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; tag = "v${version}"; - hash = "sha256-G4Bbg8tNlwV8VCVKCamhlQ/pGf8hWCkABm6f8i5doos="; + hash = "sha256-OWw47okAs8x4Ri8+IJHPhy6YSkSN2sBlJ0v8h6GlhfU="; }; outputs = [ "out" ]; From 6542dad56758616566be463eecef02bd4949591a Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:16:55 +0200 Subject: [PATCH 2/3] pgformatter: use compound license --- pkgs/by-name/pg/pgformatter/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index ffce37761ff8..3833cf85004f 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -54,10 +54,12 @@ perlPackages.buildPerlPackage rec { thunze mfairley ]; - license = [ - lib.licenses.postgresql - lib.licenses.artistic2 - ]; + license = + with lib.licenses; + AND [ + postgresql + artistic2 + ]; mainProgram = "pg_format"; }; } From e2d94963a40b6c99fe92d1495f61dcacf6015d1e Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:19:07 +0200 Subject: [PATCH 3/3] pgformatter: enable `strictDeps` and `__structuredAttrs` --- pkgs/by-name/pg/pgformatter/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 3833cf85004f..142acea85995 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -17,6 +17,9 @@ perlPackages.buildPerlPackage rec { hash = "sha256-OWw47okAs8x4Ri8+IJHPhy6YSkSN2sBlJ0v8h6GlhfU="; }; + strictDeps = true; + __structuredAttrs = true; + outputs = [ "out" ]; makeMakerFlags = [ "INSTALLDIRS=vendor" ];