From 6856ce6a4ae9048d219532a0a3ab17aada7e25f2 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier <32938211+bbenno@users.noreply.github.com> Date: Thu, 8 Jul 2021 09:56:39 +0200 Subject: [PATCH 1/5] nextcloud: 21.0.2 -> 21.0.3 (cherry picked from commit 765c1b314412b5073818c8b981117325da46a865) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3f2b1798a2c..3d32549e314 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -60,8 +60,8 @@ in { }; nextcloud21 = generic { - version = "21.0.2"; - sha256 = "5e5b38109a3485db5fd2d248f24478eabe6c0790ec10b030acbbee207d5511fe"; + version = "21.0.3"; + sha256 = "8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee"; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' From 50fb3a1eeb94033c876d6e30a4d6f7cea2160ba4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 8 Jul 2021 12:13:38 +0200 Subject: [PATCH 2/5] nextcloud20: 20.0.7 -> 20.0.11 ChangeLog: https://nextcloud.com/changelog/#20-0-11 (cherry picked from commit d45672d059cbcc106c3d3d52e4a185859b6c6635) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3d32549e314..a08b2bd4dd5 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -55,8 +55,8 @@ in { }; nextcloud20 = generic { - version = "20.0.7"; - sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; + version = "20.0.11"; + sha256 = "sha256-CLrJH5eNTiJJrDzfCg+re3J2qmwxFOe12nUU/QgtD6A="; }; nextcloud21 = generic { From edfe11b5354c8021658ff359fcee27b6e11d851d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 12 Jul 2021 23:12:19 +0200 Subject: [PATCH 3/5] nextcloud19: make it clear that it's EOL I actually wanted to remove it before 21.05, but unfortunately I forgot about this. This is a less drastic way of getting rid of v19 in contrast to the actual breaking change in master[1]. [1] b922990a8eb4dbee8f9e7428572d2230a86c2a55 --- pkgs/servers/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a08b2bd4dd5..e1288502b72 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -45,12 +45,12 @@ in { [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html ''; - # FIXME(@Ma27) remove on 21.05 nextcloud19 = generic { version = "19.0.6"; sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; 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 EOL!" ]; }; From b58ae55e223abb4c70666956bcfc49b39ff8bf1c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 12 Jul 2021 23:14:59 +0200 Subject: [PATCH 4/5] nextcloud19: 19.0.6 -> 19.0.13 This basically has two reasons: * I forgot to remove v19 here and I don't want to break this now. Going up to the most recent patch-level is the least we can do. * With a changed version, the `permittedInsecurePackages`-setting in people's deployments has to change, so people will actually notice the EOL of v19. --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index e1288502b72..c1789a39749 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,8 +46,8 @@ in { ''; nextcloud19 = generic { - version = "19.0.6"; - sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; + version = "19.0.13"; + sha256 = "sha256-pc5sS7cK65c5vwG7NhKaWU2DeXHovSHH0wEmeosxIg8="; 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 EOL!" From f8b79de69efe236496f4f7ce29517e98255a0078 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 12 Jul 2021 23:27:57 +0200 Subject: [PATCH 5/5] nextcloud22: init at 22.0.0 Simplified, non-breaking version of e05f4101c16f08058a14ac4335886567e1ffe987. --- nixos/modules/services/web-apps/nextcloud.nix | 4 ++-- nixos/modules/services/web-apps/nextcloud.xml | 4 ++-- pkgs/servers/nextcloud/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 545deaa905f..bb8ea5ab6e0 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -92,7 +92,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud19" "nextcloud20" "nextcloud21" ]; + relatedPackages = [ "nextcloud19" "nextcloud20" "nextcloud21" "nextcloud22" ]; }; maxUploadSize = mkOption { @@ -385,7 +385,7 @@ in { ]; warnings = let - latest = 21; + latest = 22; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 83a6f68edcb..2adbd9a9495 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -11,8 +11,8 @@ desktop client is packaged at pkgs.nextcloud-client. - The current default by NixOS is nextcloud21 which is also the latest - major version available. + The current default by NixOS is nextcloud21. The latest version available is + nextcloud22.
Basic usage diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index c1789a39749..8ff6dccedd0 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -63,6 +63,11 @@ in { version = "21.0.3"; sha256 = "8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee"; }; + + nextcloud22 = generic { + version = "22.0.0"; + sha256 = "sha256-ORHTdUw3rKfJtfOys3UTwPK1u5ea8AgWwRF7Hu28XXo="; + }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ddda7fa937..0cfaca0572a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7075,7 +7075,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud18 nextcloud19 nextcloud20 nextcloud21; + nextcloud18 nextcloud19 nextcloud20 nextcloud21 nextcloud22; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };