diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index f9589ace1309..a56720b801b8 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, writeTextDir, php, makeBinaryWrapper, fetchFromGitHub, fetchurl, composer-local-repo-plugin }: +{ callPackage, stdenvNoCC, lib, writeTextDir, php, makeBinaryWrapper, fetchFromGitHub, fetchurl }: let buildComposerProjectOverride = finalAttrs: previousAttrs: @@ -6,6 +6,7 @@ let let phpDrv = finalAttrs.php or php; composer = finalAttrs.composer or phpDrv.packages.composer; + composer-local-repo-plugin = callPackage ./composer-local-repo-plugin.nix { }; composerLock = finalAttrs.composerLock or null; in { diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/build-composer-repository.nix index 7a7ba6f146c0..95681104e234 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/build-composer-repository.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, writeTextDir, fetchFromGitHub, php, composer-local-repo-plugin }: +{ callPackage, stdenvNoCC, lib, writeTextDir, fetchFromGitHub, php }: let mkComposerRepositoryOverride = @@ -19,6 +19,7 @@ let let phpDrv = finalAttrs.php or php; composer = finalAttrs.composer or phpDrv.packages.composer; + composer-local-repo-plugin = callPackage ./composer-local-repo-plugin.nix { }; in assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument."); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 580a09e34172..f128c756ccab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17991,11 +17991,8 @@ with pkgs; # PHP interpreters, packages and extensions. - composer = callPackage ../development/tools/misc/composer { }; - composer-local-repo-plugin = callPackage ../build-support/php/composer-local-repo-plugin.nix {}; - # # Set default PHP interpreter, extensions and packages php = php82;