From 3360cb0bb03325383508727d403186518e18fd6b Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 6 Oct 2023 10:30:07 +0200
Subject: [PATCH] phpPackages.composer: 2.6.4 -> 2.6.5

---
 pkgs/build-support/php/pkgs/composer-phar.nix     |  4 ++--
 .../development/php-packages/composer/default.nix | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix
index 7269d3029b6b..414671142d16 100644
--- a/pkgs/build-support/php/pkgs/composer-phar.nix
+++ b/pkgs/build-support/php/pkgs/composer-phar.nix
@@ -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;
diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index fd26cc0e4849..8a78102876d2 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -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 ];