From 5aa0015983eadc42a1e37f797e13f57ce368c08c Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Fri, 5 Sep 2025 11:36:44 +0200 Subject: [PATCH 1/3] phpPackages.phan: migrate to buildComposerProject2 --- pkgs/development/php-packages/phan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index 21a08f670d63..5286d73fc066 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -4,7 +4,7 @@ php, }: -(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject +(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject2 (finalAttrs: { pname = "phan"; version = "5.5.1"; @@ -16,7 +16,7 @@ hash = "sha256-G17ORkHmu6nkfJ8UrGzcaybPOKPrq1Q+LXVS56aVOZ8="; }; - vendorHash = "sha256-Ake5/7IyoweC2ONDuWt9jJSbG0JbnU9lmCRu2p6uUQM="; + vendorHash = "sha256-k/ExFSr0veKYURu66HmYaNHPubAAKH5mgIPXzcpMbPc="; meta = { description = "Static analyzer for PHP"; From 9fed49d6d62ff77c879786abb66b062ec6c44aa3 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Fri, 5 Sep 2025 11:38:20 +0200 Subject: [PATCH 2/3] phpPackages.phan: add versionCheckHook --- pkgs/development/php-packages/phan/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index 5286d73fc066..94d11fa486e6 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, php, + versionCheckHook, }: (php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject2 @@ -18,6 +19,10 @@ vendorHash = "sha256-k/ExFSr0veKYURu66HmYaNHPubAAKH5mgIPXzcpMbPc="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { description = "Static analyzer for PHP"; homepage = "https://github.com/phan/phan"; From 81c11051dcf18c7cd924ad75c6dd71b97bcd5c74 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 18 Jan 2026 18:09:59 +0100 Subject: [PATCH 3/3] phpPackages.phan: 5.5.1 -> 6.0.0 --- pkgs/development/php-packages/phan/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index 94d11fa486e6..18e33ed93875 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -8,17 +8,18 @@ (php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject2 (finalAttrs: { pname = "phan"; - version = "5.5.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "phan"; repo = "phan"; - rev = finalAttrs.version; - hash = "sha256-G17ORkHmu6nkfJ8UrGzcaybPOKPrq1Q+LXVS56aVOZ8="; + tag = finalAttrs.version; + hash = "sha256-1qRGNDptiAdcGc1x+iLrxe9TjLGaL8EM8xuTOUNB+Ww="; }; - vendorHash = "sha256-k/ExFSr0veKYURu66HmYaNHPubAAKH5mgIPXzcpMbPc="; + vendorHash = "sha256-Ro5/lA72xVIkZyuRNix77Cpeyyj1GbW5J4DzjQMq0Rc="; + composerStrictValidation = false; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version";