ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-05 02:23:07 +03:00
Code Issues Projects Releases Wiki Activity

nixos/nextcloud: use php8 where possible

Browse Source
This commit is contained in:
Maximilian Bosch 2021-10-01 17:03:09 +02:00
parent 82155ff501
commit 66edc1e846
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ let
cfg = config.services.nextcloud; cfg = config.services.nextcloud;
fpm = config.services.phpfpm.pools.nextcloud; fpm = config.services.phpfpm.pools.nextcloud;
phpPackage = pkgs.php74.buildEnv { phpPackage = cfg.phpPackage.buildEnv {
extensions = { enabled, all }: extensions = { enabled, all }:
(with all; (with all;
enabled enabled
@ -94,6 +94,14 @@ in {
description = "Which package to use for the Nextcloud instance."; description = "Which package to use for the Nextcloud instance.";
relatedPackages = [ "nextcloud20" "nextcloud21" "nextcloud22" ]; relatedPackages = [ "nextcloud20" "nextcloud21" "nextcloud22" ];
}; };
phpPackage = mkOption {
type = types.package;
relatedPackages = [ "php74" "php80" ];
defaultText = "pkgs.php";
description = ''
PHP package to use for Nextcloud.
'';
};
maxUploadSize = mkOption { maxUploadSize = mkOption {
default = "512M"; default = "512M";
@ -423,6 +431,10 @@ in {
else if versionOlder stateVersion "21.11" then nextcloud21 else if versionOlder stateVersion "21.11" then nextcloud21
else nextcloud22 else nextcloud22
); );
services.nextcloud.phpPackage =
if versionOlder cfg.package.version "21" then pkgs.php74
else pkgs.php80;
} }
{ systemd.timers.nextcloud-cron = { { systemd.timers.nextcloud-cron = {