From 3bcaabbb7119cb06f7f79770baf2e11ad293955c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 23 Sep 2024 09:19:29 +0200 Subject: [PATCH 1/3] build-support/php: fix comments in multi-lines command --- .../php/builders/v2/hooks/composer-vendor-hook.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index f6d1157456f7..21df071e28a2 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -60,10 +60,10 @@ composerVendorBuildHook() { echo "Executing composerVendorBuildHook" 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)" \ + `# 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-interaction \ --no-progress \ --optimize-autoloader \ From 07e6929c812d6df226b0f326178f15e93aba1a33 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 23 Sep 2024 09:20:42 +0200 Subject: [PATCH 2/3] build-support/php: fix environment variables for Composer --- .../php/builders/v1/build-composer-project.nix | 6 ------ .../php/builders/v1/build-composer-repository.nix | 7 ------- .../php/builders/v1/build-composer-with-plugin.nix | 6 ------ .../php/builders/v1/hooks/composer-install-hook.sh | 1 + .../php/builders/v1/hooks/php-script-utils.bash | 7 +++++++ .../php/builders/v2/build-composer-project.nix | 6 ------ .../php/builders/v2/build-composer-vendor.nix | 7 ------- .../php/builders/v2/hooks/composer-vendor-hook.sh | 2 ++ .../php/builders/v2/hooks/php-script-utils.bash | 7 +++++++ 9 files changed, 17 insertions(+), 32 deletions(-) diff --git a/pkgs/build-support/php/builders/v1/build-composer-project.nix b/pkgs/build-support/php/builders/v1/build-composer-project.nix index 698391ad1603..912fe7d72f3c 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-project.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-project.nix @@ -94,12 +94,6 @@ let or (if finalAttrs.composerRepository.composerLock == null then nix-update-script { } else null); }; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - }; - meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; }; diff --git a/pkgs/build-support/php/builders/v1/build-composer-repository.nix b/pkgs/build-support/php/builders/v1/build-composer-repository.nix index 037d8bdeb3eb..c16056ce8fdf 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-repository.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-repository.nix @@ -102,13 +102,6 @@ let runHook postInstallCheck ''; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "0"; - }; - outputHashMode = "recursive"; outputHashAlgo = if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; diff --git a/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix b/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix index 060b51241e6c..e199000f4f7b 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix @@ -149,12 +149,6 @@ let or (if finalAttrs.vendor.composerLock == null then nix-update-script { } else null); }; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - }; - meta = previousAttrs.meta or composer.meta; }; in diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh index 44e87d06d3a5..1301fca0f058 100644 --- a/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh @@ -100,6 +100,7 @@ composerInstallInstallHook() { echo "Executing composerInstallInstallHook" setComposeRootVersion + setComposeEnvVariables # Finally, run `composer install` to install the dependencies and generate # the autoloader. diff --git a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash index 65c0a3b410f6..a64086a68eef 100644 --- a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash @@ -13,6 +13,13 @@ setComposeRootVersion() { set -e } +setComposeEnvVariables() { + echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" + export COMPOSER_MIRROR_PATH_REPOS=1 + export COMPOSER_CACHE_DIR=/dev/null + export COMPOSER_HTACCESS_PROTECT=0 +} + checkComposerValidate() { setComposeRootVersion diff --git a/pkgs/build-support/php/builders/v2/build-composer-project.nix b/pkgs/build-support/php/builders/v2/build-composer-project.nix index 6013225e7c59..bfbd2327812b 100644 --- a/pkgs/build-support/php/builders/v2/build-composer-project.nix +++ b/pkgs/build-support/php/builders/v2/build-composer-project.nix @@ -94,12 +94,6 @@ let or (if finalAttrs.composerVendor.composerLock == null then nix-update-script { } else null); }; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - }; - meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; }; diff --git a/pkgs/build-support/php/builders/v2/build-composer-vendor.nix b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix index b68e16e6cc1a..cbbe643d20f1 100644 --- a/pkgs/build-support/php/builders/v2/build-composer-vendor.nix +++ b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix @@ -87,13 +87,6 @@ let runHook postInstallCheck ''; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "0"; - }; - outputHashMode = "recursive"; outputHashAlgo = if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 21df071e28a2..14522f27a07e 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -59,6 +59,8 @@ composerVendorConfigureHook() { composerVendorBuildHook() { echo "Executing composerVendorBuildHook" + setComposeEnvVariables + composer \ `# The acpu-autoloader is not reproducible and has to be disabled.` \ `# Upstream PR: https://github.com/composer/composer/pull/12090` \ diff --git a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash index 3e8299bf15d3..1ff248a1c111 100644 --- a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash @@ -13,6 +13,13 @@ setComposeRootVersion() { set -e } +setComposeEnvVariables() { + echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" + export COMPOSER_MIRROR_PATH_REPOS=1 + export COMPOSER_CACHE_DIR=/dev/null + export COMPOSER_HTACCESS_PROTECT=0 +} + checkComposerValidate() { if [ "1" == "${composerGlobal-}" ]; then global="global"; From 95f5cf75d37fd6b437df35b6a48c5cd04053fbf0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 23 Sep 2024 11:41:15 +0200 Subject: [PATCH 3/3] build-support/php: fix typo --- .../php/builders/v1/hooks/composer-install-hook.sh | 8 ++++---- .../php/builders/v1/hooks/composer-repository-hook.sh | 4 ++-- .../builders/v1/hooks/composer-with-plugin-vendor-hook.sh | 2 +- .../php/builders/v1/hooks/php-script-utils.bash | 6 +++--- .../php/builders/v2/hooks/composer-install-hook.sh | 2 +- .../php/builders/v2/hooks/composer-vendor-hook.sh | 4 ++-- .../php/builders/v2/hooks/php-script-utils.bash | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh index 1301fca0f058..d69050ecc6a4 100644 --- a/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh @@ -24,7 +24,7 @@ composerInstallConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then - setComposeRootVersion + setComposerRootVersion composer \ --no-install \ @@ -79,7 +79,7 @@ composerInstallConfigureHook() { composerInstallBuildHook() { echo "Executing composerInstallBuildHook" - setComposeRootVersion + setComposerRootVersion # Since this file cannot be generated in the composer-repository-hook.sh # because the file contains hardcoded nix store paths, we generate it here. @@ -99,8 +99,8 @@ composerInstallCheckHook() { composerInstallInstallHook() { echo "Executing composerInstallInstallHook" - setComposeRootVersion - setComposeEnvVariables + setComposerRootVersion + setComposerEnvVariables # Finally, run `composer install` to install the dependencies and generate # the autoloader. diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh index ec9777541fc0..9d7b048870ee 100644 --- a/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh @@ -20,7 +20,7 @@ composerRepositoryConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then - setComposeRootVersion + setComposerRootVersion composer \ --no-install \ @@ -58,7 +58,7 @@ composerRepositoryBuildHook() { mkdir -p repository - setComposeRootVersion + setComposerRootVersion # Build the local composer repository # The command 'build-local-repo' is provided by the Composer plugin diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh index 0d88d14094ad..186b72111cca 100644 --- a/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh @@ -28,7 +28,7 @@ composerWithPluginConfigureHook() { cp -ar $src $out/src if [[ ! -f "$out/composer.lock" ]]; then - setComposeRootVersion + setComposerRootVersion composer \ global \ diff --git a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash index a64086a68eef..d1b8a25c949d 100644 --- a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash @@ -2,7 +2,7 @@ declare version declare composerStrictValidation declare composerGlobal -setComposeRootVersion() { +setComposerRootVersion() { set +e # Disable exit on error if [[ -v version ]]; then @@ -13,7 +13,7 @@ setComposeRootVersion() { set -e } -setComposeEnvVariables() { +setComposerEnvVariables() { echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" export COMPOSER_MIRROR_PATH_REPOS=1 export COMPOSER_CACHE_DIR=/dev/null @@ -21,7 +21,7 @@ setComposeEnvVariables() { } checkComposerValidate() { - setComposeRootVersion + setComposerRootVersion if [ "1" == "${composerGlobal-}" ]; then global="global"; diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh index 7cc176058b50..0b04af622233 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh @@ -14,7 +14,7 @@ source @phpScriptUtils@ composerInstallConfigureHook() { echo "Executing composerInstallConfigureHook" - setComposeRootVersion + setComposerRootVersion if [[ ! -e "${composerVendor}" ]]; then echo "No local composer vendor found." diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 14522f27a07e..24f3eaa2744e 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -15,7 +15,7 @@ source @phpScriptUtils@ composerVendorConfigureHook() { echo "Executing composerVendorConfigureHook" - setComposeRootVersion + setComposerRootVersion if [[ -e "$composerLock" ]]; then echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m" @@ -59,7 +59,7 @@ composerVendorConfigureHook() { composerVendorBuildHook() { echo "Executing composerVendorBuildHook" - setComposeEnvVariables + setComposerEnvVariables composer \ `# The acpu-autoloader is not reproducible and has to be disabled.` \ diff --git a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash index 1ff248a1c111..573b82c2baff 100644 --- a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash @@ -2,7 +2,7 @@ declare version declare composerStrictValidation declare composerGlobal -setComposeRootVersion() { +setComposerRootVersion() { set +e # Disable exit on error if [[ -v version ]]; then @@ -13,7 +13,7 @@ setComposeRootVersion() { set -e } -setComposeEnvVariables() { +setComposerEnvVariables() { echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" export COMPOSER_MIRROR_PATH_REPOS=1 export COMPOSER_CACHE_DIR=/dev/null