Merge: nixos/nextcloud: fix eval (#428709)

This commit is contained in:
Maximilian Bosch
2025-07-28 11:37:35 +02:00
committed by GitHub
+16 -18
View File
@@ -1058,24 +1058,22 @@ in
++ (lib.optional (lib.versionOlder overridePackage.version "30") (upgradeWarning 29 "24.11"))
++ (lib.optional (lib.versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05"));
services.nextcloud.package =
with pkgs;
lib.mkDefault (
if pkgs ? nextcloud then
throw ''
The `pkgs.nextcloud`-attribute has been removed. If it's supposed to be the default
nextcloud defined in an overlay, please set `services.nextcloud.package` to
`pkgs.nextcloud`.
''
else if versionOlder stateVersion "24.05" then
nextcloud27
else if versionOlder stateVersion "24.11" then
nextcloud29
else if versionOlder stateVersion "25.05" then
nextcloud30
else
nextcloud31
);
services.nextcloud.package = lib.mkDefault (
if pkgs ? nextcloud then
throw ''
The `pkgs.nextcloud`-attribute has been removed. If it's supposed to be the default
nextcloud defined in an overlay, please set `services.nextcloud.package` to
`pkgs.nextcloud`.
''
else if lib.versionOlder stateVersion "24.05" then
pkgs.nextcloud27
else if lib.versionOlder stateVersion "24.11" then
pkgs.nextcloud29
else if lib.versionOlder stateVersion "25.05" then
pkgs.nextcloud30
else
pkgs.nextcloud31
);
services.nextcloud.phpOptions = mkMerge [
(lib.mapAttrs (lib.const lib.mkOptionDefault) defaultPHPSettings)