public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #130050 from Ma27/backport-nextcloud

Browse Source 
[21.05] nextcloud: version updates
This commit is contained in:
Robin Gloster 2021-07-13 03:00:46 -05:00 committed by GitHub
commit 8b98eb8fd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -92,7 +92,7 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
description = "Which package to use for the Nextcloud instance."; description = "Which package to use for the Nextcloud instance.";
relatedPackages = [ "nextcloud19" "nextcloud20" "nextcloud21" ]; relatedPackages = [ "nextcloud19" "nextcloud20" "nextcloud21" "nextcloud22" ];
}; };
maxUploadSize = mkOption { maxUploadSize = mkOption {
@ -385,7 +385,7 @@ in {
]; ];
warnings = let warnings = let
latest = 21; latest = 22;
upgradeWarning = major: nixos: upgradeWarning = major: nixos:
'' ''
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.

4
nixos/modules/services/web-apps/nextcloud.xml
View File

@ -11,8 +11,8 @@
desktop client is packaged at <literal>pkgs.nextcloud-client</literal>. desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
</para> </para>
<para> <para>
The current default by NixOS is <package>nextcloud21</package> which is also the latest The current default by NixOS is <package>nextcloud21</package>. The latest version available is
major version available. <package>nextcloud22</package>.
</para> </para>
<section xml:id="module-services-nextcloud-basic-usage"> <section xml:id="module-services-nextcloud-basic-usage">
<title>Basic usage</title> <title>Basic usage</title>

19
pkgs/servers/nextcloud/default.nix
View File

@ -45,23 +45,28 @@ in {
[1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html
''; '';
# FIXME(@Ma27) remove on 21.05
nextcloud19 = generic { nextcloud19 = generic {
version = "19.0.6"; version = "19.0.13";
sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; sha256 = "sha256-pc5sS7cK65c5vwG7NhKaWU2DeXHovSHH0wEmeosxIg8=";
extraVulnerabilities = [ extraVulnerabilities = [
"Nextcloud 19 is still supported, but CVE-2020-8259 & CVE-2020-8152 are unfixed! Please note that both CVEs only affect the file encryption module which is turned off by default. Alternatively, `pkgs.nextcloud20` can be used." "Nextcloud 19 is still supported, but CVE-2020-8259 & CVE-2020-8152 are unfixed! Please note that both CVEs only affect the file encryption module which is turned off by default. Alternatively, `pkgs.nextcloud20` can be used."
"Nextcloud 19 is EOL!"
]; ];
}; };
nextcloud20 = generic { nextcloud20 = generic {
version = "20.0.7"; version = "20.0.11";
sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; sha256 = "sha256-CLrJH5eNTiJJrDzfCg+re3J2qmwxFOe12nUU/QgtD6A=";
}; };
nextcloud21 = generic { nextcloud21 = generic {
version = "21.0.2"; version = "21.0.3";
sha256 = "5e5b38109a3485db5fd2d248f24478eabe6c0790ec10b030acbbee207d5511fe"; sha256 = "8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee";
};
nextcloud22 = generic {
version = "22.0.0";
sha256 = "sha256-ORHTdUw3rKfJtfOys3UTwPK1u5ea8AgWwRF7Hu28XXo=";
}; };
# tip: get she sha with: # tip: get she sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'

2
pkgs/top-level/all-packages.nix
View File

@ -7075,7 +7075,7 @@ in
grocy = callPackage ../servers/grocy { }; grocy = callPackage ../servers/grocy { };
inherit (callPackage ../servers/nextcloud {}) inherit (callPackage ../servers/nextcloud {})
nextcloud18 nextcloud19 nextcloud20 nextcloud21; nextcloud18 nextcloud19 nextcloud20 nextcloud21 nextcloud22;
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };