diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-02-13 15:33:27 +0100 |
|---|---|---|
| committer | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-05 19:39:35 +0100 |
| commit | cf9e77ef8e6c7b903c7dd5b37d3753c65b3c6a13 (patch) | |
| tree | 2dff728cb7bc228cc26cf335e50568d49730a2e6 /pkgs/build-support/php/hooks/composer-install-hook.sh | |
| parent | 39502e7aa718377973117333caeafa38f5108ae8 (diff) | |
phpPackages.composer: 2.6.6 -> 2.7.1
Diff: https://github.com/composer/composer/compare/2.6.6..2.7.1 Changelog: https://github.com/composer/composer/releases/tag/2.7.1 Fix CVE: CVE-2024-24821
Diffstat (limited to 'pkgs/build-support/php/hooks/composer-install-hook.sh')
| -rw-r--r-- | pkgs/build-support/php/hooks/composer-install-hook.sh | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index a84a9e3aa8628..f5c93a6e3d34e 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -83,28 +83,7 @@ composerInstallBuildHook() { # Since this file cannot be generated in the composer-repository-hook.sh # because the file contains hardcoded nix store paths, we generate it here. - composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" . - - # Remove all the repositories of type "composer" and "vcs" - # from the composer.json file. - jq -r -c 'del(try .repositories[] | select(.type == "composer" or .type == "vcs"))' composer.json | sponge composer.json - - # Configure composer to disable packagist and avoid using the network. - composer config repo.packagist false - # Configure composer to use the local repository. - composer config repo.composer composer file://"$PWD"/packages.json - - # Since the composer.json file has been modified in the previous step, the - # composer.lock file needs to be updated. - composer \ - --lock \ - --no-ansi \ - --no-install \ - --no-interaction \ - ${composerNoDev:+--no-dev} \ - ${composerNoPlugins:+--no-plugins} \ - ${composerNoScripts:+--no-scripts} \ - update + composer-local-repo-plugin --no-ansi build-local-repo-lock -m "${composerRepository}" . echo "Finished composerInstallBuildHook" } @@ -151,9 +130,6 @@ composerInstallInstallHook() { ${composerNoScripts:+--no-scripts} \ install - # Remove packages.json, we don't need it in the store. - rm packages.json - # Copy the relevant files only in the store. mkdir -p "$out"/share/php/"${pname}" cp -r . "$out"/share/php/"${pname}"/ |