gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php84Packages.composer: 2.8.1 -> 2.8.4 (#372696)

Browse Source
This commit is contained in:
Pol Dellaiera
2025-01-10 21:14:25 +01:00
committed by GitHub
parent dd48b23916 adab75c7ca
commit 85795c79e9
13 changed files with 743 additions and 2443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh
+8 -29
View File
@@ -21,38 +21,17 @@ composerInstallConfigureHook() {
exit 1
fi
install -Dm644 ${composerVendor}/composer.{json,lock} .
install -Dm644 ${composerVendor}/composer.json .
if [[ ! -f "composer.lock" ]]; then
composer \
--no-install \
--no-interaction \
--no-progress \
--optimize-autoloader \
${composerNoDev:+--no-dev} \
${composerNoPlugins:+--no-plugins} \
${composerNoScripts:+--no-scripts} \
update
install -Dm644 composer.lock -t $out/
echo
echo -e "\e[31mERROR: No composer.lock found\e[0m"
echo
echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m'
echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m"
echo
echo -e '\e[31mTo fix the issue:\e[0m'
echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m"
echo -e "\e[31m cp $out/composer.lock <path>\e[0m"
echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m'
echo -e '\e[31m composerLock = ./composer.lock;\e[0m'
echo
exit 1
if [[ -f "${composerVendor}/composer.lock" ]]; then
install -Dm644 ${composerVendor}/composer.lock .
fi
chmod +w composer.{json,lock}
if [[ -f "composer.lock" ]]; then
chmod +w composer.lock
fi
chmod +w composer.json
echo "Finished composerInstallConfigureHook"
}
pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
+30 -20
View File
@@ -22,8 +22,10 @@ composerVendorConfigureHook() {
install -Dm644 $composerLock ./composer.lock
fi
if [[ ! -f "composer.lock" ]]; then
composer \
--no-cache \
--no-install \
--no-interaction \
--no-progress \
@@ -33,25 +35,31 @@ composerVendorConfigureHook() {
${composerNoScripts:+--no-scripts} \
update
install -Dm644 composer.lock -t $out/
if [[ -f "composer.lock" ]]; then
install -Dm644 composer.lock -t $out/
echo
echo -e "\e[31mERROR: No composer.lock found\e[0m"
echo
echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m'
echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m"
echo
echo -e '\e[31mTo fix the issue:\e[0m'
echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m"
echo -e "\e[31m cp $out/composer.lock <path>\e[0m"
echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m'
echo -e '\e[31m composerLock = ./composer.lock;\e[0m'
echo
echo
echo -e "\e[31mERROR: No composer.lock found\e[0m"
echo
echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m'
echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m"
echo
echo -e '\e[31mTo fix the issue:\e[0m'
echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m"
echo -e "\e[31m cp $out/composer.lock <path>\e[0m"
echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m'
echo -e '\e[31m composerLock = ./composer.lock;\e[0m'
echo
exit 1
exit 1
fi
fi
chmod +w composer.{json,lock}
if [[ -f "composer.lock" ]]; then
chmod +w composer.lock
fi
chmod +w composer.json
echo "Finished composerVendorConfigureHook"
}
@@ -62,10 +70,7 @@ composerVendorBuildHook() {
setComposerEnvVariables
composer \
`# The acpu-autoloader is not reproducible and has to be disabled.` \
`# Upstream PR: https://github.com/composer/composer/pull/12090` \
`# --apcu-autoloader` \
`# --apcu-autoloader-prefix="$(jq -r -c 'try ."content-hash"' < composer.lock)"` \
--no-cache \
--no-interaction \
--no-progress \
--optimize-autoloader \
@@ -89,7 +94,12 @@ composerVendorInstallHook() {
echo "Executing composerVendorInstallHook"
mkdir -p $out
cp -ar composer.{json,lock} $(composer config vendor-dir) $out/
cp -ar composer.json $(composer config vendor-dir) $out/
if [[ -f "composer.lock" ]]; then
cp -ar composer.lock $(composer config vendor-dir) $out/
fi
echo "Finished composerVendorInstallHook"
}
pkgs/by-name/ph/phpdocumentor/package.nix
+7 -10
View File
@@ -1,7 +1,8 @@
{ lib
, php
, fetchFromGitHub
, makeBinaryWrapper
{
lib,
php,
fetchFromGitHub,
makeBinaryWrapper,
}:
php.buildComposerProject (finalAttrs: {
@@ -11,7 +12,7 @@ php.buildComposerProject (finalAttrs: {
src = fetchFromGitHub {
owner = "phpDocumentor";
repo = "phpDocumentor";
rev = "v${finalAttrs.version}";
tag = "v${finalAttrs.version}";
hash = "sha256-8TQlqXhZ3rHmOAuxsBYa+7JD+SxMQY0NZgCyElStFag=";
};
@@ -22,14 +23,10 @@ php.buildComposerProject (finalAttrs: {
nativeBuildInputs = [ makeBinaryWrapper ];
installPhase = ''
runHook preInstall
postInstall = ''
wrapProgram "$out/bin/phpdoc" \
--set-default APP_CACHE_DIR /tmp \
--set-default APP_LOG_DIR /tmp/log
runHook postInstall
'';
meta = {
pkgs/by-name/ph/phpunit/package.nix
+2 -2
View File
@@ -14,11 +14,11 @@ php.buildComposerProject2 (finalAttrs: {
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
rev = finalAttrs.version;
tag = finalAttrs.version;
hash = "sha256-0NVoaUFmmV4EtaErhaqLxJzCbD2WuMaVZC2OHG9+gSA=";
};
vendorHash = "sha256-EkTERk8jJWxCZCJnSHfg3Tnn//Ny2985qXJNX/gad58=";
vendorHash = "sha256-C1BmMURmAMQhDS6iAKC80wqZuYdSRPGyFpU9Jdr6snA=";
passthru = {
updateScript = nix-update-script { };
pkgs/development/php-packages/composer/default.nix
+18 -7
View File
@@ -2,12 +2,13 @@
lib,
stdenvNoCC,
fetchFromGitHub,
fetchpatch,
callPackage,
php,
unzip,
_7zz,
xz,
git,
gitMinimal,
curl,
cacert,
makeBinaryWrapper,
@@ -15,13 +16,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "composer";
version = "2.8.1";
version = "2.8.4";
# Hash used by ../../../build-support/php/pkgs/composer-phar.nix to
# use together with the version from this package to keep the
# bootstrap phar file up-to-date together with the end user composer
# package.
passthru.pharHash = "sha256-kws3b70hR6Yj6ntwTrnTuLDWBymSIHqgU1qiH28FN44=";
passthru.pharHash = "sha256-xMTi4b6rDqBOC9BCpdu6n+2h+/XtoNNiA5WO3TQ8Coo=";
composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix {
inherit (finalAttrs) version;
@@ -31,10 +32,20 @@ stdenvNoCC.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "composer";
repo = "composer";
rev = finalAttrs.version;
hash = "sha256-5UcbEx1d5jEz73mTFTacifl6ykxm6yQw3wvkJQtINHs=";
tag = finalAttrs.version;
hash = "sha256-m4CfWWbrmMN0j27XaMx/KRbFjpW5iMMNUlAtzlrorJc=";
};
patches = [
# Fix an issue preventing reproducible builds
# This patch should be removed at the next release (2.8.5)
# More information at https://github.com/composer/composer/pull/12090
(fetchpatch {
url = "https://github.com/composer/composer/commit/7b1e983ce9a0b30a6369cda11a7d61cca9c1ce46.patch";
hash = "sha256-veBdfZxzgL/R3P87GpvxQc+es3AdpaKSzCX0DCzH63U=";
})
];
nativeBuildInputs = [ makeBinaryWrapper ];
buildInputs = [ php ];
@@ -86,7 +97,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-FfFwx5E2LVDSqo2P31fqtvk2P30XnTm+TUqhNSHTt/M=";
outputHash = "sha256-McyO3Z4PSyC6LiWt8rsXziAIbEqOhiaT77gUdzZ6tzw=";
};
installPhase = ''
@@ -101,7 +112,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
lib.makeBinPath [
_7zz
curl
git
gitMinimal
unzip
xz
]
pkgs/development/php-packages/php-codesniffer/composer.lock
Generated
-1758
View File
File diff suppressed because it is too large Load Diff
pkgs/development/php-packages/php-codesniffer/default.nix
+4 -5
View File
@@ -6,17 +6,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "php-codesniffer";
version = "3.11.0";
version = "3.11.2";
src = fetchFromGitHub {
owner = "PHPCSStandards";
repo = "PHP_CodeSniffer";
rev = "${finalAttrs.version}";
hash = "sha256-zCAaXKlKIBF7LK+DHkbzOqnSMj+ZaeafZnSOHOq3Z5Q=";
tag = "${finalAttrs.version}";
hash = "sha256-/rUkAQvdVMjeIS9UIKjTgk2D9Hb6HfQBRUXqbDYTAmg=";
};
composerLock = ./composer.lock;
vendorHash = "sha256-r40bINMa9n4Rzlv75QSuz0TiV5qGsdh4mwMqj9BsKTY=";
vendorHash = "sha256-t5v+HyzOwa6+z5+PtEAAs9wSKxNBZ++tNc2iGO3tspY=";
meta = {
changelog = "https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/${finalAttrs.version}";
pkgs/development/php-packages/php-cs-fixer/composer.lock
Generated
+435 -371
View File
File diff suppressed because it is too large Load Diff
pkgs/development/php-packages/php-cs-fixer/default.nix
+4 -4
View File
@@ -6,19 +6,19 @@
php.buildComposerProject2 (finalAttrs: {
pname = "php-cs-fixer";
version = "3.64.0";
version = "3.67.0";
src = fetchFromGitHub {
owner = "PHP-CS-Fixer";
repo = "PHP-CS-Fixer";
rev = "v${finalAttrs.version}";
hash = "sha256-N2m3U0HjwQtm7loqYfEl7kstqljXC8evp6GEh+Cd9Hs=";
tag = "v${finalAttrs.version}";
hash = "sha256-FIqEVChYxtFqD9RcOttSk1QTPzG3HUBZmFI0wWY2BTQ=";
};
# Upstream doesn't provide a composer.lock.
# More info at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590
composerLock = ./composer.lock;
vendorHash = "sha256-cOKfvNjFl9QKwPZp81IHaRurRhmXgbydhdTWYknlGBM=";
vendorHash = "sha256-lOlwQjBh/Uy+Hr3cc+NQC+2Fu3UODKOCSXpSrNOBNWY=";
meta = {
changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}";
pkgs/development/php-packages/phpstan/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: {
hash = "sha256-pc65TtMFsei338t73kjKO8agPhyvYfJrtKleQG7ZLlY=";
};
vendorHash = "sha256-93HlbsEn5BX/9Ch0hCexLJS/zqJHyG0ngyiz/wnAqog=";
vendorHash = "sha256-HclF1hXWKwfq+r897FV8XMG1I31RyppyDz5LdFj2Sbg=";
composerStrictValidation = false;
meta = {
pkgs/development/php-packages/psalm/composer.lock
Generated
+225 -227
View File
File diff suppressed because it is too large Load Diff
pkgs/development/php-packages/psalm/default.nix
+3 -3
View File
@@ -6,19 +6,19 @@
php.buildComposerProject2 (finalAttrs: {
pname = "psalm";
version = "5.25.0";
version = "5.26.1";
src = fetchFromGitHub {
owner = "vimeo";
repo = "psalm";
tag = finalAttrs.version;
hash = "sha256-ecORCwTnTKzy/pgfODu9W9I/5xL+8Fo4OgZ5LsYDYLQ=";
hash = "sha256-TZm7HByPoCB4C0tdU5rzTfjMQEnhRhWPEiNR0bQDkTs=";
};
# Missing `composer.lock` from the repository.
# Issue open at https://github.com/vimeo/psalm/issues/10446
composerLock = ./composer.lock;
vendorHash = "sha256-lPUwhEUFIyFZPHFxQTE0l7GkkJxGCcSGSYqaVOohSgs=";
vendorHash = "sha256-po43yrMlvX7Y91Z3D5IYSpY7FOS6+tL/+a3AozopZ9Q=";
meta = {
changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}";
pkgs/development/php-packages/psysh/default.nix
+6 -6
View File
@@ -7,19 +7,19 @@
let
pname = "psysh";
version = "0.12.4";
version = "0.12.7";
src = fetchFromGitHub {
owner = "bobthecow";
repo = "psysh";
rev = "v${version}";
hash = "sha256-Zvo0QWHkQhYD9OeT8cgTo2AW5tClzQfwdohSUd8pRBQ=";
tag = "v${version}";
hash = "sha256-dgMUz7lB1XoJ08UvF9XMZGVXYcFK9sNnSb+pcwfeoqQ=";
};
composerLock = fetchurl {
name = "composer.lock";
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/composer-v${version}.lock";
hash = "sha256-PQDWShzvTY8yF+OUPVJAV0HMx0/KnA03TDhZUM7ppXw=";
hash = "sha256-JYJksHKyKKhU248hLPaNXFCh3X+5QiT8iNKzeGc1ZPw=";
};
in
php.buildComposerProject2 (finalAttrs: {
@@ -40,12 +40,12 @@ php.buildComposerProject2 (finalAttrs: {
preBuild = ''
composer config platform.php 7.4
composer require --no-update symfony/polyfill-iconv:1.29 symfony/polyfill-mbstring:1.29
composer require --no-update symfony/polyfill-iconv:1.31 symfony/polyfill-mbstring:1.31
composer require --no-update --dev roave/security-advisories:dev-latest
composer update --lock --no-install
'';
vendorHash = "sha256-tKy2A3dGGmZZzZF0JxtG6NYMfG/paQsuxAO1y3GfCsA=";
vendorHash = "sha256-ODUfR7PsM1YKkEIl4KEAHcY2irqlqMGlpvmEYV1M2jk=";
};
meta = {