summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorLuke Granger-Brown <git@lukegb.com>2022-03-13 02:20:38 +0000
committerGitHub <noreply@github.com>2022-03-13 02:20:38 +0000
commit8035c513e36fc2db98948a3eeaa2a0fdc1a1e853 (patch)
tree08fbf6902d2680092721fe6762a08fd8801bc3d0 /nixos/doc
parentc01da72106d756201602328f9a0c7bf419b9f34d (diff)
parentc19e76b29f7bd0d225ab89feb0a3726676f915c8 (diff)
downloadnixpkgs-8035c513e36fc2db98948a3eeaa2a0fdc1a1e853.tar
nixpkgs-8035c513e36fc2db98948a3eeaa2a0fdc1a1e853.tar.gz
nixpkgs-8035c513e36fc2db98948a3eeaa2a0fdc1a1e853.tar.bz2
nixpkgs-8035c513e36fc2db98948a3eeaa2a0fdc1a1e853.tar.lz
nixpkgs-8035c513e36fc2db98948a3eeaa2a0fdc1a1e853.tar.xz
nixpkgs-8035c513e36fc2db98948a3eeaa2a0fdc1a1e853.tar.zst
nixpkgs-8035c513e36fc2db98948a3eeaa2a0fdc1a1e853.zip
Merge pull request #163673 from lukegb/pomerium
pomerium: 0.15.7 -> 0.17.0
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml10
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md5
2 files changed, 15 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 4a2177ca9e2..bdf51211378 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
@@ -1376,6 +1376,16 @@
       </listitem>
       <listitem>
         <para>
+          The <literal>pomerium-cli</literal> command has been moved out
+          of the <literal>pomerium</literal> package into the
+          <literal>pomerium-cli</literal> package, following upstream’s
+          repository split. If you are using the
+          <literal>pomerium-cli</literal> command, you should now
+          install the <literal>pomerium-cli</literal> package.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           The option
           <link linkend="opt-networking.networkmanager.enableFccUnlock">services.networking.networkmanager.enableFccUnlock</link>
           was added to support FCC unlock procedures. Since release
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index b8fa641a565..b8d6078a21d 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -503,6 +503,11 @@ In addition to numerous new and upgraded packages, this release has the followin
   Reason is that the old name has been deprecated upstream.
   Using the old option name will still work, but produce a warning.
 
+- The `pomerium-cli` command has been moved out of the `pomerium` package into
+  the `pomerium-cli` package, following upstream's repository split. If you are
+  using the `pomerium-cli` command, you should now install the `pomerium-cli`
+  package.
+
 - The option
   [services.networking.networkmanager.enableFccUnlock](#opt-networking.networkmanager.enableFccUnlock)
   was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager