phpPackages.composer: use fetchgit
Using `fetchgit` prevent the `composer.lock` from being stripped out when `fetchFromGitHub` is being used
This commit is contained in:
parent
5a3de0e783
commit
1231c76417
|
@ -1,4 +1,4 @@
|
||||||
{ lib, callPackage, fetchFromGitHub, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }:
|
{ lib, callPackage, fetchgit, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }:
|
||||||
|
|
||||||
php.buildComposerProject (finalAttrs: {
|
php.buildComposerProject (finalAttrs: {
|
||||||
composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { };
|
composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { };
|
||||||
|
@ -6,11 +6,14 @@ php.buildComposerProject (finalAttrs: {
|
||||||
pname = "composer";
|
pname = "composer";
|
||||||
version = "2.6.4";
|
version = "2.6.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "composer";
|
# We use `fetchgit` instead of `fetchFromGitHub` to ensure the existence
|
||||||
repo = "composer";
|
# of the `composer.lock` file, which is omitted in the archive downloaded
|
||||||
|
# via `fetchFromGitHub`.
|
||||||
|
src = fetchgit {
|
||||||
|
url = "https://github.com/composer/composer.git";
|
||||||
rev = finalAttrs.version;
|
rev = finalAttrs.version;
|
||||||
hash = "sha256-o7z2GBiYjTwDQR9ZFuOOV8zsKUuGqyA52dvwTzo4hVA=";
|
hash = "sha256-8lylMfTARff+gBZpIRqttmE0jeXdJnLHZKVmqHY3p+s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||||
|
@ -20,7 +23,7 @@ php.buildComposerProject (finalAttrs: {
|
||||||
--prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]}
|
--prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
vendorHash = "sha256-S6LprixkLIbD+qqvg+eYjWsDe+jFl9NO1qWztWYKPXs=";
|
vendorHash = "sha256-SG5RsKaP7zqJY2vjvULuNdf7w6tAGh7/dlxx2Pkfj2A=";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";
|
changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";
|
||||||
|
|
Loading…
Reference in a new issue