dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/nextcloud: minor fixups

Browse Source 
* Apply review comments.
* Default to PHP 8.2 for v26.
This commit is contained in:
Maximilian Bosch 2023-03-22 19:57:23 +01:00 committed by Raito Bezarius
parent 6a0b0a5de9
commit cbc539c19f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,7 +204,7 @@ in {
package = mkOption {
type = types.package;
description = lib.mdDoc "Which package to use for the Nextcloud instance.";
relatedPackages = [ "nextcloud24" "nextcloud25" ];
relatedPackages = [ "nextcloud24" "nextcloud25" "nextcloud26" ];
};
phpPackage = mkOption {
type = types.package;
@ -728,8 +728,8 @@ in {
);
services.nextcloud.phpPackage =
if versionOlder cfg.package.version "24" then pkgs.php80
else pkgs.php81;
if versionOlder cfg.package.version "26" then pkgs.php81
else pkgs.php82;
}
{ assertions = [

1
nixos/tests/nextcloud/openssl-sse.nix
View File

@ -80,7 +80,6 @@ in {
nextcloudwithopenssl1.succeed("grep bye /var/lib/nextcloud/data/root/files/test-shared-file2")
nextcloudwithopenssl1.succeed("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye")
with subtest("Switch back to OpenSSL 1.1 and ensure that encrypted files are readable again"):
nextcloudwithopenssl1.succeed("${openssl1-node}/bin/switch-to-configuration test")
nextcloudwithopenssl1.wait_for_open_port(80)