This commit is contained in:
Robin Appelman 2026-08-31 16:48:10 +02:00
commit 64ed2da575
5 changed files with 36 additions and 56 deletions

View file

@ -121,7 +121,9 @@ in
config = mkMerge [
(mkIf (pathExists config.composerJson) {
withOverlays = [
(final: prev: {
(final: prev: let
withMinPhp = pkg: pkg.override {php = final.minPhp;};
in {
minPhp = buildPhp final;
vendor = final.callPackage ./pkgs/vendor.nix {
php = final.minPhp;
@ -134,8 +136,10 @@ in
testDependencies = config.testDependencies final;
};
phpstan = withMinPhp prev.phpstan;
inherit composerMeta filteredSrc;
inherit (final.minPhp.packages) php-cs-fixer composer psalm phpstan;
inherit (final.minPhp.packages) php-cs-fixer composer psalm;
})
];
@ -159,7 +163,7 @@ in
forPhpVersions = name: checkFile:
genAttrs' composerMeta.phpVersions (version: {
name = "${name}${removeDots version}";
value = pkgs.callPackage ./checks/psalm.nix {
value = pkgs.callPackage checkFile {
src = filteredSrc;
php = buildPhpVersion pkgs version;
};