b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

php: Simplify php-packages import, rename exts -> extensions

Browse source
This commit is contained in:
talyz 2020-04-03 18:14:26 +02:00
parent 1b69056e46
commit 4ff523f691
No known key found for this signature in database
GPG key ID: 2DED2151F4671A2B
3 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2009.xml
View file

@ -134,7 +134,7 @@
<programlisting>
environment.systemPackages = [
(pkgs.php.buildEnv { exts = pp: with pp; [
(pkgs.php.buildEnv { extensions = pp: with pp; [
imagick
opcache
pdo_mysql

2
nixos/modules/services/web-apps/nextcloud.nix
View file

@ -7,7 +7,7 @@ let
fpm = config.services.phpfpm.pools.nextcloud;
phpPackage = pkgs.php74.buildEnv {
exts = pp: with pp; [
extensions = e: with e; [
bcmath calendar curl exif ftp filter gd gettext gmp intl json ldap
mysqlnd opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql
pdo_sqlite pgsql readline session soap sodium sqlite3 zip zlib mbstring

33
pkgs/development/interpreters/php/default.nix
View file

@ -150,27 +150,22 @@ let
let
php = generic (builtins.removeAttrs args [ "self" "selfWithExtensions" ]);
packages = (callPackage ../../../top-level/php-packages.nix {
php-packages = (callPackage ../../../top-level/php-packages.nix {
php = self;
phpWithExtensions = selfWithExtensions;
}).packages;
});
extensions = (callPackage ../../../top-level/php-packages.nix {
php = self;
phpWithExtensions = selfWithExtensions;
}).extensions;
buildEnv = { exts ? (_: []), extraConfig ? "" }:
buildEnv = { extensions ? (_: []), extraConfig ? "" }:
let
getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name;
extList = exts extensions;
extList = extensions php-packages.extensions;
# Generate extension load configuration snippets from
# exts. This is an attrset suitable for use with
# textClosureList, which is used to put the strings in the
# right order - if a plugin which is dependent on another
# plugin is placed before its dependency, it will fail to
# load.
# Generate extension load configuration snippets from the
# extension parameter. This is an attrset suitable for use
# with textClosureList, which is used to put the strings in
# the right order - if a plugin which is dependent on
# another plugin is placed before its dependency, it will
# fail to load.
extensionTexts =
lib.listToAttrs
(map (ext:
@ -198,7 +193,8 @@ let
inherit (php) dev;
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit buildEnv packages extensions;
inherit buildEnv;
inherit (php-packages) packages extensions;
};
paths = [ php ];
postBuild = ''
@ -214,7 +210,8 @@ let
in
php.overrideAttrs (_: {
passthru = {
inherit buildEnv packages extensions;
inherit buildEnv;
inherit (php-packages) packages extensions;
};
});
@ -246,7 +243,7 @@ let
};
defaultPhpExtensions = {
exts = pp: with pp; ([
extensions = extensions: with extensions; ([
bcmath calendar curl ctype dom exif fileinfo filter ftp gd
gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache
openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql