summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorajs124 <ajs124@users.noreply.github.com>2021-10-02 16:30:57 +0200
committerGitHub <noreply@github.com>2021-10-02 16:30:57 +0200
commit352bb6205189b6ad6fb076c3b8790aba83b46036 (patch)
treed4d370cc04833150ae5bb4a5591c2ba0c4ae8a3a /nixos
parent8fc47f611261570f450401afc7d433ab2059b615 (diff)
parent3a9ffac149446f885ac533025a10a84f64db836a (diff)
downloadnixpkgs-352bb6205189b6ad6fb076c3b8790aba83b46036.tar
nixpkgs-352bb6205189b6ad6fb076c3b8790aba83b46036.tar.gz
nixpkgs-352bb6205189b6ad6fb076c3b8790aba83b46036.tar.bz2
nixpkgs-352bb6205189b6ad6fb076c3b8790aba83b46036.tar.lz
nixpkgs-352bb6205189b6ad6fb076c3b8790aba83b46036.tar.xz
nixpkgs-352bb6205189b6ad6fb076c3b8790aba83b46036.tar.zst
nixpkgs-352bb6205189b6ad6fb076c3b8790aba83b46036.zip
Merge pull request #138058 from helsinki-systems/upd/varnish
varnish6/7: updates
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml4
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
2 files changed, 3 insertions, 3 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 0688de77af6..98fe3513e25 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
@@ -1002,8 +1002,8 @@ Superuser created successfully.
       <listitem>
         <para>
           The <literal>varnish</literal> package was upgraded from 6.3.x
-          to 6.5.x. <literal>varnish60</literal> for the last LTS
-          release is also still available.
+          to 7.x. <literal>varnish60</literal> for the last LTS release
+          is also still available.
         </para>
       </listitem>
       <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 56babf8ac00..fef42ec52c9 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -310,7 +310,7 @@ In addition to numerous new and upgraded packages, this release has the followin
   configures the address and port the web UI is listening, it defaults to `:9001`.
   To be able to access the web UI this port needs to be opened in the firewall.
 
-- The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available.
+- The `varnish` package was upgraded from 6.3.x to 7.x. `varnish60` for the last LTS release is also still available.
 
 - The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used.