summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2021-12-02 01:43:22 -0800
committerGitHub <noreply@github.com>2021-12-02 01:43:22 -0800
commitfafe9a8d0414682365fac2fb123b2d3389faeab7 (patch)
tree1df6eed22cce62026edcea70fdb1d823e133c6cf /nixos
parentba798538d076f5dea9e5f8bafdec0384fef9b1d6 (diff)
parent932ab304f0b8e3241c1311b9b731d3d330291715 (diff)
Merge pull request #148236 from Vonfry/emacs/remove-org-elpa
emacsPackages.orgPackages: deprecated
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.md5
2 files changed, 17 insertions, 1 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 baefa0d369e5..4752cad6c7b0 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
@@ -24,7 +24,7 @@
</section>
<section xml:id="sec-release-22.05-incompatibilities">
<title>Backward Incompatibilities</title>
- <itemizedlist spacing="compact">
+ <itemizedlist>
<listitem>
<para>
<literal>pkgs.ghc</literal> now refers to
@@ -46,6 +46,17 @@
<literal>haskellPackages.callPackage</literal>).
</para>
</listitem>
+ <listitem>
+ <para>
+ <literal>pkgs.emacsPackages.orgPackages</literal> is removed
+ because org elpa is deprecated. The packages in the top level
+ of <literal>pkgs.emacsPackages</literal>, such as org and
+ org-contrib, refer to the ones in
+ <literal>pkgs.emacsPackages.elpaPackages</literal> and
+ <literal>pkgs.emacsPackages.nongnuPackages</literal> where the
+ new versions will release.
+ </para>
+ </listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index a66e29bdb5f8..b0526a1fb3b4 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -22,4 +22,9 @@ In addition to numerous new and upgraded packages, this release has the followin
instead to ensure cross compilation keeps working (or switch to
`haskellPackages.callPackage`).
+* `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated.
+ The packages in the top level of `pkgs.emacsPackages`, such as org and
+ org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
+ `pkgs.emacsPackages.nongnuPackages` where the new versions will release.
+
## Other Notable Changes {#sec-release-22.05-notable-changes}