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

Merge pull request #309605 from drupol/build-support/php/files-reorganisation 

build-support/php: reorganize files
parents e9778401 3d155494

pkgs/build-support/php/builders/default.nix

0 → 100644
+8 −0
Original line number Diff line number Diff line 
{ callPackage, callPackages, ... }:

{

  v1 = {

    buildComposerProject = callPackage ./v1/build-composer-project.nix { };

    mkComposerRepository = callPackage ./v1/build-composer-repository.nix { };

    composerHooks = callPackages ./v1/hooks { };

  };

}

pkgs/build-support/php/build-composer-project.nix→pkgs/build-support/php/builders/v1/build-composer-project.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ let 
    let

      phpDrv = finalAttrs.php or php;

      composer = finalAttrs.composer or phpDrv.packages.composer;

      composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { };

      composer-local-repo-plugin = callPackage ../../pkgs/composer-local-repo-plugin.nix { };

    in

    {

      composerLock = previousAttrs.composerLock or null;

pkgs/build-support/php/build-composer-repository.nix→pkgs/build-support/php/builders/v1/build-composer-repository.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ let 
    let

      phpDrv = finalAttrs.php or php;

      composer = finalAttrs.composer or phpDrv.packages.composer;

      composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { };

      composer-local-repo-plugin = callPackage ../../pkgs/composer-local-repo-plugin.nix { };

    in

    assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument.");

    assert (