diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-10-01 21:08:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 21:08:31 +0200 |
| commit | cdb48d75c0b8bf4cdb9d5ba970afe376e29ed10e (patch) | |
| tree | 3610e46d07c4840d76f7d3ef662fec3d41409da4 /nixos/modules | |
| parent | 6d898617a22b02d5f1ac5c46a703f6ecc3c39cea (diff) | |
| parent | 10703a8c926e182311cdf538937517db33f4261c (diff) | |
| download | nixpkgs-cdb48d75c0b8bf4cdb9d5ba970afe376e29ed10e.tar nixpkgs-cdb48d75c0b8bf4cdb9d5ba970afe376e29ed10e.tar.gz nixpkgs-cdb48d75c0b8bf4cdb9d5ba970afe376e29ed10e.tar.bz2 nixpkgs-cdb48d75c0b8bf4cdb9d5ba970afe376e29ed10e.tar.lz nixpkgs-cdb48d75c0b8bf4cdb9d5ba970afe376e29ed10e.tar.xz nixpkgs-cdb48d75c0b8bf4cdb9d5ba970afe376e29ed10e.tar.zst nixpkgs-cdb48d75c0b8bf4cdb9d5ba970afe376e29ed10e.zip | |
Merge pull request #140159 from Ma27/nextcloud-misc
nextcloud: misc changes
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 8f8d9cd0e26..3c952fd883a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -6,7 +6,7 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; - phpPackage = pkgs.php74.buildEnv { + phpPackage = cfg.phpPackage.buildEnv { extensions = { enabled, all }: (with all; enabled @@ -94,6 +94,14 @@ in { description = "Which package to use for the Nextcloud instance."; relatedPackages = [ "nextcloud20" "nextcloud21" "nextcloud22" ]; }; + phpPackage = mkOption { + type = types.package; + relatedPackages = [ "php74" "php80" ]; + defaultText = "pkgs.php"; + description = '' + PHP package to use for Nextcloud. + ''; + }; maxUploadSize = mkOption { default = "512M"; @@ -449,6 +457,10 @@ in { else if versionOlder stateVersion "21.11" then nextcloud21 else nextcloud22 ); + + services.nextcloud.phpPackage = + if versionOlder cfg.package.version "21" then pkgs.php74 + else pkgs.php80; } { systemd.timers.nextcloud-cron = { |