diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index b07c25beec55..82dcdeaf535d 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -11,6 +11,8 @@ xz, version, pharHash, + installShellFiles, + stdenv, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -24,7 +26,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontUnpack = true; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + installShellFiles + ]; installPhase = '' runHook preInstall @@ -46,13 +51,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd composer \ + --bash <($out/bin/composer completion bash) + ''; + meta = { changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}"; description = "Dependency Manager for PHP, shipped from the PHAR file"; homepage = "https://getcomposer.org/"; license = lib.licenses.mit; mainProgram = "composer"; - maintainers = with lib.maintainers; [ drupol ]; + maintainers = [ lib.maintainers.patka ]; + teams = [ lib.teams.php ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 6dd3d98830db..986347de7f4c 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer"; - version = "2.8.5"; + version = "2.8.11"; # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-nO8YIS4iI1GutHa4HeeypTg/d1M2R0Rnv1x8z+hKsMw="; + passthru.pharHash = "sha256-JXqWnpqdJ+DkXP6VSDXBenYDO6hKOI4PRy24Pt7WWos="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "composer"; repo = "composer"; tag = finalAttrs.version; - hash = "sha256-/E/fXh+jefPwzsADpmGyrJ+xqW5CSPNok0DVLD1KZDY="; + hash = "sha256-ufkrrCnIwJHtAsjKdaFzlJkCH0i7Tm17+eIqgSqDwlE="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -87,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-UcMB0leKqD8cXeExXpjDgPvF8pfhGXnCR0EN4FVWouw="; + outputHash = "sha256-elh3zgN4DJK0lY6TDRGWfBjmnWZzy7s1sMWe34RsLEE="; }; installPhase = ''