Skip to content

Commit 1d68795

Browse files
authored
php83Packages.composer: 2.8.4 -> 2.8.5 (NixOS#375639)
2 parents d0de797 + 23ad04a commit 1d68795

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

pkgs/development/php-packages/composer/default.nix

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
stdenvNoCC.mkDerivation (finalAttrs: {
1818
pname = "composer";
19-
version = "2.8.4";
19+
version = "2.8.5";
2020

2121
# Hash used by ../../../build-support/php/pkgs/composer-phar.nix to
2222
# use together with the version from this package to keep the
2323
# bootstrap phar file up-to-date together with the end user composer
2424
# package.
25-
passthru.pharHash = "sha256-xMTi4b6rDqBOC9BCpdu6n+2h+/XtoNNiA5WO3TQ8Coo=";
25+
passthru.pharHash = "sha256-nO8YIS4iI1GutHa4HeeypTg/d1M2R0Rnv1x8z+hKsMw=";
2626

2727
composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix {
2828
inherit (finalAttrs) version;
@@ -33,27 +33,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
3333
owner = "composer";
3434
repo = "composer";
3535
tag = finalAttrs.version;
36-
hash = "sha256-m4CfWWbrmMN0j27XaMx/KRbFjpW5iMMNUlAtzlrorJc=";
36+
hash = "sha256-/E/fXh+jefPwzsADpmGyrJ+xqW5CSPNok0DVLD1KZDY=";
3737
};
3838

39-
patches = [
40-
# Fix an issue preventing reproducible builds
41-
# This patch should be removed at the next release (2.8.5)
42-
# More information at https://github.com/composer/composer/pull/12090
43-
(fetchpatch {
44-
url = "https://github.com/composer/composer/commit/7b1e983ce9a0b30a6369cda11a7d61cca9c1ce46.patch";
45-
hash = "sha256-veBdfZxzgL/R3P87GpvxQc+es3AdpaKSzCX0DCzH63U=";
46-
})
47-
];
48-
4939
nativeBuildInputs = [ makeBinaryWrapper ];
5040

5141
buildInputs = [ php ];
5242

5343
vendor = stdenvNoCC.mkDerivation {
5444
pname = "${finalAttrs.pname}-vendor";
5545

56-
inherit (finalAttrs) src version patches;
46+
inherit (finalAttrs) src version;
5747

5848
nativeBuildInputs = [
5949
cacert
@@ -97,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
9787

9888
outputHashMode = "recursive";
9989
outputHashAlgo = "sha256";
100-
outputHash = "sha256-0VbIaOuXeBNRd41q4Ogde8/B4hApueb5FeZ8cGHwB7s=";
90+
outputHash = "sha256-UcMB0leKqD8cXeExXpjDgPvF8pfhGXnCR0EN4FVWouw=";
10191
};
10292

10393
installPhase = ''

0 commit comments

Comments
 (0)