Unverified Commit 9e701e63 authored by Elis Hirwing's avatar Elis Hirwing Committed by Pol Dellaiera
Browse files

composer-local-repo-plugin: Stop exposing this internal tool

parent c0c01910

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

+2 −1
Original line number Diff line number Diff line 
{ 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

    {

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

+2 −1
Original line number Diff line number Diff line 
{ 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.");

pkgs/top-level/all-packages.nix

+0 −3
Original line number Diff line number Diff line
@@ -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;