diff options
| -rw-r--r-- | pkgs/build-support/php/composer-local-repo-plugin.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/php-packages/composer/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/php/composer-local-repo-plugin.nix b/pkgs/build-support/php/composer-local-repo-plugin.nix index 81672762618..3e918689088 100644 --- a/pkgs/build-support/php/composer-local-repo-plugin.nix +++ b/pkgs/build-support/php/composer-local-repo-plugin.nix @@ -1,6 +1,8 @@ -{ 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"; diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 2d0e7c579d5..a1459bb2d25 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,7 +1,7 @@ -{ 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f128c756cca..256885a8ce9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |