Unverified Commit c9d54720 authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

nextcloud33, nextcloud33Packages: init at 33.0.0; nextcloud31*: drop (#492137)

parents 4782cfd8 79e727ee

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

+7 −0
Original line number Diff line number Diff line
@@ -189,6 +189,13 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>. 


- `services.caddy` now supports setting `httpPort` and `httpsPort` and opening them in the firewall via `openFirewall`.



- The latest available version of Nextcloud is v33 (available as `pkgs.nextcloud33`). 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 >=26.05, `pkgs.nextcloud33` will be installed by default.

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

  - `nextcloud31` is EOL and was thus removed.

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



- `services.slurm` now supports slurmrestd usage through the `services.slurm.rest` NixOS options.



- `services.kanidm` options for server, client and unix were moved under dedicated namespaces.

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

+1 −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 `nextcloud32` which is also the latest

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

major version available.



## Basic usage {#module-services-nextcloud-basic-usage}

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

+7 −6
Original line number Diff line number Diff line
@@ -464,8 +464,8 @@ in 
      type = lib.types.package;

      description = "Which package to use for the Nextcloud instance.";

      relatedPackages = [

        "nextcloud31"

        "nextcloud32"

        "nextcloud33"

      ];

    };

    phpPackage = lib.mkPackageOption pkgs "php" {
@@ -1194,7 +1194,7 @@ in 
      {

        warnings =

          let

            latest = 32;

            latest = 33;

            upgradeWarning = major: nixos: ''

              A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
@@ -1226,7 +1226,8 @@ in 
          ++ (lib.optional (lib.versionOlder cfg.package.version "29") (upgradeWarning 28 "24.11"))

          ++ (lib.optional (lib.versionOlder cfg.package.version "30") (upgradeWarning 29 "24.11"))

          ++ (lib.optional (lib.versionOlder cfg.package.version "31") (upgradeWarning 30 "25.05"))

          ++ (lib.optional (lib.versionOlder cfg.package.version "32") (upgradeWarning 31 "25.11"));

          ++ (lib.optional (lib.versionOlder cfg.package.version "32") (upgradeWarning 31 "25.11"))

          ++ (lib.optional (lib.versionOlder cfg.package.version "33") (upgradeWarning 32 "26.05"));



        services.nextcloud.package = lib.mkDefault (

          if pkgs ? nextcloud then
@@ -1235,12 +1236,12 @@ in 
              nextcloud defined in an overlay, please set `services.nextcloud.package` to

              `pkgs.nextcloud`.

            ''

          else if lib.versionOlder stateVersion "25.05" then

            pkgs.nextcloud30

          else if lib.versionOlder stateVersion "25.11" then

            pkgs.nextcloud31

          else

          else if lib.versionOlder stateVersion "26.05" then

            pkgs.nextcloud32

          else

            pkgs.nextcloud33

        );



        services.nextcloud.phpOptions = lib.mkMerge [

nixos/tests/nextcloud/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ let 
in

listToAttrs (

  concatMap genTests [

    31

    32

    33

  ]

)

pkgs/servers/nextcloud/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
  stdenvNoCC,

  fetchurl,

  nixosTests,

  nextcloud31Packages,

  nextcloud32Packages,

  nextcloud33Packages,

}:



let
@@ -52,18 +52,18 @@ let 
    };

in

{

  nextcloud31 = generic {

    version = "31.0.14";

    hash = "sha256-0JZessv2gQV0PLvm7vQEyJCSz5LEDa7iycuc9u32NhM=";

    packages = nextcloud31Packages;

  };



  nextcloud32 = generic {

    version = "32.0.6";

    hash = "sha256-RLwz/A4xplC7UguxI8CqplGbf3uThhM9Vhred+U/cTA=";

    packages = nextcloud32Packages;

  };



  nextcloud33 = generic {

    version = "33.0.0";

    hash = "sha256-b3cwkCJpyHn58q1KoKInyxa1QI7kbwk/aL0yYz90Gr8=";

    packages = nextcloud33Packages;

  };



  # tip: get the sha with:

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

}