Unverified Commit c3da85f1 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

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

parents dc963787 58def163
Loading
Loading
Loading
Loading
+16 −18
Original line number Diff line number Diff line
@@ -1058,23 +1058,21 @@ 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 (
      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 versionOlder stateVersion "24.05" then
            nextcloud27
          else if versionOlder stateVersion "24.11" then
            nextcloud29
          else if versionOlder stateVersion "25.05" then
            nextcloud30
        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
            nextcloud31
          pkgs.nextcloud31
      );

      services.nextcloud.phpOptions = mkMerge [