summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-09 00:01:34 +0000
committerGitHub <noreply@github.com>2021-07-09 00:01:34 +0000
commit17a534e48bf9d8cf63cb03026977e4e57ddfee81 (patch)
treea4a9e093bf5dbe1716bcedbc0d10e12ef0b67f58 /nixos/doc/manual
parente15847d16874bea247706e4ac7f7dd84e9319813 (diff)
parent664ebda061df7791a14aac226ccda5526d218632 (diff)
downloadnixpkgs-17a534e48bf9d8cf63cb03026977e4e57ddfee81.tar
nixpkgs-17a534e48bf9d8cf63cb03026977e4e57ddfee81.tar.gz
nixpkgs-17a534e48bf9d8cf63cb03026977e4e57ddfee81.tar.bz2
nixpkgs-17a534e48bf9d8cf63cb03026977e4e57ddfee81.tar.lz
nixpkgs-17a534e48bf9d8cf63cb03026977e4e57ddfee81.tar.xz
nixpkgs-17a534e48bf9d8cf63cb03026977e4e57ddfee81.tar.zst
nixpkgs-17a534e48bf9d8cf63cb03026977e4e57ddfee81.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml7
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
2 files changed, 9 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 2fe040d3fd8..42441dcfc1b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -71,6 +71,13 @@
           be able to access programmers supported by flashrom.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <link xlink:href="https://vikunja.io">vikunja</link>, a to-do
+          list app. Available as
+          <link linkend="opt-services.vikunja.enable">services.vikunja</link>.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-incompatibilities">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index fa3c0c40a28..3a734f88ffc 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -22,6 +22,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - Users of flashrom should migrate to [programs.flashrom.enable](options.html#opt-programs.flashrom.enable) and add themselves to the `flashrom` group to be able to access programmers supported by flashrom.
 
+- [vikunja](https://vikunja.io), a to-do list app. Available as [services.vikunja](#opt-services.vikunja.enable).
+
 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
 
 - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1