diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2023-12-15 08:14:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-15 08:14:15 +0100 |
commit | 28089f8874ffdd06c52dc3b8e94dccf6ac8fffa8 (patch) | |
tree | 895691ce9b8eb35f45f59218e175f90768f1f9fe /nixos/modules/services/web-apps | |
parent | bc2ae87f8d5335654b215235e31776f45eb6d8b2 (diff) | |
parent | e6751379bcaa6f425fa30b77faf6ffac8f615f64 (diff) | |
download | nixlib-28089f8874ffdd06c52dc3b8e94dccf6ac8fffa8.tar nixlib-28089f8874ffdd06c52dc3b8e94dccf6ac8fffa8.tar.gz nixlib-28089f8874ffdd06c52dc3b8e94dccf6ac8fffa8.tar.bz2 nixlib-28089f8874ffdd06c52dc3b8e94dccf6ac8fffa8.tar.lz nixlib-28089f8874ffdd06c52dc3b8e94dccf6ac8fffa8.tar.xz nixlib-28089f8874ffdd06c52dc3b8e94dccf6ac8fffa8.tar.zst nixlib-28089f8874ffdd06c52dc3b8e94dccf6ac8fffa8.zip |
Merge pull request #273858 from dotlambda/nextcloud28-init
nextcloud28: init at 28.0.0, nextcloud27: 27.1.4 -> 27.1.5, nextcloud26: 26.0.9 -> 26.0.10
Diffstat (limited to 'nixos/modules/services/web-apps')
-rw-r--r-- | nixos/modules/services/web-apps/nextcloud.md | 2 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index ecc7f380592a..b10fd566abb3 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -5,7 +5,7 @@ self-hostable cloud platform. The server setup can be automated using [services.nextcloud](#opt-services.nextcloud.enable). A desktop client is packaged at `pkgs.nextcloud-client`. -The current default by NixOS is `nextcloud27` which is also the latest +The current default by NixOS is `nextcloud28` which is also the latest major version available. ## Basic usage {#module-services-nextcloud-basic-usage} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index db6eacf30196..2a3db4cd13f9 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -28,6 +28,7 @@ let phpPackage = cfg.phpPackage.buildEnv { extensions = { enabled, all }: (with all; enabled + ++ [ bz2 intl sodium ] # recommended ++ optional cfg.enableImagemagick imagick # Optionally enabled depending on caching settings ++ optional cfg.caching.apcu apcu @@ -190,7 +191,7 @@ in { package = mkOption { type = types.package; description = lib.mdDoc "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud26" "nextcloud27" ]; + relatedPackages = [ "nextcloud26" "nextcloud27" "nextcloud28" ]; }; phpPackage = mkPackageOption pkgs "php" { example = "php82"; @@ -679,7 +680,7 @@ in { config = mkIf cfg.enable (mkMerge [ { warnings = let - latest = 27; + latest = 28; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. @@ -700,7 +701,8 @@ in { '') ++ (optional (versionOlder cfg.package.version "25") (upgradeWarning 24 "22.11")) ++ (optional (versionOlder cfg.package.version "26") (upgradeWarning 25 "23.05")) - ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")); + ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")) + ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 27 "24.05")); services.nextcloud.package = with pkgs; mkDefault ( @@ -710,15 +712,13 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `pkgs.nextcloud`. '' - else if versionOlder stateVersion "22.11" then nextcloud24 else if versionOlder stateVersion "23.05" then nextcloud25 else if versionOlder stateVersion "23.11" then nextcloud26 - else nextcloud27 + else if versionOlder stateVersion "24.05" then nextcloud27 + else nextcloud28 ); - services.nextcloud.phpPackage = - if versionOlder cfg.package.version "26" then pkgs.php81 - else pkgs.php82; + services.nextcloud.phpPackage = pkgs.php82; services.nextcloud.phpOptions = mkMerge [ (mapAttrs (const mkOptionDefault) defaultPHPSettings) |