From 1bcbba5012be1ecd3a05a6358bdd45f0e8add7bb Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Jul 2023 18:36:24 +0200
Subject: [PATCH 1/2] phpPackages.composer: 2.5.7 -> 2.5.8

---
 pkgs/development/php-packages/composer/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index 1c0e30500e21..e28eff31f721 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "composer";
-  version = "2.5.7";
+  version = "2.5.8";
 
   src = fetchurl {
     url = "https://github.com/composer/composer/releases/download/${version}/composer.phar";
-    sha256 = "sha256-klbEwcgDudDLemahq2xzfkjEPMbfe47J7CSXpyS/RN4=";
+    hash = "sha256-8Hk0+tRPkEjA3IdaUGzKMcwnlNauv8GGfzsfv0jc4sU=";
   };
 
   dontUnpack = true;
@@ -23,11 +23,11 @@ mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
-    description = "Dependency Manager for PHP";
-    license = licenses.mit;
-    homepage = "https://getcomposer.org/";
+  meta = {
     changelog = "https://github.com/composer/composer/releases/tag/${version}";
-    maintainers = with maintainers; [ offline ] ++ teams.php.members;
+    description = "Dependency Manager for PHP";
+    homepage = "https://getcomposer.org/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ offline ] ++ lib.teams.php.members;
   };
 }

From 39bea5f1ba4b81eb2e06a58908b68f39d6d85290 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Jul 2023 18:37:43 +0200
Subject: [PATCH 2/2] phpPackages.composer: switch to `finalAttrs` pattern

---
 pkgs/development/php-packages/composer/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index e28eff31f721..2a563397656a 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -1,11 +1,11 @@
 { mkDerivation, fetchurl, makeBinaryWrapper, unzip, lib, php }:
 
-mkDerivation rec {
+mkDerivation (finalAttrs: {
   pname = "composer";
   version = "2.5.8";
 
   src = fetchurl {
-    url = "https://github.com/composer/composer/releases/download/${version}/composer.phar";
+    url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar";
     hash = "sha256-8Hk0+tRPkEjA3IdaUGzKMcwnlNauv8GGfzsfv0jc4sU=";
   };
 
@@ -24,10 +24,10 @@ mkDerivation rec {
   '';
 
   meta = {
-    changelog = "https://github.com/composer/composer/releases/tag/${version}";
+    changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";
     description = "Dependency Manager for PHP";
     homepage = "https://getcomposer.org/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ offline ] ++ lib.teams.php.members;
   };
-}
+})