Unverified Commit 2160ed2b authored by Elis Hirwing's avatar Elis Hirwing Committed by Pol Dellaiera
Browse files

composer: Stop exposing composer built from a phar file

parent 9e701e63

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

+3 −1
Original line number Diff line number Diff line 
{ stdenvNoCC, lib, fetchFromGitHub, composer, makeBinaryWrapper }:

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



let

  composer = callPackage ../../development/tools/misc/composer { };



  composerKeys = stdenvNoCC.mkDerivation (finalComposerKeysAttrs: {

    pname = "composer-keys";

    version = "fa5a62092f33e094073fbda23bbfc7188df3cbc5";

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

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

{ lib, callPackage, fetchFromGitHub, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }:



php.buildComposerProject (finalAttrs: {

  inherit composer;

  composer = callPackage ../../tools/misc/composer { };



  pname = "composer";

  version = "2.6.2";

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -17991,8 +17991,6 @@ with pkgs; 




























  # PHP interpreters, packages and extensions.













  composer = callPackage ../development/tools/misc/composer { };



























  #















  # Set default PHP interpreter, extensions and packages















  php = php82;