diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-01 00:02:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 00:02:21 +0000 |
| commit | aee8ca66392a32187d1f561fba475cbe3c70d558 (patch) | |
| tree | 1b339cdf948deccc8931c9243c46ebf53a04b970 /nixos/doc | |
| parent | b96dafafd19e77e5b71ac8aacf7c6cf4090e4fe3 (diff) | |
| parent | c073294043903cb7ea596d201a9d41c8afdb0dd8 (diff) | |
| download | nixpkgs-aee8ca66392a32187d1f561fba475cbe3c70d558.tar nixpkgs-aee8ca66392a32187d1f561fba475cbe3c70d558.tar.gz nixpkgs-aee8ca66392a32187d1f561fba475cbe3c70d558.tar.bz2 nixpkgs-aee8ca66392a32187d1f561fba475cbe3c70d558.tar.lz nixpkgs-aee8ca66392a32187d1f561fba475cbe3c70d558.tar.xz nixpkgs-aee8ca66392a32187d1f561fba475cbe3c70d558.tar.zst nixpkgs-aee8ca66392a32187d1f561fba475cbe3c70d558.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 9 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2205.section.md | 2 |
2 files changed, 11 insertions, 0 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 0f0509b4e60..badd210e7e5 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 @@ -192,6 +192,15 @@ <link xlink:href="options.html#opt-services.rstudio-server.enable">services.rstudio-server</link>. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/juanfont/headscale">headscale</link>, + an Open Source implementation of the + <link xlink:href="https://tailscale.io">Tailscale</link> + Control Server. Available as + <link xlink:href="options.html#opt-services.headscale.enable">services.headscale</link> + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-incompatibilities"> diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 748837d1d9a..62273db70dc 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -58,6 +58,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable). +- [headscale](https://github.com/juanfont/headscale), an Open Source implementation of the [Tailscale](https://tailscale.io) Control Server. Available as [services.headscale](options.html#opt-services.headscale.enable) + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} |