From cb78d9f4d0bba0a4bef7efe13079c84c37b5ad3f Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Fri, 10 Jan 2025 22:07:06 +0100 Subject: [PATCH 1/2] phpdocumentor: switch to buildComposerProject2 (cherry picked from commit bfd6e434306958fd5fabc5e6b215bdce4b3c9f29) --- pkgs/by-name/ph/phpdocumentor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index 7960dea771765..a4b703a2f64e6 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -5,7 +5,7 @@ makeBinaryWrapper, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phpdocumentor"; version = "3.5.3"; @@ -16,7 +16,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-zpAKygpxyKYfefa5ag76saTSQNLon/v3rYkl0Nj2+FM="; }; - vendorHash = "sha256-VNlAzWueF7ZXBpr9RrJghMPrAUof7f1DCh1osFIwFfs="; + vendorHash = "sha256-whyLSlv0s7v+oi+0Qv8tBxUzYrUOARUjKZiNTfIqoTU="; # Needed because of the unbound version constraint on phpdocumentor/json-path composerStrictValidation = false; From 3e160f9883a3dfdd972b93d5c22a3dacd09ce8e7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 10 Jan 2025 22:55:21 +0100 Subject: [PATCH 2/2] phpdocumentor: 3.5.3 -> 3.6.0 (manual cherry picked from commit d88d2c2a0e6fa8adf7ef38fcfe2f9415e334c1d6) --- pkgs/by-name/ph/phpdocumentor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index a4b703a2f64e6..7d91f7f4399e7 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpdocumentor"; - version = "3.5.3"; + version = "3.6.0"; src = fetchFromGitHub { owner = "phpDocumentor"; repo = "phpDocumentor"; tag = "v${finalAttrs.version}"; - hash = "sha256-zpAKygpxyKYfefa5ag76saTSQNLon/v3rYkl0Nj2+FM="; + hash = "sha256-8TQlqXhZ3rHmOAuxsBYa+7JD+SxMQY0NZgCyElStFag="; }; - vendorHash = "sha256-whyLSlv0s7v+oi+0Qv8tBxUzYrUOARUjKZiNTfIqoTU="; + vendorHash = "sha256-d+K/4xdhk0OlGmcjIRbMmTJJZjDSqfkvmynOl2thtmg="; # Needed because of the unbound version constraint on phpdocumentor/json-path composerStrictValidation = false;