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

Merge pull request #306595 from RaitoBezarius/nc29 

nextcloud29: init at 29.0.0, nextcloud27: 27.1.8 -> 27.1.9, nextcloud28: 28.0.4 -> 28.0.5
parents 5791f484 28f4adfb

nixos/doc/manual/release-notes/rl-2405.section.md

+6 −3
Original line number Diff line number Diff line
@@ -355,11 +355,14 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- `gtest` package has been updated past v1.13.0, which requires C++14 or higher.



- The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows:

- Nextcloud 26 has been removed since it's not maintained anymore by upstream.



- The latest available version of Nextcloud is v29 (available as `pkgs.nextcloud29`). The installation logic is as follows:

  - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)

  - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default.

  - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud29` will be installed by default.

  - If [`system.stateVersion`](#opt-system.stateVersion) is >=23.11, `pkgs.nextcloud27` will be installed by default.

  - Please note that an upgrade from v26 (or older) to v28 directly is not possible. Please upgrade to `nextcloud27` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud27;`](options.html#opt-services.nextcloud.package).

  - Please note that an upgrade from v27 (or older) to v29 directly is not possible. Please upgrade to `nextcloud28` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud28;`](options.html#opt-services.nextcloud.package).

  - Known warnings after the upgrade are documented in [](#module-services-nextcloud-known-warnings).



- The vendored third party libraries have been mostly removed from `cudaPackages.nsight_systems`, which we now only ship for `cudaPackages_11_8` and later due to outdated dependencies. Users comfortable with the vendored dependencies may use `overrideAttrs` to amend the `postPatch` phase and the `meta.broken` correspondingly. Alternatively, one could package the deprecated `boost170` locally, as required for `cudaPackages_11_4.nsight_systems`.

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

+27 −1
Original line number Diff line number Diff line
@@ -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 `nextcloud28` which is also the latest

The current default by NixOS is `nextcloud29` which is also the latest

major version available.



## Basic usage {#module-services-nextcloud-basic-usage}
@@ -184,6 +184,32 @@ Alternatively, extra apps can also be declared with the [](#opt-services.nextclo 
When using this setting, apps can no longer be managed statefully because this can lead to Nextcloud updating apps

that are managed by Nix. If you want automatic updates it is recommended that you use web interface to install apps.



## Known warnings {#module-services-nextcloud-known-warnings}



### Failed to get an iterator for log entries: Logreader application only supports "file" log_type {#module-services-nextcloud-warning-logreader}



This is because



* our module writes logs into the journal (`journalctl -t Nextcloud`)

* the Logreader application that allows reading logs in the admin panel is enabled

  by default and requires logs written to a file.



The logreader application doesn't work, as it was the case before. The only change is that

it complains loudly now. So nothing actionable here by default. Alternatively you can



* disable the logreader application to shut up the "error".



  We can't really do that by default since whether apps are enabled/disabled is part

  of the application's state and tracked inside the database.



* set [](#opt-services.nextcloud.settings.log_type) to "file" to be able to view logs

  from the admin panel.



### Your web server is not properly set up to resolve `.well-known` URLs, failed on: `/.well-known/caldav` {#module-services-nextcloud-warning-wellknown-caldav}



This warning appearing seems to be an upstream issue and is being sorted out

in [nextcloud/server#45033](https://github.com/nextcloud/server/issues/45033).



## Maintainer information {#module-services-nextcloud-maintainer-info}



As stated in the previous paragraph, we must provide a clean upgrade-path for Nextcloud

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

+6 −3
Original line number Diff line number Diff line
@@ -819,7 +819,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 "28") (upgradeWarning 27 "24.05"));

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

        ++ (optional (versionOlder cfg.package.version "29") (upgradeWarning 28 "24.11"));



      services.nextcloud.package = with pkgs;

        mkDefault (
@@ -832,10 +833,12 @@ in { 
          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

          else nextcloud29

        );



      services.nextcloud.phpPackage = pkgs.php82;

      services.nextcloud.phpPackage =

        if versionOlder cfg.package.version "29" then pkgs.php82

        else pkgs.php83;



      services.nextcloud.phpOptions = mkMerge [

        (mapAttrs (const mkOptionDefault) defaultPHPSettings)

nixos/tests/nextcloud/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ foldl 
    };

  })

{ }

  [ 26 27 28 ]
 
  [ 27 28 29 ]

pkgs/servers/nextcloud/default.nix

+11 −11
Original line number Diff line number Diff line 
{ lib, stdenvNoCC, fetchurl, nixosTests

, nextcloud27Packages

, nextcloud28Packages

, nextcloud26Packages

, nextcloud29Packages

}:



let
@@ -42,24 +42,24 @@ let 
    };

  };

in {

  nextcloud26 = generic {

    version = "26.0.13";

    hash = "sha256-CjYt96EjM0j5nRhT/X558GZ7VSwUXcRQEvq1SsMcea4=";

    packages = nextcloud26Packages;

  };



  nextcloud27 = generic {

    version = "27.1.8";

    hash = "sha256-Ciy5vRKCnlOq8XNUPsrQFPCeganXL6YeTEYNhOO47fs=";

    version = "27.1.9";

    hash = "sha256-+P4QzLWFNJ+EUQ25tLAgjbfziV2vPXpejxfSNuzEEfU=";

    packages = nextcloud27Packages;

  };



  nextcloud28 = generic {

    version = "28.0.4";

    hash = "sha256-m/7O4eEvukjEnppxyqgcS6ELKIR4f6t11kzP0SKhMBk=";

    version = "28.0.5";

    hash = "sha256-3KEQD5W4ZLreETR3cjxxrIlxkzUsMX45zShth2NXBus=";

    packages = nextcloud28Packages;

  };



  nextcloud29 = generic {

    version = "29.0.0";

    hash = "sha256-6bU/ZDK29mRIfThpZF+hIaZM8O1q7oOqVgkD2vhrUr0=";

    packages = nextcloud29Packages;

  };



  # tip: get the sha with:

  # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'

}