Skip to content

Commit

Permalink
nextcloud25: remove
Browse files Browse the repository at this point in the history
EOL of Nextcloud v25 is scheduled by the end of this month.
  • Loading branch information
Ma27 committed Oct 7, 2023
1 parent 0ad1a33 commit efc5c80
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 580 deletions.
2 changes: 1 addition & 1 deletion nixos/modules/services/web-apps/nextcloud.nix
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ in {
package = mkOption {
type = types.package;
description = lib.mdDoc "Which package to use for the Nextcloud instance.";
relatedPackages = [ "nextcloud25" "nextcloud26" "nextcloud27" ];
relatedPackages = [ "nextcloud26" "nextcloud27" ];
};
phpPackage = mkOption {
type = types.package;
Expand Down
6 changes: 1 addition & 5 deletions nixos/tests/nextcloud/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ with pkgs.lib;
foldl
(matrix: ver: matrix // {
"basic${toString ver}" = import ./basic.nix { inherit system pkgs; nextcloudVersion = ver; };
"openssl-sse${toString ver}" = import ./openssl-sse.nix {
inherit system pkgs;
nextcloudVersion = ver;
};
"with-postgresql-and-redis${toString ver}" = import ./with-postgresql-and-redis.nix {
inherit system pkgs;
nextcloudVersion = ver;
Expand All @@ -26,4 +22,4 @@ foldl
};
})
{ }
[ 25 26 27 ]
[ 26 27 ]
109 changes: 0 additions & 109 deletions nixos/tests/nextcloud/openssl-sse.nix

This file was deleted.

26 changes: 7 additions & 19 deletions pkgs/servers/nextcloud/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
{ lib, stdenv, fetchurl, nixosTests
, nextcloud27Packages
, nextcloud26Packages
, nextcloud25Packages
}:

let
generic = {
version, hash
, eol ? false, extraVulnerabilities ? []
, packages
}: let
major = lib.versions.major version;
in stdenv.mkDerivation rec {
}: stdenv.mkDerivation rec {
pname = "nextcloud";
inherit version;

Expand All @@ -20,9 +17,6 @@ let
inherit hash;
};

# This patch is only necessary for NC version <26.
patches = lib.optional (lib.versionOlder major "26") (./patches + "/v${major}/0001-Setup-remove-custom-dbuser-creation-behavior.patch");

passthru = {
tests = nixosTests.nextcloud;
inherit packages;
Expand All @@ -47,24 +41,18 @@ let
};
};
in {
nextcloud24 = throw ''
Nextcloud v24 has been removed from `nixpkgs` as the support for is dropped
by upstream in 2023-04. Please upgrade to at least Nextcloud v25 by declaring
nextcloud25 = throw ''
Nextcloud v25 has been removed from `nixpkgs` as the support for is dropped
by upstream in 2023-10. Please upgrade to at least Nextcloud v26 by declaring
services.nextcloud.package = pkgs.nextcloud25;
services.nextcloud.package = pkgs.nextcloud26;
in your NixOS config.
WARNING: if you were on Nextcloud 23 you have to upgrade to Nextcloud 24
first on 22.11 because Nextcloud doesn't support upgrades across multiple major versions!
WARNING: if you were on Nextcloud 24 you have to upgrade to Nextcloud 25
first on 23.05 because Nextcloud doesn't support upgrades across multiple major versions!
'';

nextcloud25 = generic {
version = "25.0.12";
hash = "sha256-UgMYQkEdh7hjL47EEq14y0K9VIi+LT77/OSmhRykTYw=";
packages = nextcloud25Packages;
};

nextcloud26 = generic {
version = "26.0.7";
hash = "sha256-vtJEqLlNE7YWqSdAUhZwwdZ9Q8SAR3I/sTGAv/bUjpI=";
Expand Down
Loading

0 comments on commit efc5c80

Please sign in to comment.