From b922990a8eb4dbee8f9e7428572d2230a86c2a55 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 8 Jul 2021 16:29:45 +0200 Subject: [PATCH] nextcloud19: remove I'm very sorry, this should've happened before the release, but we can still mark it as insecure on 21.05 and remove it on `master`. --- pkgs/servers/nextcloud/default.nix | 19 ++++--------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a08b2bd4dd5..399294ce519 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,27 +33,16 @@ let }; }; in { - nextcloud18 = throw '' - Nextcloud v18 has been removed from `nixpkgs` as the support for it was dropped - by upstream in 2021-01. Please upgrade to at least Nextcloud v19 by + nextcloud19 = throw '' + Nextcloud v19 has been removed from `nixpkgs` as the support for it was dropped + by upstream in 2021-06. Please upgrade to at least Nextcloud v20 by declaring - services.nextcloud.package = pkgs.nextcloud19; + services.nextcloud.package = pkgs.nextcloud20; in your NixOS config. - - [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." - ]; - }; - nextcloud20 = generic { version = "20.0.11"; sha256 = "sha256-CLrJH5eNTiJJrDzfCg+re3J2qmwxFOe12nUU/QgtD6A="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a6ad9fe9d3..9bf8f552a5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7264,7 +7264,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud18 nextcloud19 nextcloud20 nextcloud21; + nextcloud19 nextcloud20 nextcloud21; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };