nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

build-support/php: reorganize files

Browse Source 
Pave the way for having multiple versions in the future
This commit is contained in:
Pol Dellaiera 2024-05-07 11:18:34 +02:00
parent 08e29ab163
commit 3d155494e4
No known key found for this signature in database
GPG Key ID: D476DFE9C67467CA
8 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/php/builders/default.nix Normal file
View File

@ -0,0 +1,8 @@
{ callPackage, callPackages, ... }:
{
v1 = {
buildComposerProject = callPackage ./v1/build-composer-project.nix { };
mkComposerRepository = callPackage ./v1/build-composer-repository.nix { };
composerHooks = callPackages ./v1/hooks { };
};
}

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

@ -12,7 +12,7 @@ let
let let
phpDrv = finalAttrs.php or php; phpDrv = finalAttrs.php or php;
composer = finalAttrs.composer or phpDrv.packages.composer; 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 in
{ {
composerLock = previousAttrs.composerLock or null; composerLock = previousAttrs.composerLock or null;

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

@ -24,7 +24,7 @@ let
let let
phpDrv = finalAttrs.php or php; phpDrv = finalAttrs.php or php;
composer = finalAttrs.composer or phpDrv.packages.composer; 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 in
assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument.");
assert ( assert (

0
pkgs/build-support/php/hooks/composer-install-hook.sh → pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh
View File

0
pkgs/build-support/php/hooks/composer-repository-hook.sh → pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh
View File

0
pkgs/build-support/php/hooks/default.nix → pkgs/build-support/php/builders/v1/hooks/default.nix
View File

0
pkgs/build-support/php/hooks/php-script-utils.bash → pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash
View File

9
pkgs/top-level/php-packages.nix
View File

@ -48,15 +48,16 @@
lib.makeScope pkgs.newScope (self: let lib.makeScope pkgs.newScope (self: let
inherit (self) buildPecl callPackage mkExtension php; inherit (self) buildPecl callPackage mkExtension php;
builders = import ../build-support/php/builders {
inherit callPackages callPackage buildPecl;
};
in { in {
buildPecl = callPackage ../build-support/php/build-pecl.nix { buildPecl = callPackage ../build-support/php/build-pecl.nix {
php = php.unwrapped; php = php.unwrapped;
}; };
composerHooks = callPackages ../build-support/php/hooks { }; inherit (builders.v1) buildComposerProject composerHooks mkComposerRepository;
mkComposerRepository = callPackage ../build-support/php/build-composer-repository.nix { };
buildComposerProject = callPackage ../build-support/php/build-composer-project.nix { };
# Wrap mkDerivation to prepend pname with "php-" to make names consistent # Wrap mkDerivation to prepend pname with "php-" to make names consistent
# with how buildPecl does it and make the file easier to overview. # with how buildPecl does it and make the file easier to overview.