From 7ef73d05cd9fd4a21ef83e8154ba102cfa3f5898 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 19 Jan 2025 00:08:35 +0100 Subject: [PATCH] nextcloud28: remove This major release is dead now. --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- nixos/tests/nextcloud/default.nix | 2 +- pkgs/servers/nextcloud/default.nix | 7 ------- pkgs/top-level/aliases.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 3 +-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 10c72550f2cd..aa9f074a6178 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -299,7 +299,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud28" "nextcloud29" "nextcloud30" ]; + relatedPackages = [ "nextcloud29" "nextcloud30" ]; }; phpPackage = mkPackageOption pkgs "php" { example = "php82"; diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index a1aba5c1ab64..568440150b23 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -110,4 +110,4 @@ let ./with-objectstore.nix ]; in -listToAttrs (concatMap genTests [ 28 29 30 ]) +listToAttrs (concatMap genTests [ 29 30 ]) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d12ba27586ca..624212f6efed 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -3,7 +3,6 @@ stdenvNoCC, fetchurl, nixosTests, - nextcloud28Packages, nextcloud29Packages, nextcloud30Packages, }: @@ -58,12 +57,6 @@ let }; in { - nextcloud28 = generic { - version = "28.0.14"; - hash = "sha256-SpN/GIJIZCbJcD5Z7EspP2Ib6NCAt/hQFvYpkDw68zY="; - packages = nextcloud28Packages; - }; - nextcloud29 = generic { version = "29.0.11"; hash = "sha256-UGf8F91zICzC39m5ccp7uUy5UEghRgJ9rGILEjweztE="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fa8a07f695dd..c40d71bcff98 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -898,6 +898,18 @@ mapAliases { neocities-cli = neocities; # Added 2024-07-31 netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 + nextcloud28 = throw '' + Nextcloud v28 has been removed from `nixpkgs` as the support for is dropped + by upstream in 2025-01. Please upgrade to at least Nextcloud v29 by declaring + + services.nextcloud.package = pkgs.nextcloud29; + + in your NixOS config. + + WARNING: if you were on Nextcloud 27 you have to upgrade to Nextcloud 28 + first on 24.11 because Nextcloud doesn't support upgrades across multiple major versions! + ''; # Added 2025-01-19 + nextcloud28Packages = throw "Nextcloud 28 is EOL!"; # Added 2025-01-19 nextcloud27 = throw '' Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ba597d8c07..8c0cf44ae1f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4354,9 +4354,8 @@ with pkgs; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; inherit (callPackages ../servers/nextcloud {}) - nextcloud28 nextcloud29 nextcloud30; + nextcloud29 nextcloud30; - nextcloud28Packages = callPackage ../servers/nextcloud/packages { ncVersion = "28"; }; nextcloud29Packages = callPackage ../servers/nextcloud/packages { ncVersion = "29"; }; nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; };