phpPackages: convert to scope
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:
parent
f3103172fd
commit
7e8b2b7e98
|
@ -49,7 +49,7 @@ let
|
||||||
php = generic filteredArgs;
|
php = generic filteredArgs;
|
||||||
|
|
||||||
php-packages = (callPackage ../../../top-level/php-packages.nix {
|
php-packages = (callPackage ../../../top-level/php-packages.nix {
|
||||||
php = phpWithExtensions;
|
phpPackage = phpWithExtensions;
|
||||||
});
|
});
|
||||||
|
|
||||||
allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
|
allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
|
||||||
|
@ -112,7 +112,8 @@ let
|
||||||
phpIni = "${phpWithExtensions}/lib/php.ini";
|
phpIni = "${phpWithExtensions}/lib/php.ini";
|
||||||
unwrapped = php;
|
unwrapped = php;
|
||||||
tests = nixosTests.php;
|
tests = nixosTests.php;
|
||||||
inherit (php-packages) packages extensions buildPecl;
|
inherit (php-packages) extensions buildPecl;
|
||||||
|
packages = php-packages.tools;
|
||||||
meta = php.meta // {
|
meta = php.meta // {
|
||||||
outputsToInstall = [ "out" ];
|
outputsToInstall = [ "out" ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -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
|
, gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium
|
||||||
, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl
|
, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl
|
||||||
, uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng
|
, uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng
|
||||||
|
@ -6,7 +6,7 @@
|
||||||
, readline, rsync, fetchpatch, valgrind
|
, readline, rsync, fetchpatch, valgrind
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
lib.makeScope pkgs.newScope (self: with self; {
|
||||||
buildPecl = import ../build-support/build-pecl.nix {
|
buildPecl = import ../build-support/build-pecl.nix {
|
||||||
php = php.unwrapped;
|
php = php.unwrapped;
|
||||||
inherit lib;
|
inherit lib;
|
||||||
|
@ -21,15 +21,10 @@ let
|
||||||
|
|
||||||
pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;
|
pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;
|
||||||
|
|
||||||
callPackage = pkgs.newScope {
|
php = phpPackage;
|
||||||
inherit mkDerivation php buildPecl pcre';
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
inherit buildPecl;
|
|
||||||
|
|
||||||
# This is a set of interactive tools based on PHP.
|
# This is a set of interactive tools based on PHP.
|
||||||
packages = {
|
tools = {
|
||||||
box = callPackage ../development/php-packages/box { };
|
box = callPackage ../development/php-packages/box { };
|
||||||
|
|
||||||
composer = callPackage ../development/php-packages/composer { };
|
composer = callPackage ../development/php-packages/composer { };
|
||||||
|
@ -550,4 +545,4 @@ in
|
||||||
|
|
||||||
# Produce the final attribute set of all extensions defined.
|
# Produce the final attribute set of all extensions defined.
|
||||||
in builtins.listToAttrs namedExtensions);
|
in builtins.listToAttrs namedExtensions);
|
||||||
}
|
})
|
||||||
|
|
Loading…
Reference in a new issue