Unverified Commit 05c36949 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #259426 from etu/composer-keep-versions-in-sync 

php.packages.composer: Make sure that both composers use the same version
parents dba2db34 f0987a05

pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix

+4 −2
Original line number Diff line number Diff line 
{ callPackage, stdenvNoCC, lib, fetchFromGitHub, makeBinaryWrapper }:

{ php, callPackage, stdenvNoCC, lib, fetchFromGitHub, makeBinaryWrapper }:



let

  composer = callPackage ./composer-phar.nix { };

  composer = callPackage ./composer-phar.nix {

    inherit (php.packages.composer) version pharHash;

  };



  composerKeys = stdenvNoCC.mkDerivation (finalComposerKeysAttrs: {

    pname = "composer-keys";

pkgs/build-support/php/pkgs/composer-phar.nix

+4 −2
Original line number Diff line number Diff line
@@ -10,15 +10,17 @@ 
  , stdenvNoCC

  , unzip

  , xz

  , version

  , pharHash

}:



stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "composer-phar";

  version = "2.6.5";

  inherit version;



  src = fetchurl {

    url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar";

    hash = "sha256-mhjho6rby5TBuv1sSpj/kx9LQ6RW70hXUTBGbhnwXdY=";

    hash = pharHash;

  };



  dontUnpack = true;

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

+10 −1
Original line number Diff line number Diff line 
{ lib, callPackage, fetchFromGitHub, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }:



php.buildComposerProject (finalAttrs: {

  composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { };

  # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to

  # use together with the version from this package to keep the

  # bootstrap phar file up-to-date together with the end user composer

  # package.

  passthru.pharHash = "sha256-mhjho6rby5TBuv1sSpj/kx9LQ6RW70hXUTBGbhnwXdY=";



  composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix {

    inherit (finalAttrs) version;

    inherit (finalAttrs.passthru) pharHash;

  };



  pname = "composer";

  version = "2.6.5";