commit cfed3b8b226dfd103f1942c55ffa664178832c29 · pyrox.dev/nixpkgs

+1 -1

.version

+1 -1

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

···

       8
        
         This section lists the release notes for each stable version of NixOS and

     

       9
        
         current unstable revision.

     

       10
        
        </para>

     

       11
       -
        <xi:include href="rl-2103.xml" />

     

       12
        
        <xi:include href="rl-2009.xml" />

     

       13
        
        <xi:include href="rl-2003.xml" />

     

       14
        
        <xi:include href="rl-1909.xml" />

···

       8
        
         This section lists the release notes for each stable version of NixOS and

     

       9
        
         current unstable revision.

     

       10
        
        </para>

     

       11
       +
        <xi:include href="rl-2105.xml" />

     

       12
        
        <xi:include href="rl-2009.xml" />

     

       13
        
        <xi:include href="rl-2003.xml" />

     

       14
        
        <xi:include href="rl-1909.xml" />

+4 -2

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

···

       6
        
        <title>Release 20.09 (“Nightingale”, 2020.10/27)</title>

     

       7
        
       

     

       8
        
         <para>

     

       9
       -
          Support is planned until the end of April 2021, handing over to 21.03.

     

       0
        
       
     

       0
        
       
     

       10
        
         </para>

     

       11
        
        <section xmlns="http://docbook.org/ns/docbook"

     

       12
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     
···

       1538
        
          <listitem>

     

       1539
        
           <para>

     

       1540
        
            Specifying <link linkend="opt-services.dovecot2.mailboxes">mailboxes</link> in the <package>dovecot2</package> module

     

       1541
       -
            as a list is deprecated and will break eval in 21.03. Instead, an attribute-set should be specified where the <literal>name</literal>

     

       1542
        
            should be the key of the attribute.

     

       1543
        
           </para>

     

       1544
        
           <para>

···

       6
        
        <title>Release 20.09 (“Nightingale”, 2020.10/27)</title>

     

       7
        
       

     

       8
        
         <para>

     

       9
       +
          Support is planned until the end of June 2021, handing over to 21.05.

     

       10
       +
          (Plans <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md#core-changes">

     

       11
       +
          have shifted</link> by two months since release of 20.09.)

     

       12
        
         </para>

     

       13
        
        <section xmlns="http://docbook.org/ns/docbook"

     

       14
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     
···

       1540
        
          <listitem>

     

       1541
        
           <para>

     

       1542
        
            Specifying <link linkend="opt-services.dovecot2.mailboxes">mailboxes</link> in the <package>dovecot2</package> module

     

       1543
       +
            as a list is deprecated and will break eval in 21.05. Instead, an attribute-set should be specified where the <literal>name</literal>

     

       1544
        
            should be the key of the attribute.

     

       1545
        
           </para>

     

       1546
        
           <para>

+7 -7

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

···

       2
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       3
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       4
        
                version="5.0"

     

       5
       -
                xml:id="sec-release-21.03">

     

       6
       -
        <title>Release 21.03 (“Okapi”, 2021.03/??)</title>

     

       7
        
       

     

       8
        
        <section xmlns="http://docbook.org/ns/docbook"

     

       9
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       10
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       11
        
                version="5.0"

     

       12
       -
                xml:id="sec-release-21.03-highlights">

     

       13
        
         <title>Highlights</title>

     

       14
        
       

     

       15
        
         <para>

     
···

       20
        
         <itemizedlist>

     

       21
        
          <listitem>

     

       22
        
           <para>

     

       23
       -
            Support is planned until the end of October 2021, handing over to 21.09.

     

       24
        
           </para>

     

       25
        
          </listitem>

     

       26
        
          <listitem>

     
···

       46
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       47
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       48
        
                version="5.0"

     

       49
       -
                xml:id="sec-release-21.03-new-services">

     

       50
        
         <title>New Services</title>

     

       51
        
       

     

       52
        
         <para>

     
···

       82
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       83
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       84
        
                version="5.0"

     

       85
       -
                xml:id="sec-release-21.03-incompatibilities">

     

       86
        
         <title>Backward Incompatibilities</title>

     

       87
        
       

     

       88
        
         <para>

     
···

       501
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       502
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       503
        
                version="5.0"

     

       504
       -
                xml:id="sec-release-21.03-notable-changes">

     

       505
        
         <title>Other Notable Changes</title>

     

       506
        
       

     

       507
        
         <itemizedlist>

···

       2
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       3
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       4
        
                version="5.0"

     

       5
       +
                xml:id="sec-release-21.05">

     

       6
       +
        <title>Release 21.05 (“Okapi”, 2021.05/??)</title>

     

       7
        
       

     

       8
        
        <section xmlns="http://docbook.org/ns/docbook"

     

       9
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       10
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       11
        
                version="5.0"

     

       12
       +
                xml:id="sec-release-21.05-highlights">

     

       13
        
         <title>Highlights</title>

     

       14
        
       

     

       15
        
         <para>

     
···

       20
        
         <itemizedlist>

     

       21
        
          <listitem>

     

       22
        
           <para>

     

       23
       +
            Support is planned until the end of December 2021, handing over to 21.11.

     

       24
        
           </para>

     

       25
        
          </listitem>

     

       26
        
          <listitem>

     
···

       46
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       47
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       48
        
                version="5.0"

     

       49
       +
                xml:id="sec-release-21.05-new-services">

     

       50
        
         <title>New Services</title>

     

       51
        
       

     

       52
        
         <para>

     
···

       82
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       83
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       84
        
                version="5.0"

     

       85
       +
                xml:id="sec-release-21.05-incompatibilities">

     

       86
        
         <title>Backward Incompatibilities</title>

     

       87
        
       

     

       88
        
         <para>

     
···

       501
        
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       502
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       503
        
                version="5.0"

     

       504
       +
                xml:id="sec-release-21.05-notable-changes">

     

       505
        
         <title>Other Notable Changes</title>

     

       506
        
       

     

       507
        
         <itemizedlist>

+1 -1

nixos/modules/services/mail/dovecot.nix

···

       463
        
           environment.systemPackages = [ dovecotPkg ];

     

       464
        
       

     

       465
        
           warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [

     

       466
       -
             "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03! See the release notes for more info for migration."

     

       467
        
           ];

     

       468
        
       

     

       469
        
           assertions = [

···

       463
        
           environment.systemPackages = [ dovecotPkg ];

     

       464
        
       

     

       465
        
           warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [

     

       466
       +
             "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.05! See the release notes for more info for migration."

     

       467
        
           ];

     

       468
        
       

     

       469
        
           assertions = [

+1 -1

nixos/modules/services/networking/kresd.nix

···

       140
        
       

     

       141
        
           # Try cleaning up the previously default location of cache file.

     

       142
        
           # Note that /var/cache/* should always be safe to remove.

     

       143
       -
           # TODO: remove later, probably between 20.09 and 21.03

     

       144
        
           systemd.tmpfiles.rules = [ "R /var/cache/kresd" ];

     

       145
        
         };

     

       146
        
       }

···

       140
        
       

     

       141
        
           # Try cleaning up the previously default location of cache file.

     

       142
        
           # Note that /var/cache/* should always be safe to remove.

     

       143
       +
           # TODO: remove later, probably between 20.09 and 21.05

     

       144
        
           systemd.tmpfiles.rules = [ "R /var/cache/kresd" ];

     

       145
        
         };

     

       146
        
       }

+4

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

···

       5
        
       let

     

       6
        
         cfg = config.services.hedgedoc;

     

       7
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
         name = if versionAtLeast config.system.stateVersion "21.03"

     

       9
        
           then "hedgedoc"

     

       10
        
           else "codimd";

···

       5
        
       let

     

       6
        
         cfg = config.services.hedgedoc;

     

       7
        
       

     

       8
       +
         # 21.03 will not be an official release - it was instead 21.05.  This

     

       9
       +
         # versionAtLeast statement remains set to 21.03 for backwards compatibility.

     

       10
       +
         # See https://github.com/NixOS/nixpkgs/pull/108899 and

     

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

     

       12
        
         name = if versionAtLeast config.system.stateVersion "21.03"

     

       13
        
           then "hedgedoc"

     

       14
        
           else "codimd";

+5 -1

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

···

       368
        
               '')

     

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

     

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

     

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

     

       372
        
       

     

       373
        
             services.nextcloud.package = with pkgs;

     

       374
        
               mkDefault (

     
···

       380
        
                   ''

     

       381
        
                 else if versionOlder stateVersion "20.03" then nextcloud17

     

       382
        
                 else if versionOlder stateVersion "20.09" then nextcloud18

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       383
        
                 else if versionOlder stateVersion "21.03" then nextcloud19

     

       384
        
                 else nextcloud20

     

       385
        
               );

···

       368
        
               '')

     

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

     

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

     

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

     

       372
        
       

     

       373
        
             services.nextcloud.package = with pkgs;

     

       374
        
               mkDefault (

     
···

       380
        
                   ''

     

       381
        
                 else if versionOlder stateVersion "20.03" then nextcloud17

     

       382
        
                 else if versionOlder stateVersion "20.09" then nextcloud18

     

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

     

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

     

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

     

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

     

       387
        
                 else if versionOlder stateVersion "21.03" then nextcloud19

     

       388
        
                 else nextcloud20

     

       389
        
               );

+1 -1

pkgs/applications/editors/emacs-modes/melpa-packages.nix

···

       610
        
             };

     

       611
        
       

     

       612
        
             # Deprecated legacy aliases for backwards compat

     

       613
       -
             aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) {

     

       614
        
               "auto-complete-clang-async" = "emacsClangCompleteAsync";

     

       615
        
               "vterm" = "emacs-libvterm";

     

       616
        
               "0xc" = "_0xc";

···

       610
        
             };

     

       611
        
       

     

       612
        
             # Deprecated legacy aliases for backwards compat

     

       613
       +
             aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.05, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) {

     

       614
        
               "auto-complete-clang-async" = "emacsClangCompleteAsync";

     

       615
        
               "vterm" = "emacs-libvterm";

     

       616
        
               "0xc" = "_0xc";

+1 -1

pkgs/top-level/aliases.nix

···

       846
        
       

     

       847
        
         todolist = throw "todolist is now ultralist."; # added 2020-12-27

     

       848
        
       

     

       849
       -
         /* Cleanup before 21.03 */

     

       850
        
         riot-desktop = throw "riot-desktop is now element-desktop!";

     

       851
        
         riot-web = throw "riot-web is now element-web";

     

       852

···

       846
        
       

     

       847
        
         todolist = throw "todolist is now ultralist."; # added 2020-12-27

     

       848
        
       

     

       849
       +
         /* Cleanup before 21.05 */

     

       850
        
         riot-desktop = throw "riot-desktop is now element-desktop!";

     

       851
        
         riot-web = throw "riot-web is now element-web";

     

       852