From c1541b370a2c5f444fe4885222af4d490abbeef1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 1 Oct 2021 17:03:09 +0200
Subject: [PATCH 1/2] nixos/nextcloud: use php8 where possible
(cherry picked from commit 66edc1e84625ed5b4bed5868f4093a570a822c2e)
---
nixos/modules/services/web-apps/nextcloud.nix | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index d047a768233..4bfa564a67f 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 = [ "nextcloud19" "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";
@@ -450,6 +458,10 @@ in {
else if versionOlder stateVersion "21.03" then nextcloud19
else nextcloud21
);
+
+ services.nextcloud.phpPackage =
+ if versionOlder cfg.package.version "21" then pkgs.php74
+ else pkgs.php80;
}
{ systemd.timers.nextcloud-cron = {
From 50b29bf6aae0fcbe6e6423369de438616e9c8c75 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 1 Oct 2021 17:03:32 +0200
Subject: [PATCH 2/2] nixos/nextcloud: run tests against each Nextcloud
instance
(cherry picked from commit 10703a8c926e182311cdf538937517db33f4261c)
---
nixos/tests/nextcloud/basic.nix | 7 ++++--
nixos/tests/nextcloud/default.nix | 22 ++++++++++++++-----
.../nextcloud/with-mysql-and-memcached.nix | 7 ++++--
.../nextcloud/with-postgresql-and-redis.nix | 7 ++++--
4 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix
index c4ce34748ac..40ee9d5184c 100644
--- a/nixos/tests/nextcloud/basic.nix
+++ b/nixos/tests/nextcloud/basic.nix
@@ -1,4 +1,6 @@
-import ../make-test-python.nix ({ pkgs, ...}: let
+args@{ pkgs, nextcloudVersion ? 22, ... }:
+
+(import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "notproduction";
adminuser = "root";
in {
@@ -39,6 +41,7 @@ in {
inherit adminpass;
dbtableprefix = "nixos_";
};
+ package = pkgs.${"nextcloud" + (toString nextcloudVersion)};
autoUpdateApps = {
enable = true;
startAt = "20:00";
@@ -100,4 +103,4 @@ in {
)
assert "hi" in client.succeed("cat /mnt/dav/test-shared-file")
'';
-})
+})) args
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix
index e4c7a70606c..65043e509b3 100644
--- a/nixos/tests/nextcloud/default.nix
+++ b/nixos/tests/nextcloud/default.nix
@@ -2,8 +2,20 @@
config ? {},
pkgs ? import ../../.. { inherit system config; }
}:
-{
- basic = import ./basic.nix { inherit system pkgs; };
- with-postgresql-and-redis = import ./with-postgresql-and-redis.nix { inherit system pkgs; };
- with-mysql-and-memcached = import ./with-mysql-and-memcached.nix { inherit system pkgs; };
-}
+
+with pkgs.lib;
+
+foldl
+ (matrix: ver: matrix // {
+ "basic${toString ver}" = import ./basic.nix { inherit system pkgs; nextcloudVersion = ver; };
+ "with-postgresql-and-redis${toString ver}" = import ./with-postgresql-and-redis.nix {
+ inherit system pkgs;
+ nextcloudVersion = ver;
+ };
+ "with-mysql-and-memcached${toString ver}" = import ./with-mysql-and-memcached.nix {
+ inherit system pkgs;
+ nextcloudVersion = ver;
+ };
+ })
+ {}
+ [ 20 21 22 ]
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
index de5f53d559a..c0df773eaaa 100644
--- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@@ -1,4 +1,6 @@
-import ../make-test-python.nix ({ pkgs, ...}: let
+args@{ pkgs, nextcloudVersion ? 22, ... }:
+
+(import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "hunter2";
adminuser = "root";
in {
@@ -18,6 +20,7 @@ in {
enable = true;
hostName = "nextcloud";
https = true;
+ package = pkgs.${"nextcloud" + (toString nextcloudVersion)};
caching = {
apcu = true;
redis = false;
@@ -103,4 +106,4 @@ in {
"${withRcloneEnv} ${diffSharedFile}"
)
'';
-})
+})) args
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
index 81af620598e..36a69fda505 100644
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -1,4 +1,6 @@
-import ../make-test-python.nix ({ pkgs, ...}: let
+args@{ pkgs, nextcloudVersion ? 22, ... }:
+
+(import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "hunter2";
adminuser = "custom-admin-username";
in {
@@ -17,6 +19,7 @@ in {
services.nextcloud = {
enable = true;
hostName = "nextcloud";
+ package = pkgs.${"nextcloud" + (toString nextcloudVersion)};
caching = {
apcu = false;
redis = true;
@@ -96,4 +99,4 @@ in {
"${withRcloneEnv} ${diffSharedFile}"
)
'';
-})
+})) args