0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-19 00:01:36 +00:00 committed by GitHub
commit dc802b2e19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 112 additions and 67 deletions

View file

@ -7,7 +7,7 @@
<itemizedlist spacing="compact">
<listitem>
<para>
Support is planned until the end of April 2022, handing over to
Support is planned until the end of June 2022, handing over to
22.05.
</para>
</listitem>

View file

@ -2,7 +2,7 @@
In addition to numerous new and upgraded packages, this release has the following highlights:
- Support is planned until the end of April 2022, handing over to 22.05.
- Support is planned until the end of June 2022, handing over to 22.05.
## Highlights {#sec-release-21.11-highlights}