diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-29 00:01:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 00:01:33 +0000 |
commit | 4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc (patch) | |
tree | 009d65e0b0351612af7de7970317a9890fdc1657 /nixos/doc/manual | |
parent | 6fcda9f1ec27db14412a2103281b4b14f806066a (diff) | |
parent | db809100db91e97c118a70c3879307afdbf1dbb7 (diff) | |
download | nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.gz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.bz2 nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.lz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.xz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.zst nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.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.xml | 7 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 |
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 5a7f52d338f..de2cd7bef6d 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 @@ -133,6 +133,13 @@ <link linkend="opt-services.prometheus.exporters.influxdb.enable">services.prometheus.exporters.influxdb</link>. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/matrix-discord/mx-puppet-discord">mx-puppet-discord</link>, + a discord puppeting bridge for matrix. Available as + <link linkend="opt-services.mx-puppet-discord.enable">services.mx-puppet-discord</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 89a3e6398c6..1ce78a4d774 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -41,6 +41,8 @@ pt-services.clipcat.enable). - [influxdb-exporter](https://github.com/prometheus/influxdb_exporter) a Prometheus exporter that exports metrics received on an InfluxDB compatible endpoint is now available as [services.prometheus.exporters.influxdb](#opt-services.prometheus.exporters.influxdb.enable). +- [mx-puppet-discord](https://github.com/matrix-discord/mx-puppet-discord), a discord puppeting bridge for matrix. Available as [services.mx-puppet-discord](#opt-services.mx-puppet-discord.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 |