Unverified Commit 9be06503 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 480ac1c7 0352cd1d

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -24567,6 +24567,11 @@ 
    githubId = 67710369;

    keys = [ { fingerprint = "EA88 EA07 26E9 6CBF 6365  3966 163B 16EE 76ED 24CE"; } ];

  };

  shunueda = {

    name = "Shun Ueda";

    github = "shunueda";

    githubId = 62182668;

  };

  shved = {

    name = "Yury Shvedov";

    email = "mestofel13@gmail.com";

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

+6 −1
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ let 
              type = types.str;

              default = "";

            };

            provision = mkOption {

              type = types.str;

              default = "";

            };

            extraTests = mkOption {

              type = types.either types.str (types.functionTo types.str);

              default = "";
@@ -75,6 +79,7 @@ let 
          inherit (config) test-helpers;

        in

        mkBefore ''

          ${test-helpers.provision}

          start_all()

          nextcloud.wait_for_unit("multi-user.target")
@@ -142,7 +147,7 @@ let 
in

listToAttrs (

  concatMap genTests [

    31

    32

    33

  ]

)