Unverified Commit f718012d authored by Maximilian Bosch's avatar Maximilian Bosch
Browse files

nixos/nextcloud: updates for nc28 

* Always use PHP 8.2: at the time of writing, Nextcloud also suggests to
  use 8.2 rather than 8.3 in the manual for v28.

  One contributing factor is probably that all plugins need new releases
  to declare PHP 8.3 support.

* Fix upgradeWarning for installing v27 now that v28 is out.

* Drop upgrade warning for v24. This one is EOL for quite a while
  already, so right now everybody should've switched (or carefully
  studied the release notes in case they were upgrading from <23.05) and
  we can clean up the module a little bit.

  v25 was dropped not so long ago, so if it's still referenced (because
  somebody didn't declare `services.nextcloud.package` and has
  `system.stateVersion = "22.11";`) it's appropriate to still give a
  specialized error.
parent 0cb577ff

nixos/modules/services/web-apps/nextcloud.nix

+2 −5
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ 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 "28") (upgradeWarning 26 "24.05"));

        ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 27 "24.05"));



      services.nextcloud.package = with pkgs;

        mkDefault (
@@ -712,16 +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 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)