summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2022-05-21 18:34:28 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2022-05-21 18:34:28 +0200
commit33c44a10310b6613e735c3596af776ed1f36622b (patch)
tree8780959baac4901364b7f5379b22a507cb6b1754 /nixos
parentd191eb270f86288bac12fb53ebdebfff94a87283 (diff)
nextcloud22: drop
Version 22 will be EOLed in July 2022[1] and we shouldn't have unsupported software in the soon-to-be-released NixOS 22.05, hence dropping it already. [1] https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml13
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md4
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix3
-rw-r--r--nixos/tests/nextcloud/default.nix2
4 files changed, 19 insertions, 3 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 19aaf12f26a1..aafa9b831b66 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -1647,6 +1647,19 @@
</listitem>
<listitem>
<para>
+ The default version of <literal>nextcloud</literal> is
+ <emphasis role="strong">nextcloud24</emphasis>. Please note
+ that it’s <emphasis role="strong">not</emphasis> possible to
+ upgrade <literal>nextcloud</literal> across multiple major
+ versions! This means it’s e.g. not possible to upgrade from
+ <literal>nextcloud22</literal> to
+ <literal>nextcloud24</literal> in a single deploy and most
+ <literal>21.11</literal> users will have to upgrade to
+ <literal>nextcloud23</literal> first.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<literal>pkgs.vimPlugins.onedark-nvim</literal> now refers to
<link xlink:href="https://github.com/navarasu/onedark.nvim">navarasu/onedark.nvim</link>
(formerly refers to
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 9261511e7b8c..52bcc2e80d99 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -632,6 +632,10 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `vpnc` package has been changed to use GnuTLS instead of OpenSSL by default for licensing reasons.
+- The default version of `nextcloud` is **nextcloud24**. Please note that it's **not** possible to upgrade
+ `nextcloud` across multiple major versions! This means it's e.g. not possible to upgrade from `nextcloud22`
+ to `nextcloud24` in a single deploy and most `21.11` users will have to upgrade to `nextcloud23` first.
+
- `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim)
(formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)).
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 52287a834c91..a58e8aa3abd8 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -153,7 +153,7 @@ in {
package = mkOption {
type = types.package;
description = "Which package to use for the Nextcloud instance.";
- relatedPackages = [ "nextcloud22" "nextcloud23" "nextcloud24" ];
+ relatedPackages = [ "nextcloud23" "nextcloud24" ];
};
phpPackage = mkOption {
type = types.package;
@@ -625,7 +625,6 @@ in {
nextcloud defined in an overlay, please set `services.nextcloud.package` to
`pkgs.nextcloud`.
''
- else if versionOlder stateVersion "21.11" then nextcloud21
else if versionOlder stateVersion "22.05" then nextcloud22
else nextcloud24
);
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix
index 76feac314d5b..45165b04bf89 100644
--- a/nixos/tests/nextcloud/default.nix
+++ b/nixos/tests/nextcloud/default.nix
@@ -18,4 +18,4 @@ foldl
};
})
{ }
- [ 22 23 24 ]
+ [ 23 24 ]