diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-05-07 11:18:34 +0200 |
---|---|---|
committer | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-05-07 11:18:34 +0200 |
commit | 3d155494e45d63780685591272da68cd358451ea (patch) | |
tree | afb5e3c8112ba7c13b2b8a96bdf4f197a4a8ff58 | |
parent | 08e29ab1632a5b920420a568fd9fdf238831eb75 (diff) |
build-support/php: reorganize files
Pave the way for having multiple versions in the future
-rw-r--r-- | pkgs/build-support/php/builders/default.nix | 8 | ||||
-rw-r--r-- | pkgs/build-support/php/builders/v1/build-composer-project.nix (renamed from pkgs/build-support/php/build-composer-project.nix) | 2 | ||||
-rw-r--r-- | pkgs/build-support/php/builders/v1/build-composer-repository.nix (renamed from pkgs/build-support/php/build-composer-repository.nix) | 2 | ||||
-rw-r--r-- | pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh (renamed from pkgs/build-support/php/hooks/composer-install-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh (renamed from pkgs/build-support/php/hooks/composer-repository-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/build-support/php/builders/v1/hooks/default.nix (renamed from pkgs/build-support/php/hooks/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash (renamed from pkgs/build-support/php/hooks/php-script-utils.bash) | 0 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 9 |
8 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/build-support/php/builders/default.nix b/pkgs/build-support/php/builders/default.nix new file mode 100644 index 0000000000000..209c834367d18 --- /dev/null +++ b/pkgs/build-support/php/builders/default.nix @@ -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 { }; + }; +} diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/builders/v1/build-composer-project.nix index b83734a02f025..a292335932547 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-project.nix @@ -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; diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/builders/v1/build-composer-repository.nix index ec6c35b8a42c4..54944b91d202d 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-repository.nix @@ -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 ( diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh index a91263422bc84..a91263422bc84 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh diff --git a/pkgs/build-support/php/hooks/composer-repository-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh index c4fa0d52126c1..c4fa0d52126c1 100644 --- a/pkgs/build-support/php/hooks/composer-repository-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh diff --git a/pkgs/build-support/php/hooks/default.nix b/pkgs/build-support/php/builders/v1/hooks/default.nix index 4c0ba1b18801c..4c0ba1b18801c 100644 --- a/pkgs/build-support/php/hooks/default.nix +++ b/pkgs/build-support/php/builders/v1/hooks/default.nix diff --git a/pkgs/build-support/php/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash index bba0242e65d1e..bba0242e65d1e 100644 --- a/pkgs/build-support/php/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6af2a8b575f69..e5bcc7ba3c59f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -48,15 +48,16 @@ lib.makeScope pkgs.newScope (self: let inherit (self) buildPecl callPackage mkExtension php; + + builders = import ../build-support/php/builders { + inherit callPackages callPackage buildPecl; + }; in { buildPecl = callPackage ../build-support/php/build-pecl.nix { php = php.unwrapped; }; - composerHooks = callPackages ../build-support/php/hooks { }; - - mkComposerRepository = callPackage ../build-support/php/build-composer-repository.nix { }; - buildComposerProject = callPackage ../build-support/php/build-composer-project.nix { }; + inherit (builders.v1) buildComposerProject composerHooks mkComposerRepository; # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. |