public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/nextcloud: don't make phpPackages configurable

Browse Source 
It needs to match the version in phpfm which is hard coded.
So there is no point in being able to change it.
This commit is contained in:
Pascal Bach 2019-03-01 16:37:00 +01:00
parent f0c0b8d949
commit 390b6108a2
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -5,15 +5,18 @@ with lib;
let let
cfg = config.services.nextcloud; cfg = config.services.nextcloud;
phpPackage = pkgs.php73;
phpPackages = pkgs.php73Packages;
toKeyValue = generators.toKeyValue { toKeyValue = generators.toKeyValue {
mkKeyValue = generators.mkKeyValueDefault {} " = "; mkKeyValue = generators.mkKeyValueDefault {} " = ";
}; };
phpOptionsExtensions = '' phpOptionsExtensions = ''
${optionalString cfg.caching.apcu "extension=${cfg.phpPackages.apcu}/lib/php/extensions/apcu.so"} ${optionalString cfg.caching.apcu "extension=${phpPackages.apcu}/lib/php/extensions/apcu.so"}
${optionalString cfg.caching.redis "extension=${cfg.phpPackages.redis}/lib/php/extensions/redis.so"} ${optionalString cfg.caching.redis "extension=${phpPackages.redis}/lib/php/extensions/redis.so"}
${optionalString cfg.caching.memcached "extension=${cfg.phpPackages.memcached}/lib/php/extensions/memcached.so"} ${optionalString cfg.caching.memcached "extension=${phpPackages.memcached}/lib/php/extensions/memcached.so"}
extension=${cfg.phpPackages.imagick}/lib/php/extensions/imagick.so extension=${phpPackages.imagick}/lib/php/extensions/imagick.so
zend_extension = opcache.so zend_extension = opcache.so
opcache.enable = 1 opcache.enable = 1
''; '';
@ -95,18 +98,6 @@ in {
''; '';
}; };
phpPackages = mkOption {
type = types.attrs;
default = pkgs.php73Packages;
defaultText = "pkgs.php73Packages";
description = ''
Overridable attribute of the PHP packages set to use. If any caching
module is enabled, it will be taken from here. Therefore it should
match the version of PHP given to
<literal>services.phpfpm.phpPackage</literal>.
'';
};
phpOptions = mkOption { phpOptions = mkOption {
type = types.attrsOf types.str; type = types.attrsOf types.str;
default = { default = {
@ -367,7 +358,7 @@ in {
phpOptions))); phpOptions)));
in { in {
phpOptions = phpOptionsExtensions; phpOptions = phpOptionsExtensions;
phpPackage = pkgs.php73; phpPackage = phpPackage;
listen = "/run/phpfpm/nextcloud"; listen = "/run/phpfpm/nextcloud";
extraConfig = '' extraConfig = ''
listen.owner = nginx listen.owner = nginx