From fa248afdd6ffb9de62880ea50756cf2de06c58af Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Apr 2021 13:53:54 +0200 Subject: [PATCH 1/2] phpPackages.composer: 2.0.12 -> 2.0.13 --- pkgs/development/php-packages/composer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index a7be06f1d04..6a9cffa8ae7 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.0.12"; + version = "2.0.13"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-guqMFTfPrOt+VvYATHzN+Z3a/OcjfAc3TZIOY1cwpjE="; + sha256 = "sha256-EW/fB8ySavZGY1pqvJLYiv97AqXcNlOPgcUKfSc2bb8="; }; dontUnpack = true; @@ -16,11 +16,13 @@ mkDerivation { nativeBuildInputs = [ 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 : ${lib.makeBinPath [ unzip ]} + runHook postInstall ''; meta = with lib; { From a6d0e1c19057e6966d1858131b1d07cdfc4bfcdc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Apr 2021 13:55:37 +0200 Subject: [PATCH 2/2] phpPackages.composer1: 1.10.15 -> 1.10.22 --- pkgs/development/php-packages/composer/1.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/1.x.nix b/pkgs/development/php-packages/composer/1.x.nix index 4660da9532d..35cee92972e 100644 --- a/pkgs/development/php-packages/composer/1.x.nix +++ b/pkgs/development/php-packages/composer/1.x.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "1.10.15"; + version = "1.10.22"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6"; + sha256 = "00073smi1jja00d4bqfs6p4fqs38mki2ziy7b1kwsmiv5lcsw9v1"; }; dontUnpack = true; @@ -16,11 +16,13 @@ mkDerivation { nativeBuildInputs = [ 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 : ${lib.makeBinPath [ unzip ]} + runHook postInstall ''; meta = with lib; {