movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

build-support/php: fix typo

Browse source
This commit is contained in:
Pol Dellaiera 2024-09-23 11:41:15 +02:00
parent 07e6929c81
commit 95f5cf75d3
No known key found for this signature in database
GPG key ID: D476DFE9C67467CA
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh
View file

@ -24,7 +24,7 @@ composerInstallConfigureHook() {
fi fi
if [[ ! -f "composer.lock" ]]; then if [[ ! -f "composer.lock" ]]; then
setComposeRootVersion setComposerRootVersion
composer \ composer \
--no-install \ --no-install \
@ -79,7 +79,7 @@ composerInstallConfigureHook() {
composerInstallBuildHook() { composerInstallBuildHook() {
echo "Executing composerInstallBuildHook" echo "Executing composerInstallBuildHook"
setComposeRootVersion setComposerRootVersion
# Since this file cannot be generated in the composer-repository-hook.sh # Since this file cannot be generated in the composer-repository-hook.sh
# because the file contains hardcoded nix store paths, we generate it here. # because the file contains hardcoded nix store paths, we generate it here.
@ -99,8 +99,8 @@ composerInstallCheckHook() {
composerInstallInstallHook() { composerInstallInstallHook() {
echo "Executing composerInstallInstallHook" echo "Executing composerInstallInstallHook"
setComposeRootVersion setComposerRootVersion
setComposeEnvVariables setComposerEnvVariables
# Finally, run `composer install` to install the dependencies and generate # Finally, run `composer install` to install the dependencies and generate
# the autoloader. # the autoloader.

4
pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh
View file

@ -20,7 +20,7 @@ composerRepositoryConfigureHook() {
fi fi
if [[ ! -f "composer.lock" ]]; then if [[ ! -f "composer.lock" ]]; then
setComposeRootVersion setComposerRootVersion
composer \ composer \
--no-install \ --no-install \
@ -58,7 +58,7 @@ composerRepositoryBuildHook() {
mkdir -p repository mkdir -p repository
setComposeRootVersion setComposerRootVersion
# Build the local composer repository # Build the local composer repository
# The command 'build-local-repo' is provided by the Composer plugin # The command 'build-local-repo' is provided by the Composer plugin

2
pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh
View file

@ -28,7 +28,7 @@ composerWithPluginConfigureHook() {
cp -ar $src $out/src cp -ar $src $out/src
if [[ ! -f "$out/composer.lock" ]]; then if [[ ! -f "$out/composer.lock" ]]; then
setComposeRootVersion setComposerRootVersion
composer \ composer \
global \ global \

6
pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash
View file

@ -2,7 +2,7 @@ declare version
declare composerStrictValidation declare composerStrictValidation
declare composerGlobal declare composerGlobal
setComposeRootVersion() { setComposerRootVersion() {
set +e # Disable exit on error set +e # Disable exit on error
if [[ -v version ]]; then if [[ -v version ]]; then
@ -13,7 +13,7 @@ setComposeRootVersion() {
set -e set -e
} }
setComposeEnvVariables() { setComposerEnvVariables() {
echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" echo -e "\e[32mSetting some required environment variables for Composer...\e[0m"
export COMPOSER_MIRROR_PATH_REPOS=1 export COMPOSER_MIRROR_PATH_REPOS=1
export COMPOSER_CACHE_DIR=/dev/null export COMPOSER_CACHE_DIR=/dev/null
@ -21,7 +21,7 @@ setComposeEnvVariables() {
} }
checkComposerValidate() { checkComposerValidate() {
setComposeRootVersion setComposerRootVersion
if [ "1" == "${composerGlobal-}" ]; then if [ "1" == "${composerGlobal-}" ]; then
global="global"; global="global";

2
pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh
View file

@ -14,7 +14,7 @@ source @phpScriptUtils@
composerInstallConfigureHook() { composerInstallConfigureHook() {
echo "Executing composerInstallConfigureHook" echo "Executing composerInstallConfigureHook"
setComposeRootVersion setComposerRootVersion
if [[ ! -e "${composerVendor}" ]]; then if [[ ! -e "${composerVendor}" ]]; then
echo "No local composer vendor found." echo "No local composer vendor found."

4
pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
View file

@ -15,7 +15,7 @@ source @phpScriptUtils@
composerVendorConfigureHook() { composerVendorConfigureHook() {
echo "Executing composerVendorConfigureHook" echo "Executing composerVendorConfigureHook"
setComposeRootVersion setComposerRootVersion
if [[ -e "$composerLock" ]]; then if [[ -e "$composerLock" ]]; then
echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m" echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m"
@ -59,7 +59,7 @@ composerVendorConfigureHook() {
composerVendorBuildHook() { composerVendorBuildHook() {
echo "Executing composerVendorBuildHook" echo "Executing composerVendorBuildHook"
setComposeEnvVariables setComposerEnvVariables
composer \ composer \
`# The acpu-autoloader is not reproducible and has to be disabled.` \ `# The acpu-autoloader is not reproducible and has to be disabled.` \

4
pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash
View file

@ -2,7 +2,7 @@ declare version
declare composerStrictValidation declare composerStrictValidation
declare composerGlobal declare composerGlobal
setComposeRootVersion() { setComposerRootVersion() {
set +e # Disable exit on error set +e # Disable exit on error
if [[ -v version ]]; then if [[ -v version ]]; then
@ -13,7 +13,7 @@ setComposeRootVersion() {
set -e set -e
} }
setComposeEnvVariables() { setComposerEnvVariables() {
echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" echo -e "\e[32mSetting some required environment variables for Composer...\e[0m"
export COMPOSER_MIRROR_PATH_REPOS=1 export COMPOSER_MIRROR_PATH_REPOS=1
export COMPOSER_CACHE_DIR=/dev/null export COMPOSER_CACHE_DIR=/dev/null