cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

phpPackages: convert to scope

Browse source 
This will make it easier to make overridable.

Had to rename `packages` attribute to `tools` in `php-packages.nix` because `packages` is shadowed by `makeScope`.
This commit is contained in:
Jan Tojnar 2020-12-15 17:42:21 +01:00
parent f3103172fd
commit 7e8b2b7e98
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/interpreters/php/generic.nix
View file

@ -49,7 +49,7 @@ let
php = generic filteredArgs;
php-packages = (callPackage ../../../top-level/php-packages.nix {
php = phpWithExtensions;
phpPackage = phpWithExtensions;
});
allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
@ -112,7 +112,8 @@ let
phpIni = "${phpWithExtensions}/lib/php.ini";
unwrapped = php;
tests = nixosTests.php;
inherit (php-packages) packages extensions buildPecl;
inherit (php-packages) extensions buildPecl;
packages = php-packages.tools;
meta = php.meta // {
outputsToInstall = [ "out" ];
};

15
pkgs/top-level/php-packages.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c
{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkgconfig, re2c
, gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium
, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl
, uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng
@ -6,7 +6,7 @@
, readline, rsync, fetchpatch, valgrind
}:
let
lib.makeScope pkgs.newScope (self: with self; {
buildPecl = import ../build-support/build-pecl.nix {
php = php.unwrapped;
inherit lib;
@ -21,15 +21,10 @@ let
pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;
callPackage = pkgs.newScope {
inherit mkDerivation php buildPecl pcre';
};
in
{
inherit buildPecl;
php = phpPackage;
# This is a set of interactive tools based on PHP.
packages = {
tools = {
box = callPackage ../development/php-packages/box { };
composer = callPackage ../development/php-packages/composer { };
@ -550,4 +545,4 @@ in
# Produce the final attribute set of all extensions defined.
in builtins.listToAttrs namedExtensions);
}
})