Merge pull request #259349 from NixOS/php/bump-composer-2-6-5

phpPackages.composer: 2.6.4 -> 2.6.5
This commit is contained in:
Elis Hirwing 2023-10-06 19:51:30 +02:00 committed by GitHub
commit 13441fc1f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions

View File

@ -14,11 +14,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "composer-phar";
version = "2.6.4";
version = "2.6.5";
src = fetchurl {
url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar";
hash = "sha256-Wjnz4s5bo5HuP+yyJ/ryE5D1t+1cVvFMq54cMEi8+Lg=";
hash = "sha256-mhjho6rby5TBuv1sSpj/kx9LQ6RW70hXUTBGbhnwXdY=";
};
dontUnpack = true;

View File

@ -1,19 +1,16 @@
{ lib, callPackage, fetchgit, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }:
{ lib, callPackage, fetchFromGitHub, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }:
php.buildComposerProject (finalAttrs: {
composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { };
pname = "composer";
version = "2.6.4";
version = "2.6.5";
# We use `fetchgit` instead of `fetchFromGitHub` to ensure the existence
# of the `composer.lock` file, which is omitted in the archive downloaded
# via `fetchFromGitHub`.
src = fetchgit {
url = "https://github.com/composer/composer.git";
src = fetchFromGitHub {
owner = "composer";
repo = "composer";
rev = finalAttrs.version;
hash = "sha256-8lylMfTARff+gBZpIRqttmE0jeXdJnLHZKVmqHY3p+s=";
hash = "sha256-CKP7CYOuMKpuWdVveET2iLJPKJyCnv5YVjx4DE68UoE=";
};
nativeBuildInputs = [ makeBinaryWrapper ];