summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2024-01-03 16:12:51 +0100
committerGitHub <noreply@github.com>2024-01-03 16:12:51 +0100
commitd45794fd254a7da62cc2d3c4f54a1d65e39760d9 (patch)
tree5fd64d49c6ae359ab2be0de2bf7b124bb2a5fc7f
parentMerge pull request #278299 from NixOS/backport-278223-to-release-23.11 (diff)
parentnixos/nextcloud: missing ocm-dir applys also from 26.0.8 onward (diff)
downloadnixpkgs-d45794fd254a7da62cc2d3c4f54a1d65e39760d9.tar.gz
Merge pull request #273136 from NixOS/backport-266935-to-release-23.11
[Backport release-23.11] nixos/nextcloud: missing ocm-dir applys also from 26.0.8 onward
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 3c4bcfb60c46..8735718a93d0 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -100,7 +100,9 @@ let
pgsqlLocal = cfg.database.createLocally && cfg.config.dbtype == "pgsql";
# https://github.com/nextcloud/documentation/pull/11179
- ocmProviderIsNotAStaticDirAnymore = versionAtLeast cfg.package.version "27.1.2";
+ ocmProviderIsNotAStaticDirAnymore = versionAtLeast cfg.package.version "27.1.2"
+ || (versionOlder cfg.package.version "27.0.0"
+ && versionAtLeast cfg.package.version "26.0.8");
in {