Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nextcloud31: init at 31.0.0 #385060

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+440 −7
Open

nextcloud31: init at 31.0.0 #385060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/services/web-apps/nextcloud.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 `nextcloud30` which is also the latest
The current default by NixOS is `nextcloud31` which is also the latest
major version available.

## Basic usage {#module-services-nextcloud-basic-usage}
Expand Down
11 changes: 7 additions & 4 deletions nixos/modules/services/web-apps/nextcloud.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ in {

config = mkIf cfg.enable (mkMerge [
{ warnings = let
latest = 30;
latest = 31;
upgradeWarning = major: nixos:
''
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
Expand Down Expand Up @@ -868,7 +868,8 @@ in {
++ (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 "29") (upgradeWarning 28 "24.11"))
++ (optional (versionOlder cfg.package.version "30") (upgradeWarning 29 "24.11"));
++ (optional (versionOlder cfg.package.version "30") (upgradeWarning 29 "24.11"))
++ (optional (versionOlder cfg.package.version "31") (upgradeWarning 30 "25.05"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
++ (optional (versionOlder cfg.package.version "31") (upgradeWarning 30 "25.05"));
++ (optional (versionOlder cfg.package.version "31") (upgradeWarning 30 "25.05"))
;

would make future diffs prettier


services.nextcloud.package = with pkgs;
mkDefault (
Expand All @@ -880,12 +881,14 @@ in {
''
else if versionOlder stateVersion "24.05" then nextcloud27
else if versionOlder stateVersion "24.11" then nextcloud29
else nextcloud30
else if versionOlder stateVersion "25.05" then nextcloud30
else nextcloud31
);

services.nextcloud.phpPackage =
if versionOlder cfg.package.version "29" then pkgs.php82
else pkgs.php83;
else if versionOlder cfg.package.version "30" then pkgs83
else pkgs.php84;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream still recommends 8.3 though.


services.nextcloud.phpOptions = mkMerge [
(mapAttrs (const mkOptionDefault) defaultPHPSettings)
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/nextcloud/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ let
./with-objectstore.nix
];
in
listToAttrs (concatMap genTests [ 29 30 ])
listToAttrs (concatMap genTests [ 29 30 31 ])
7 changes: 7 additions & 0 deletions pkgs/servers/nextcloud/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
nixosTests,
nextcloud29Packages,
nextcloud30Packages,
nextcloud31Packages,
}:

let
Expand Down Expand Up @@ -70,6 +71,12 @@ in
packages = nextcloud30Packages;
};

nextcloud31 = generic {
version = "31.0.0";
hash = "sha256-b76weze7nPp8kb8bLfvPAxkFi25gSHweqht3frl2LZE=";
packages = nextcloud31Packages;
};

# tip: get the sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'
}
Loading