diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-05-23 20:23:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 20:23:11 +0200 |
| commit | 2b7e06e0b6c4e6e02728dd621b07b43de19ad7d4 (patch) | |
| tree | 4acdc229aae50452f2c4740a2c81bd908f0d56f0 /nixos | |
| parent | cf3cb4893f7b275b4eee16985f7737a624e0b027 (diff) | |
| parent | f3f0b60006cc992856061a16d9dc5bcf4ab20cfa (diff) | |
Merge pull request #174145 from alarsyo/nextcloud24-php8
nixos/nextcloud: use PHP 8 avoiding broken 2FA app
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a58e8aa3abd8a..1d5ec5594f791 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -633,8 +633,13 @@ in { services.nextcloud.phpPackage = if versionOlder cfg.package.version "21" then pkgs.php74 - else if versionOlder cfg.package.version "24" then pkgs.php80 - else pkgs.php81; + # FIXME: Use PHP 8.1 with Nextcloud 24 and higher, once issues like this one are fixed: + # + # https://github.com/nextcloud/twofactor_totp/issues/1192 + # + # else if versionOlder cfg.package.version "24" then pkgs.php80 + # else pkgs.php81; + else pkgs.php80; } { assertions = [ |