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

[20.09] phpPackages.composer: 1.10.8 -> 1.10.22, 2.0.12 -> 2.0.13
NixOS · Apr 27, 2021 · 7dc6998 · 7dc6998
2 parents c6f0d28 + 191651a
commit 7dc6998
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
@@ -57,24 +57,26 @@ in
     };
 
     composer = mkDerivation rec {
-      version = "1.10.8";
+      version = "1.10.22";
       pname = "composer";
 
       src = pkgs.fetchurl {
         url = "https://getcomposer.org/download/${version}/composer.phar";
-        sha256 = "1rbqa56bsc3wrhk8djxdzh755zx1qrqp3wrdid7x0djzbmzp6h2c";
+        sha256 = "00073smi1jja00d4bqfs6p4fqs38mki2ziy7b1kwsmiv5lcsw9v1";
       };
 
       dontUnpack = true;
 
       nativeBuildInputs = [ pkgs.makeWrapper ];
 
       installPhase = ''
+        runHook preInstall
         mkdir -p $out/bin
         install -D $src $out/libexec/composer/composer.phar
         makeWrapper ${php}/bin/php $out/bin/composer \
           --add-flags "$out/libexec/composer/composer.phar" \
           --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
+        runHook postInstall
       '';
 
       meta = with pkgs.lib; {
@@ -86,24 +88,26 @@ in
     };
 
     composer2 = mkDerivation rec {
-      version = "2.0.12";
+      version = "2.0.13";
       pname = "composer";
 
       src = pkgs.fetchurl {
         url = "https://getcomposer.org/download/${version}/composer.phar";
-        sha256 = "0cd661bn63lj9lvhfz13wzydm7grrmy4q07narzfpb6g6waqrsl2";
+        sha256 = "sha256-EW/fB8ySavZGY1pqvJLYiv97AqXcNlOPgcUKfSc2bb8=";
       };
 
       dontUnpack = true;
 
       nativeBuildInputs = [ pkgs.makeWrapper ];
 
       installPhase = ''
+        runHook preInstall
         mkdir -p $out/bin
         install -D $src $out/libexec/composer/composer.phar
         makeWrapper ${php}/bin/php $out/bin/composer \
           --add-flags "$out/libexec/composer/composer.phar" \
           --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
+        runHook postInstall
       '';
 
       meta = with pkgs.lib; {