diff options
| author | Elis Hirwing <elis@hirwing.se> | 2020-04-02 22:13:04 +0200 |
|---|---|---|
| committer | talyz <kim.lindberger@gmail.com> | 2020-04-05 16:45:17 +0200 |
| commit | a2099156eca905ee0b7a232cb7ec07539eebd72c (patch) | |
| tree | 271a1dea88a60f49f88cac39a7307f6bf87540f9 /nixos | |
| parent | a4bc30c802d99bcc5c2f4c7bb84d40da14137c4c (diff) | |
php: split php.packages to php.packages and php.extensions
So now we have only packages for human interaction in php.packages and
only extensions in php.extensions. With this php.packages.exts have
been merged into the same attribute set as all the other extensions to
make it flat and nice.
The nextcloud module have been updated to reflect this change as well
as the documentation.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 6 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index db4b8df4a225..1618fc89477f 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -134,8 +134,8 @@ <programlisting> environment.systemPackages = [ -(pkgs.php.buildEnv { exts = pp: with pp.exts; [ - pp.imagick +(pkgs.php.buildEnv { exts = pp: with pp; [ + imagick opcache pdo_mysql ]; }) @@ -144,7 +144,7 @@ environment.systemPackages = [ The default <literal>php</literal> attribute hasn't lost any extensions - the <literal>opcache</literal> extension was added there. - All upstream PHP extensions are available under <package><![CDATA[php.packages.exts.<name?>]]></package>. + All upstream PHP extensions are available under <package><![CDATA[php.extensions.<name?>]]></package>. </para> <para> The updated <literal>php</literal> attribute is now easily customizable to your liking diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index c6c1cdadf027..33d356700294 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -7,12 +7,12 @@ let fpm = config.services.phpfpm.pools.nextcloud; phpPackage = pkgs.php74.buildEnv { - exts = pp: with pp.exts; [ + exts = pp: with pp; [ 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 - posix ctype dom simplexml xmlreader xmlwriter pp.apcu - pp.redis pp.memcached pp.imagick + posix ctype dom simplexml xmlreader xmlwriter + apcu redis memcached imagick ]; extraConfig = phpOptionsStr; }; |