commit f7011c70f30acf0fe5a229b77e4ad22041b8872e · pyrox.dev/nixpkgs

+5 -3

nixos/doc/manual/release-notes/rl-2105.xml

···

       552
       552
        
          </listitem>

     

       553
       553
        
          <listitem>

     

       554
       554
        
           <para>

     

       555
       555
       -
            The default-version of <literal>nextcloud</literal> is <package>nextcloud20</package>.

     

       555
       555
       +
            The default-version of <literal>nextcloud</literal> is <package>nextcloud21</package>.

     

       556
       556
        
            Please note that it's <emphasis>not</emphasis> possible to upgrade <literal>nextcloud</literal>

     

       557
       557
        
            across multiple major versions! This means that it's e.g. not possible to upgrade

     

       558
       558
       -
            from <package>nextcloud18</package> to <package>nextcloud20</package> in a single deploy.

     

       558
       558
       +
            from <package>nextcloud18</package> to <package>nextcloud20</package> in a single deploy and

     

       559
       559
       +
            most <literal>20.09</literal> users will have to upgrade to <package>nextcloud20</package>

     

       560
       560
       +
            first.

     

       559
       561
        
           </para>

     

       560
       562
        
           <para>

     

       561
       563
        
            The package can be manually upgraded by setting <xref linkend="opt-services.nextcloud.package" />

     

       562
       562
       -
            to <package>nextcloud20</package>.

     

       564
       564
       +
            to <package>nextcloud21</package>.

     

       563
       565
        
           </para>

     

       564
       566
        
          </listitem>

     

       565
       567
        
          <listitem>

+5 -6

nixos/modules/services/web-apps/nextcloud.nix

···

       86
       86
        
           package = mkOption {

     

       87
       87
        
             type = types.package;

     

       88
       88
        
             description = "Which package to use for the Nextcloud instance.";

     

       89
       89
       -
             relatedPackages = [ "nextcloud18" "nextcloud19" "nextcloud20" ];

     

       89
       89
       +
             relatedPackages = [ "nextcloud19" "nextcloud20" "nextcloud21" ];

     

       90
       90
        
           };

     

       91
       91
        
       

     

       92
       92
        
           maxUploadSize = mkOption {

     
···

       348
       348
        
             ];

     

       349
       349
        
       

     

       350
       350
        
             warnings = let

     

       351
       351
       -
               latest = 20;

     

       351
       351
       +
               latest = 21;

     

       352
       352
        
               upgradeWarning = major: nixos:

     

       353
       353
        
                 ''

     

       354
       354
        
                   A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.

     
···

       366
       366
        
                 Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.

     

       367
       367
        
                 Please migrate your configuration to config.services.nextcloud.poolSettings.

     

       368
       368
        
               '')

     

       369
       369
       -
               ++ (optional (versionOlder cfg.package.version "18") (upgradeWarning 17 "20.03"))

     

       370
       369
        
               ++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09"))

     

       371
       371
       -
               ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05"));

     

       370
       370
       +
               ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05"))

     

       371
       371
       +
               ++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05"));

     

       372
       372
        
       

     

       373
       373
        
             services.nextcloud.package = with pkgs;

     

       374
       374
        
               mkDefault (

     
···

       378
       378
        
                     nextcloud defined in an overlay, please set `services.nextcloud.package` to

     

       379
       379
        
                     `pkgs.nextcloud`.

     

       380
       380
        
                   ''

     

       381
       381
       -
                 else if versionOlder stateVersion "20.03" then nextcloud17

     

       382
       381
        
                 else if versionOlder stateVersion "20.09" then nextcloud18

     

       383
       382
        
                 # 21.03 will not be an official release - it was instead 21.05.

     

       384
       383
        
                 # This versionOlder statement remains set to 21.03 for backwards compatibility.

     

       385
       384
        
                 # See https://github.com/NixOS/nixpkgs/pull/108899 and

     

       386
       385
        
                 # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.

     

       387
       386
        
                 else if versionOlder stateVersion "21.03" then nextcloud19

     

       388
       388
       -
                 else nextcloud20

     

       387
       387
       +
                 else nextcloud21

     

       389
       388
        
               );

     

       390
       389
        
           }

     

       391
       390

+1 -1

nixos/modules/services/web-apps/nextcloud.xml

···

       11
       11
        
         desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.

     

       12
       12
        
        </para>

     

       13
       13
        
        <para>

     

       14
       14
       -
         The current default by NixOS is <package>nextcloud20</package> which is also the latest

     

       14
       14
       +
         The current default by NixOS is <package>nextcloud21</package> which is also the latest

     

       15
       15
        
         major version available.

     

       16
       16
        
        </para>

     

       17
       17
        
        <section xml:id="module-services-nextcloud-basic-usage">

+10 -10

pkgs/servers/nextcloud/default.nix

···

       31
       31
        
           };

     

       32
       32
        
         };

     

       33
       33
        
       in {

     

       34
       34
       -
         nextcloud17 = throw ''

     

       35
       35
       -
           Nextcloud v17 has been removed from `nixpkgs` as the support for it will be dropped

     

       36
       36
       -
           by upstream within the lifetime of NixOS 20.09[1]. Please upgrade to Nextcloud v18 by

     

       34
       34
       +
         nextcloud18 = throw ''

     

       35
       35
       +
           Nextcloud v18 has been removed from `nixpkgs` as the support for it was dropped

     

       36
       36
       +
           by upstream in 2021-01. Please upgrade to at least Nextcloud v19 by

     

       37
       37
        
           declaring

     

       38
       38
        
       

     

       39
       39
       -
               services.nextcloud.package = pkgs.nextcloud18;

     

       39
       39
       +
               services.nextcloud.package = pkgs.nextcloud19;

     

       40
       40
        
       

     

       41
       41
        
           in your NixOS config.

     

       42
       42
        
       

     

       43
       43
        
           [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html

     

       44
       44
        
         '';

     

       45
       45
        
       

     

       46
       46
       -
         nextcloud18 = generic {

     

       47
       47
       -
           version = "18.0.10";

     

       48
       48
       -
           sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6";

     

       49
       49
       -
           eol = true;

     

       50
       50
       -
         };

     

       51
       51
       -
       

     

       46
       46
       +
         # FIXME(@Ma27) remove on 2021-06

     

       52
       47
        
         nextcloud19 = generic {

     

       53
       48
        
           version = "19.0.6";

     

       54
       49
        
           sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg=";

     
···

       60
       55
        
         nextcloud20 = generic {

     

       61
       56
        
           version = "20.0.7";

     

       62
       57
        
           sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys=";

     

       58
       58
       +
         };

     

       59
       59
       +
       

     

       60
       60
       +
         nextcloud21 = generic {

     

       61
       61
       +
           version = "21.0.0";

     

       62
       62
       +
           sha256 = "sha256-zq2u72doWhGvxbI7Coa6PHvQp7E41dHswFJiODZV8fA=";

     

       63
       63
        
         };

     

       64
       64
        
       }

+1 -1

pkgs/top-level/all-packages.nix

···

       6544
       6544
        
         grocy = callPackage ../servers/grocy { };

     

       6545
       6545
        
       

     

       6546
       6546
        
         inherit (callPackage ../servers/nextcloud {})

     

       6547
       6547
       -
           nextcloud17 nextcloud18 nextcloud19 nextcloud20;

     

       6547
       6547
       +
           nextcloud18 nextcloud19 nextcloud20 nextcloud21;

     

       6548
       6548
        
       

     

       6549
       6549
        
         nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };

     

       6550
       6550