Merge pull request #173906 from Ma27/rm-nextcloud22

nextcloud22: drop

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml

@@ -1645,6 +1645,19 @@
           GnuTLS instead of OpenSSL by default for licensing reasons.
         </para>
       </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

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)).
 

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
         );

nixos/tests/nextcloud/default.nix

@@ -18,4 +18,4 @@ foldl
     };
   })
 { }
-  [ 22 23 24 ]
+  [ 23 24 ]

pkgs/servers/nextcloud/default.nix

@@ -33,23 +33,18 @@ let
     };
   };
 in {
-  nextcloud21 = throw ''
+  nextcloud22 = throw ''
-    Nextcloud v21 has been removed from `nixpkgs` as the support for it was dropped
+    Nextcloud v22 has been removed from `nixpkgs` as the support for is dropped
-    by upstream in 2022-02. Please upgrade to at least Nextcloud v22 by declaring
+    by upstream in 2022-07. Please upgrade to at least Nextcloud v23 by declaring
 
-        services.nextcloud.package = pkgs.nextcloud22;
+        services.nextcloud.package = pkgs.nextcloud23;
 
     in your NixOS config.
 
-    WARNING: if you were on Nextcloud 20 on NixOS 21.11 you have to upgrade to Nextcloud 21
+    WARNING: if you were on Nextcloud 21 on NixOS 21.11 you have to upgrade to Nextcloud 22
     first on 21.11 because Nextcloud doesn't support upgrades accross multiple major versions!
   '';
 
-  nextcloud22 = generic {
-    version = "22.2.8";
-    sha256 = "061b8a118d0fa500058a04ff8476ba96d4c24cef56e5fe5e300cc7113ce13a18";
-  };
-
   nextcloud23 = generic {
     version = "23.0.5";
     sha256 = "3cf51a795f8439e5d34f0a521d939cefafbae38450cce64c6673016984195f29";

pkgs/top-level/all-packages.nix

@@ -8621,7 +8621,7 @@ with pkgs;
   grocy = callPackage ../servers/grocy { };
 
   inherit (callPackage ../servers/nextcloud {})
-    nextcloud21 nextcloud22 nextcloud23 nextcloud24;
+    nextcloud22 nextcloud23 nextcloud24;
 
   nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };