pyrox.dev / nixpkgs
lol
fork atom

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

authored by

Maximilian Bosch and committed by
GitHub c3da85f1 dc963787

+16 -18
+16 -18
nixos/modules/services/web-apps/nextcloud.nix
··· 1058 1058 ++ (lib.optional (lib.versionOlder overridePackage.version "30") (upgradeWarning 29 "24.11")) 1059 1059 ++ (lib.optional (lib.versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05")); 1060 1060 1061 - services.nextcloud.package = 1062 - with pkgs; 1063 - lib.mkDefault ( 1064 - if pkgs ? nextcloud then 1065 - throw '' 1066 - The `pkgs.nextcloud`-attribute has been removed. If it's supposed to be the default 1067 - nextcloud defined in an overlay, please set `services.nextcloud.package` to 1068 - `pkgs.nextcloud`. 1069 - '' 1070 - else if versionOlder stateVersion "24.05" then 1071 - nextcloud27 1072 - else if versionOlder stateVersion "24.11" then 1073 - nextcloud29 1074 - else if versionOlder stateVersion "25.05" then 1075 - nextcloud30 1076 - else 1077 - nextcloud31 1078 - ); 1061 + services.nextcloud.package = lib.mkDefault ( 1062 + if pkgs ? nextcloud then 1063 + throw '' 1064 + The `pkgs.nextcloud`-attribute has been removed. If it's supposed to be the default 1065 + nextcloud defined in an overlay, please set `services.nextcloud.package` to 1066 + `pkgs.nextcloud`. 1067 + '' 1068 + else if lib.versionOlder stateVersion "24.05" then 1069 + pkgs.nextcloud27 1070 + else if lib.versionOlder stateVersion "24.11" then 1071 + pkgs.nextcloud29 1072 + else if lib.versionOlder stateVersion "25.05" then 1073 + pkgs.nextcloud30 1074 + else 1075 + pkgs.nextcloud31 1076 + ); 1079 1077 1080 1078 services.nextcloud.phpOptions = mkMerge [ 1081 1079 (lib.mapAttrs (lib.const lib.mkOptionDefault) defaultPHPSettings)