Merge pull request #120855 from LeSuisse/composer-CVE-2021-29472

phpPackages.composer: 2.0.12 -> 2.0.13, 1.10.15 -> 1.10.22

authored by

Elis Hirwing and committed by
GitHub
c75166fb 39a51c99

+8 -4
+4 -2
pkgs/development/php-packages/composer/1.x.nix
··· 1 1 { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: 2 2 let 3 3 pname = "composer"; 4 - version = "1.10.15"; 4 + version = "1.10.22"; 5 5 in 6 6 mkDerivation { 7 7 inherit pname version; 8 8 9 9 src = fetchurl { 10 10 url = "https://getcomposer.org/download/${version}/composer.phar"; 11 - sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6"; 11 + sha256 = "00073smi1jja00d4bqfs6p4fqs38mki2ziy7b1kwsmiv5lcsw9v1"; 12 12 }; 13 13 14 14 dontUnpack = true; ··· 16 16 nativeBuildInputs = [ makeWrapper ]; 17 17 18 18 installPhase = '' 19 + runHook preInstall 19 20 mkdir -p $out/bin 20 21 install -D $src $out/libexec/composer/composer.phar 21 22 makeWrapper ${php}/bin/php $out/bin/composer \ 22 23 --add-flags "$out/libexec/composer/composer.phar" \ 23 24 --prefix PATH : ${lib.makeBinPath [ unzip ]} 25 + runHook postInstall 24 26 ''; 25 27 26 28 meta = with lib; {
+4 -2
pkgs/development/php-packages/composer/default.nix
··· 1 1 { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: 2 2 let 3 3 pname = "composer"; 4 - version = "2.0.12"; 4 + version = "2.0.13"; 5 5 in 6 6 mkDerivation { 7 7 inherit pname version; 8 8 9 9 src = fetchurl { 10 10 url = "https://getcomposer.org/download/${version}/composer.phar"; 11 - sha256 = "sha256-guqMFTfPrOt+VvYATHzN+Z3a/OcjfAc3TZIOY1cwpjE="; 11 + sha256 = "sha256-EW/fB8ySavZGY1pqvJLYiv97AqXcNlOPgcUKfSc2bb8="; 12 12 }; 13 13 14 14 dontUnpack = true; ··· 16 16 nativeBuildInputs = [ makeWrapper ]; 17 17 18 18 installPhase = '' 19 + runHook preInstall 19 20 mkdir -p $out/bin 20 21 install -D $src $out/libexec/composer/composer.phar 21 22 makeWrapper ${php}/bin/php $out/bin/composer \ 22 23 --add-flags "$out/libexec/composer/composer.phar" \ 23 24 --prefix PATH : ${lib.makeBinPath [ unzip ]} 25 + runHook postInstall 24 26 ''; 25 27 26 28 meta = with lib; {